summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattis fjallstrom <mattis@acm.org>2015-07-02 03:39:44 -0700
committermattis fjallstrom <mattis@acm.org>2015-07-02 03:39:44 -0700
commit33e469f9a671582651715e5cfba2ea5c14659b9a (patch)
treeee2cfc3ab07276283114123abe3e02acfd45847c
parent745d0a31aad904aa6d25541e9220d12734591ac3 (diff)
downloadolio-linux-3.10-33e469f9a671582651715e5cfba2ea5c14659b9a.tar.xz
olio-linux-3.10-33e469f9a671582651715e5cfba2ea5c14659b9a.zip
Changing the USB CS pin for PV
Change-Id: I7c1cfb8fdc7c42f68fb065af89c5263b9582f086
-rw-r--r--arch/arm/boot/dts/omap3_h1.dts2
-rw-r--r--arch/arm/mach-omap2/board-omap3h1.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts
index 9111ebf872e..23945098e65 100644
--- a/arch/arm/boot/dts/omap3_h1.dts
+++ b/arch/arm/boot/dts/omap3_h1.dts
@@ -172,7 +172,7 @@
/* touch reset */
0x0f2 0x11c /* CAM_D6, MODE4 | INPUT_PULLUP */
- 0x5ba 0x004 /* ETK_D7, MODE4 | OUTPUT */
+ 0x5b2 0x004 /* ETK_D3, MODE4 | OUTPUT */
0x1b0 0xc100 /* SYS_NIRQ, MODE0 | INPUT | OFFWAKEUP */
0x0dc 0x004 /* CAM_HS, MODE4 | OUTPUT */
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index 0d3214c4150..7a59a3b4d18 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -76,7 +76,7 @@
#define ATMEL_MXT_GPIO 105
#define TPS_SYS_NIRQ 0
#define USB_IRQ 124
-#define USB_ON_ETK_D7 21
+#define USB_CS 17
#define DEFAULT_RXDMA_POLLRATE 1 /* RX DMA polling rate (us) */
#define DEFAULT_RXDMA_BUFSIZE 4096 /* RX DMA buffer size */
@@ -393,7 +393,7 @@ static int __init omap3_h1_i2c_init(void)
omap3h1_i2c1_board_info[1].irq = acc_irq;
#endif
- gpio_request_one(USB_ON_ETK_D7, GPIOF_OUT_INIT_HIGH, "USB on");
+ gpio_request_one(USB_CS, GPIOF_OUT_INIT_HIGH, "USB on");
/* Register buses */