summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/exynos4210-origen.dts
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-09-22 07:17:37 +0400
committerKukjin Kim <kgene.kim@samsung.com>2012-09-22 07:17:37 +0400
commita0cabc4017a78643e26d7bd79bcac548410f0480 (patch)
tree83bb72392d38c59a0eacbcfc7a794332aaed1a53 /arch/arm/boot/dts/exynos4210-origen.dts
parent56952baa9b6f6bc06437abd51baefc4f7c8dee3b (diff)
parentc8c24dad2349fb430641535a4f26a7a1cebb9644 (diff)
downloadlinux-a0cabc4017a78643e26d7bd79bcac548410f0480.tar.xz
Merge branch 'next/dt-samsung' into next/dt-samsung-new
Conflicts: arch/arm/boot/dts/exynos4210-origen.dts arch/arm/boot/dts/exynos4210.dtsi
Diffstat (limited to 'arch/arm/boot/dts/exynos4210-origen.dts')
-rw-r--r--arch/arm/boot/dts/exynos4210-origen.dts63
1 files changed, 7 insertions, 56 deletions
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index d69a7999a12b..3e68f52e8454 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -40,6 +40,7 @@
<&gpk2 4 2 3 3>,
<&gpk2 5 2 3 3>,
<&gpk2 6 2 3 3>;
+ status = "okay";
};
sdhci@12510000 {
@@ -53,6 +54,7 @@
<&gpk0 4 2 3 3>,
<&gpk0 5 2 3 3>,
<&gpk0 6 2 3 3>;
+ status = "okay";
};
gpio_keys {
@@ -64,30 +66,35 @@
label = "Up";
gpios = <&gpx2 0 0 0x10000 2>;
linux,code = <103>;
+ gpio-key,wakeup;
};
down {
label = "Down";
gpios = <&gpx2 1 0 0x10000 2>;
linux,code = <108>;
+ gpio-key,wakeup;
};
back {
label = "Back";
gpios = <&gpx1 7 0 0x10000 2>;
linux,code = <158>;
+ gpio-key,wakeup;
};
home {
label = "Home";
gpios = <&gpx1 6 0 0x10000 2>;
linux,code = <102>;
+ gpio-key,wakeup;
};
menu {
label = "Menu";
gpios = <&gpx1 5 0 0x10000 2>;
linux,code = <139>;
+ gpio-key,wakeup;
};
};
@@ -98,60 +105,4 @@
linux,default-trigger = "heartbeat";
};
};
-
- keypad@100A0000 {
- status = "disabled";
- };
-
- sdhci@12520000 {
- status = "disabled";
- };
-
- sdhci@12540000 {
- status = "disabled";
- };
-
- i2c@13860000 {
- status = "disabled";
- };
-
- i2c@13870000 {
- status = "disabled";
- };
-
- i2c@13880000 {
- status = "disabled";
- };
-
- i2c@13890000 {
- status = "disabled";
- };
-
- i2c@138A0000 {
- status = "disabled";
- };
-
- i2c@138B0000 {
- status = "disabled";
- };
-
- i2c@138C0000 {
- status = "disabled";
- };
-
- i2c@138D0000 {
- status = "disabled";
- };
-
- spi_0: spi@13920000 {
- status = "disabled";
- };
-
- spi_1: spi@13930000 {
- status = "disabled";
- };
-
- spi_2: spi@13940000 {
- status = "disabled";
- };
};