Skip to contentSkip to conversation

ARM: dts: rockchip: add #phy-cells to all usb2-phy nodes

PATCH New Johan Jonker 1 participant 2 messages Apr 1, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: dts: rockchip: add #phy-cells to all usb2-phy nodes

Current dts files for Rockchip with 'usb2-phy' subnodes are manually verified. In order to automate this process phy-rockchip-inno-usb2.txt has been converted to yaml. 'usb2-phy' nodes are now checked by:
'phy-rockchip-inno-usb2.yaml' and 'phy-provider.yaml'. '#phy-cells' is now required for all usb2-phy nodes, so add them.

make -k ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/ phy/phy-rockchip-inno-usb2.yaml

---
 arch/arm/boot/dts/rk322x.dtsi | 2 ++
 arch/arm/boot/dts/rv1108.dtsi | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
arch/arm/boot/dts/rk322x.dtsi +2 -0
index 06172ebbf..9ad32651a 100644
@@ -214,6 +214,7 @@
 			clock-names = "phyclk";
 			clock-output-names = "usb480m_phy0";
 			#clock-cells = <0>;
+			#phy-cells = <0>;
 			status = "disabled";
 
 			u2phy0_otg: otg-port {
@@ -241,6 +242,7 @@
 			clock-names = "phyclk";
 			clock-output-names = "usb480m_phy1";
 			#clock-cells = <0>;
+			#phy-cells = <0>;
 			status = "disabled";
 
 			u2phy1_otg: otg-port {
arch/arm/boot/dts/rv1108.dtsi +2 -1
index f9cfe2c80..b453f8d0f 100644
@@ -269,9 +269,10 @@
 			reg = <0x100 0x0c>;
 			clocks = <&cru SCLK_USBPHY>;
 			clock-names = "phyclk";
-			#clock-cells = <0>;
 			clock-output-names = "usbphy";
 			rockchip,usbgrf = <&usbgrf>;
+			#clock-cells = <0>;
+			#phy-cells = <0>;
 			status = "disabled";
 
 			u2phy_otg: otg-port {
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/2 arm64: dts: rockchip: add #phy-cells to all usb2-phy nodes

Current dts files for Rockchip with 'usb2-phy' subnodes are manually verified. In order to automate this process phy-rockchip-inno-usb2.txt has been converted to yaml. 'usb2-phy' nodes are now checked by:
'phy-rockchip-inno-usb2.yaml' and 'phy-provider.yaml'. '#phy-cells' is now required for all usb2-phy nodes, so add them.

make -k ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/ phy/phy-rockchip-inno-usb2.yaml

---
 arch/arm64/boot/dts/rockchip/px30.dtsi   | 5 +++--
 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 3 ++-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/rockchip/px30.dtsi +3 -2
index bd5f51d23..6f7171290 100644
@@ -822,10 +822,11 @@
 			reg = <0x100 0x20>;
 			clocks = <&pmucru SCLK_USBPHY_REF>;
 			clock-names = "phyclk";
-			#clock-cells = <0>;
+			clock-output-names = "usb480m_phy";
 			assigned-clocks = <&cru USB480M>;
 			assigned-clock-parents = <&u2phy>;
-			clock-output-names = "usb480m_phy";
+			#clock-cells = <0>;
+			#phy-cells = <0>;
 			status = "disabled";
 
 			u2phy_host: host-port {
arch/arm64/boot/dts/rockchip/rk3328.dtsi +2 -1
index 8976c869f..470783a48 100644
@@ -830,9 +830,10 @@
 			clocks = <&xin24m>;
 			clock-names = "phyclk";
 			clock-output-names = "usb480m_phy";
-			#clock-cells = <0>;
 			assigned-clocks = <&cru USB480M>;
 			assigned-clock-parents = <&u2phy>;
+			#clock-cells = <0>;
+			#phy-cells = <0>;
 			status = "disabled";
 
 			u2phy_otg: otg-port {
arch/arm64/boot/dts/rockchip/rk3399.dtsi +4 -2
index 3dc8fe620..a7ee5aa65 100644
@@ -1391,8 +1391,9 @@
 			reg = <0xe450 0x10>;
 			clocks = <&cru SCLK_USB2PHY0_REF>;
 			clock-names = "phyclk";
-			#clock-cells = <0>;
 			clock-output-names = "clk_usbphy0_480m";
+			#clock-cells = <0>;
+			#phy-cells = <0>;
 			status = "disabled";
 
 			u2phy0_host: host-port {
@@ -1418,8 +1419,9 @@
 			reg = <0xe460 0x10>;
 			clocks = <&cru SCLK_USB2PHY1_REF>;
 			clock-names = "phyclk";
-			#clock-cells = <0>;
 			clock-output-names = "clk_usbphy1_480m";
+			#clock-cells = <0>;
+			#phy-cells = <0>;
 			status = "disabled";
 
 			u2phy1_host: host-port {
Signature · 1 line
2.11.0