| Message ID | 1371650753-11452-6-git-send-email-rogerq@ti.com |
|---|---|
| State | New |
| Headers | show |
Roger Quadros <rogerq@ti.com> writes: > Add the Idle state pins for USB host and enable WAKEUP on > DIR, DAT0-3, so that the PHY can wakeup the OMAP SoC from > sleep on any USB activity (e.g. remote wakeup or connect/disconnect). > > CC: Benoît Cousson <b-cousson@ti.com> > Signed-off-by: Roger Quadros <rogerq@ti.com> This one doesn't apply... > --- > arch/arm/boot/dts/omap3-beagle-xm.dts | 29 +++++++++++++++++++++++------ > 1 files changed, 23 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts > index d3808ed..f1d56c2 100644 > --- a/arch/arm/boot/dts/omap3-beagle-xm.dts > +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts > @@ -89,12 +89,7 @@ > }; > > &omap3_pmx_core { > - pinctrl-names = "default"; > - pinctrl-0 = < > - &hsusbb2_pins > - >; > - > - hsusbb2_pins: pinmux_hsusbb2_pins { This omap3_pmx_core section doesn't exist upstream in the xM DTS file (but does in omap3-beagle.dts.) Is there a dependency patch missing? Kevin
On 06/19/2013 09:42 PM, Kevin Hilman wrote: > Roger Quadros <rogerq@ti.com> writes: > >> Add the Idle state pins for USB host and enable WAKEUP on >> DIR, DAT0-3, so that the PHY can wakeup the OMAP SoC from >> sleep on any USB activity (e.g. remote wakeup or connect/disconnect). >> >> CC: Benoît Cousson <b-cousson@ti.com> >> Signed-off-by: Roger Quadros <rogerq@ti.com> > > This one doesn't apply... > >> --- >> arch/arm/boot/dts/omap3-beagle-xm.dts | 29 +++++++++++++++++++++++------ >> 1 files changed, 23 insertions(+), 6 deletions(-) >> >> diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts >> index d3808ed..f1d56c2 100644 >> --- a/arch/arm/boot/dts/omap3-beagle-xm.dts >> +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts >> @@ -89,12 +89,7 @@ >> }; >> >> &omap3_pmx_core { >> - pinctrl-names = "default"; >> - pinctrl-0 = < >> - &hsusbb2_pins >> - >; >> - >> - hsusbb2_pins: pinmux_hsusbb2_pins { > > This omap3_pmx_core section doesn't exist upstream in the xM DTS file > (but does in omap3-beagle.dts.) > > Is there a dependency patch missing? > Sorry for not mentioning it earlier. This is based on Benoit's tree [1] and you need these patches http://thread.gmane.org/gmane.linux.drivers.devicetree/38383 [1] git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git /for_3.11/dts cheers, -roger
On 06/20/2013 02:55 PM, Roger Quadros wrote: > On 06/19/2013 09:42 PM, Kevin Hilman wrote: >> Roger Quadros <rogerq@ti.com> writes: >> >>> Add the Idle state pins for USB host and enable WAKEUP on >>> DIR, DAT0-3, so that the PHY can wakeup the OMAP SoC from >>> sleep on any USB activity (e.g. remote wakeup or connect/disconnect). >>> >>> CC: Benoît Cousson <b-cousson@ti.com> >>> Signed-off-by: Roger Quadros <rogerq@ti.com> >> >> This one doesn't apply... >> >>> --- >>> arch/arm/boot/dts/omap3-beagle-xm.dts | 29 +++++++++++++++++++++++------ >>> 1 files changed, 23 insertions(+), 6 deletions(-) >>> >>> diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts >>> index d3808ed..f1d56c2 100644 >>> --- a/arch/arm/boot/dts/omap3-beagle-xm.dts >>> +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts >>> @@ -89,12 +89,7 @@ >>> }; >>> >>> &omap3_pmx_core { >>> - pinctrl-names = "default"; >>> - pinctrl-0 = < >>> - &hsusbb2_pins >>> - >; >>> - >>> - hsusbb2_pins: pinmux_hsusbb2_pins { >> >> This omap3_pmx_core section doesn't exist upstream in the xM DTS file >> (but does in omap3-beagle.dts.) >> >> Is there a dependency patch missing? >> > > Sorry for not mentioning it earlier. This is based on Benoit's tree [1] > and you need these patches > > http://thread.gmane.org/gmane.linux.drivers.devicetree/38383 Just noticed that this no longer applies today. I'll send a revision soon. cheers, -roger
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index d3808ed..f1d56c2 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -89,12 +89,7 @@ }; &omap3_pmx_core { - pinctrl-names = "default"; - pinctrl-0 = < - &hsusbb2_pins - >; - - hsusbb2_pins: pinmux_hsusbb2_pins { + hsusb2_pins: pinmux_hsusb2_pins { pinctrl-single,pins = < 0x5c0 (PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */ 0x5c2 (PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */ @@ -110,6 +105,25 @@ 0x1ae (PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_cs1.hsusb2_data3 */ >; }; + + /* WAKEUP enabled on DIR, DAT0-3 */ + hsusb2_idle_pins: pinmux_hsusb2_idle_pins { + pinctrl-single,pins = < + 0x5c0 (PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */ + 0x5c2 (PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */ + 0x5c4 (PIN_INPUT_PULLDOWN | WAKEUP_EN | MUX_MODE3) /* etk_d12.hsusb2_dir */ + 0x5c6 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */ + 0x5c8 (PIN_INPUT_PULLDOWN | WAKEUP_EN | MUX_MODE3) /* etk_d14.hsusb2_data0 */ + 0x5cA (PIN_INPUT_PULLDOWN | WAKEUP_EN | MUX_MODE3) /* etk_d15.hsusb2_data1 */ + 0x1a4 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi1_cs3.hsusb2_data2 */ + 0x1a6 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_clk.hsusb2_data7 */ + 0x1a8 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_simo.hsusb2_data4 */ + 0x1aa (PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_somi.hsusb2_data5 */ + 0x1ac (PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_cs0.hsusb2_data6 */ + 0x1ae (PIN_INPUT_PULLDOWN | WAKEUP_EN | MUX_MODE3) /* mcspi2_cs1.hsusb2_data3 */ + >; + interrupts = <77>; /* route padconf wakeup to EHCI IRQ */ + }; }; &i2c1 { @@ -181,6 +195,9 @@ }; &usbhshost { + pinctrl-names = "default", "idle"; + pinctrl-0 = <&hsusb2_pins>; + pinctrl-1 = <&hsusb2_idle_pins>; port2-mode = "ehci-phy"; };
Add the Idle state pins for USB host and enable WAKEUP on DIR, DAT0-3, so that the PHY can wakeup the OMAP SoC from sleep on any USB activity (e.g. remote wakeup or connect/disconnect). CC: Benoît Cousson <b-cousson@ti.com> Signed-off-by: Roger Quadros <rogerq@ti.com> --- arch/arm/boot/dts/omap3-beagle-xm.dts | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-)