Merge tag 'samsung-dt-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Merge "Samsung 2nd DT updates for v3.16" from Kukjin Kim:

exynos4
 - add hsotg device, exynos_usbphy nodes
 - add PMU syscon and audio subsystem nodes
 - replace number by macro in clock binding

exynos4210-universal_c210
 - add external sd card node and multimedia nodes
 - enable USB functionality

exynos4412-trats2
 - enable usb nodes and usb gagdet functionality
 - add cm36651 light/proximity sensor node
 - fixed gpio key node

exynos5250 and exynos5420
 - add pmu syscon handle and sysreg system controller nodes
 - add support for usb2phy
 - replace number by macro in clock binding
 - add USB 2.0 support on exynos5420

exynos5420-peach-pit
 - move dp hpd gpio pin to pinctrl_0

* tag 'samsung-dt-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (21 commits)
  ARM: dts: enable usb nodes for exynos4412-trats2
  ARM: dts: add hsotg device node for exynos4
  ARM: dts: add exynos_usbphy node for exynos4
  ARM: dts: add PMU syscon node for exynos4
  ARM: dts: add pmu syscon handle to exynos5420 hdmi
  ARM: dts: add pmu syscon handle to exynos5250 hdmi
  ARM: dts: replace number by macro in clock binding for exynos5420
  ARM: dts: replace number by macro in clock binding for exynos5250
  ARM: dts: replace number by macro in clock binding for exynos4
  ARM: dts: add external sd card node for exynos4210-universal_c210
  ARM: dts: add multimedia nodes for exynos4210-universal_c210
  ARM: dts: enable USB functionality for exynos4210-universal_c210
  ARM: dts: Enable USB gadget functionality for exynos4210-trats
  ARM: dts: Add audio subsystem nodes to exynos4.dtsi
  ARM: dts: fixed gpio key node for exynos4412-trats2
  ARM: dts: add cm36651 light/proximity sensor node for exynos4412-trats2
  ARM: dts: Add USB 2.0 support on exynos5420
  ARM: dts: Add usb2phy support on exynos5420
  ARM: dts: Add usb2phy to exynos5250
  ARM: dts: Add sysreg sytem controller node to exynos5250 and exynos5420
  ...

11 files changed, 289 insertions, 21 deletions

diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt
index f1f155255f28..b562634db746 100644
--- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt
@@ -2,6 +2,9 @@ SAMSUNG Exynos SoC series PMU Registers
 
 Properties:
  - compatible : should contain two values. First value must be one from following list:
+                   - "samsung,exynos4210-pmu" - for Exynos4210 SoC,
+                   - "samsung,exynos4212-pmu" - for Exynos4212 SoC,
+                   - "samsung,exynos4412-pmu" - for Exynos4412 SoC,
                    - "samsung,exynos5250-pmu" - for Exynos5250 SoC,
                    - "samsung,exynos5420-pmu" - for Exynos5420 SoC.
                 second value must be always "syscon".
diff --git a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt b/Documentation/devicetree/bindings/arm/samsung/sysreg.txt
index 0ab3251a6ec2..4fced6e9d5e4 100644
--- a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/sysreg.txt
@@ -1,8 +1,10 @@
 SAMSUNG S5P/Exynos SoC series System Registers (SYSREG)
 
 Properties:
- - compatible : should contain "samsung,<chip name>-sysreg", "syscon";
-   For Exynos4 SoC series it should be "samsung,exynos4-sysreg", "syscon";
+ - compatible : should contain two values. First value must be one from following list:
+                - "samsung,exynos4-sysreg" - for Exynos4 based SoCs,
+                - "samsung,exynos5-sysreg" - for Exynos5 based SoCs.
+                second value must be always "syscon".
  - reg : offset and length of the register set.
 
 Example:
@@ -10,3 +12,8 @@ Example:
                 compatible = "samsung,exynos4-sysreg", "syscon";
                 reg = <0x10010000 0x400>;
         };
+
+        syscon@10050000 {
+                compatible = "samsung,exynos5-sysreg", "syscon";
+                reg = <0x10050000 0x5000>;
+        };
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 58ff8e28c74f..b8ece4be41ca 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -20,6 +20,7 @@
  */
 
 #include <dt-bindings/clock/exynos4.h>
+#include <dt-bindings/clock/exynos-audss-clk.h>
 #include "skeleton.dtsi"
 
 / {
@@ -45,6 +46,23 @@
                 fimc3 = &fimc_3;
         };
 
+        clock_audss: clock-controller@03810000 {
+                compatible = "samsung,exynos4210-audss-clock";
+                reg = <0x03810000 0x0C>;
+                #clock-cells = <1>;
+        };
+
+        i2s0: i2s@03830000 {
+                compatible = "samsung,s5pv210-i2s";
+                reg = <0x03830000 0x100>;
+                clocks = <&clock_audss EXYNOS_I2S_BUS>;
+                clock-names = "iis";
+                dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;
+                dma-names = "tx", "rx", "tx-sec";
+                samsung,idma-addr = <0x03000000>;
+                status = "disabled";
+        };
+
         chipid@10000000 {
                 compatible = "samsung,exynos4210-chipid";
                 reg = <0x10000000 0x100>;
@@ -110,6 +128,11 @@
                 reg = <0x10010000 0x400>;
         };
 
+        pmu_system_controller: system-controller@10020000 {
+                compatible = "samsung,exynos4210-pmu", "syscon";
+                reg = <0x10020000 0x4000>;
+        };
+
         dsi_0: dsi@11C80000 {
                 compatible = "samsung,exynos4210-mipi-dsi";
                 reg = <0x11C80000 0x10000>;
@@ -117,7 +140,7 @@
                 samsung,power-domain = <&pd_lcd0>;
                 phys = <&mipi_phy 1>;
                 phy-names = "dsim";
-                clocks = <&clock 286>, <&clock 143>;
+                clocks = <&clock CLK_DSIM0>, <&clock CLK_SCLK_MIPI0>;
                 clock-names = "bus_clk", "pll_clk";
                 status = "disabled";
                 #address-cells = <1>;
@@ -271,6 +294,27 @@
                 status = "disabled";
         };
 
+        exynos_usbphy: exynos-usbphy@125B0000 {
+                compatible = "samsung,exynos4210-usb2-phy";
+                reg = <0x125B0000 0x100>;
+                samsung,pmureg-phandle = <&pmu_system_controller>;
+                clocks = <&clock CLK_USB_DEVICE>, <&clock CLK_XUSBXTI>;
+                clock-names = "phy", "ref";
+                #phy-cells = <1>;
+                status = "disabled";
+        };
+
+        hsotg@12480000 {
+                compatible = "samsung,s3c6400-hsotg";
+                reg = <0x12480000 0x20000>;
+                interrupts = <0 71 0>;
+                clocks = <&clock CLK_USB_DEVICE>;
+                clock-names = "otg";
+                phys = <&exynos_usbphy 0>;
+                phy-names = "usb2-phy";
+                status = "disabled";
+        };
+
         ehci@12580000 {
                 compatible = "samsung,exynos4210-ehci";
                 reg = <0x12580000 0x100>;
@@ -289,6 +333,26 @@
                 status = "disabled";
         };
 
+        i2s1: i2s@13960000 {
+                compatible = "samsung,s5pv210-i2s";
+                reg = <0x13960000 0x100>;
+                clocks = <&clock CLK_I2S1>;
+                clock-names = "iis";
+                dmas = <&pdma1 12>, <&pdma1 11>;
+                dma-names = "tx", "rx";
+                status = "disabled";
+        };
+
+        i2s2: i2s@13970000 {
+                compatible = "samsung,s5pv210-i2s";
+                reg = <0x13970000 0x100>;
+                clocks = <&clock CLK_I2S2>;
+                clock-names = "iis";
+                dmas = <&pdma0 14>, <&pdma0 13>;
+                dma-names = "tx", "rx";
+                status = "disabled";
+        };
+
         mfc: codec@13400000 {
                 compatible = "samsung,mfc-v5";
                 reg = <0x13400000 0x10000>;
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index 63aa2bb24a4b..f516da9e8b3a 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -88,6 +88,12 @@
                 };
         };
 
+        hsotg@12480000 {
+                vusb_d-supply = <&vusb_reg>;
+                vusb_a-supply = <&vusbdac_reg>;
+                status = "okay";
+        };
+
         sdhci_emmc: sdhci@12510000 {
                 bus-width = <8>;
                 non-removable;
@@ -97,6 +103,10 @@
                 status = "okay";
         };
 
+        exynos-usbphy@125B0000 {
+                status = "okay";
+        };
+
         serial@13800000 {
                 status = "okay";
         };
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index 9296dee10e26..d50eb3aa708e 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -68,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;
@@ -77,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";
         };
@@ -216,6 +250,7 @@
                                         regulator-name = "VUSB+MIPI_1.1V";
                                         regulator-min-microvolt = <1100000>;
                                         regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
                                 };
 
                                 ldo4_reg: LDO4 {
@@ -246,6 +281,7 @@
                                         regulator-name = "VUSB+VDAC_3.3V";
                                         regulator-min-microvolt = <3300000>;
                                         regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
                                 };
 
                                 ldo9_reg: LDO9 {
@@ -428,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 {
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index f621fd976815..106a7057bcaf 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -21,6 +21,7 @@
 
         aliases {
                 i2c9 = &i2c_ak8975;
+                i2c10 = &i2c_cm36651;
         };
 
         memory {
@@ -98,38 +99,49 @@
                         enable-active-high;
                         regulator-always-on;
                 };
+
+                ps_als_reg: voltage-regulator-5 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "LED_A_3.0V";
+                        regulator-min-microvolt = <3000000>;
+                        regulator-max-microvolt = <3000000>;
+                        gpio = <&gpj0 5 0>;
+                        enable-active-high;
+                };
         };
 
         gpio-keys {
                 compatible = "gpio-keys";
 
                 key-down {
-                        interrupt-parent = <&gpj1>;
-                        interrupts = <2 0>;
-                        gpios = <&gpj1 2 1>;
+                        gpios = <&gpx3 3 1>;
                         linux,code = <114>;
                         label = "volume down";
                         debounce-interval = <10>;
                 };
 
                 key-up {
-                        interrupt-parent = <&gpj1>;
-                        interrupts = <1 0>;
-                        gpios = <&gpj1 1 1>;
+                        gpios = <&gpx2 2 1>;
                         linux,code = <115>;
                         label = "volume up";
                         debounce-interval = <10>;
                 };
 
                 key-power {
-                        interrupt-parent = <&gpx2>;
-                        interrupts = <7 0>;
                         gpios = <&gpx2 7 1>;
                         linux,code = <116>;
                         label = "power";
                         debounce-interval = <10>;
                         gpio-key,wakeup;
                 };
+
+                key-ok {
+                        gpios = <&gpx0 1 1>;
+                        linux,code = <139>;
+                        label = "ok";
+                        debounce-inteval = <10>;
+                        gpio-key,wakeup;
+                };
         };
 
         adc: adc@126C0000 {
@@ -558,6 +570,22 @@
                 };
         };
 
+        i2c_cm36651: i2c-gpio-2 {
+                compatible = "i2c-gpio";
+                gpios = <&gpf0 0 1>, <&gpf0 1 1>;
+                i2c-gpio,delay-us = <2>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cm36651@18 {
+                        compatible = "capella,cm36651";
+                        reg = <0x18>;
+                        interrupt-parent = <&gpx0>;
+                        interrupts = <2 2>;
+                        vled-supply = <&ps_als_reg>;
+                };
+        };
+
         spi_1: spi@13930000 {
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi1_bus>;
@@ -732,6 +760,16 @@
                 };
         };
 
+        exynos-usbphy@125B0000 {
+                status = "okay";
+        };
+
+        hsotg@12480000 {
+                vusb_d-supply = <&ldo15_reg>;
+                vusb_a-supply = <&ldo12_reg>;
+                status = "okay";
+        };
+
         thermistor-ap@0 {
                 compatible = "ntc,ncp15wb473";
                 pullup-uv = <1800000>;   /* VCC_1.8V_AP */
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 15d3c0ac2f5f..c42a3e196cd5 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -29,4 +29,8 @@
         gic: interrupt-controller@10490000 {
                 cpu-offset = <0x4000>;
         };
+
+        pmu_system_controller: system-controller@10020000 {
+                compatible = "samsung,exynos4412-pmu", "syscon";
+        };
 };
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 70e3765b51ee..c5a943df1cd7 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -137,6 +137,10 @@
                 interrupts = <0 72 0>;
         };
 
+        pmu_system_controller: system-controller@10020000 {
+                compatible = "samsung,exynos4212-pmu", "syscon";
+        };
+
         g2d@10800000 {
                 compatible = "samsung,exynos4212-g2d";
                 reg = <0x10800000 0x1000>;
@@ -261,4 +265,9 @@
                 clock-names = "biu", "ciu";
                 status = "disabled";
         };
+
+        exynos-usbphy@125B0000 {
+                compatible = "samsung,exynos4x12-usb2-phy";
+                samsung,sysreg-phandle = <&sys_reg>;
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 68a3e6f254d9..834fb5a5306f 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -193,6 +193,11 @@
                 reg = <0x10040000 0x5000>;
         };
 
+        sysreg_system_controller: syscon@10050000 {
+                compatible = "samsung,exynos5-sysreg", "syscon";
+                reg = <0x10050000 0x5000>;
+        };
+
         watchdog@101D0000 {
                 compatible = "samsung,exynos5250-wdt";
                 reg = <0x101D0000 0x100>;
@@ -268,7 +273,7 @@
         sata_phy: sata-phy@12170000 {
                 compatible = "samsung,exynos5250-sata-phy";
                 reg = <0x12170000 0x1ff>;
-                clocks = <&clock 287>;
+                clocks = <&clock CLK_SATA_PHYCTRL>;
                 clock-names = "sata_phyctrl";
                 #phy-cells = <0>;
                 samsung,syscon-phandle = <&pmu_system_controller>;
@@ -572,6 +577,12 @@
 
                 clocks = <&clock CLK_USB2>;
                 clock-names = "usbhost";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                port@0 {
+                        reg = <0>;
+                        phys = <&usb2_phy_gen 1>;
+                };
         };
 
         usb@12120000 {
@@ -581,6 +592,12 @@
 
                 clocks = <&clock CLK_USB2>;
                 clock-names = "usbhost";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                port@0 {
+                        reg = <0>;
+                        phys = <&usb2_phy_gen 1>;
+                };
         };
 
         usb2_phy: usbphy@12130000 {
@@ -598,6 +615,16 @@
                 };
         };
 
+        usb2_phy_gen: phy@12130000 {
+                compatible = "samsung,exynos5250-usb2-phy";
+                reg = <0x12130000 0x100>;
+                clocks = <&clock CLK_USB2>, <&clock CLK_FIN_PLL>;
+                clock-names = "phy", "ref";
+                #phy-cells = <1>;
+                samsung,sysreg-phandle = <&sysreg_system_controller>;
+                samsung,pmureg-phandle = <&pmu_system_controller>;
+        };
+
         pwm: pwm@12dd0000 {
                 compatible = "samsung,exynos4210-pwm";
                 reg = <0x12dd0000 0x100>;
@@ -704,6 +731,7 @@
                          <&clock CLK_MOUT_HDMI>;
                 clock-names = "hdmi", "sclk_hdmi", "sclk_pixel",
                                 "sclk_hdmiphy", "mout_hdmi";
+                samsung,syscon-phandle = <&pmu_system_controller>;
         };
 
         mixer {
@@ -747,7 +775,7 @@
                 compatible = "samsung,exynos4210-secss";
                 reg = <0x10830000 0x10000>;
                 interrupts = <0 112 0>;
-                clocks = <&clock 348>;
+                clocks = <&clock CLK_SSS>;
                 clock-names = "secss";
         };
 };
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index d4127b0ba83f..29f64de95ebf 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -117,6 +117,13 @@
                 samsung,pin-pud = <1>;
                 samsung,pin-drv = <0>;
         };
+
+        dp_hpd_gpio: dp_hpd_gpio {
+                samsung,pins = "gpx2-6";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <3>;
+                samsung,pin-drv = <0>;
+        };
 };
 
 &pinctrl_3 {
@@ -133,13 +140,6 @@
                 samsung,pin-pud = <0>;
                 samsung,pin-drv = <0>;
         };
-
-        dp_hpd_gpio: dp_hpd_gpio {
-                samsung,pins = "gpx2-6";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <3>;
-                samsung,pin-drv = <0>;
-        };
 };
 
 &rtc {
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 9b6414a9e8a1..3a89cfbd6a87 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -660,6 +660,7 @@
                 clock-names = "hdmi", "sclk_hdmi", "sclk_pixel",
                         "sclk_hdmiphy", "mout_hdmi";
                 phy = <&hdmiphy>;
+                samsung,syscon-phandle = <&pmu_system_controller>;
                 status = "disabled";
         };
 
@@ -698,6 +699,11 @@
                 reg = <0x10040000 0x5000>;
         };
 
+        sysreg_system_controller: syscon@10050000 {
+                compatible = "samsung,exynos5-sysreg", "syscon";
+                reg = <0x10050000 0x5000>;
+        };
+
         tmu_cpu0: tmu@10060000 {
                 compatible = "samsung,exynos5420-tmu";
                 reg = <0x10060000 0x100>;
@@ -751,7 +757,7 @@
                 compatible = "samsung,exynos4210-secss";
                 reg = <0x10830000 0x10000>;
                 interrupts = <0 112 0>;
-                clocks = <&clock 471>;
+                clocks = <&clock CLK_SSS>;
                 clock-names = "secss";
         };
 
@@ -806,4 +812,44 @@
                 samsung,pmu-syscon = <&pmu_system_controller>;
                 #phy-cells = <1>;
         };
+
+        usbhost2: usb@12110000 {
+                compatible = "samsung,exynos4210-ehci";
+                reg = <0x12110000 0x100>;
+                interrupts = <0 71 0>;
+
+                clocks = <&clock CLK_USBH20>;
+                clock-names = "usbhost";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                port@0 {
+                        reg = <0>;
+                        phys = <&usb2_phy 1>;
+                };
+        };
+
+        usbhost1: usb@12120000 {
+                compatible = "samsung,exynos4210-ohci";
+                reg = <0x12120000 0x100>;
+                interrupts = <0 71 0>;
+
+                clocks = <&clock CLK_USBH20>;
+                clock-names = "usbhost";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                port@0 {
+                        reg = <0>;
+                        phys = <&usb2_phy 1>;
+                };
+        };
+
+        usb2_phy: phy@12130000 {
+                compatible = "samsung,exynos5250-usb2-phy";
+                reg = <0x12130000 0x100>;
+                clocks = <&clock CLK_USBH20>, <&clock CLK_SCLK_USBPHY300>;
+                clock-names = "phy", "ref";
+                #phy-cells = <1>;
+                samsung,sysreg-phandle = <&sysreg_system_controller>;
+                samsung,pmureg-phandle = <&pmu_system_controller>;
+        };
 };