UPSTREAM: ARM: dts: rockchip: fix missing usbphy unit-names

The usbphy subnodes do have a reg property but no unitname, add them.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>
Change-Id: I5b48e289b332397ab7c383b839b875aeefa9f114
 (cherry picked from commit a8f0fa2764626d2dd808cfbe1a160f2939a36c88)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index 946f18705e965cb6fdfa357d0839bb594637f14a..be1207d5d404f2746ca466317d40274673034075 100644 (file)
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -176,14 +176,14 @@
                #size-cells = <0>;
                status = "disabled";
 
-               usbphy0: usb-phy0 {
+               usbphy0: usb-phy@17c {
                        #phy-cells = <0>;
                        reg = <0x17c>;
                        clocks = <&cru SCLK_OTGPHY0>;
                        clock-names = "phyclk";
                };
 
-               usbphy1: usb-phy1 {
+               usbphy1: usb-phy@188 {
                        #phy-cells = <0>;
                        reg = <0x188>;
                        clocks = <&cru SCLK_OTGPHY1>;

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 6399942f1840cc4ae485c07040f848d1bc630fea..7afcf1b42e8850b259800dadf0f4715311182f1d 100644 (file)
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -151,14 +151,14 @@
                #size-cells = <0>;
                status = "disabled";
 
-               usbphy0: usb-phy0 {
+               usbphy0: usb-phy@10c {
                        #phy-cells = <0>;
                        reg = <0x10c>;
                        clocks = <&cru SCLK_OTGPHY0>;
                        clock-names = "phyclk";
                };
 
-               usbphy1: usb-phy1 {
+               usbphy1: usb-phy@11c {
                        #phy-cells = <0>;
                        reg = <0x11c>;
                        clocks = <&cru SCLK_OTGPHY1>;

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 4f48c50119826975de134bf27d88907ce7670da2..dada333aa96d5c0d4c7c3e3f05c519fa26722f3e 100644 (file)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -862,33 +862,36 @@
                        status = "disabled";
                };
 
-               usbphy: phy {
+               usbphy: usbphy {
                        compatible = "rockchip,rk3288-usb-phy";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
 
-                       usbphy0: usb-phy0 {
+                       usbphy0: usb-phy@320 {
                                #phy-cells = <0>;
                                reg = <0x320>;
                                clocks = <&cru SCLK_OTGPHY0>;
                                clock-names = "phyclk";
+                               #clock-cells = <0>;
                                resets = <&cru SRST_USBOTG_PHY>;
                                reset-names = "phy-reset";
                        };
 
-                       usbphy1: usb-phy1 {
+                       usbphy1: usb-phy@334 {
                                #phy-cells = <0>;
                                reg = <0x334>;
                                clocks = <&cru SCLK_OTGPHY1>;
                                clock-names = "phyclk";
+                               #clock-cells = <0>;
                        };
 
-                       usbphy2: usb-phy2 {
+                       usbphy2: usb-phy@348 {
                                #phy-cells = <0>;
                                reg = <0x348>;
                                clocks = <&cru SCLK_OTGPHY2>;
                                clock-names = "phyclk";
+                               #clock-cells = <0>;
                                resets = <&cru SRST_USBHOST1_PHY>;
                                reset-names = "phy-reset";
                        };