diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:34:39 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:34:39 -0700 |
| commit | a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5 (patch) | |
| tree | 653ab2d3049d1231e7e462155564a6953d0a720a /arch/arm/boot | |
| parent | 8b1a13b02812b60b88920801363920956691feb3 (diff) | |
| parent | e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad (diff) | |
Merge branch 'next/boards' into HEAD
Conflicts:
arch/arm/mach-shmobile/board-armadillo800eva.c
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/exynos4210-origen.dts | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index 0c49caa09978..d69a7999a12b 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts @@ -62,35 +62,43 @@ up { label = "Up"; - gpios = <&gpx2 0 0 0 2>; + gpios = <&gpx2 0 0 0x10000 2>; linux,code = <103>; }; down { label = "Down"; - gpios = <&gpx2 1 0 0 2>; + gpios = <&gpx2 1 0 0x10000 2>; linux,code = <108>; }; back { label = "Back"; - gpios = <&gpx1 7 0 0 2>; + gpios = <&gpx1 7 0 0x10000 2>; linux,code = <158>; }; home { label = "Home"; - gpios = <&gpx1 6 0 0 2>; + gpios = <&gpx1 6 0 0x10000 2>; linux,code = <102>; }; menu { label = "Menu"; - gpios = <&gpx1 5 0 0 2>; + gpios = <&gpx1 5 0 0x10000 2>; linux,code = <139>; }; }; + leds { + compatible = "gpio-leds"; + status { + gpios = <&gpx1 3 0 0x10000 2>; + linux,default-trigger = "heartbeat"; + }; + }; + keypad@100A0000 { status = "disabled"; }; |