Loading drivers/regulator/ab8500.c +49 −6 Original line number Diff line number Diff line Loading @@ -160,6 +160,28 @@ static const unsigned int fixed_3300000_voltage[] = { 3300000, }; static const unsigned int ldo_vana_voltages[] = { 1050000, 1075000, 1100000, 1125000, 1150000, 1175000, 1200000, 1225000, }; static const unsigned int ldo_vaudio_voltages[] = { 2000000, 2100000, 2200000, 2300000, 2400000, 2500000, 2600000, 2600000, /* Duplicated in Vaudio and IsoUicc Control register. */ }; static int ab8500_regulator_enable(struct regulator_dev *rdev) { int ret; Loading Loading @@ -416,6 +438,16 @@ static struct regulator_ops ab8500_regulator_volt_mode_ops = { .list_voltage = regulator_list_voltage_table, }; static struct regulator_ops ab8500_regulator_volt_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable, .is_enabled = ab8500_regulator_is_enabled, .get_voltage_sel = ab8500_regulator_get_voltage_sel, .set_voltage_sel = ab8500_regulator_set_voltage_sel, .list_voltage = regulator_list_voltage_table, .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, }; static struct regulator_ops ab8500_regulator_mode_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable, Loading Loading @@ -851,17 +883,23 @@ static struct ab8500_regulator_info [AB8505_LDO_AUDIO] = { .desc = { .name = "LDO-AUDIO", .ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_volt_ops, .type = REGULATOR_VOLTAGE, .id = AB8505_LDO_AUDIO, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2000000_voltage, .n_voltages = ARRAY_SIZE(ldo_vaudio_voltages), .volt_table = ldo_vaudio_voltages, }, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x02, .update_val = 0x02, .voltage_bank = 0x01, .voltage_reg = 0x57, .voltage_mask = 0x7, .voltage_shift = 4, .voltages = ldo_vaudio_voltages, .voltages_len = ARRAY_SIZE(ldo_vaudio_voltages), }, [AB8505_LDO_ANAMIC1] = { .desc = { Loading Loading @@ -914,12 +952,12 @@ static struct ab8500_regulator_info [AB8505_LDO_ANA] = { .desc = { .name = "LDO-ANA", .ops = &ab8500_regulator_mode_ops, .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8505_LDO_ANA, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_1200000_voltage, .n_voltages = ARRAY_SIZE(ldo_vana_voltages), .volt_table = ldo_vana_voltages, }, .load_lp_uA = 1000, .update_bank = 0x04, Loading @@ -928,6 +966,11 @@ static struct ab8500_regulator_info .update_val = 0x04, .update_val_idle = 0x0c, .update_val_normal = 0x04, .voltage_bank = 0x04, .voltage_reg = 0x29, .voltage_mask = 0x7, .voltages = ldo_vana_voltages, .voltages_len = ARRAY_SIZE(ldo_vana_voltages), }, }; Loading Loading
drivers/regulator/ab8500.c +49 −6 Original line number Diff line number Diff line Loading @@ -160,6 +160,28 @@ static const unsigned int fixed_3300000_voltage[] = { 3300000, }; static const unsigned int ldo_vana_voltages[] = { 1050000, 1075000, 1100000, 1125000, 1150000, 1175000, 1200000, 1225000, }; static const unsigned int ldo_vaudio_voltages[] = { 2000000, 2100000, 2200000, 2300000, 2400000, 2500000, 2600000, 2600000, /* Duplicated in Vaudio and IsoUicc Control register. */ }; static int ab8500_regulator_enable(struct regulator_dev *rdev) { int ret; Loading Loading @@ -416,6 +438,16 @@ static struct regulator_ops ab8500_regulator_volt_mode_ops = { .list_voltage = regulator_list_voltage_table, }; static struct regulator_ops ab8500_regulator_volt_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable, .is_enabled = ab8500_regulator_is_enabled, .get_voltage_sel = ab8500_regulator_get_voltage_sel, .set_voltage_sel = ab8500_regulator_set_voltage_sel, .list_voltage = regulator_list_voltage_table, .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, }; static struct regulator_ops ab8500_regulator_mode_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable, Loading Loading @@ -851,17 +883,23 @@ static struct ab8500_regulator_info [AB8505_LDO_AUDIO] = { .desc = { .name = "LDO-AUDIO", .ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_volt_ops, .type = REGULATOR_VOLTAGE, .id = AB8505_LDO_AUDIO, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_2000000_voltage, .n_voltages = ARRAY_SIZE(ldo_vaudio_voltages), .volt_table = ldo_vaudio_voltages, }, .update_bank = 0x03, .update_reg = 0x83, .update_mask = 0x02, .update_val = 0x02, .voltage_bank = 0x01, .voltage_reg = 0x57, .voltage_mask = 0x7, .voltage_shift = 4, .voltages = ldo_vaudio_voltages, .voltages_len = ARRAY_SIZE(ldo_vaudio_voltages), }, [AB8505_LDO_ANAMIC1] = { .desc = { Loading Loading @@ -914,12 +952,12 @@ static struct ab8500_regulator_info [AB8505_LDO_ANA] = { .desc = { .name = "LDO-ANA", .ops = &ab8500_regulator_mode_ops, .ops = &ab8500_regulator_volt_mode_ops, .type = REGULATOR_VOLTAGE, .id = AB8505_LDO_ANA, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_1200000_voltage, .n_voltages = ARRAY_SIZE(ldo_vana_voltages), .volt_table = ldo_vana_voltages, }, .load_lp_uA = 1000, .update_bank = 0x04, Loading @@ -928,6 +966,11 @@ static struct ab8500_regulator_info .update_val = 0x04, .update_val_idle = 0x0c, .update_val_normal = 0x04, .voltage_bank = 0x04, .voltage_reg = 0x29, .voltage_mask = 0x7, .voltages = ldo_vana_voltages, .voltages_len = ARRAY_SIZE(ldo_vana_voltages), }, }; Loading