diff options
Diffstat (limited to 'arch/arm/mach-exynos/gc1-power.c')
| -rw-r--r-- | arch/arm/mach-exynos/gc1-power.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/gc1-power.c b/arch/arm/mach-exynos/gc1-power.c index 175a579..65a822d 100644 --- a/arch/arm/mach-exynos/gc1-power.c +++ b/arch/arm/mach-exynos/gc1-power.c @@ -370,7 +370,11 @@ struct max77686_platform_data exynos4_max77686_info = { void midas_power_set_muic_pdata(void *pdata, int gpio) { - gpio_request(gpio, "AP_PMIC_IRQ"); + int err; + + err = gpio_request(gpio, "AP_PMIC_IRQ"); + if (err) + pr_warn("failed to request AP_PMIC_IRQ\n"); s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf)); s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); } @@ -490,6 +494,10 @@ static struct regulator_consumer_supply s5m_ldo14_supply[] = { REGULATOR_SUPPLY("vabb2_1.95v", NULL), }; +static struct regulator_consumer_supply s5m_ldo19_supply[] = { + REGULATOR_SUPPLY("lcd_io_1.8v", NULL), +}; + static struct regulator_consumer_supply s5m_ldo20_supply[] = { REGULATOR_SUPPLY("touch", NULL), }; @@ -509,6 +517,7 @@ static struct regulator_consumer_supply s5m_ldo23_supply[] = { static struct regulator_consumer_supply s5m_ldo24_supply[] = { REGULATOR_SUPPLY("led_3.3v", NULL), + REGULATOR_SUPPLY("vmotor", NULL), }; static struct regulator_consumer_supply s5m_ldo25_supply[] = { @@ -586,6 +595,8 @@ S5M_REGULATOR_INIT(s5m_ldo12, "VUOTG_3.0V", 3000000, 3000000, 1, REGULATOR_CHANGE_STATUS, 0); S5M_REGULATOR_INIT(s5m_ldo14, "VABB2_1.95V", 1950000, 1950000, 1, REGULATOR_CHANGE_STATUS, 1); +S5M_REGULATOR_INIT(s5m_ldo19, "LCD_IO_1.8V", 1800000, 1800000, 0, + REGULATOR_CHANGE_STATUS, 1); S5M_REGULATOR_INIT(s5m_ldo20, "TSP_AVDD_3.3V", 3300000, 3300000, 0, REGULATOR_CHANGE_STATUS, 1); S5M_REGULATOR_INIT(s5m_ldo21, "MOT_3.3V", 3300000, 3300000, 0, @@ -594,7 +605,7 @@ S5M_REGULATOR_INIT(s5m_ldo22, "CAM_SENSOR_2.8V", 2800000, 2800000, 0, REGULATOR_CHANGE_STATUS, 1); S5M_REGULATOR_INIT(s5m_ldo23, "VTF_2.8V", 2800000, 2800000, 0, REGULATOR_CHANGE_STATUS, 1); -S5M_REGULATOR_INIT(s5m_ldo24, "LED_3.3V", 3300000, 3300000, 0, +S5M_REGULATOR_INIT(s5m_ldo24, "LED_3.3V", 3000000, 3000000, 0, REGULATOR_CHANGE_STATUS, 1); S5M_REGULATOR_INIT(s5m_ldo25, "CAM_SENSOR_CORE_1.2V", 1200000, 1200000, 0, REGULATOR_CHANGE_STATUS, 1); @@ -701,6 +712,7 @@ static struct s5m_regulator_data s5m8767_regulators[] = { {S5M8767_LDO11, &s5m_ldo11_init_data,}, {S5M8767_LDO12, &s5m_ldo12_init_data,}, {S5M8767_LDO14, &s5m_ldo14_init_data,}, + {S5M8767_LDO19, &s5m_ldo19_init_data,}, {S5M8767_LDO20, &s5m_ldo20_init_data,}, {S5M8767_LDO21, &s5m_ldo21_init_data,}, {S5M8767_LDO22, &s5m_ldo22_init_data,}, @@ -723,6 +735,7 @@ struct s5m_opmode_data s5m8767_opmode_data[S5M8767_REG_MAX] = { [S5M8767_LDO11] = {S5M8767_LDO11, S5M_OPMODE_STANDBY}, [S5M8767_LDO12] = {S5M8767_LDO12, S5M_OPMODE_STANDBY}, [S5M8767_LDO14] = {S5M8767_LDO14, S5M_OPMODE_STANDBY}, + [S5M8767_LDO19] = {S5M8767_LDO19, S5M_OPMODE_STANDBY}, }; struct s5m_platform_data exynos4_s5m8767_info = { @@ -777,6 +790,7 @@ struct s5m_platform_data exynos4_s5m8767_info = { .buck_ds[1] = EXYNOS4_GPF3(2), .buck_ds[2] = EXYNOS4_GPF3(3), + .buck1_init = 1000000, .buck2_init = 1100000, .buck3_init = 1000000, .buck4_init = 1000000, |