Merge tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux into next/dt

Pull "Allwinner DT additions for 3.15, take 2" from Maxime Ripard:

  - Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME
  - Addition of the I2C for the A31
  - Addition USB Host mode for the A10, A10s, A13 and A20
  - Addition of SATA support for the A10 and A20
  - Change of compatible for the watchdog

* tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux: (23 commits)
  ARM: sunxi: dt: Update the watchdog compatibles
  ARM: sun6i: colombus: Enable the I2C controllers
  ARM: sun6i: Enable the I2C muxing options
  ARM: sun6i: Enable the I2C controllers
  ARM: sun4i: dt: Add support for the INet-97F_Rev_02 board
  ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board
  ARM: sun7i: dt: Add USB host nodes to a20-olinuxino-micro dts
  ARM: sun7i: dt: Add USB host nodes to cubieboard2 dts
  ARM: sun7i: dt: Add USB host nodes to cubietruck dts
  ARM: sun5i: dt: Add USB host nodes to a13-olinuxino-micro
  ARM: sun5i: dt: Add USB host nodes to a10s-olinuxino-micro
  ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino
  ARM: sun4i: dt: Add USB host nodes to pcduino.dts
  ARM: sun4i: dt: Add USB host nodes to mini-xplus dts
  ARM: sun4i: dt: Add USB host nodes to hackberry dts
  ARM: sun4i: dt: Add USB host nodes to cubieboard dts
  ARM: sun4i: dt: Add USB host nodes to Mele A1000 dts
  ARM: sun7i: dt: Add USB host bindings
  ARM: sun5i: dt: Add USB host bindings
  ARM: sun4i: dt: Add USB host bindings
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 33 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index a7198b615afd..8681f6c18fdc 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -338,6 +338,38 @@
                         #size-cells = <0>;
                 };
 
+                usbphy: phy@01c13400 {
+                        #phy-cells = <1>;
+                        compatible = "allwinner,sun5i-a13-usb-phy";
+                        reg = <0x01c13400 0x10 0x01c14800 0x4>;
+                        reg-names = "phy_ctrl", "pmu1";
+                        clocks = <&usb_clk 8>;
+                        clock-names = "usb_phy";
+                        resets = <&usb_clk 1>;
+                        reset-names = "usb1_reset";
+                        status = "disabled";
+                };
+
+                ehci0: usb@01c14000 {
+                        compatible = "allwinner,sun5i-a10s-ehci", "generic-ehci";
+                        reg = <0x01c14000 0x100>;
+                        interrupts = <39>;
+                        clocks = <&ahb_gates 1>;
+                        phys = <&usbphy 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
+
+                ohci0: usb@01c14400 {
+                        compatible = "allwinner,sun5i-a10s-ohci", "generic-ohci";
+                        reg = <0x01c14400 0x100>;
+                        interrupts = <40>;
+                        clocks = <&usb_clk 6>, <&ahb_gates 2>;
+                        phys = <&usbphy 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
+
                 spi2: spi@01c17000 {
                         compatible = "allwinner,sun4i-a10-spi";
                         reg = <0x01c17000 0x1000>;
@@ -429,7 +461,7 @@
                 };
 
                 wdt: watchdog@01c20c90 {
-                        compatible = "allwinner,sun4i-wdt";
+                        compatible = "allwinner,sun4i-a10-wdt";
                         reg = <0x01c20c90 0x10>;
                 };