UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: imx51: Fix USB PHY duplicate unit-address 

Currently the following DTC warnings are seen with W=1:

arch/arm/boot/dts/imx51-babbage.dtb: Warning (unique_unit_address): /usbphy/usbphy@0: duplicate unit-address (also used in node /usbphy/usbh1phy@0)
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dtb: Warning (unique_unit_address): /usbphy/usbphy@0: duplicate unit-address (also used in node /usbphy/usbh1phy@0)

Fix it by moving the USB PHY nodes outside of simple-bus and drop the
unneeded unit-address, which matches the bindings documentation
at Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt

While at it rename the USB PHY node to usbphy1 for consistency.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Fabio Estevam 2018-07-03 10:05:54 -03:00 committed by Shawn Guo
parent b97872d4eb
commit 82210bfd94
3 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/arm/boot/dts/imx51-babbage.dts
View File

@ -170,22 +170,15 @@
mux-ext-port = <3>; mux-ext-port = <3>;
}; };
usbphy { usbphy1: usbphy1 {
#address-cells = <1>; compatible = "usb-nop-xceiv";
#size-cells = <0>; pinctrl-names = "default";
compatible = "simple-bus"; pinctrl-0 = <&pinctrl_usbh1reg>;
clocks = <&clk_usb>;
usbh1phy: usbh1phy@0 { clock-names = "main_clk";
compatible = "usb-nop-xceiv"; reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; vcc-supply = <&vusb_reg>;
pinctrl-0 = <&pinctrl_usbh1reg>; #phy-cells = <0>;
reg = <0>;
clocks = <&clk_usb>;
clock-names = "main_clk";
reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
vcc-supply = <&vusb_reg>;
#phy-cells = <0>;
};
}; };
}; };
@ -431,7 +424,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbh1>; pinctrl-0 = <&pinctrl_usbh1>;
vbus-supply = <&reg_hub_reset>; vbus-supply = <&reg_hub_reset>;
fsl,usbphy = <&usbh1phy>; fsl,usbphy = <&usbphy1>;
phy_type = "ulpi"; phy_type = "ulpi";
status = "okay"; status = "okay";
}; };

21
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
View File

@ -83,19 +83,12 @@
fsl,mux-ext-port = <3>; fsl,mux-ext-port = <3>;
}; };
usbphy { usbphy1: usbphy1 {
#address-cells = <1>; compatible = "usb-nop-xceiv";
#size-cells = <0>; clocks = <&clks IMX5_CLK_USB_PHY_GATE>;
compatible = "simple-bus"; clock-names = "main_clk";
clock-frequency = <19200000>;
usbh1phy: usbh1phy@0 { #phy-cells = <0>;
compatible = "usb-nop-xceiv";
reg = <0>;
clocks = <&clks IMX5_CLK_USB_PHY_GATE>;
clock-names = "main_clk";
clock-frequency = <19200000>;
#phy-cells = <0>;
};
}; };
}; };
@ -275,7 +268,7 @@
&usbh1 { &usbh1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbh1>; pinctrl-0 = <&pinctrl_usbh1>;
fsl,usbphy = <&usbh1phy>; fsl,usbphy = <&usbphy1>;
dr_mode = "host"; dr_mode = "host";
phy_type = "ulpi"; phy_type = "ulpi";
status = "okay"; status = "okay";

17
arch/arm/boot/dts/imx51.dtsi
View File

@ -93,18 +93,11 @@
}; };
}; };
usbphy { usbphy0: usbphy0 {
#address-cells = <1>; compatible = "usb-nop-xceiv";
#size-cells = <0>; clocks = <&clks IMX5_CLK_USB_PHY_GATE>;
compatible = "simple-bus"; clock-names = "main_clk";
#phy-cells = <0>;
usbphy0: usbphy@0 {
compatible = "usb-nop-xceiv";
reg = <0>;
clocks = <&clks IMX5_CLK_USB_PHY_GATE>;
clock-names = "main_clk";
#phy-cells = <0>;
};
}; };
display-subsystem { display-subsystem {