Commit 82210bfd authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

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: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent b97872d4

arch/arm/boot/dts/imx51-babbage.dts

+10 −17
Original line number Diff line number Diff line
@@ -170,16 +170,10 @@ sound { 
		mux-ext-port = <3>;

	};



	usbphy {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "simple-bus";



		usbh1phy: usbh1phy@0 {

	usbphy1: usbphy1 {

		compatible = "usb-nop-xceiv";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usbh1reg>;

			reg = <0>;

		clocks = <&clk_usb>;

		clock-names = "main_clk";

		reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
@@ -187,7 +181,6 @@ usbh1phy: usbh1phy@0 { 
		#phy-cells = <0>;

	};

};

};



&audmux {

	pinctrl-names = "default";
@@ -431,7 +424,7 @@ &usbh1 { 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbh1>;

	vbus-supply = <&reg_hub_reset>;

	fsl,usbphy = <&usbh1phy>;

	fsl,usbphy = <&usbphy1>;

	phy_type = "ulpi";

	status = "okay";

};

arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts

+7 −14
Original line number Diff line number Diff line
@@ -83,21 +83,14 @@ sound { 
		fsl,mux-ext-port = <3>;

	};



	usbphy {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "simple-bus";



		usbh1phy: usbh1phy@0 {

	usbphy1: usbphy1 {

		compatible = "usb-nop-xceiv";

			reg = <0>;

		clocks = <&clks IMX5_CLK_USB_PHY_GATE>;

		clock-names = "main_clk";

		clock-frequency = <19200000>;

		#phy-cells = <0>;

	};

};

};



&audmux {

	pinctrl-names = "default";
@@ -275,7 +268,7 @@ &uart3 { 
&usbh1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbh1>;

	fsl,usbphy = <&usbh1phy>;

	fsl,usbphy = <&usbphy1>;

	dr_mode = "host";

	phy_type = "ulpi";

	status = "okay";

arch/arm/boot/dts/imx51.dtsi

+5 −12
Original line number Diff line number Diff line
@@ -93,19 +93,12 @@ cpu: cpu@0 { 
		};

	};



	usbphy {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "simple-bus";



		usbphy0: usbphy@0 {

	usbphy0: usbphy0 {

		compatible = "usb-nop-xceiv";

			reg = <0>;

		clocks = <&clks IMX5_CLK_USB_PHY_GATE>;

		clock-names = "main_clk";

		#phy-cells = <0>;

	};

	};



	display-subsystem {

		compatible = "fsl,imx-display-subsystem";