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: Bengt Jonsson <bengt.g.jonsson@stericsson.com>,
	Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 13/73] regulator: ab8500: Separate regulator and MFD platform data
Date: Mon,  4 Feb 2013 11:53:28 +0000	[thread overview]
Message-ID: <1359978868-28736-14-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1359978868-28736-1-git-send-email-lee.jones@linaro.org>

From: Bengt Jonsson <bengt.g.jonsson@stericsson.com>

The ab8500 MFD should not have knowledge about regulator-
specific platform data like number of regulators and
regulator registers. As the regulator platform data is
about to grow with external regulators, this information
is moved to a new structure provided by the regulator
driver.

Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Yvan FILLION <yvan.fillion@stericsson.com>
---
 arch/arm/mach-ux500/board-mop500-regulators.c |   12 +++++++++---
 arch/arm/mach-ux500/board-mop500-regulators.h |    4 +---
 drivers/regulator/ab8500.c                    |   21 +++++++++++++++------
 include/linux/regulator/ab8500.h              |    7 +++++++
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index a138587..967e4ac 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -122,8 +122,7 @@ static struct regulator_consumer_supply ab8500_vana_consumers[] = {
 };
 
 /* ab8500 regulator register initialization */
-struct ab8500_regulator_reg_init
-ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
+static struct ab8500_regulator_reg_init ab8500_reg_init[] = {
 	/*
 	 * VanaRequestCtrl          = HP/LP depending on VxRequest
 	 * VpllRequestCtrl          = HP/LP depending on VxRequest
@@ -330,7 +329,7 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
 };
 
 /* AB8500 regulators */
-struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
+static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
 	/* supplies to the display/camera */
 	[AB8500_LDO_AUX1] = {
 		.constraints = {
@@ -439,3 +438,10 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
 		.consumer_supplies = ab8500_vana_consumers,
 	},
 };
+
+struct ab8500_regulator_platform_data ab8500_regulator_plat_data = {
+	.reg_init               = ab8500_reg_init,
+	.num_reg_init           = ARRAY_SIZE(ab8500_reg_init),
+	.regulator              = ab8500_regulators,
+	.num_regulator          = ARRAY_SIZE(ab8500_regulators),
+};
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.h b/arch/arm/mach-ux500/board-mop500-regulators.h
index 78a0642..9ca4869 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.h
+++ b/arch/arm/mach-ux500/board-mop500-regulators.h
@@ -14,9 +14,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/regulator/ab8500.h>
 
-extern struct ab8500_regulator_reg_init
-ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS];
-extern struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS];
+extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data;
 extern struct regulator_init_data tps61052_regulator;
 extern struct regulator_init_data gpio_en_3v3_regulator;
 
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index d88ff3e..3ccb9eb 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -976,8 +976,9 @@ ab8500_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
 static int ab8500_regulator_probe(struct platform_device *pdev)
 {
 	struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
-	struct ab8500_platform_data *pdata;
 	struct device_node *np = pdev->dev.of_node;
+	struct ab8500_platform_data *ppdata;
+	struct ab8500_regulator_platform_data *pdata;
 	int i, err;
 
 	if (np) {
@@ -998,7 +999,14 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "null mfd parent\n");
 		return -EINVAL;
 	}
-	pdata = dev_get_platdata(ab8500->dev);
+
+	ppdata = dev_get_platdata(ab8500->dev);
+	if (!ppdata) {
+		dev_err(&pdev->dev, "null parent pdata\n");
+		return -EINVAL;
+	}
+
+	pdata = ppdata->regulator;
 	if (!pdata) {
 		dev_err(&pdev->dev, "null pdata\n");
 		return -EINVAL;
@@ -1011,12 +1019,12 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
 	}
 
 	/* initialize registers */
-	for (i = 0; i < pdata->num_regulator_reg_init; i++) {
+	for (i = 0; i < pdata->num_reg_init; i++) {
 		int id, mask, value;
 
-		id = pdata->regulator_reg_init[i].id;
-		mask = pdata->regulator_reg_init[i].mask;
-		value = pdata->regulator_reg_init[i].value;
+		id = pdata->reg_init[i].id;
+		mask = pdata->reg_init[i].mask;
+		value = pdata->reg_init[i].value;
 
 		/* check for configuration errors */
 		BUG_ON(id >= AB8500_NUM_REGULATOR_REGISTERS);
@@ -1082,5 +1090,6 @@ module_exit(ab8500_regulator_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Sundar Iyer <sundar.iyer@stericsson.com>");
+MODULE_AUTHOR("Bengt Jonsson <bengt.g.jonsson@stericsson.com>");
 MODULE_DESCRIPTION("Regulator Driver for ST-Ericsson AB8500 Mixed-Sig PMIC");
 MODULE_ALIAS("platform:ab8500-regulator");
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index dd7944f..3a8e026 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -152,4 +152,11 @@ enum ab9540_regulator_reg {
 	AB9540_NUM_REGULATOR_REGISTERS,
 };
 
+struct ab8500_regulator_platform_data {
+	int num_reg_init;
+	struct ab8500_regulator_reg_init *reg_init;
+	int num_regulator;
+	struct regulator_init_data *regulator;
+};
+
 #endif
-- 
1.7.9.5


  parent reply	other threads:[~2013-02-04 11:56 UTC|newest]

Thread overview: 85+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-04 11:53 [PATCH 00/73 v2] Regulators: Bring the AB8500 into the 20th century Lee Jones
2013-02-04 11:53 ` [PATCH 01/73] regulator: ab8500: Remove VBB from suspend force Lee Jones
2013-02-04 11:53 ` [PATCH 02/73] regulator: ab8500: Initialize Vrf1 regulator Lee Jones
2013-02-04 11:53 ` [PATCH 03/73] regulator: ab8500: Add init values for vsmps1/2 Lee Jones
2013-02-04 11:53 ` [PATCH 04/73] regulator: ab8500: Added SysClkReq1 control of Vpll Lee Jones
2013-02-04 11:53 ` [PATCH 05/73] ARM: ux500: Vsmps3 controlled by SysClkReq1 Lee Jones
2013-02-04 19:37   ` Mark Brown
2013-02-04 21:21     ` Linus Walleij
2013-02-05 12:01       ` Mark Brown
2013-02-05 13:03         ` Lee Jones
2013-02-26  9:44         ` Lee Jones
2013-02-26 10:16           ` Bengt Jönsson
2013-02-26 12:50           ` Mark Brown
2013-02-04 11:53 ` [PATCH 06/73] regulator: ab8500: Add set_mode/get_mode support Lee Jones
2013-02-04 11:53 ` [PATCH 07/73] regulator: ab8500: Fix for regulator_set_mode functionality Lee Jones
2013-02-04 19:38   ` Mark Brown
2013-02-04 11:53 ` [PATCH 08/73] regulator: ab8500: Added get_optimum_mode on regulators with idle mode Lee Jones
2013-02-04 11:53 ` [PATCH 09/73] ARM: ux500: regulators: Add mask for configuration Lee Jones
2013-02-04 11:53 ` [PATCH 10/73] regulator: ab8500: Added more configurable bits Lee Jones
2013-02-04 11:53 ` [PATCH 11/73] regulator: ab8500: Removed initialization of body biasing Lee Jones
2013-02-04 11:53 ` [PATCH 12/73] regulator: core: Show consumers that hold a regulator in Sysfs Lee Jones
2013-02-04 19:41   ` Mark Brown
2013-02-04 11:53 ` Lee Jones [this message]
2013-02-04 11:53 ` [PATCH 14/73] regulator: ab8500: Add support of low voltage battery Lee Jones
2013-02-04 11:53 ` [PATCH 15/73] ARM: ux500: Update displays in vaux1 consumer list Lee Jones
2013-02-04 11:53 ` [PATCH 16/73] regulator: ab8500-ext: Cosmetic changes Lee Jones
2013-02-04 11:53 ` [PATCH 17/73] regulator: ab8500-ext: Add HW request support Lee Jones
2013-02-04 11:53 ` [PATCH 18/73] regulator: ab8500-ext: Add suspend support Lee Jones
2013-02-04 11:53 ` [PATCH 19/73] regulator: ab8500-ext: Add regulator_set_mode/get_mode Lee Jones
2013-02-04 11:53 ` [PATCH 20/73] regulator: ab8500-ext: Add VextSupply1 regulator Lee Jones
2013-02-04 11:53 ` [PATCH 21/73] regulator: ab8500-ext: Add VextSupply2 regulator Lee Jones
2013-02-04 11:53 ` [PATCH 22/73] regulator: ab8500: Remove USB regulator Lee Jones
2013-02-04 11:53 ` [PATCH 23/73] regulator: ab8500: Init debug from regulator driver Lee Jones
2013-02-04 11:53 ` [PATCH 24/73] ARM: ux500: Add supply for the L3G4200D Gyroscope Lee Jones
2013-02-04 11:53 ` [PATCH 25/73] ARM: ux500: Add supply for the Proximity and Hal sensor Lee Jones
2013-02-04 11:53 ` [PATCH 26/73] ARM: ux500: Add supply for the Ambient light sensor device Lee Jones
2013-02-04 11:53 ` [PATCH 27/73] ARM: ux500: Add supply for the Pressure sensor Lee Jones
2013-02-04 11:53 ` [PATCH 28/73] ARM: ux500: Add supply for the Cypress TrueTouch Touchscreen Lee Jones
2013-02-04 11:53 ` [PATCH 29/73] ARM: ux500: Add supply for the MMIO Camera Lee Jones
2013-02-04 11:53 ` [PATCH 30/73] regulator: ab8500: Remove Vsafe voltage settings Lee Jones
2013-02-04 11:53 ` [PATCH 31/73] regulator: ab8500: Remove Vsafe settings Lee Jones
2013-02-04 11:53 ` [PATCH 32/73] regulator: ab8500: Clean out SoC registers Lee Jones
2013-02-04 11:53 ` [PATCH 33/73] regulator: ab8500: Add support for the AB9540 Lee Jones
2013-02-04 11:53 ` [PATCH 34/73] regulator: ab8500: Correct TVOUT regulator start-up delay Lee Jones
2013-02-04 11:53 ` [PATCH 35/73] regulator: ab8500-ext: Add support for AB8505/AB9540 Lee Jones
2013-02-04 11:53 ` [PATCH 36/73] ARM: ux500: Partially revert changes surrounding audio regulators Lee Jones
2013-02-04 11:53 ` [PATCH 37/73] regulator: ab8500: add support for ab8505 Lee Jones
2013-02-04 11:53 ` [PATCH 38/73] ARM: ux500: regulator: Use device IDs instead of device names Lee Jones
2013-02-04 11:53 ` [PATCH 39/73] regulator: ab8500-ext: Add support for AB9540 regulators Lee Jones
2013-02-04 11:53 ` [PATCH 40/73] regulator: ab8500: Add AB8505 register initialization Lee Jones
2013-02-04 11:53 ` [PATCH 41/73] regulator: ab8500: Provide full settings for AB8540 regulators Lee Jones
2013-02-04 11:53 ` [PATCH 42/73] regulator: ab8500: Correct init mask for AB8540 Lee Jones
2013-02-04 11:53 ` [PATCH 43/73] regulator: ab8500: Add VSDIO definition for the AB8540 Lee Jones
2013-02-04 11:53 ` [PATCH 44/73] regulator: ab8500: Vaux5/6 cannot be disabled on " Lee Jones
2013-02-04 11:54 ` [PATCH 45/73] regulator: ab8500: Update voltage handling for fixed voltage regulators Lee Jones
2013-02-04 11:54 ` [PATCH 46/73] regulator: ab8500: Delete useless fixed_uV field Lee Jones
2013-02-04 11:54 ` [PATCH 47/73] regulator: ab8500: Update AB9540 init masks Lee Jones
2013-02-04 11:54 ` [PATCH 48/73] regulator: ab8500: Use regulator_list_voltage_table() Lee Jones
2013-02-04 11:54 ` [PATCH 49/73] regulator: ab8500: Fix vsdio parameters for AB8540 based platforms Lee Jones
2013-02-04 11:54 ` [PATCH 50/73] regulator: ab8500: Correct regulator id values Lee Jones
2013-02-04 11:54 ` [PATCH 51/73] regulator: ab8500: Regulator vaux8 not declared using correct name Lee Jones
2013-02-04 11:54 ` [PATCH 52/73] ARM ux500: Remove external regulators from AB8505 init data Lee Jones
2013-02-05 15:22   ` Linus Walleij
2013-02-04 11:54 ` [PATCH 53/73] regulator: ab8500: Don't register external regulators on AB8505 Lee Jones
2013-02-04 11:54 ` [PATCH 54/73] regulator: ab8500: Add voltage selection for AUDIO and ANA " Lee Jones
2013-02-04 11:54 ` [PATCH 55/73] regulator: ab8500: Provide ExtSupply register init values for AB8505 Lee Jones
2013-02-04 11:54 ` [PATCH 56/73] regulator: ab8500: Also check for AB8505 based platforms Lee Jones
2013-02-04 11:54 ` [PATCH 57/73] regulator: ab8500: Remove surplus include of id.h Lee Jones
2013-02-04 11:54 ` [PATCH 58/73] regulator: ab8500: Add new operations for Vaux3 Lee Jones
2013-02-04 11:54 ` [PATCH 59/73] regulator: ab8500: Change mode fix for LDO USB Lee Jones
2013-02-04 11:54 ` [PATCH 60/73] ARM: ux500: regulators: Add LDO USB consumer Lee Jones
2013-02-05 15:21   ` Linus Walleij
2013-02-04 11:54 ` [PATCH 61/73] regulator: ab8500: Default value on LDO USB to HP Lee Jones
2013-02-04 11:54 ` [PATCH 62/73] regulator: ab8500: Remove vusb from AB8540 regulator framework Lee Jones
2013-02-04 11:54 ` [PATCH 63/73] regulator: ab8500: Add mode operation for v-amic Lee Jones
2013-02-04 11:54 ` [PATCH 64/73] regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540 Lee Jones
2013-02-04 11:54 ` [PATCH 65/73] regulator: ab8500: Update VAna supply management for the AB9540 Lee Jones
2013-02-04 11:54 ` [PATCH 66/73] regulator: ab8500-ext: Adapt regulator registration for newly changed API Lee Jones
2013-02-04 11:54 ` [PATCH 67/73] regulator: ab8500: Use a struct to select the good regulator configuration Lee Jones
2013-02-04 11:54 ` [PATCH 68/73] regulator: ab8500: Provide DT support for additional platforms Lee Jones
2013-02-04 11:54 ` [PATCH 69/73] regulator: ab8500: Introduce aux5, aux6 regulators for AB8540 Lee Jones
2013-02-04 11:54 ` [PATCH 70/73] regulator: ab8500: Set enable enable_time in regulator_desc Lee Jones
2013-02-04 11:54 ` [PATCH 71/73] regulator: ab8500: Remove the need for a 'delay' property Lee Jones
2013-02-04 11:54 ` [PATCH 72/73] regulator: ab8500: Use regulator_list_voltage_table() to look-up voltages Lee Jones
2013-02-04 11:54 ` [PATCH 73/73] ARM: ux500: Pass regulator platform data using the new format 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=1359978868-28736-14-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=bengt.g.jonsson@stericsson.com \
    --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®