Unverified Commit 72e76dc2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Cleanup of ARM DTS for v5.20, part two

Series of cleanups for ARM DTS - white-spaces, gpio-key subnode names
and gpio-key properties for more boards: TI, Marvell, AT91 and Aspeed.

* tag 'dt-cleanup-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: aspeed: correct gpio-keys properties
  ARM: dts: aspeed: align gpio-key node names with dtschema
  ARM: dts: at91: drop unneeded status from gpio-keys
  ARM: dts: at91: correct gpio-keys properties
  ARM: dts: at91: align gpio-key node names with dtschema
  ARM: dts: omap: correct gpio-keys properties
  ARM: dts: omap: align gpio-key node names with dtschema
  ARM: dts: marvell: correct gpio-keys properties
  ARM: dts: marvell: align gpio-key node names with dtschema
  ARM: dts: omap: adjust whitespace around '='
  ARM: dts: ti: adjust whitespace around '='

Link: https://lore.kernel.org/r/20220706163754.33064-2-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ec21041b 3d34cae1

arch/arm/boot/dts/am335x-evm.dts

+3 −5
Original line number Diff line number Diff line
@@ -92,20 +92,18 @@ &gpio1 26 GPIO_ACTIVE_HIGH /* Bank1, pin26 */ 
				0x0201006c>;	/* DOWN */

	};



	gpio_keys: volume_keys0 {

	gpio_keys: volume-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		autorepeat;



		switch9 {

		switch-9 {

			label = "volume-up";

			linux,code = <115>;

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			wakeup-source;

		};



		switch10 {

		switch-10 {

			label = "volume-down";

			linux,code = <114>;

			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/am335x-guardian.dts

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ guardian_buttons: gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&guardian_button_pins>;

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		select-button {

			label = "guardian-select-button";

arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi

+1 −3
Original line number Diff line number Diff line
@@ -166,10 +166,8 @@ &mmc2 { 
&buttons {

	pinctrl-names = "default";

	pinctrl-0 = <&push_button_pins>;

	#address-cells = <1>;

	#size-cells = <0>;



	button@0 {

	button-0 {

		label = "push_button";

		linux,code = <0x100>;

		gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi

+1 −3
Original line number Diff line number Diff line
@@ -378,10 +378,8 @@ &mmc3 { 
&buttons {

	pinctrl-names = "default";

	pinctrl-0 = <&push_button_pins>;

	#address-cells = <1>;

	#size-cells = <0>;



	button@0 {

	button-0 {

		label = "push_button";

		linux,code = <0x100>;

		gpios = <&gpio3 21 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/am335x-pcm-953.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -54,14 +54,14 @@ user_buttons: user_buttons { 
		pinctrl-names = "default";

		pinctrl-0 = <&user_buttons_pins>;



		button@0 {

		button-0 {

			label = "home";

			linux,code = <KEY_HOME>;

			gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>;

			wakeup-source;

		};



		button@1 {

		button-1 {

			label = "menu";

			linux,code = <KEY_MENU>;

			gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;