diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 10:20:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 10:20:51 +0100 |
| commit | 93837812a5dcde17224ad20cf2ad7be1e94482bb (patch) | |
| tree | e4755fac9912bbff19f2df21a89600dbdfe71870 /arch/arm/mach-omap1 | |
| parent | usb: mtu3: mtu3_debug: remove an unused struct member (diff) | |
| parent | Linux 5.10-rc7 (diff) | |
| download | linux-dev-93837812a5dcde17224ad20cf2ad7be1e94482bb.tar.xz linux-dev-93837812a5dcde17224ad20cf2ad7be1e94482bb.zip | |
Merge 5.10-rc7 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 144b9caa935c..a720259099ed 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -288,7 +288,7 @@ static struct gpiod_lookup_table osk_usb_gpio_table = { .dev_id = "ohci", .table = { /* Power GPIO on the I2C-attached TPS65010 */ - GPIO_LOOKUP("i2c-tps65010", 1, "power", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("tps65010", 0, "power", GPIO_ACTIVE_HIGH), GPIO_LOOKUP(OMAP_GPIO_LABEL, 9, "overcurrent", GPIO_ACTIVE_HIGH), }, |