diff --git a/arch/arm64/boot/dts/exynos/google/zuma-akita.dts b/arch/arm64/boot/dts/exynos/google/zuma-akita.dts index 0f01727be9..bd1822f005 100644 --- a/arch/arm64/boot/dts/exynos/google/zuma-akita.dts +++ b/arch/arm64/boot/dts/exynos/google/zuma-akita.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include "zuma.dtsi" / { @@ -55,8 +56,11 @@ * hang that never panics lasts until someone resets the phone * with its buttons: panic on soft and hard lockups and on RCU * stalls, so that panic=10 resets the phone by itself. + * mem_sleep_default=s2idle: the firmware offers PSCI system + * suspend, so "mem" would otherwise mean "deep", which needs a + * PMU sleep sequence the kernel doesn't have yet. */ - bootargs = "console=tty0 fbcon=font:TER16x32 reboot=warm panic=10 softlockup_panic=1 nmi_watchdog=panic sysctl.kernel.panic_on_rcu_stall=1 clk_ignore_unused pd_ignore_unused rdinit=/init"; + bootargs = "console=tty0 fbcon=font:TER16x32 reboot=warm panic=10 softlockup_panic=1 nmi_watchdog=panic sysctl.kernel.panic_on_rcu_stall=1 clk_ignore_unused pd_ignore_unused rdinit=/init mem_sleep_default=s2idle"; #address-cells = <2>; #size-cells = <1>; ranges; @@ -77,6 +81,33 @@ }; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-0 = <&key_voldown>, <&key_volup>, <&key_power>; + pinctrl-names = "default"; + + button-vol-down { + label = "KEY_VOLUMEDOWN"; + linux,code = ; + gpios = <&gpa4 1 GPIO_ACTIVE_LOW>; + wakeup-source; + }; + + button-vol-up { + label = "KEY_VOLUMEUP"; + linux,code = ; + gpios = <&gpa6 2 GPIO_ACTIVE_LOW>; + wakeup-source; + }; + + button-power { + label = "KEY_POWER"; + linux,code = ; + gpios = <&gpa4 0 GPIO_ACTIVE_LOW>; + wakeup-source; + }; + }; + reserved-memory { #address-cells = <2>; #size-cells = <1>;