summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/omap3-minnow-p0.dts26
-rw-r--r--arch/arm/boot/dts/omap3-minnow.dtsi7
-rwxr-xr-xarch/arm/configs/minnow_defconfig1
-rw-r--r--arch/arm/mach-omap2/board-minnow.c1
4 files changed, 34 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-minnow-p0.dts b/arch/arm/boot/dts/omap3-minnow-p0.dts
index 10dca9e08b2..2d3eecfea2a 100644
--- a/arch/arm/boot/dts/omap3-minnow-p0.dts
+++ b/arch/arm/boot/dts/omap3-minnow-p0.dts
@@ -18,6 +18,32 @@
compatible = "mot,vib-gpio";
vib-gpio-supply = <&ldo6_reg>;
};
+
+ tusb_phy: tusb-usb@0 {
+ compatible = "ti,tusb-usb";
+ irq-gpio = <142>;
+ resetn-gpio = <15>;
+ cs-gpio = <16>;
+ csn-gpio = <27>;
+ reg = <0 0>;
+ };
+};
+
+&usb_phy_pins {
+ pinctrl-single,pins = <
+ 0x140 0x104 /* MCBSP3_CLKX, MODE4 (GPIO-142) | INPUT */
+ 0x5ae 0x004 /* ETK_D1, MODE4 (GPIO_15) | OUTPUT */
+ 0x5b0 0x004 /* ETK_D2, MODE4 (GPIO_16) | OUTPUT */
+ 0x5c6 0x004 /* EDK_D13, MODE4 (GPIO_27) | OUTPUT */
+ >;
+};
+
+&usb_otg_hs {
+ interface-type = <0>;
+ usb-phy = <&tusb_phy>;
+ mode = <3>;
+ power = <50>;
+
};
&mcspi1 {
diff --git a/arch/arm/boot/dts/omap3-minnow.dtsi b/arch/arm/boot/dts/omap3-minnow.dtsi
index 5997b6cdb2c..7140a47cca1 100644
--- a/arch/arm/boot/dts/omap3-minnow.dtsi
+++ b/arch/arm/boot/dts/omap3-minnow.dtsi
@@ -150,7 +150,10 @@
&omap3_pmx_core {
pinctrl-names = "default";
- pinctrl-0 = <&board_pins>;
+ pinctrl-0 = <
+ &board_pins
+ &usb_phy_pins
+ >;
board_pins: pinmux_board_pins {
pinctrl-single,pins = <
@@ -196,7 +199,9 @@
0x5c0 0x004 /* ETK_D10, MODE4 | OUTPUT */
0x5c8 0x004 /* ETK_D14, MODE4 | OUTPUT */
>;
+ };
+ usb_phy_pins: pinmux_board_pins {
};
};
diff --git a/arch/arm/configs/minnow_defconfig b/arch/arm/configs/minnow_defconfig
index 90323b3d6be..72070b266eb 100755
--- a/arch/arm/configs/minnow_defconfig
+++ b/arch/arm/configs/minnow_defconfig
@@ -1836,6 +1836,7 @@ CONFIG_USB_PHY=y
# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_ULPI is not set
CONFIG_CPCAP_USB=y
+CONFIG_USB_TUSB=y
CONFIG_USB_GADGET=y
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
diff --git a/arch/arm/mach-omap2/board-minnow.c b/arch/arm/mach-omap2/board-minnow.c
index 209bd9031b5..47f6da16e3d 100644
--- a/arch/arm/mach-omap2/board-minnow.c
+++ b/arch/arm/mach-omap2/board-minnow.c
@@ -37,6 +37,7 @@ static const char *omap3_gp_boards_compat[] __initdata = {
};
static void __init minnow_musb_init(void)
{
+ usb_bind_phy("musb-hdrc.0.auto", 0, "tps-usb");
usb_bind_phy("musb-hdrc.1.auto", 0, "cpcap_usb");
usb_musb_init(NULL);
}