diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index eac42115f84..f4eaa295e0e 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -311,7 +311,8 @@ CONFIG_OMAP_PACKAGE_CBP=y CONFIG_MACH_OMAP3_H1=y # CONFIG_MACH_OMAP3_H1_EVT1 is not set # CONFIG_MACH_OMAP3_H1_EVT2 is not set -CONFIG_MACH_OMAP3_H1_DVT=y +# CONFIG_MACH_OMAP3_H1_DVT1 is not set +CONFIG_MACH_OMAP3_H1_DVT2=y # CONFIG_MACH_DEVKIT8000 is not set # CONFIG_MACH_OMAP_LDP is not set # CONFIG_MACH_OMAP3530_LV_SOM is not set @@ -1840,6 +1841,7 @@ CONFIG_SND_SOC_DMAENGINE_PCM=y # CONFIG_SND_DESIGNWARE_I2S is not set CONFIG_SND_OMAP_SOC=y # CONFIG_SND_OMAP_SOC_C55 is not set +#CONFIG_SND_OMAP_SOC_OMAP3_H1 is not set CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set # CONFIG_SND_SIMPLE_CARD is not set diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 6270437b4d2..57672948fdb 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -171,8 +171,8 @@ static struct lm3530_platform_data omap3h1_backlight_platform_data = { //.pwm_pol_hi = true, //.als_avrg_time = LM3530_ALS_AVRG_TIME_512ms, .brt_ramp_law = 0, - .brt_ramp_fall = LM3530_RAMP_TIME_130ms, /* LM3530_RAMP_TIME_1s, */ - .brt_ramp_rise = LM3530_RAMP_TIME_130ms, /* LM3530_RAMP_TIME_1s, */ + .brt_ramp_fall = LM3530_RAMP_TIME_1s, /* LM3530_RAMP_TIME_1s, */ + .brt_ramp_rise = LM3530_RAMP_TIME_1s, /* LM3530_RAMP_TIME_1s, */ //.als1_resistor_sel = LM3530_ALS_IMPD_13_53kOhm, //.als2_resistor_sel = LM3530_ALS_IMPD_Z, //.als_vmin = 730, /* mV */ @@ -330,7 +330,7 @@ static struct regulator_init_data tps65910_3v3 = { static struct regulator_consumer_supply tps65910_1v8_supply[] = { REGULATOR_SUPPLY("vdds_dsi", "omapdss"), - REGULATOR_SUPPLY("vin", "1-0038"), + REGULATOR_SUPPLY("vin", "2-0038"), }; static struct regulator_init_data tps65910_1v8 = { @@ -390,6 +390,10 @@ static struct regulator_init_data tps65910_touch = { /* --------------------------------------------------------------------------- */ +/* This one only works if 'always_on' is set to true. Do I need to do something + * special otherwise to turn it on? + */ + static struct regulator_consumer_supply tps65910_accel_supply[] = { REGULATOR_SUPPLY("vdd", "mpu6515"), }; @@ -400,8 +404,8 @@ static struct regulator_init_data tps65910_accel = { .min_uV = 1800000, .max_uV = 1800000, .valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, - .always_on = false, + .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_STATUS, + .always_on = true, .apply_uV = true, }, .num_consumer_supplies = ARRAY_SIZE(tps65910_accel_supply), |