ARM: imx25: set default phy_type and dr_mode for usbotg port

All currently supported i.MX25-based machines use phy_type = "utmi" and
dr_mode = "otg".  So this seems to be a sensible default.

This also doesn't hurt out-of-tree machines because up to now they had
to specify these two properties in the machine.dts which still takes
precedence by just overwriting the defaults added here.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
index 9300711f1ea379a346c2055c1bac9d89c06ce205..db39bd6b8e0062ae1cae8b97b743a7ebc577f759 100644 (file)
--- a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
+++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
@@ -179,8 +179,6 @@ &usbhost1 {
 };
 
 &usbotg {
-       phy_type = "utmi";
-       dr_mode = "otg";
        external-vbus-divider;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx25-pdk.dts b/arch/arm/boot/dts/imx25-pdk.dts
index 70292101ba038b7122e3cac312f0794cddb4ff42..d921dd2ed6761370ac9250c3ea9f6ce26af86ec1 100644 (file)
--- a/arch/arm/boot/dts/imx25-pdk.dts
+++ b/arch/arm/boot/dts/imx25-pdk.dts
@@ -309,8 +309,6 @@ &usbhost1 {
 };
 
 &usbotg {
-       phy_type = "utmi";
-       dr_mode = "otg";
        external-vbus-divider;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index e0ba55016a04ad0e0a102336447f479416ef40b2..89c8f8f914ff10401728f19ec4dbc317ca95e4fe 100644 (file)
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -544,6 +544,8 @@ usbotg: usb@53ff4000 {
                                clock-names = "ipg", "ahb", "per";
                                fsl,usbmisc = <&usbmisc 0>;
                                fsl,usbphy = <&usbphy0>;
+                               phy_type = "utmi";
+                               dr_mode = "otg";
                                status = "disabled";
                        };