[PATCH 2/2] arm: omap: usb: enable I/O wakeups of ehci and ohci hwmods of omap3
From: Keshava Munegowda
Date: Fri Sep 09 2011 - 10:56:25 EST
From: Keshava Munegowda <Keshava_mgowda@xxxxxx>
For ehci and ohci hwmods, the omap3 I/O wakeup capablity is enabled.
for ehci in phy mode,
- the DAT0 and DIR I/O pad is set as wakeup capable
for ohci in serial mode
- usbb*_mm_rxdp is set as I/O wakeup for 6 pin serial mode
- usbb*_mm_rxrcv is set as I/O wakeup for 4 pin serial mode
- usbb*_mm_txen is set as I/O wakeup for 3 pin serial mode
- usbb*_mm_txdat is set as I/O wakeup for 2 pin serial mode
Signed-off-by: Keshava Munegowda <keshava_mgowda@xxxxxx>
---
arch/arm/mach-omap2/usb-host.c | 96 +++++++++++++++++++++++++++++++++-------
1 files changed, 80 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index cf2e726..d3cb100 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -467,7 +467,11 @@ static struct omap_device_pad omap3_port1_phy_pads[] __initdata = {
},
{
.name = "etk_d8.hsusb1_dir",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d9.hsusb1_nxt",
@@ -475,7 +479,11 @@ static struct omap_device_pad omap3_port1_phy_pads[] __initdata = {
},
{
.name = "etk_d0.hsusb1_data0",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d1.hsusb1_data1",
@@ -569,7 +577,11 @@ static struct omap_device_pad omap3_port2_phy_pads[] __initdata = {
},
{
.name = "etk_d12.hsusb2_dir",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d13.hsusb2_nxt",
@@ -577,7 +589,11 @@ static struct omap_device_pad omap3_port2_phy_pads[] __initdata = {
},
{
.name = "etk_d14.hsusb2_data0",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE3 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d15.hsusb2_data1",
@@ -714,7 +730,11 @@ static struct omap_device_pad omap3_port3_tll_pads[] __initdata = {
static struct omap_device_pad omap3_port1_6pin_pads[] __initdata = {
{
.name = "etk_clk.mm1_rxdp",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d9.mm1_rxdm",
@@ -741,7 +761,11 @@ static struct omap_device_pad omap3_port1_6pin_pads[] __initdata = {
static struct omap_device_pad omap3_port1_4pin_pads[] __initdata = {
{
.name = "etk_d0.mm1_rxrcv",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d7.mm1_txen_n",
@@ -760,7 +784,11 @@ static struct omap_device_pad omap3_port1_4pin_pads[] __initdata = {
static struct omap_device_pad omap3_port1_3pin_pads[] __initdata = {
{
.name = "etk_d7.mm1_txen_n",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d2.mm1_txdat",
@@ -775,7 +803,11 @@ static struct omap_device_pad omap3_port1_3pin_pads[] __initdata = {
static struct omap_device_pad omap3_port1_2pin_pads[] __initdata = {
{
.name = "etk_d2.mm1_txdat",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d1.mm1_txse0",
@@ -786,7 +818,11 @@ static struct omap_device_pad omap3_port1_2pin_pads[] __initdata = {
static struct omap_device_pad omap3_port2_6pin_pads[] __initdata = {
{
.name = "etk_d11.mm2_rxdp",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d13.mm2_rxdm",
@@ -813,7 +849,11 @@ static struct omap_device_pad omap3_port2_6pin_pads[] __initdata = {
static struct omap_device_pad omap3_port2_4pin_pads[] __initdata = {
{
.name = "etk_d14.mm2_rxrcv",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5 |
+ OMAP_WAKEUP_EN,
},
{
.name = "mcspi2_cs1.mm2_txen_n",
@@ -832,7 +872,11 @@ static struct omap_device_pad omap3_port2_4pin_pads[] __initdata = {
static struct omap_device_pad omap3_port2_3pin_pads[] __initdata = {
{
.name = "mcspi2_cs1.mm2_txen_n",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5 |
+ OMAP_WAKEUP_EN,
},
{
.name = "etk_d15.mm2_txse0",
@@ -847,7 +891,11 @@ static struct omap_device_pad omap3_port2_3pin_pads[] __initdata = {
static struct omap_device_pad omap3_port2_2pin_pads[] __initdata = {
{
.name = "etk_d15.mm2_txse0",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE5 |
+ OMAP_WAKEUP_EN,
},
{
.name = "mcspi1_cs3.mm2_txdat",
@@ -858,7 +906,11 @@ static struct omap_device_pad omap3_port2_2pin_pads[] __initdata = {
static struct omap_device_pad omap3_port3_6pin_pads[] __initdata = {
{
.name = "sdmmc2_dat5.mm3_rxdp",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6 |
+ OMAP_WAKEUP_EN,
},
{
.name = "sdmmc2_dat7.mm3_rxdm",
@@ -885,7 +937,11 @@ static struct omap_device_pad omap3_port3_6pin_pads[] __initdata = {
static struct omap_device_pad omap3_port3_4pin_pads[] __initdata = {
{
.name = "mcbsp4_dr.mm3_rxrcv",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6 |
+ OMAP_WAKEUP_EN,
},
{
.name = "mcbsp4_fsx.mm3_txen_n",
@@ -904,7 +960,11 @@ static struct omap_device_pad omap3_port3_4pin_pads[] __initdata = {
static struct omap_device_pad omap3_port3_3pin_pads[] __initdata = {
{
.name = "mcbsp4_fsx.mm3_txen_n",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6 |
+ OMAP_WAKEUP_EN,
},
{
.name = "mcbsp4_clkx.mm3_txse0",
@@ -919,7 +979,11 @@ static struct omap_device_pad omap3_port3_3pin_pads[] __initdata = {
static struct omap_device_pad omap3_port3_2pin_pads[] __initdata = {
{
.name = "mcbsp4_clkx.mm3_txse0",
- .enable = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6,
+ .enable = (OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6) &
+ ~OMAP_WAKEUP_EN,
+ .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+ .idle = OMAP_PIN_INPUT_PULLDOWN | OMAP_MUX_MODE6 |
+ OMAP_WAKEUP_EN,
},
{
.name = "mcbsp4_dx.mm3_txdat",
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/