Commit 314de2f6 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Greg Kroah-Hartman
Browse files

ARM: dts: exynos: Use standard arrays of generic PHYs for EHCI/OHCI devices 



Move USB PHYs to a standard arrays for Exynos EHCI/OHCI devices. This
resolves the conflict between Exynos EHCI/OHCI sub-nodes and generic USB
device bindings. Once the Exynos EHCI/OHCI sub-nodes are removed, the
boards can finally provide sub-nodes for the USB devices using generic USB
device bindings.

Suggested-by: default avatarMåns Rullgård <mans@mansr.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20190726081453.9456-4-m.szyprowski@samsung.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 214b606e

arch/arm/boot/dts/exynos4.dtsi

+4 −24
Original line number Diff line number Diff line
@@ -380,23 +380,8 @@ 
			clocks = <&clock CLK_USB_HOST>;

			clock-names = "usbhost";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

			port@0 {

				reg = <0>;

				phys = <&exynos_usbphy 1>;

				status = "disabled";

			};

			port@1 {

				reg = <1>;

				phys = <&exynos_usbphy 2>;

				status = "disabled";

			};

			port@2 {

				reg = <2>;

				phys = <&exynos_usbphy 3>;

				status = "disabled";

			};

			phys = <&exynos_usbphy 1>, <&exynos_usbphy 2>, <&exynos_usbphy 3>;

			phy-names = "host", "hsic0", "hsic1";

		};



		ohci: ohci@12590000 {
@@ -406,13 +391,8 @@ 
			clocks = <&clock CLK_USB_HOST>;

			clock-names = "usbhost";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

			port@0 {

				reg = <0>;

			phys = <&exynos_usbphy 1>;

				status = "disabled";

			};

			phy-names = "host";

		};



		gpu: gpu@13000000 {

arch/arm/boot/dts/exynos4210-universal_c210.dts

+2 −6
Original line number Diff line number Diff line
@@ -204,9 +204,8 @@ 


&ehci {

	status = "okay";

	port@0 {

		status = "okay";

	};

	phys = <&exynos_usbphy 1>;

	phy-names = "host";

};



&exynos_usbphy {
@@ -520,9 +519,6 @@ 


&ohci {

	status = "okay";

	port@0 {

		status = "okay";

	};

};



&pinctrl_1 {

arch/arm/boot/dts/exynos4412-itop-elite.dts

+2 −7
Original line number Diff line number Diff line
@@ -146,13 +146,8 @@ 
	/* In order to reset USB ethernet */

	samsung,vbus-gpio = <&gpc0 1 GPIO_ACTIVE_HIGH>;



	port@0 {

		status = "okay";

	};



	port@2 {

		status = "okay";

	};

	phys = <&exynos_usbphy 1>, <&exynos_usbphy 3>;

	phy-names = "host", "hsic1";

};



&exynos_usbphy {

arch/arm/boot/dts/exynos4412-odroidu3.dts

+2 −6
Original line number Diff line number Diff line
@@ -105,12 +105,8 @@ 
};



&ehci {

	port@1 {

		status = "okay";

	};

	port@2 {

		status = "okay";

	};

	phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>;

	phy-names = "hsic0", "hsic1";

};



&sound {

arch/arm/boot/dts/exynos4412-odroidx.dts

+2 −3
Original line number Diff line number Diff line
@@ -72,9 +72,8 @@ 
};



&ehci {

	port@1 {

		status = "okay";

	};

	phys = <&exynos_usbphy 2>;

	phy-names = "hsic0";

};



&mshc_0 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE