diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-12-11 16:55:48 -0800 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2015-12-11 16:55:48 -0800 |
| commit | 606779d73f51a0ebe81f691bd7c173fc1740be24 (patch) | |
| tree | 42e68bd40f3a375dfbb5ba940c6de9b4591f9016 /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | b6602fe7788593d7c5e02ae7bb5616ebc6f63f2c (diff) | |
| parent | b258e74fe4251438954e0fc08575f4b15ab35605 (diff) | |
| download | olio-linux-3.10-606779d73f51a0ebe81f691bd7c173fc1740be24.tar.xz olio-linux-3.10-606779d73f51a0ebe81f691bd7c173fc1740be24.zip | |
Merge remote-tracking branch 'olio/android-3.10-bringup' into 1.1.45
Conflicts:
drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_core.c
drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c
drivers/power/bq27x00_battery.c
Change-Id: Iafb1129617680cd2705bc05eb49faaafff325692
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 14a0008d0b9..ad40bd6d90e 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -91,6 +91,7 @@ #define LCD_RESET_GPIO 122 #endif + #define BACKLIGHT_PWM_GPIO 128 static struct of_device_id omap_dt_match_table[] __initdata = { @@ -269,7 +270,7 @@ static struct omap_musb_board_data musb_board_data = { static struct nop_usb_xceiv_platform_data nop_plat_data = { .type = USB_PHY_TYPE_USB2, .clk_rate = 60000000, /* 60 MHz */ - .needs_vcc = 1, + .needs_vcc = 0, .needs_reset = 0, }; @@ -479,6 +480,7 @@ static struct platform_device *omap3h1_devices[] __initdata = { static void __init omap3_h1_init(void) { + /* Read what we can from the device tree */ of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); |