Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / arch / arm / boot / dts / exynos5250.dtsi

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 8b815c945949a6d01ed347a00c1783f8eb24655f..ef57277fc38fa4b79262dd056a896fe6c92c77cb 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -17,12 +17,13 @@
  * published by the Free Software Foundation.
 */
 
-/include/ "skeleton.dtsi"
-/include/ "exynos5250-pinctrl.dtsi"
+#include "exynos5.dtsi"
+#include "exynos5250-pinctrl.dtsi"
+
+#include <dt-bindings/clk/exynos-audss-clk.h>
 
 / {
        compatible = "samsung,exynos5250";
-       interrupt-parent = <&gic>;
 
        aliases {
                spi0 = &spi_0;
@@ -51,9 +52,20 @@
                pinctrl3 = &pinctrl_3;
        };
 
-       chipid@10000000 {
-               compatible = "samsung,exynos4210-chipid";
-               reg = <0x10000000 0x100>;
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               cpu@0 {
+                       device_type = "cpu";
+                       compatible = "arm,cortex-a15";
+                       reg = <0>;
+               };
+               cpu@1 {
+                       device_type = "cpu";
+                       compatible = "arm,cortex-a15";
+                       reg = <1>;
+               };
        };
 
        pd_gsc: gsc-power-domain@0x10044000 {
@@ -72,15 +84,10 @@
                #clock-cells = <1>;
        };
 
-       gic:interrupt-controller@10481000 {
-               compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
-               #interrupt-cells = <3>;
-               interrupt-controller;
-               reg = <0x10481000 0x1000>,
-                     <0x10482000 0x1000>,
-                     <0x10484000 0x2000>,
-                     <0x10486000 0x2000>;
-               interrupts = <1 9 0xf04>;
+       clock_audss: audss-clock-controller@3810000 {
+               compatible = "samsung,exynos5250-audss-clock";
+               reg = <0x03810000 0x0C>;
+               #clock-cells = <1>;
        };
 
        timer {
@@ -91,22 +98,6 @@
                             <1 10 0xf08>;
        };
 
-       combiner:interrupt-controller@10440000 {
-               compatible = "samsung,exynos4210-combiner";
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               samsung,combiner-nr = <32>;
-               reg = <0x10440000 0x1000>;
-               interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
-                            <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
-                            <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
-                            <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
-                            <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>,
-                            <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>,
-                            <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>,
-                            <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;
-       };
-
        mct@101C0000 {
                compatible = "samsung,exynos4210-mct";
                reg = <0x101C0000 0x800>;
@@ -168,9 +159,6 @@
        };
 
        watchdog {
-               compatible = "samsung,s3c2410-wdt";
-               reg = <0x101D0000 0x100>;
-               interrupts = <0 42 0>;
                clocks = <&clock 336>;
                clock-names = "watchdog";
        };
@@ -183,12 +171,8 @@
        };
 
        rtc {
-               compatible = "samsung,s3c6410-rtc";
-               reg = <0x101E0000 0x100>;
-               interrupts = <0 43 0>, <0 44 0>;
                clocks = <&clock 337>;
                clock-names = "rtc";
-               status = "disabled";
        };
 
        tmu@10060000 {
@@ -200,33 +184,21 @@
        };
 
        serial@12C00000 {
-               compatible = "samsung,exynos4210-uart";
-               reg = <0x12C00000 0x100>;
-               interrupts = <0 51 0>;
                clocks = <&clock 289>, <&clock 146>;
                clock-names = "uart", "clk_uart_baud0";
        };
 
        serial@12C10000 {
-               compatible = "samsung,exynos4210-uart";
-               reg = <0x12C10000 0x100>;
-               interrupts = <0 52 0>;
                clocks = <&clock 290>, <&clock 147>;
                clock-names = "uart", "clk_uart_baud0";
        };
 
        serial@12C20000 {
-               compatible = "samsung,exynos4210-uart";
-               reg = <0x12C20000 0x100>;
-               interrupts = <0 53 0>;
                clocks = <&clock 291>, <&clock 148>;
                clock-names = "uart", "clk_uart_baud0";
        };
 
        serial@12C30000 {
-               compatible = "samsung,exynos4210-uart";
-               reg = <0x12C30000 0x100>;
-               interrupts = <0 54 0>;
                clocks = <&clock 292>, <&clock 149>;
                clock-names = "uart", "clk_uart_baud0";
        };
@@ -405,31 +377,19 @@
        };
 
        dwmmc_0: dwmmc0@12200000 {
-               compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12200000 0x1000>;
-               interrupts = <0 75 0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                clocks = <&clock 280>, <&clock 139>;
                clock-names = "biu", "ciu";
        };
 
        dwmmc_1: dwmmc1@12210000 {
-               compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12210000 0x1000>;
-               interrupts = <0 76 0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                clocks = <&clock 281>, <&clock 140>;
                clock-names = "biu", "ciu";
        };
 
        dwmmc_2: dwmmc2@12220000 {
-               compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12220000 0x1000>;
-               interrupts = <0 77 0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                clocks = <&clock 282>, <&clock 141>;
                clock-names = "biu", "ciu";
        };
@@ -451,6 +411,10 @@
                        &pdma0 9
                        &pdma0 8>;
                dma-names = "tx", "rx", "tx-sec";
+               clocks = <&clock_audss EXYNOS_I2S_BUS>,
+                       <&clock_audss EXYNOS_I2S_BUS>,
+                       <&clock_audss EXYNOS_SCLK_I2S>;
+               clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
                samsung,supports-6ch;
                samsung,supports-rstclr;
                samsung,supports-secdai;
@@ -465,6 +429,8 @@
                dmas = <&pdma1 12
                        &pdma1 11>;
                dma-names = "tx", "rx";
+               clocks = <&clock 307>, <&clock 157>;
+               clock-names = "iis", "i2s_opclk0";
                pinctrl-names = "default";
                pinctrl-0 = <&i2s1_bus>;
        };
@@ -475,10 +441,42 @@
                dmas = <&pdma0 12
                        &pdma0 11>;
                dma-names = "tx", "rx";
+               clocks = <&clock 308>, <&clock 158>;
+               clock-names = "iis", "i2s_opclk0";
                pinctrl-names = "default";
                pinctrl-0 = <&i2s2_bus>;
        };
 
+       usb@12000000 {
+               compatible = "samsung,exynos5250-dwusb3";
+               clocks = <&clock 286>;
+               clock-names = "usbdrd30";
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               dwc3 {
+                       compatible = "synopsys,dwc3";
+                       reg = <0x12000000 0x10000>;
+                       interrupts = <0 72 0>;
+                       usb-phy = <&usb2_phy &usb3_phy>;
+               };
+       };
+
+       usb3_phy: usbphy@12100000 {
+               compatible = "samsung,exynos5250-usb3phy";
+               reg = <0x12100000 0x100>;
+               clocks = <&clock 1>, <&clock 286>;
+               clock-names = "ext_xtal", "usbdrd30";
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               usbphy-sys {
+                       reg = <0x10040704 0x8>;
+               };
+       };
+
        usb@12110000 {
                compatible = "samsung,exynos4210-ehci";
                reg = <0x12110000 0x100>;
@@ -497,7 +495,7 @@
                clock-names = "usbhost";
        };
 
-       usbphy@12130000 {
+       usb2_phy: usbphy@12130000 {
                compatible = "samsung,exynos5250-usb2phy";
                reg = <0x12130000 0x100>;
                clocks = <&clock 1>, <&clock 285>;
@@ -621,6 +619,8 @@
                reg = <0x145b0000 0x1000>;
                interrupts = <10 3>;
                interrupt-parent = <&combiner>;
+               clocks = <&clock 342>;
+               clock-names = "dp";
                #address-cells = <1>;
                #size-cells = <0>;