Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos3250.dtsi

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index b5157492a4228d057ebda664a4cbe835b848ce20..62f3dcd9e046c3dc526d81a8bd70a575be99487f 100644 (file)
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -31,6 +31,7 @@
                pinctrl1 = &pinctrl_1;
                mshc0 = &mshc_0;
                mshc1 = &mshc_1;
+               mshc2 = &mshc_2;
                spi0 = &spi_0;
                spi1 = &spi_1;
                i2c0 = &i2c_0;
@@ -43,6 +44,7 @@
                i2c7 = &i2c_7;
                serial0 = &serial_0;
                serial1 = &serial_1;
+               serial2 = &serial_2;
        };
 
        cpus {
@@ -153,7 +155,7 @@
                        interrupt-parent = <&gic>;
                };
 
-               mipi_phy: video-phy@10020710 {
+               mipi_phy: video-phy {
                        compatible = "samsung,s5pv210-mipi-video-phy";
                        #phy-cells = <1>;
                        syscon = <&pmu_system_controller>;
@@ -357,6 +359,18 @@
                        status = "disabled";
                };
 
+               mshc_2: mshc@12530000 {
+                       compatible = "samsung,exynos5250-dw-mshc";
+                       reg = <0x12530000 0x1000>;
+                       interrupts = <0 144 0>;
+                       clocks = <&cmu CLK_SDMMC2>, <&cmu CLK_SCLK_MMC2>;
+                       clock-names = "biu", "ciu";
+                       fifo-depth = <0x80>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
                exynos_usbphy: exynos-usbphy@125B0000 {
                        compatible = "samsung,exynos3250-usb2-phy";
                        reg = <0x125B0000 0x100>;
@@ -452,6 +466,17 @@
                        status = "disabled";
                };
 
+               serial_2: serial@13820000 {
+                       compatible = "samsung,exynos4210-uart";
+                       reg = <0x13820000 0x100>;
+                       interrupts = <0 111 0>;
+                       clocks = <&cmu CLK_UART2>, <&cmu CLK_SCLK_UART2>;
+                       clock-names = "uart", "clk_uart_baud0";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uart2_data>;
+                       status = "disabled";
+               };
+
                i2c_0: i2c@13860000 {
                        #address-cells = <1>;
                        #size-cells = <0>;