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 29/46] regulator: ab8500: Use regulator_list_voltage_table()
Date: Thu, 21 Mar 2013 15:59:26 +0000 [thread overview]
Message-ID: <1363881583-15234-30-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1363881583-15234-1-git-send-email-lee.jones@linaro.org>
Following a recent move to regulator_list_voltage_table() for
all previous abx500 related platforms this converts all recent
platform updates over too.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/regulator/ab8500.c | 62 ++++++++++++++++----------------------------
1 file changed, 22 insertions(+), 40 deletions(-)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 7ae7416..22bac57 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -98,7 +98,7 @@ static const unsigned int ldo_vaux3_voltages[] = {
2910000,
};
-static const int ldo_vaux56_voltages[] = {
+static const unsigned int ldo_vaux56_voltages[] = {
1800000,
1050000,
1100000,
@@ -109,7 +109,7 @@ static const int ldo_vaux56_voltages[] = {
2790000,
};
-static const int ldo_vaux3_ab8540_voltages[] = {
+static const unsigned int ldo_vaux3_ab8540_voltages[] = {
1200000,
1500000,
1800000,
@@ -131,7 +131,7 @@ static const unsigned int ldo_vintcore_voltages[] = {
1350000,
};
-static const int ldo_sdio_voltages[] = {
+static const unsigned int ldo_sdio_voltages[] = {
1160000,
1050000,
1100000,
@@ -652,6 +652,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX1,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -663,8 +664,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x1f,
.voltage_mask = 0x0f,
- .voltages = ldo_vauxn_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages),
},
[AB8505_LDO_AUX2] = {
.desc = {
@@ -674,6 +673,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX2,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -685,8 +685,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x20,
.voltage_mask = 0x0f,
- .voltages = ldo_vauxn_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages),
},
[AB8505_LDO_AUX3] = {
.desc = {
@@ -696,6 +694,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX3,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
+ .volt_table = ldo_vaux3_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -707,8 +706,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x21,
.voltage_mask = 0x07,
- .voltages = ldo_vaux3_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vaux3_voltages),
},
[AB8505_LDO_AUX4] = {
.desc = {
@@ -718,6 +715,7 @@ static struct ab8500_regulator_info
.id = AB9540_LDO_AUX4,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
/* values for Vaux4Regu register */
@@ -731,8 +729,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x2f,
.voltage_mask = 0x0f,
- .voltages = ldo_vauxn_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages),
},
[AB8505_LDO_AUX5] = {
.desc = {
@@ -742,6 +738,7 @@ static struct ab8500_regulator_info
.id = AB8505_LDO_AUX5,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux56_voltages),
+ .volt_table = ldo_vaux56_voltages,
},
.load_lp_uA = 2000,
/* values for CtrlVaux5 register */
@@ -754,8 +751,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x01,
.voltage_reg = 0x55,
.voltage_mask = 0x07,
- .voltages = ldo_vaux56_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vaux56_voltages),
},
[AB8505_LDO_AUX6] = {
.desc = {
@@ -765,6 +760,7 @@ static struct ab8500_regulator_info
.id = AB8505_LDO_AUX6,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux56_voltages),
+ .volt_table = ldo_vaux56_voltages,
},
.load_lp_uA = 2000,
/* values for CtrlVaux6 register */
@@ -777,8 +773,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x01,
.voltage_reg = 0x56,
.voltage_mask = 0x07,
- .voltages = ldo_vaux56_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vaux56_voltages),
},
[AB8505_LDO_INTCORE] = {
.desc = {
@@ -788,6 +782,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_INTCORE,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
+ .volt_table = ldo_vintcore_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x03,
@@ -799,8 +794,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x03,
.voltage_reg = 0x80,
.voltage_mask = 0x38,
- .voltages = ldo_vintcore_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vintcore_voltages),
.voltage_shift = 3,
},
@@ -945,6 +938,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX1,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -956,8 +950,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x1f,
.voltage_mask = 0x0f,
- .voltages = ldo_vauxn_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages),
},
[AB9540_LDO_AUX2] = {
.desc = {
@@ -967,6 +959,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX2,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -978,8 +971,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x20,
.voltage_mask = 0x0f,
- .voltages = ldo_vauxn_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages),
},
[AB9540_LDO_AUX3] = {
.desc = {
@@ -989,6 +980,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX3,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
+ .volt_table = ldo_vaux3_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -1000,8 +992,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x21,
.voltage_mask = 0x07,
- .voltages = ldo_vaux3_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vaux3_voltages),
},
[AB9540_LDO_AUX4] = {
.desc = {
@@ -1011,6 +1001,7 @@ static struct ab8500_regulator_info
.id = AB9540_LDO_AUX4,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
/* values for Vaux4Regu register */
@@ -1024,8 +1015,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x2f,
.voltage_mask = 0x0f,
- .voltages = ldo_vauxn_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages),
},
[AB9540_LDO_INTCORE] = {
.desc = {
@@ -1035,6 +1024,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_INTCORE,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
+ .volt_table = ldo_vintcore_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x03,
@@ -1046,8 +1036,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x03,
.voltage_reg = 0x80,
.voltage_mask = 0x38,
- .voltages = ldo_vintcore_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vintcore_voltages),
.voltage_shift = 3,
},
@@ -1193,6 +1181,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX1,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -1204,8 +1193,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x1f,
.voltage_mask = 0x0f,
- .voltages = ldo_vauxn_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages),
},
[AB8540_LDO_AUX2] = {
.desc = {
@@ -1215,6 +1202,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX2,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -1226,8 +1214,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x20,
.voltage_mask = 0x0f,
- .voltages = ldo_vauxn_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages),
},
[AB8540_LDO_AUX3] = {
.desc = {
@@ -1237,6 +1223,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX3,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_ab8540_voltages),
+ .volt_table = ldo_vaux3_ab8540_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -1248,8 +1235,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x21,
.voltage_mask = 0x07,
- .voltages = ldo_vaux3_ab8540_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vaux3_ab8540_voltages),
},
[AB8540_LDO_AUX4] = {
.desc = {
@@ -1259,6 +1244,7 @@ static struct ab8500_regulator_info
.id = AB9540_LDO_AUX4,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
/* values for Vaux4Regu register */
@@ -1272,8 +1258,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x2f,
.voltage_mask = 0x0f,
- .voltages = ldo_vauxn_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages),
},
[AB8540_LDO_INTCORE] = {
.desc = {
@@ -1283,6 +1267,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_INTCORE,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
+ .volt_table = ldo_vintcore_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x03,
@@ -1294,8 +1279,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x03,
.voltage_reg = 0x80,
.voltage_mask = 0x38,
- .voltages = ldo_vintcore_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vintcore_voltages),
.voltage_shift = 3,
},
@@ -1410,7 +1393,8 @@ static struct ab8500_regulator_info
.type = REGULATOR_VOLTAGE,
.id = AB8540_LDO_SDIO,
.owner = THIS_MODULE,
- .n_voltages = ARRAY_SIZE(ldo_sdio_voltages),
+ .n_voltages = ARRAY_SIZE(ldo_sdio_voltages),
+ .volt_table = ldo_sdio_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x03,
@@ -1422,8 +1406,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x03,
.voltage_reg = 0x88,
.voltage_mask = 0x07,
- .voltages = ldo_sdio_voltages,
- .voltages_len = ARRAY_SIZE(ldo_sdio_voltages),
},
};
--
1.7.10.4
next prev parent reply other threads:[~2013-03-21 16:01 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 ` [PATCH 27/46] regulator: ab8500: Update voltage handling for fixed voltage regulators Lee Jones
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 ` Lee Jones [this message]
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-30-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®