Commit 799270e9 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Thierry Reding
Browse files

ARM: tegra: Align gpio-keys node names with dtschema 



The node names should be generic and DT schema expects certain pattern
(e.g. with key/button/switch).

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 829205d8

arch/arm/boot/dts/tegra114-asus-tf701t.dts

+4 −4
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&gpio_keys_default>;



		power {

		button-power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;
@@ -692,14 +692,14 @@ power { 
			wakeup-source;

		};



		volume-up {

		button-volume-up {

			label = "Volume Up";

			gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

			debounce-interval = <10>;

		};



		volume-down {

		button-volume-down {

			label = "Volume Down";

			gpios = <&gpio TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEDOWN>;
@@ -715,7 +715,7 @@ gpio-hall-sensor { 
		pinctrl-names = "default";

		pinctrl-0 = <&gpio_hall_sensor_default>;



		hall-sensor {

		switch-hall-sensor {

			label = "Hall Effect Sensor";

			gpios = <&gpio TEGRA_GPIO(O, 5) GPIO_ACTIVE_LOW>;

			linux,input-type = <EV_SW>;

arch/arm/boot/dts/tegra114-dalmore.dts

+4 −4
Original line number Diff line number Diff line
@@ -1161,26 +1161,26 @@ clk32k_in: clock-32k { 
	gpio-keys {

		compatible = "gpio-keys";



		home {

		key-home {

			label = "Home";

			gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_HOME>;

		};



		power {

		key-power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			wakeup-source;

		};



		volume_down {

		key-volume-down {

			label = "Volume Down";

			gpios = <&gpio TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEDOWN>;

		};



		volume_up {

		key-volume-up {

			label = "Volume Up";

			gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

arch/arm/boot/dts/tegra114-roth.dts

+3 −3
Original line number Diff line number Diff line
@@ -1025,19 +1025,19 @@ clk32k_in: clock-32k { 
	gpio-keys {

		compatible = "gpio-keys";



		back {

		key-back {

			label = "Back";

			gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_BACK>;

		};



		home {

		key-home {

			label = "Home";

			gpios = <&gpio TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_HOME>;

		};



		power {

		key-power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

arch/arm/boot/dts/tegra114-tn7.dts

+3 −3
Original line number Diff line number Diff line
@@ -282,20 +282,20 @@ clk32k_in: clock-32k { 
	gpio-keys {

		compatible = "gpio-keys";



		power {

		key-power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			wakeup-source;

		};



		volume_down {

		key-volume-down {

			label = "Volume Down";

			gpios = <&gpio TEGRA_GPIO(Q, 2) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEDOWN>;

		};



		volume_up {

		key-volume-up {

			label = "Volume Up";

			gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

arch/arm/boot/dts/tegra124-apalis-eval.dts

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ backlight: backlight { 
	gpio-keys {

		compatible = "gpio-keys";



		wakeup {

		key-wakeup {

			label = "WAKE1_MICO";

			gpios = <&gpio TEGRA_GPIO(DD, 3) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_WAKEUP>;