Commit 5ee46bfb authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Thomas Bogendoerfer
Browse files

MIPS: dts: correct gpio-keys names and properties 



gpio-keys children do not use unit addresses.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarArınç ÜNAL <arinc.unal@arinc9.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent e1a534f5

arch/mips/boot/dts/img/pistachio_marduk.dts

+2 −2
Original line number Diff line number Diff line
@@ -59,12 +59,12 @@ 


	keys {

		compatible = "gpio-keys";

		button@1 {

		button-1 {

			label = "Button 1";

			linux,code = <0x101>; /* BTN_1 */

			gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;

		};

		button@2 {

		button-2 {

			label = "Button 2";

			linux,code = <0x102>; /* BTN_2 */

			gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;

arch/mips/boot/dts/ingenic/gcw0.dts

+14 −17
Original line number Diff line number Diff line
@@ -130,89 +130,86 @@ 


	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		autorepeat;



		button@0 {

		button-0 {

			label = "D-pad up";

			linux,code = <KEY_UP>;

			linux,can-disable;

			gpios = <&gpe 21 GPIO_ACTIVE_LOW>;

		};



		button@1 {

		button-1 {

			label = "D-pad down";

			linux,code = <KEY_DOWN>;

			linux,can-disable;

			gpios = <&gpe 25 GPIO_ACTIVE_LOW>;

		};



		button@2 {

		button-2 {

			label = "D-pad left";

			linux,code = <KEY_LEFT>;

			linux,can-disable;

			gpios = <&gpe 23 GPIO_ACTIVE_LOW>;

		};



		button@3 {

		button-3 {

			label = "D-pad right";

			linux,code = <KEY_RIGHT>;

			linux,can-disable;

			gpios = <&gpe 24 GPIO_ACTIVE_LOW>;

		};



		button@4 {

		button-4 {

			label = "Button A";

			linux,code = <KEY_LEFTCTRL>;

			linux,can-disable;

			gpios = <&gpe 29 GPIO_ACTIVE_LOW>;

		};



		button@5 {

		button-5 {

			label = "Button B";

			linux,code = <KEY_LEFTALT>;

			linux,can-disable;

			gpios = <&gpe 20 GPIO_ACTIVE_LOW>;

		};



		button@6 {

		button-6 {

			label = "Button Y";

			linux,code = <KEY_SPACE>;

			linux,can-disable;

			gpios = <&gpe 27 GPIO_ACTIVE_LOW>;

		};



		button@7 {

		button-7 {

			label = "Button X";

			linux,code = <KEY_LEFTSHIFT>;

			linux,can-disable;

			gpios = <&gpe 28 GPIO_ACTIVE_LOW>;

		};



		button@8 {

		button-8 {

			label = "Left shoulder button";

			linux,code = <KEY_TAB>;

			linux,can-disable;

			gpios = <&gpb 20 GPIO_ACTIVE_LOW>;

		};



		button@9 {

		button-9 {

			label = "Right shoulder button";

			linux,code = <KEY_BACKSPACE>;

			linux,can-disable;

			gpios = <&gpe 26 GPIO_ACTIVE_LOW>;

		};



		button@10 {

		button-10 {

			label = "Start button";

			linux,code = <KEY_ENTER>;

			linux,can-disable;

			gpios = <&gpb 21 GPIO_ACTIVE_LOW>;

		};



		button@11 {

		button-11 {

			label = "Select button";

			linux,code = <KEY_ESC>;

			linux,can-disable;
@@ -223,7 +220,7 @@ 
			gpios = <&gpd 18 GPIO_ACTIVE_HIGH>;

		};



		button@12 {

		button-12 {

			label = "Power slider";

			linux,code = <KEY_POWER>;

			linux,can-disable;
@@ -231,7 +228,7 @@ 
			wakeup-source;

		};



		button@13 {

		button-13 {

			label = "Power hold";

			linux,code = <KEY_PAUSE>;

			linux,can-disable;

arch/mips/boot/dts/ingenic/rs90.dts

+8 −10
Original line number Diff line number Diff line
@@ -52,53 +52,51 @@ 


	keys@0 {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		key@0 {

		key-0 {

			label = "D-pad up";

			linux,code = <KEY_UP>;

			gpios = <&gpc 10 GPIO_ACTIVE_LOW>;

		};



		key@1 {

		key-1 {

			label = "D-pad down";

			linux,code = <KEY_DOWN>;

			gpios = <&gpc 11 GPIO_ACTIVE_LOW>;

		};



		key@2 {

		key-2 {

			label = "D-pad left";

			linux,code = <KEY_LEFT>;

			gpios = <&gpb 31 GPIO_ACTIVE_LOW>;

		};



		key@3 {

		key-3 {

			label = "D-pad right";

			linux,code = <KEY_RIGHT>;

			gpios = <&gpd 21 GPIO_ACTIVE_LOW>;

		};



		key@4 {

		key-4 {

			label = "Button A";

			linux,code = <KEY_LEFTCTRL>;

			gpios = <&gpc 31 GPIO_ACTIVE_LOW>;

		};



		key@5 {

		key-5 {

			label = "Button B";

			linux,code = <KEY_LEFTALT>;

			gpios = <&gpc 30 GPIO_ACTIVE_LOW>;

		};



		key@6 {

		key-6 {

			label = "Right shoulder button";

			linux,code = <KEY_BACKSPACE>;

			gpios = <&gpc 12 GPIO_ACTIVE_LOW>;

			debounce-interval = <10>;

		};



		key@7 {

		key-7 {

			label = "Start button";

			linux,code = <KEY_ENTER>;

			gpios = <&gpd 17 GPIO_ACTIVE_LOW>;

arch/mips/boot/dts/pic32/pic32mzda_sk.dts

+3 −6
Original line number Diff line number Diff line
@@ -52,22 +52,19 @@ 
		pinctrl-0 = <&user_buttons_s0>;

		pinctrl-names = "default";



		#address-cells = <1>;

		#size-cells = <0>;



		button@sw1 {

		button-1 {

			label = "ESC";

			linux,code = <1>;

			gpios = <&gpio1 12 0>;

		};



		button@sw2 {

		button-2 {

			label = "Home";

			linux,code = <102>;

			gpios = <&gpio1 13 0>;

		};



		button@sw3 {

		button-3 {

			label = "Menu";

			linux,code = <139>;

			gpios = <&gpio1 14 0>;

arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts

+2 −4
Original line number Diff line number Diff line
@@ -23,17 +23,15 @@ 


	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button@0 {

		button-0 {

			label = "reset";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;

			debounce-interval = <60>;

		};



		button@1 {

		button-1 {

			label = "qss";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;