mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com
Cc: Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 21/33] regulator: ab8500: Add voltage selection for AUDIO and ANA on AB8505
Date: Thu, 28 Mar 2013 16:11:21 +0000	[thread overview]
Message-ID: <1364487093-19551-22-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1364487093-19551-1-git-send-email-lee.jones@linaro.org>

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/regulator/ab8500.c |   55 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 9123af4..90f5263 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -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;
@@ -405,6 +427,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,
@@ -840,17 +872,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 = {
@@ -903,12 +941,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,
@@ -917,6 +955,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),
 	},
 };
 
-- 
1.7.10.4


  parent reply	other threads:[~2013-03-28 16:12 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-28 16:11 [PATCH 00/33] Regulators: Bring the AB8500 into the 21st century Lee Jones
2013-03-28 16:11 ` [PATCH 01/33] regulator: ab8500-ext: New driver to control external regulators Lee Jones
2013-03-29 17:49   ` Mark Brown
2013-03-28 16:11 ` [PATCH 02/33] ARM: ux500: Add regulator platform data for AB8500 " Lee Jones
2013-03-28 16:11 ` [PATCH 03/33] ARM: ux500: Provide a mechanism to over-ride regulator init values Lee Jones
2013-03-28 16:11 ` [PATCH 04/33] ARM: ux500: Turn off external regulator #1 when early HREFs suspend Lee Jones
2013-03-28 16:11 ` [PATCH 05/33] ARM: ux500: Setup external regulator supply #2 for HREF v20 boards Lee Jones
2013-03-28 16:11 ` [PATCH 06/33] regulator: ab8500-ext: Add HW request support Lee Jones
2013-03-28 16:11 ` [PATCH 07/33] regulator: ab8500-ext: Add suspend support Lee Jones
2013-03-29 17:44   ` Mark Brown
2013-03-28 16:11 ` [PATCH 08/33] regulator: ab8500: Remove USB regulator Lee Jones
2013-03-29 17:50   ` Mark Brown
2013-03-28 16:11 ` [PATCH 09/33] regulator: ab8500: Init debug from regulator driver Lee Jones
2013-03-29 17:50   ` Mark Brown
2013-03-28 16:11 ` [PATCH 10/33] regulator: ab8500: Prepare the driver for additional platforms Lee Jones
2013-03-28 16:11 ` [PATCH 11/33] regulator: ab8500: Add support for the ab9540 Lee Jones
2013-03-28 16:11 ` [PATCH 12/33] regulator: ab8500: Correct TVOUT regulator enable time Lee Jones
2013-03-28 16:11 ` [PATCH 13/33] regulator: ab8500-ext: Add support for AB8505/AB9540 Lee Jones
2013-04-01 12:21   ` Mark Brown
2013-03-28 16:11 ` [PATCH 14/33] regulator: ab8500: add support for ab8505 Lee Jones
2013-03-28 16:11 ` [PATCH 15/33] regulator: ab8500-ext: Add support for AB9540 regulators Lee Jones
2013-04-01 12:22   ` Mark Brown
2013-03-28 16:11 ` [PATCH 16/33] regulator: ab8500: Add support for the ab8540 Lee Jones
2013-03-28 16:11 ` [PATCH 17/33] regulator: ab8500: Update voltage handling for fixed voltage regulators Lee Jones
2013-03-28 16:11 ` [PATCH 18/33] regulator: ab8500: Use regulator_list_voltage_table() Lee Jones
2013-04-01 12:24   ` Mark Brown
2013-03-28 16:11 ` [PATCH 19/33] regulator: ab8500: Supply platform specific regulator id values Lee Jones
2013-03-28 16:11 ` [PATCH 20/33] regulator: ab8500: Don't register external regulators on AB8505 Lee Jones
2013-03-28 16:11 ` Lee Jones [this message]
2013-03-28 16:11 ` [PATCH 22/33] regulator: ab8500: Also check for AB8505 based platforms Lee Jones
2013-03-28 16:11 ` [PATCH 23/33] regulator: ab8500: Add new operations for Vaux3 Lee Jones
2013-03-28 16:11 ` [PATCH 24/33] regulator: ab8500: Add mode operation for v-amic Lee Jones
2013-03-28 16:11 ` [PATCH 25/33] regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540 Lee Jones
2013-03-28 16:11 ` [PATCH 26/33] regulator: ab8500: Use a struct to select the good regulator configuration Lee Jones
2013-03-28 16:11 ` [PATCH 27/33] regulator: ab8500: Introduce aux5, aux6 regulators for AB8540 Lee Jones
2013-03-28 16:11 ` [PATCH 28/33] regulator: ab8500: Set enable enable_time in regulator_desc Lee Jones
2013-03-28 16:11 ` [PATCH 29/33] regulator: ab8500: Remove the need for a 'delay' property Lee Jones
2013-03-28 16:11 ` [PATCH 30/33] regulator: ab8500: Use regulator_list_voltage_table() to look-up voltages Lee Jones
2013-03-28 16:11 ` [PATCH 31/33] ARM: ux500: Pass regulator platform data using the new format Lee Jones
2013-03-28 16:11 ` [PATCH 32/33] regulator: ab8500: Shuffle init functions into a more logical order Lee Jones
2013-03-28 16:11 ` [PATCH 33/33] ARM: ux500: Regulators: Bring the AB8500 regulator platform data up-to-date Lee Jones

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=1364487093-19551-22-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --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®