leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup of ARM64 DTS for v5.20, part two

Browse Source 
Remaining cleanups for ARM64 DTS: gpio-keys and led node names on Marvel
 platforms.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmLFuQsQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD17EZD/9BLYWbXy+xsUSKVs6a7PCP2JV2TDTym+2/
 qUP+gBcWHtO08MRmti+Wa2hiLZOV8xcr0Su+fbv/xA4iLJM52ZhgsQLZxwX7DYUg
 x/FbhgBTVgCHaFHlZJK1sHaFpAOaxbYhqiycdtzkLzuS+6DjUuKQPhDlfOb4suct
 LGl/8dAI5W4PP1YYAtB1IaI8JdaPf9ElC1VRdJGeyVMZPEhOjc2gUzuCPp/iRrdR
 e+0J/F2OmutFI4G7VUEczSl3Xx83gM/uj6QyhN0idszdbTHRjzCZynqdG8mFJYiK
 LZAK2NZJ5qIyHpnxR3EWJZejgF3eE9uD/EIyHPLCh2/26tcs7LRnRZKFKdUx4JNQ
 NN6l57p9KuXnlQGv95YrxJVo5iGqnlshUIm57v+WdpdPIMNPiZHUHH0/0kMACvSM
 n8wxTMTXaGe1gwdry8ePHURcnboDuPef0VQ4C6dSZ2xqh0b+6bTqKv31+Mj2tHDo
 WiPdFnoSRkWhUO220ZBj7DPTXedpdon8K6/8vSiNTQi7wsZQ8Kroyd/7ytKhDfzl
 tIFufGjNRFumAzk3v4GVp29G5lbsf2rrOHSnMPD/ItoXh16PzSRq4YyCrkRI/lqa
 1zK2KBsoMyObBRpRLgAOuf0MfsdwJWT/kWkzV4LzSFy/zDa8qNEcV7SYQC0C9Hd0
 UFOcAn+lkQ==
 =oAoI
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmLF8XUACgkQmmx57+YA
 GNmRzw/+LkaC50V0MBk5oetzogaLIfHV2Clnnu3as98zFNv0tSrG0hsnR4Vc6hix
 8GvfbIesu8D57QjzdLiusRX8/bpZQFaE4IKhcYzaHHq5Fr74OMdURy2iA6gVXAIY
 pr7TCJN5BajdatoXqEfDanxaOkGXBwM5z3qoyL41X5jDJHx3Lz903bx+7ws5N3FJ
 UhbDe4bZi+fsfBRMrjFCGX2lxdnR9Zv64V/tXCURymT9zBKf9ydjQLZ5m61rkuBL
 1rjaOw2UEosrzzmGzW6tSCmtOZLHrpZ3pHcAGggAeZHiN03iaZitgFW48cT9E+iI
 B78kq/swsgXOmMdP99OUGS9W0sqy8kVRc3MpGy7Btq4+jlBn07yYyoOYQgMSvyPU
 AFBMiIQRL006HU/WP+1QltDewnFLmNPB22+N5fcvcwLDt94K1I41N1paRfGBFdKI
 MkYz48yg2Q5JoNZ2vgt2uZXiGVc+iGZcfhfFZFI+fC7KSjAWh0zbfjIcpuaN3scL
 NwlITx/wVzMct/p/9ohmpj2UyA5XRs7j7OXMbHmlk4ykvFfVvQk8CBP/OeO33k3P
 IV8dk4cK9eopVut24dRWsfM+B5jHL785TrXogbSDSRNJUZ77IAr2vtTAQlaicXuC
 a2yLrHT3BrW2947F5zlxQHU+rkKkhMwsMxDYdmzuCFHgZ0bWcx4=
 =jO+A
 -----END PGP SIGNATURE-----

Merge tag 'dt64-cleanup-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Cleanup of ARM64 DTS for v5.20, part two

Remaining cleanups for ARM64 DTS: gpio-keys and led node names on Marvel
platforms.

* tag 'dt64-cleanup-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: marvell: armada-3720: align lednode names with dtschema
  arm64: dts: marvell: align gpio-key node names with dtschema

Link: https://lore.kernel.org/r/20220706163754.33064-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-07-06 22:32:51 +02:00
commit ec21041bb3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
View File

@ -35,7 +35,7 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
red { led {
label = "mox:red:activity"; label = "mox:red:activity";
gpios = <&gpiosb 21 GPIO_ACTIVE_LOW>; gpios = <&gpiosb 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
@ -45,7 +45,7 @@
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
reset { key-reset {
label = "reset"; label = "reset";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>; gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>;

4
arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
View File

@ -94,7 +94,7 @@
pinctrl-0 = <&cp0_gpio_reset_pins &cp1_wps_button_pins>; pinctrl-0 = <&cp0_gpio_reset_pins &cp1_wps_button_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
button_0 { button-0 {
/* The rear button */ /* The rear button */
label = "Rear Button"; label = "Rear Button";
gpios = <&cp0_gpio2 7 GPIO_ACTIVE_LOW>; gpios = <&cp0_gpio2 7 GPIO_ACTIVE_LOW>;
@ -102,7 +102,7 @@
linux,code = <BTN_0>; linux,code = <BTN_0>;
}; };
button_1 { button-1 {
/* The wps button */ /* The wps button */
label = "WPS Button"; label = "WPS Button";
gpios = <&cp1_gpio1 30 GPIO_ACTIVE_LOW>; gpios = <&cp1_gpio1 30 GPIO_ACTIVE_LOW>;