Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / arch / arm / boot / dts / rk3066a.dtsi

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index cb0a552..0d0dae3 100644 (file)
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -169,7 +169,7 @@
                clocks = <&cru PCLK_EFUSE>;
                clock-names = "pclk_efuse";
 
-               cpu_leakage: cpu_leakage {
+               cpu_leakage: cpu_leakage@17 {
                        reg = <0x17 0x1>;
                };
        };
@@ -197,6 +197,8 @@
                clock-names = "saradc", "apb_pclk";
                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                #io-channel-cells = <1>;
+               resets = <&cru SRST_SARADC>;
+               reset-names = "saradc-apb";
                status = "disabled";
        };
 
@@ -207,7 +209,7 @@
                #size-cells = <0>;
                status = "disabled";
 
-               usbphy0: usb-phy0 {
+               usbphy0: usb-phy@17c {
                        #phy-cells = <0>;
                        reg = <0x17c>;
                        clocks = <&cru SCLK_OTGPHY0>;
@@ -215,7 +217,7 @@
                        #clock-cells = <0>;
                };
 
-               usbphy1: usb-phy1 {
+               usbphy1: usb-phy@188 {
                        #phy-cells = <0>;
                        reg = <0x188>;
                        clocks = <&cru SCLK_OTGPHY1>;