Skip to content

Commit

Permalink
ARM: dts: Configure USB host for 37xx-evm
Browse files Browse the repository at this point in the history
Looks like nobody bothered to configure USB host for 37xx-evm
when we converted things to device tree, so let's add it. This
is similar to beagleboard configuration with few extra quirks
to configure the port. And as with beagleboard, OHCI won't work
because there is no USB LS/FS PHY. A HS USB hub is needed to use
devices like keyboard and mice.

Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
tmlind committed May 26, 2017
1 parent 05e7d62 commit 05306b8
Show file tree
Hide file tree
Showing 2 changed files with 135 additions and 0 deletions.
102 changes: 102 additions & 0 deletions arch/arm/boot/dts/omap3-evm-37xx.dts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,15 @@
>;
};

&hsusb2_phy {
pinctrl-names = "default";
pinctrl-0 = <&ehci_phy_pins>;
};

&omap3_pmx_core {
pinctrl-names = "default";
pinctrl-0 = <&on_board_gpio_61 &hsusb2_pins>;

dss_dpi_pins1: pinmux_dss_dpi_pins2 {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0) /* dss_pclk.dss_pclk */
Expand Down Expand Up @@ -98,6 +106,37 @@
>;
};

/* Devices are routed with gpmc_nbe1.gpio_61 to on-board devices */
on_board_gpio_61: pinmux_ehci_port_select_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x20c8, PIN_OUTPUT | MUX_MODE4)
>;
};

/* Used by OHCI and EHCI. OHCI won't work without external phy */
hsusb2_pins: pinmux_hsusb2_pins {
pinctrl-single,pins = <

/* mcspi1_cs3.hsusb2_data2 */
OMAP3_CORE1_IOPAD(0x21d4, PIN_INPUT_PULLDOWN | MUX_MODE3)

/* mcspi2_clk.hsusb2_data7 */
OMAP3_CORE1_IOPAD(0x21d6, PIN_INPUT_PULLDOWN | MUX_MODE3)

/* mcspi2_simo.hsusb2_data4 */
OMAP3_CORE1_IOPAD(0x21d8, PIN_INPUT_PULLDOWN | MUX_MODE3)

/* mcspi2_somi.hsusb2_data5 */
OMAP3_CORE1_IOPAD(0x21da, PIN_INPUT_PULLDOWN | MUX_MODE3)

/* mcspi2_cs0.hsusb2_data6 */
OMAP3_CORE1_IOPAD(0x21dc, PIN_INPUT_PULLDOWN | MUX_MODE3)

/* mcspi2_cs1.hsusb2_data3 */
OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3)
>;
};

wl12xx_gpio: pinmux_wl12xx_gpio {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x2180, PIN_OUTPUT | MUX_MODE4) /* uart1_cts.gpio_150 */
Expand All @@ -112,6 +151,46 @@
};
};

&omap3_pmx_core2 {
pinctrl-names = "default";
pinctrl-0 = <&hsusb2_2_pins>;

ehci_phy_pins: pinmux_ehci_phy_pins {
pinctrl-single,pins = <

/* EHCI PHY reset GPIO etk_d7.gpio_21 */
OMAP3630_CORE2_IOPAD(0x25ea, PIN_OUTPUT | MUX_MODE4)

/* EHCI VBUS etk_d8.gpio_22 */
OMAP3630_CORE2_IOPAD(0x25ec, PIN_OUTPUT | MUX_MODE4)
>;
};

/* Used by OHCI and EHCI. OHCI won't work without external phy */
hsusb2_2_pins: pinmux_hsusb2_2_pins {
pinctrl-single,pins = <

/* etk_d10.hsusb2_clk */
OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3)

/* etk_d11.hsusb2_stp */
OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3)

/* etk_d12.hsusb2_dir */
OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3)

/* etk_d13.hsusb2_nxt */
OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3)

/* etk_d14.hsusb2_data0 */
OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3)

/* etk_d15.hsusb2_data1 */
OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3)
>;
};
};

&omap3_pmx_wkup {
dss_dpi_pins2: pinmux_dss_dpi_pins1 {
pinctrl-single,pins = <
Expand Down Expand Up @@ -153,6 +232,29 @@
pinctrl-0 = <&uart3_pins>;
};

/*
* GPIO_61 (nUSB2_EN_1V8) must be low to enable on-board EHCI USB2 interface
* for bus switch SN74CB3Q3384A, level-shifter SN74AVC16T245DGGR, and 1.8V.
*/
&gpio2 {
en_usb2_port {
gpio-hog;
gpios = <29 GPIO_ACTIVE_HIGH>; /* gpio_61 */
output-low;
line-name = "enable usb2 port";
};
};

/* T2_GPIO_2 low to route GPIO_61 to on-board devices */
&twl_gpio {
en_on_board_gpio_61 {
gpio-hog;
gpios = <2 GPIO_ACTIVE_HIGH>;
output-low;
line-name = "en_hsusb2_clk";
};
};

&gpmc {
ranges = <0 0 0x30000000 0x1000000>, /* CS0: 16MB for NAND */
<5 0 0x2c000000 0x01000000>;
Expand Down
33 changes: 33 additions & 0 deletions arch/arm/boot/dts/omap3-evm-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,24 @@
};
};

/* HS USB Port 2 Power */
hsusb2_power: hsusb2_power_reg {
compatible = "regulator-fixed";
regulator-name = "hsusb2_vbus";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; /* gpio_22 */
startup-delay-us = <70000>;
enable-active-high;
};

/* HS USB Host PHY on PORT 2 */
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; /* gpio_21 */
vcc-supply = <&hsusb2_power>;
};

leds {
compatible = "gpio-leds";
ledb {
Expand Down Expand Up @@ -142,6 +160,14 @@
>;
};

&usbhshost {
port2-mode = "ehci-phy";
};

&usbhsehci {
phys = <0 &hsusb2_phy>;
};

&usb_otg_hs {
interface-type = <0>;
usb-phy = <&usb2_phy>;
Expand All @@ -158,3 +184,10 @@
reg = <5 0 0xff>;
};
};

&vaux2 {
regulator-name = "usb_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};

0 comments on commit 05306b8

Please sign in to comment.