Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos4210-universal_c210.dts

diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index 63e34b24b04f7fbf35b4f78e7e17ee8b4a314d05..d50eb3aa708e9a5709f94c5c7491e8d85d1d2387 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -28,6 +28,21 @@
                bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";
        };
 
+       sysram@02020000 {
+               smp-sysram@0 {
+                       status = "disabled";
+               };
+
+               smp-sysram@5000 {
+                       compatible = "samsung,exynos4210-sysram";
+                       reg = <0x5000 0x1000>;
+               };
+
+               smp-sysram@1f000 {
+                       status = "disabled";
+               };
+       };
+
        mct@10050000 {
                compatible = "none";
        };
@@ -53,6 +68,12 @@
                enable-active-high;
        };
 
+       hsotg@12480000 {
+               vusb_d-supply = <&ldo3_reg>;
+               vusb_a-supply = <&ldo8_reg>;
+               status = "okay";
+       };
+
        sdhci_emmc: sdhci@12510000 {
                bus-width = <8>;
                non-removable;
@@ -62,6 +83,34 @@
                status = "okay";
        };
 
+       sdhci_sd: sdhci@12530000 {
+               bus-width = <4>;
+               pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;
+               pinctrl-names = "default";
+               vmmc-supply = <&ldo5_reg>;
+               cd-gpios = <&gpx3 4 0>;
+               cd-inverted;
+               status = "okay";
+       };
+
+       ehci@12580000 {
+               status = "okay";
+               port@0 {
+                       status = "okay";
+               };
+       };
+
+       ohci@12590000 {
+               status = "okay";
+               port@0 {
+                       status = "okay";
+               };
+       };
+
+       exynos-usbphy@125B0000 {
+               status = "okay";
+       };
+
        serial@13800000 {
                status = "okay";
        };
@@ -201,6 +250,7 @@
                                        regulator-name = "VUSB+MIPI_1.1V";
                                        regulator-min-microvolt = <1100000>;
                                        regulator-max-microvolt = <1100000>;
+                                       regulator-always-on;
                                };
 
                                ldo4_reg: LDO4 {
@@ -231,6 +281,7 @@
                                        regulator-name = "VUSB+VDAC_3.3V";
                                        regulator-min-microvolt = <3300000>;
                                        regulator-max-microvolt = <3300000>;
+                                       regulator-always-on;
                                };
 
                                ldo9_reg: LDO9 {
@@ -413,6 +464,29 @@
                compatible = "samsung,s5p6440-pwm";
                status = "okay";
        };
+
+       camera {
+               status = "okay";
+
+               pinctrl-names = "default";
+               pinctrl-0 = <>;
+
+               fimc_0: fimc@11800000 {
+                       status = "okay";
+               };
+
+               fimc_1: fimc@11810000 {
+                       status = "okay";
+               };
+
+               fimc_2: fimc@11820000 {
+                       status = "okay";
+               };
+
+               fimc_3: fimc@11830000 {
+                       status = "okay";
+               };
+       };
 };
 
 &mdma1 {