diff --git a/[refs] b/[refs] index 0c1fa8cf415e..ed09f789f810 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a446172aeb8eaf18d4e42eb238be3b2e4ea443e +refs/heads/master: 89fec22d7b39167567065ec6a1c190fec2a0751b diff --git a/trunk/arch/arm/boot/dts/exynos5250-arndale.dts b/trunk/arch/arm/boot/dts/exynos5250-arndale.dts index d07a21f5dd89..6417bbc3c075 100644 --- a/trunk/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/trunk/arch/arm/boot/dts/exynos5250-arndale.dts @@ -116,6 +116,52 @@ status = "disabled"; }; + gpio_keys { + compatible = "gpio-keys"; + + menu { + label = "SW-TACT2"; + gpios = <&gpx1 4 1>; + linux,code = <139>; + gpio-key,wakeup; + }; + + home { + label = "SW-TACT3"; + gpios = <&gpx1 5 1>; + linux,code = <102>; + gpio-key,wakeup; + }; + + up { + label = "SW-TACT4"; + gpios = <&gpx1 6 1>; + linux,code = <103>; + gpio-key,wakeup; + }; + + down { + label = "SW-TACT5"; + gpios = <&gpx1 7 1>; + linux,code = <108>; + gpio-key,wakeup; + }; + + back { + label = "SW-TACT6"; + gpios = <&gpx2 0 1>; + linux,code = <158>; + gpio-key,wakeup; + }; + + wakeup { + label = "SW-TACT7"; + gpios = <&gpx2 1 1>; + linux,code = <143>; + gpio-key,wakeup; + }; + }; + fixed-rate-clocks { xxti { compatible = "samsung,clock-xxti";