1 files changed, 43 insertions, 27 deletions
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index 3e68f52e8454..f2710018e84e 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -22,38 +22,54 @@
        compatible = "insignal,origen", "samsung,exynos4210";
        memory {
-                reg = <0x40000000 0x40000000>;
+                reg = <0x40000000 0x10000000
+                       0x50000000 0x10000000
+                       0x60000000 0x10000000
+                       0x70000000 0x10000000>;
        };
        chosen {
                bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
        };
+        mmc_reg: voltage-regulator {
+                compatible = "regulator-fixed";
+                regulator-name = "VMEM_VDD_2.8V";
+                regulator-min-microvolt = <2800000>;
+                regulator-max-microvolt = <2800000>;
+                gpio = <&gpx1 1 0>;
+                enable-active-high;
+        };
        sdhci@12530000 {
-                samsung,sdhci-bus-width = <4>;
+                bus-width = <4>;
-                linux,mmc_cap_4_bit_data;
+                pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
-                samsung,sdhci-cd-internal;
+                pinctrl-names = "default";
-                gpio-cd = <&gpk2 2 2 3 3>;
+                vmmc-supply = <&mmc_reg>;
-                gpios = <&gpk2 0 2 0 3>,
-                        <&gpk2 1 2 0 3>,
-                        <&gpk2 3 2 3 3>,
-                        <&gpk2 4 2 3 3>,
-                        <&gpk2 5 2 3 3>,
-                        <&gpk2 6 2 3 3>;
                status = "okay";
        };
        sdhci@12510000 {
-                samsung,sdhci-bus-width = <4>;
+                bus-width = <4>;
-                linux,mmc_cap_4_bit_data;
+                pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>;
-                samsung,sdhci-cd-internal;
+                pinctrl-names = "default";
-                gpio-cd = <&gpk0 2 2 3 3>;
+                vmmc-supply = <&mmc_reg>;
-                gpios = <&gpk0 0 2 0 3>,
+                status = "okay";
-                        <&gpk0 1 2 0 3>,
+        };
-                        <&gpk0 3 2 3 3>,
-                        <&gpk0 4 2 3 3>,
+        serial@13800000 {
-                        <&gpk0 5 2 3 3>,
+                status = "okay";
-                        <&gpk0 6 2 3 3>;
+        };
+        serial@13810000 {
+                status = "okay";
+        };
+        serial@13820000 {
+                status = "okay";
+        };
+        serial@13830000 {
                status = "okay";
        };
@@ -64,35 +80,35 @@
                up {
                        label = "Up";
-                        gpios = <&gpx2 0 0 0x10000 2>;
+                        gpios = <&gpx2 0 1>;
                        linux,code = <103>;
                        gpio-key,wakeup;
                };
                down {
                        label = "Down";
-                        gpios = <&gpx2 1 0 0x10000 2>;
+                        gpios = <&gpx2 1 1>;
                        linux,code = <108>;
                        gpio-key,wakeup;
                };
                back {
                        label = "Back";
-                        gpios = <&gpx1 7 0 0x10000 2>;
+                        gpios = <&gpx1 7 1>;
                        linux,code = <158>;
                        gpio-key,wakeup;
                };
                home {
                        label = "Home";
-                        gpios = <&gpx1 6 0 0x10000 2>;
+                        gpios = <&gpx1 6 1>;
                        linux,code = <102>;
                        gpio-key,wakeup;
                };
                menu {
                        label = "Menu";
-                        gpios = <&gpx1 5 0 0x10000 2>;
+                        gpios = <&gpx1 5 1>;
                        linux,code = <139>;
                        gpio-key,wakeup;
                };
@@ -101,7 +117,7 @@
        leds {
                compatible = "gpio-leds";
                status {
-                        gpios = <&gpx1 3 0 0x10000 2>;
+                        gpios = <&gpx1 3 1>;
                        linux,default-trigger = "heartbeat";
                };
        };

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index 3e68f52e8454..f2710018e84e 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -22,38 +22,54 @@
22	compatible = "insignal,origen", "samsung,exynos4210";	22	compatible = "insignal,origen", "samsung,exynos4210";
23		23
24	memory {	24	memory {
25	reg = <0x40000000 0x40000000>;	25	reg = <0x40000000 0x10000000
		26	0x50000000 0x10000000
		27	0x60000000 0x10000000
		28	0x70000000 0x10000000>;
26	};	29	};
27		30
28	chosen {	31	chosen {
29	bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";	32	bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
30	};	33	};
31		34
		35	mmc_reg: voltage-regulator {
		36	compatible = "regulator-fixed";
		37	regulator-name = "VMEM_VDD_2.8V";
		38	regulator-min-microvolt = <2800000>;
		39	regulator-max-microvolt = <2800000>;
		40	gpio = <&gpx1 1 0>;
		41	enable-active-high;
		42	};
		43
32	sdhci@12530000 {	44	sdhci@12530000 {
33	samsung,sdhci-bus-width = <4>;	45	bus-width = <4>;
34	linux,mmc_cap_4_bit_data;	46	pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
35	samsung,sdhci-cd-internal;	47	pinctrl-names = "default";
36	gpio-cd = <&gpk2 2 2 3 3>;	48	vmmc-supply = <&mmc_reg>;
37	gpios = <&gpk2 0 2 0 3>,
38	<&gpk2 1 2 0 3>,
39	<&gpk2 3 2 3 3>,
40	<&gpk2 4 2 3 3>,
41	<&gpk2 5 2 3 3>,
42	<&gpk2 6 2 3 3>;
43	status = "okay";	49	status = "okay";
44	};	50	};
45		51
46	sdhci@12510000 {	52	sdhci@12510000 {
47	samsung,sdhci-bus-width = <4>;	53	bus-width = <4>;
48	linux,mmc_cap_4_bit_data;	54	pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>;
49	samsung,sdhci-cd-internal;	55	pinctrl-names = "default";
50	gpio-cd = <&gpk0 2 2 3 3>;	56	vmmc-supply = <&mmc_reg>;
51	gpios = <&gpk0 0 2 0 3>,	57	status = "okay";
52	<&gpk0 1 2 0 3>,	58	};
53	<&gpk0 3 2 3 3>,	59
54	<&gpk0 4 2 3 3>,	60	serial@13800000 {
55	<&gpk0 5 2 3 3>,	61	status = "okay";
56	<&gpk0 6 2 3 3>;	62	};
		63
		64	serial@13810000 {
		65	status = "okay";
		66	};
		67
		68	serial@13820000 {
		69	status = "okay";
		70	};
		71
		72	serial@13830000 {
57	status = "okay";	73	status = "okay";
58	};	74	};
59		75
@@ -64,35 +80,35 @@
64		80
65	up {	81	up {
66	label = "Up";	82	label = "Up";
67	gpios = <&gpx2 0 0 0x10000 2>;	83	gpios = <&gpx2 0 1>;
68	linux,code = <103>;	84	linux,code = <103>;
69	gpio-key,wakeup;	85	gpio-key,wakeup;
70	};	86	};
71		87
72	down {	88	down {
73	label = "Down";	89	label = "Down";
74	gpios = <&gpx2 1 0 0x10000 2>;	90	gpios = <&gpx2 1 1>;
75	linux,code = <108>;	91	linux,code = <108>;
76	gpio-key,wakeup;	92	gpio-key,wakeup;
77	};	93	};
78		94
79	back {	95	back {
80	label = "Back";	96	label = "Back";
81	gpios = <&gpx1 7 0 0x10000 2>;	97	gpios = <&gpx1 7 1>;
82	linux,code = <158>;	98	linux,code = <158>;
83	gpio-key,wakeup;	99	gpio-key,wakeup;
84	};	100	};
85		101
86	home {	102	home {
87	label = "Home";	103	label = "Home";
88	gpios = <&gpx1 6 0 0x10000 2>;	104	gpios = <&gpx1 6 1>;
89	linux,code = <102>;	105	linux,code = <102>;
90	gpio-key,wakeup;	106	gpio-key,wakeup;
91	};	107	};
92		108
93	menu {	109	menu {
94	label = "Menu";	110	label = "Menu";
95	gpios = <&gpx1 5 0 0x10000 2>;	111	gpios = <&gpx1 5 1>;
96	linux,code = <139>;	112	linux,code = <139>;
97	gpio-key,wakeup;	113	gpio-key,wakeup;
98	};	114	};
@@ -101,7 +117,7 @@
101	leds {	117	leds {
102	compatible = "gpio-leds";	118	compatible = "gpio-leds";
103	status {	119	status {
104	gpios = <&gpx1 3 0 0x10000 2>;	120	gpios = <&gpx1 3 1>;
105	linux,default-trigger = "heartbeat";	121	linux,default-trigger = "heartbeat";
106	};	122	};
107	};	123	};