diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 610efcc5c71..465ead82f8f 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -171,9 +171,9 @@ static struct spi_board_info omap3h1_spi_board_info[] __initdata = { }; static int __init omap3h1_spi_init(void) { - spi_register_board_info(omap3h1_spi_board_info, - ARRAY_SIZE(omap3h1_spi_board_info)); - return 0; + spi_register_board_info(omap3h1_spi_board_info, + ARRAY_SIZE(omap3h1_spi_board_info)); + return 0; } @@ -559,24 +559,24 @@ static struct regulator_init_data tps65910_vdd1 = { .name = "vdd_mpu_iva", .min_uV = 900000, .max_uV = 1350000, - .valid_modes_mask = REGULATOR_MODE_NORMAL, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, + .valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_FAST, + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, .always_on = false, .state_mem = { - .uV = 1, .mode = REGULATOR_MODE_STANDBY, - .disabled = 1, + .enabled = 1, + .disabled = 0, }, .state_disk = { - .uV = 1, .mode = REGULATOR_MODE_STANDBY, - .disabled = 1, + .enabled = 1, + .disabled = 0, }, .state_standby = { - .uV = 1, .mode = REGULATOR_MODE_STANDBY, - .disabled = 1, + .enabled = 1, + .disabled = 0, }, }, @@ -598,24 +598,24 @@ static struct regulator_init_data tps65910_vdd2 = { .name = "vdd_core", .min_uV = 900000, .max_uV = 1200000, - .valid_modes_mask = REGULATOR_MODE_NORMAL, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, + .valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_FAST, + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, .always_on = false, .state_mem = { - .uV = 1, .mode = REGULATOR_MODE_STANDBY, - .disabled = 1, + .enabled = 1, + .disabled = 0, }, .state_disk = { - .uV = 1, .mode = REGULATOR_MODE_STANDBY, - .disabled = 1, + .enabled = 1, + .disabled = 0, }, .state_standby = { - .uV = 1, - .mode = REGULATOR_MODE_STANDBY, - .disabled = 1, + .mode = REGULATOR_MODE_STANDBY, + .enabled = 1, + .disabled = 0, }, }, @@ -1195,7 +1195,8 @@ static void __init omap3_h1_init(void) omap_sdrc_init(mt29c8g96_sdrc_params, mt29c8g96_sdrc_params); - omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); + /* This is done in our device tree file now */ + /* omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); */ omap3_h1_i2c_init(); @@ -1208,9 +1209,9 @@ static void __init omap3_h1_init(void) #if 0 omap_serial_board_init(omap_uart_ports); +#endif omap_display_init(&omap3h1_dss_data); -#endif usb_bind_phy("musb-hdrc.0.auto", 0, "nop_usb_xceiv"); /* "tusb-usb-h1" */ |