Unverified Commit ec21041b authored Jul 06, 2022 by Arnd Bergmann

Merge tag 'dt64-cleanup-5.20-2' of...

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>

parents 6a65fc36 2b090180

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ memory@0 {

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

		reset {
		key-reset {
		label = "reset";
		linux,code = <KEY_RESTART>;
		gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ keys {
		pinctrl-0 = <&cp0_gpio_reset_pins &cp1_wps_button_pins>;
		pinctrl-names = "default";

		button_0 {
		button-0 {
		/* The rear button */
		label = "Rear Button";
		gpios = <&cp0_gpio2 7 GPIO_ACTIVE_LOW>;
		@@ -102,7 +102,7 @@ button_0 {
		linux,code = <BTN_0>;
		};

		button_1 {
		button-1 {
		/* The wps button */
		label = "WPS Button";
		gpios = <&cp1_gpio1 30 GPIO_ACTIVE_LOW>;