ARM: tegra20: transformer: fix Hall sensor behavior

Hall sensor found in SL101 is not used for closed dock detection as on
TF101 or TF101G, it is used to detect if keyboard slider is out. To address
this, lets move Lid sensor switch into TF101/G trees and add Tablet mode
switch into SL101 tree.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/arch/arm/dts/tegra20-asus-sl101.dts b/arch/arm/dts/tegra20-asus-sl101.dts
index b4709c3..9f78b0f 100644 (file)
--- a/arch/arm/dts/tegra20-asus-sl101.dts
+++ b/arch/arm/dts/tegra20-asus-sl101.dts
@@ -6,4 +6,14 @@
 / {
        model = "ASUS EeePad Slider SL101";
        compatible = "asus,sl101", "nvidia,tegra20";
+
+       extcon-keys {
+               compatible = "gpio-keys";
+
+               switch-tablet-mode {
+                       label = "Tablet Mode";
+                       gpios = <&gpio TEGRA_GPIO(S, 4) GPIO_ACTIVE_LOW>;
+                       linux,code = <SW_TABLET_MODE>;
+               };
+       };
 };

diff --git a/arch/arm/dts/tegra20-asus-tf101.dts b/arch/arm/dts/tegra20-asus-tf101.dts
index 7c734fb..03ba78c 100644 (file)
--- a/arch/arm/dts/tegra20-asus-tf101.dts
+++ b/arch/arm/dts/tegra20-asus-tf101.dts
@@ -6,4 +6,14 @@
 / {
        model = "ASUS EeePad Transformer TF101";
        compatible = "asus,tf101", "nvidia,tegra20";
+
+       extcon-keys {
+               compatible = "gpio-keys";
+
+               switch-dock-hall-sensor {
+                       label = "Lid sensor";
+                       gpios = <&gpio TEGRA_GPIO(S, 4) GPIO_ACTIVE_LOW>;
+                       linux,code = <SW_LID>;
+               };
+       };
 };

diff --git a/arch/arm/dts/tegra20-asus-tf101g.dts b/arch/arm/dts/tegra20-asus-tf101g.dts
index f49a358..44d5fdf 100644 (file)
--- a/arch/arm/dts/tegra20-asus-tf101g.dts
+++ b/arch/arm/dts/tegra20-asus-tf101g.dts
@@ -6,4 +6,14 @@
 / {
        model = "ASUS EeePad Transformer TF101G";
        compatible = "asus,tf101g", "nvidia,tegra20";
+
+       extcon-keys {
+               compatible = "gpio-keys";
+
+               switch-dock-hall-sensor {
+                       label = "Lid sensor";
+                       gpios = <&gpio TEGRA_GPIO(S, 4) GPIO_ACTIVE_LOW>;
+                       linux,code = <SW_LID>;
+               };
+       };
 };

diff --git a/arch/arm/dts/tegra20-asus-transformer.dtsi b/arch/arm/dts/tegra20-asus-transformer.dtsi
index 61b1cea..df078a6 100644 (file)
--- a/arch/arm/dts/tegra20-asus-transformer.dtsi
+++ b/arch/arm/dts/tegra20-asus-transformer.dtsi
@@ -497,12 +497,6 @@
                        gpios = <&gpio TEGRA_GPIO(Q, 5) GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_UP>;
                };
-
-               switch-dock-hall-sensor {
-                       label = "Lid sensor";
-                       gpios = <&gpio TEGRA_GPIO(S, 4) GPIO_ACTIVE_LOW>;
-                       linux,code = <SW_LID>;
-               };
        };
 
        panel: panel {