mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

ARM: dts: imx6ull-colibri: move gpio-keys node to som dtsi

Browse source 
The gpio-keys define module level wake-up pin functionality. Move it
from the carrier board dts file to the Som dtsi file.
While at it, also re-order the properties in the gpio-keys node
alphabetically and rename to sub-node from power to wakeup.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Marcel Ziswiler 2022-05-06 15:24:15 +02:00 committed by Shawn Guo
parent 17c101d839
commit a5fa132bbe
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
View file

@ -8,20 +8,6 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_snvs_gpiokeys>;
power {
label = "Wake-Up";
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_WAKEUP>;
debounce-interval = <10>;
wakeup-source;
};
};
/* fixed crystal dedicated to mcp2515 */ /* fixed crystal dedicated to mcp2515 */
clk16m: clk16m { clk16m: clk16m {
compatible = "fixed-clock"; compatible = "fixed-clock";
@ -29,7 +15,6 @@ clk16m: clk16m {
clock-frequency = <16000000>; clock-frequency = <16000000>;
}; };
reg_3v3: regulator-3v3 { reg_3v3: regulator-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "3.3V"; regulator-name = "3.3V";

16
arch/arm/boot/dts/imx6ull-colibri.dtsi
View file

@ -24,6 +24,20 @@ backlight: backlight {
status = "okay"; status = "okay";
}; };
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_snvs_gpiokeys>;
wakeup {
debounce-interval = <10>;
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */
label = "Wake-Up";
linux,code = <KEY_WAKEUP>;
wakeup-source;
};
};
panel_dpi: panel-dpi { panel_dpi: panel-dpi {
compatible = "edt,et057090dhu"; compatible = "edt,et057090dhu";
backlight = <&backlight>; backlight = <&backlight>;
@ -707,7 +721,7 @@ MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x130b0
pinctrl_snvs_gpiokeys: snvs-gpiokeys-grp { pinctrl_snvs_gpiokeys: snvs-gpiokeys-grp {
fsl,pins = < fsl,pins = <
MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 */ MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 / WAKE_UP */
>; >;
}; };