From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
broonie@opensource.wolfsonmicro.com
Cc: arnd@arndb.de, linus.walleij@stericsson.com,
Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 27/46] regulator: ab8500: Update voltage handling for fixed voltage regulators
Date: Thu, 21 Mar 2013 15:59:24 +0000 [thread overview]
Message-ID: <1363881583-15234-28-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1363881583-15234-1-git-send-email-lee.jones@linaro.org>
There are a few over-lapping methods for voltage selection operating
in the AB8500 regulator driver currently. This patch removes unused,
unnecessary variables from the regulator_info structures and provides
voltage tables for those regulators which have fixed voltages.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/regulator/ab8500.c | 92 +++++++++++++++++++++-----------------------
1 file changed, 44 insertions(+), 48 deletions(-)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 04f78fe..7ae7416 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -142,6 +142,26 @@ static const int ldo_sdio_voltages[] = {
3050000,
};
+static const unsigned int fixed_1200000_voltage[] = {
+ 1200000,
+};
+
+static const unsigned int fixed_1800000_voltage[] = {
+ 1800000,
+};
+
+static const unsigned int fixed_2000000_voltage[] = {
+ 2000000,
+};
+
+static const unsigned int fixed_2050000_voltage[] = {
+ 2050000,
+};
+
+static const unsigned int fixed_3300000_voltage[] = {
+ 3300000,
+};
+
static int ab8500_regulator_enable(struct regulator_dev *rdev)
{
int ret;
@@ -400,7 +420,6 @@ static struct regulator_ops ab8500_regulator_mode_ops = {
.get_optimum_mode = ab8500_regulator_get_optimum_mode,
.set_mode = ab8500_regulator_set_mode,
.get_mode = ab8500_regulator_get_mode,
- .get_voltage_sel = ab8500_regulator_get_voltage_sel,
.list_voltage = regulator_list_voltage_table,
.set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel,
};
@@ -409,7 +428,6 @@ static struct regulator_ops ab8500_regulator_ops = {
.enable = ab8500_regulator_enable,
.disable = ab8500_regulator_disable,
.is_enabled = ab8500_regulator_is_enabled,
- .get_voltage_sel = ab8500_regulator_get_voltage_sel,
.list_voltage = regulator_list_voltage_table,
};
@@ -521,7 +539,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_TVOUT,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 2000000,
+ .volt_table = fixed_2000000_voltage,
.enable_time = 500,
},
.delay = 500,
@@ -541,7 +559,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUDIO,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 2000000,
+ .volt_table = fixed_2000000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -556,7 +574,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC1,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 2050000,
+ .volt_table = fixed_2050000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -571,7 +589,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC2,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 2050000,
+ .volt_table = fixed_2050000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -586,7 +604,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_DMIC,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 1800000,
+ .volt_table = fixed_1800000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -605,7 +623,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANA,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 1200000,
+ .volt_table = fixed_1200000_voltage,
},
.load_lp_uA = 1000,
.update_bank = 0x04,
@@ -635,8 +653,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x09,
@@ -659,8 +675,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x09,
@@ -683,8 +697,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x0a,
@@ -707,8 +719,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
/* values for Vaux4Regu register */
.update_bank = 0x04,
@@ -733,8 +743,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux56_voltages),
},
- .min_uV = 1050000,
- .max_uV = 2790000,
.load_lp_uA = 2000,
/* values for CtrlVaux5 register */
.update_bank = 0x01,
@@ -758,8 +766,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux56_voltages),
},
- .min_uV = 1050000,
- .max_uV = 2790000,
.load_lp_uA = 2000,
/* values for CtrlVaux6 register */
.update_bank = 0x01,
@@ -783,8 +789,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x03,
.update_reg = 0x80,
@@ -813,9 +817,9 @@ static struct ab8500_regulator_info
.id = AB8505_LDO_ADC,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2000000_voltage,
},
.delay = 10000,
- .fixed_uV = 2000000,
.load_lp_uA = 1000,
.update_bank = 0x03,
.update_reg = 0x80,
@@ -832,8 +836,8 @@ static struct ab8500_regulator_info
.id = AB9540_LDO_USB,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_3300000_voltage,
},
- .fixed_uV = 3300000,
.update_bank = 0x03,
.update_reg = 0x82,
.update_mask = 0x03,
@@ -849,8 +853,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUDIO,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2000000_voltage,
},
- .fixed_uV = 2000000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x02,
@@ -864,8 +868,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC1,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
- .fixed_uV = 2050000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x08,
@@ -879,8 +883,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC2,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
- .fixed_uV = 2050000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x10,
@@ -894,8 +898,8 @@ static struct ab8500_regulator_info
.id = AB8505_LDO_AUX8,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_1800000_voltage,
},
- .fixed_uV = 1800000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x04,
@@ -912,8 +916,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANA,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_1200000_voltage,
},
- .fixed_uV = 1200000,
.load_lp_uA = 1000,
.update_bank = 0x04,
.update_reg = 0x06,
@@ -942,8 +946,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x09,
@@ -966,8 +968,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x09,
@@ -990,8 +990,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x0a,
@@ -1014,8 +1012,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
/* values for Vaux4Regu register */
.update_bank = 0x04,
@@ -1040,8 +1036,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x03,
.update_reg = 0x80,
@@ -1070,9 +1064,9 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_TVOUT,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2000000_voltage,
},
.delay = 10000,
- .fixed_uV = 2000000,
.load_lp_uA = 1000,
.update_bank = 0x03,
.update_reg = 0x80,
@@ -1089,8 +1083,8 @@ static struct ab8500_regulator_info
.id = AB9540_LDO_USB,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_3300000_voltage,
},
- .fixed_uV = 3300000,
.update_bank = 0x03,
.update_reg = 0x82,
.update_mask = 0x03,
@@ -1106,8 +1100,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUDIO,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2000000_voltage,
},
- .fixed_uV = 2000000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x02,
@@ -1121,8 +1115,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC1,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
- .fixed_uV = 2050000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x08,
@@ -1136,8 +1130,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC2,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
- .fixed_uV = 2050000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x10,
@@ -1151,8 +1145,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_DMIC,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_1800000_voltage,
},
- .fixed_uV = 1800000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x04,
@@ -1170,8 +1164,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANA,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_1200000_voltage,
},
- .fixed_uV = 1200000,
.load_lp_uA = 1000,
.update_bank = 0x04,
.update_reg = 0x06,
@@ -1336,6 +1330,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUDIO,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2000000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -1350,6 +1345,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC1,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -1364,6 +1360,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC2,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -1396,6 +1393,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANA,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_1200000_voltage,
},
.load_lp_uA = 1000,
.update_bank = 0x04,
@@ -1414,8 +1412,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_sdio_voltages),
},
- .min_uV = 1050000,
- .max_uV = 3050000,
.load_lp_uA = 5000,
.update_bank = 0x03,
.update_reg = 0x88,
--
1.7.10.4
next prev parent reply other threads:[~2013-03-21 16:06 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-21 15:58 [PATCH 00/46] Regulators: Bring the AB8500 into the 21st century Lee Jones
2013-03-21 15:58 ` [PATCH 01/46] regulator: ab8500: Further populate initialisation registers Lee Jones
2013-03-21 15:58 ` [PATCH 02/46] regulator: ab8500: Add set_mode/get_mode support Lee Jones
2013-03-21 15:59 ` [PATCH 03/46] regulator: ab8500: Added get_optimum_mode on regulators with idle mode Lee Jones
2013-03-21 15:59 ` [PATCH 04/46] ARM: ux500: regulators: Add mask for configuration Lee Jones
2013-03-21 15:59 ` [PATCH 05/46] regulator: ab8500: Another push to synchronise recent AB8500 developments Lee Jones
2013-03-21 15:59 ` [PATCH 06/46] regulator: ab8500: Separate regulator and MFD platform data Lee Jones
2013-03-22 11:04 ` Mark Brown
2013-03-21 15:59 ` [PATCH 07/46] regulator: ab8500: Add support of low voltage battery Lee Jones
2013-03-28 0:06 ` Mark Brown
2013-03-21 15:59 ` [PATCH 08/46] ARM: ux500: Update displays in vaux1 consumer list Lee Jones
2013-03-28 0:07 ` Mark Brown
2013-03-21 15:59 ` [PATCH 09/46] regulator: ab8500-ext: Add HW request support Lee Jones
2013-03-21 15:59 ` [PATCH 10/46] regulator: ab8500-ext: Add suspend support Lee Jones
2013-03-21 15:59 ` [PATCH 11/46] regulator: ab8500: Remove USB regulator Lee Jones
2013-03-21 15:59 ` [PATCH 12/46] regulator: ab8500: Init debug from regulator driver Lee Jones
2013-03-21 15:59 ` [PATCH 13/46] ARM: ux500: Add supply for the L3G4200D Gyroscope Lee Jones
2013-03-28 0:09 ` Mark Brown
2013-03-21 15:59 ` [PATCH 14/46] ARM: ux500: Add supply for the Ambient light sensor device Lee Jones
2013-03-28 0:09 ` Mark Brown
2013-03-21 15:59 ` [PATCH 15/46] ARM: ux500: Add supply for the Pressure sensor Lee Jones
2013-03-28 0:10 ` Mark Brown
2013-03-21 15:59 ` [PATCH 16/46] ARM: ux500: Add supply for the Cypress TrueTouch Touchscreen Lee Jones
2013-03-28 0:10 ` Mark Brown
2013-03-21 15:59 ` [PATCH 17/46] ARM: ux500: regulators: List the MMIO camera as a consumer of VAUX1 Lee Jones
2013-03-28 0:10 ` Mark Brown
2013-03-21 15:59 ` [PATCH 18/46] regulator: ab8500: Clean out SoC registers Lee Jones
2013-03-28 0:11 ` Mark Brown
2013-03-21 15:59 ` [PATCH 19/46] regulator: ab8500: Prepare the driver for additional platforms Lee Jones
2013-03-21 15:59 ` [PATCH 20/46] regulator: ab8500: Add support for the ab9540 Lee Jones
2013-03-21 15:59 ` [PATCH 21/46] regulator: ab8500: Correct TVOUT regulator start-up delay Lee Jones
2013-03-28 0:13 ` Mark Brown
2013-03-21 15:59 ` [PATCH 22/46] regulator: ab8500-ext: Add support for AB8505/AB9540 Lee Jones
2013-03-21 15:59 ` [PATCH 23/46] regulator: ab8500: add support for ab8505 Lee Jones
2013-03-21 15:59 ` [PATCH 24/46] ARM: ux500: regulator: Add accelerometer and fix magnetometer supply device ID Lee Jones
2013-03-28 0:15 ` Mark Brown
2013-03-21 15:59 ` [PATCH 25/46] regulator: ab8500-ext: Add support for AB9540 regulators Lee Jones
2013-03-21 15:59 ` [PATCH 26/46] regulator: ab8500: Add support for the ab8540 Lee Jones
2013-03-21 15:59 ` Lee Jones [this message]
2013-03-21 15:59 ` [PATCH 28/46] regulator: ab8500: Delete useless fixed_uV field Lee Jones
2013-03-28 0:16 ` Mark Brown
2013-03-21 15:59 ` [PATCH 29/46] regulator: ab8500: Use regulator_list_voltage_table() Lee Jones
2013-03-21 15:59 ` [PATCH 30/46] regulator: ab8500: Supply platform specific regulator id values Lee Jones
2013-03-21 15:59 ` [PATCH 31/46] regulator: ab8500: Don't register external regulators on AB8505 Lee Jones
2013-03-21 15:59 ` [PATCH 32/46] regulator: ab8500: Add voltage selection for AUDIO and ANA " Lee Jones
2013-03-21 15:59 ` [PATCH 33/46] regulator: ab8500: Also check for AB8505 based platforms Lee Jones
2013-03-21 15:59 ` [PATCH 34/46] regulator: ab8500: Add new operations for Vaux3 Lee Jones
2013-03-21 15:59 ` [PATCH 35/46] regulator: ab8500: Add mode operation for v-amic Lee Jones
2013-03-21 15:59 ` [PATCH 36/46] regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540 Lee Jones
2013-03-21 15:59 ` [PATCH 37/46] regulator: ab8500-ext: Adapt regulator registration for newly changed API Lee Jones
2013-03-28 0:18 ` Mark Brown
2013-03-21 15:59 ` [PATCH 38/46] regulator: ab8500: Use a struct to select the good regulator configuration Lee Jones
2013-03-21 15:59 ` [PATCH 39/46] regulator: ab8500: Introduce aux5, aux6 regulators for AB8540 Lee Jones
2013-03-21 15:59 ` [PATCH 40/46] regulator: ab8500: Set enable enable_time in regulator_desc Lee Jones
2013-03-21 15:59 ` [PATCH 41/46] regulator: ab8500: Remove the need for a 'delay' property Lee Jones
2013-03-21 15:59 ` [PATCH 42/46] regulator: ab8500: Use regulator_list_voltage_table() to look-up voltages Lee Jones
2013-03-21 15:59 ` [PATCH 43/46] ARM: ux500: Pass regulator platform data using the new format Lee Jones
2013-03-21 15:59 ` [PATCH 44/46] regulator: ab8500: Amend the update value for AB8500_LDO_INTCORE regulator Lee Jones
2013-03-28 0:20 ` Mark Brown
2013-03-21 15:59 ` [PATCH 45/46] regulator: ab8500: Shuffle init functions into a more logical order Lee Jones
2013-03-21 15:59 ` [PATCH 46/46] ARM: ux500: Regulators: Bring the AB8500 regulator platform data up-to-date Lee Jones
2013-03-28 0:22 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363881583-15234-28-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®