Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+4 -4
+2 -2
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
··· 35 35 36 36 leds { 37 37 compatible = "gpio-leds"; 38 - red { 38 + led { 39 39 label = "mox:red:activity"; 40 40 gpios = <&gpiosb 21 GPIO_ACTIVE_LOW>; 41 41 linux,default-trigger = "default-on"; ··· 45 45 gpio-keys { 46 46 compatible = "gpio-keys"; 47 47 48 - reset { 48 + key-reset { 49 49 label = "reset"; 50 50 linux,code = <KEY_RESTART>; 51 51 gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>;
+2 -2
arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
··· 94 94 pinctrl-0 = <&cp0_gpio_reset_pins &cp1_wps_button_pins>; 95 95 pinctrl-names = "default"; 96 96 97 - button_0 { 97 + button-0 { 98 98 /* The rear button */ 99 99 label = "Rear Button"; 100 100 gpios = <&cp0_gpio2 7 GPIO_ACTIVE_LOW>; ··· 102 102 linux,code = <BTN_0>; 103 103 }; 104 104 105 - button_1 { 105 + button-1 { 106 106 /* The wps button */ 107 107 label = "WPS Button"; 108 108 gpios = <&cp1_gpio1 30 GPIO_ACTIVE_LOW>;