ARM: dts: am335x-tx48: remove pinctrl from usb0_phy

The pins used for VBUSEN and OC in host mode are also used for the 2nd
CAN interface. When the USB0 interface is used in device mode, the
pins can still be used for the CAN interface if they are not claimed
by the USB PHY driver. Thus move the pinctrl reference to the
reg_usbotg which will only claim them for host mode.

diff --git a/arch/arm/boot/dts/am335x-tx48.dts b/arch/arm/boot/dts/am335x-tx48.dts
index 1b4554127b46fd876b059349dab2822f36d21907..28a8c1f0dd00187f4f3f427cfb6cdb29ca7a0117 100644 (file)
--- a/arch/arm/boot/dts/am335x-tx48.dts
+++ b/arch/arm/boot/dts/am335x-tx48.dts
@@ -566,9 +566,10 @@
                >;
        };
 
-       pinctrl_reg_usbotg: usbotggrp-2 {
+       pinctrl_reg_usbotg: reg-usbotggrp-1 {
                pinctrl-single,pins = <
                        0x100 (PIN_OUTPUT | MUX_MODE7)          /* mmc0_clk.gpio2_30            USBOTG_VBUSEN */
+                       0x104 (PIN_INPUT_PULLUP | MUX_MODE7)    /* mmc0_cmd.gpio2_31            #USBOTG_OC */
                >;
        };
 
@@ -620,12 +621,6 @@
                        0x21c (PIN_INPUT_PULLUP | MUX_MODE7)    /* usb0_drvvbus.gpio0_18        #USBH_OC */
                >;
        };
-
-       pinctrl_usbotg: usbotggrp-1 {
-               pinctrl-single,pins = <
-                       0x104 (PIN_INPUT_PULLUP | MUX_MODE7)    /* mmc0_cmd.gpio2_31            #USBOTG_OC */
-               >;
-       };
 };
 
 &cppi41dma {
@@ -880,8 +875,6 @@
 };
 
 &usb0_phy {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usbotg>;
        vcc-supply = <&reg_usbotg>;
        status = "okay";
 };