Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa84e6a authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

regulator: arizona-ldo1: Move pdata into a separate structure 



In preparation for sharing this driver with Madera, move the pdata
for the LDO1 regulator out of struct arizona_pdata into a dedicated
pdata struct for this driver. As a result the code in
arizona_ldo1_of_get_pdata() can be made independent of struct arizona.

This patch also updates the definition of struct arizona_pdata and
the use of this pdata in mach-crag6410-module.c

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7d8d14b5

arch/arm/mach-s3c64xx/mach-crag6410-module.c

+6 −2
Original line number Diff line number Diff line
@@ -209,7 +209,9 @@ static const struct i2c_board_info wm1277_devs[] = { 
};



static struct arizona_pdata wm5102_reva_pdata = {

	.ldo1 = {

		.ldoena = S3C64XX_GPN(7),

	},

	.gpio_base = CODEC_GPIO_BASE,

	.irq_flags = IRQF_TRIGGER_HIGH,

	.micd_pol_gpio = CODEC_GPIO_BASE + 4,
@@ -239,7 +241,9 @@ static struct spi_board_info wm5102_reva_spi_devs[] = { 
};



static struct arizona_pdata wm5102_pdata = {

	.ldo1 = {

		.ldoena = S3C64XX_GPN(7),

	},

	.gpio_base = CODEC_GPIO_BASE,

	.irq_flags = IRQF_TRIGGER_HIGH,

	.micd_pol_gpio = CODEC_GPIO_BASE + 2,

drivers/regulator/arizona-ldo1.c

+21 −18
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <linux/gpio.h>

#include <linux/slab.h>



#include <linux/regulator/arizona-ldo1.h>



#include <linux/mfd/arizona/core.h>

#include <linux/mfd/arizona/pdata.h>

#include <linux/mfd/arizona/registers.h>
@@ -186,20 +188,19 @@ static const struct regulator_init_data arizona_ldo1_wm5110 = { 
	.num_consumer_supplies = 1,

};



static int arizona_ldo1_of_get_pdata(struct device *dev,

				     struct arizona *arizona,

static int arizona_ldo1_of_get_pdata(struct arizona_ldo1_pdata *pdata,

				     struct regulator_config *config,

				     const struct regulator_desc *desc)

				     const struct regulator_desc *desc,

				     bool *external_dcvdd)

{

	struct arizona_pdata *pdata = &arizona->pdata;

	struct arizona_ldo1 *ldo1 = config->driver_data;

	struct device_node *np = arizona->dev->of_node;

	struct device_node *np = config->dev->of_node;

	struct device_node *init_node, *dcvdd_node;

	struct regulator_init_data *init_data;



	pdata->ldoena = of_get_named_gpio(np, "wlf,ldoena", 0);

	if (pdata->ldoena < 0) {

		dev_warn(arizona->dev,

		dev_warn(config->dev,

			 "LDOENA GPIO property missing/malformed: %d\n",

			 pdata->ldoena);

		pdata->ldoena = 0;
@@ -213,19 +214,19 @@ static int arizona_ldo1_of_get_pdata(struct device *dev, 
	if (init_node) {

		config->of_node = init_node;



		init_data = of_get_regulator_init_data(dev, init_node, desc);



		init_data = of_get_regulator_init_data(config->dev, init_node,

						       desc);

		if (init_data) {

			init_data->consumer_supplies = &ldo1->supply;

			init_data->num_consumer_supplies = 1;



			if (dcvdd_node && dcvdd_node != init_node)

				arizona->external_dcvdd = true;

				*external_dcvdd = true;



			pdata->ldo1 = init_data;

			pdata->init_data = init_data;

		}

	} else if (dcvdd_node) {

		arizona->external_dcvdd = true;

		*external_dcvdd = true;

	}



	of_node_put(dcvdd_node);
@@ -239,10 +240,9 @@ static int arizona_ldo1_probe(struct platform_device *pdev) 
	const struct regulator_desc *desc;

	struct regulator_config config = { };

	struct arizona_ldo1 *ldo1;

	bool external_dcvdd = false;

	int ret;



	arizona->external_dcvdd = false;



	ldo1 = devm_kzalloc(&pdev->dev, sizeof(*ldo1), GFP_KERNEL);

	if (!ldo1)

		return -ENOMEM;
@@ -283,17 +283,18 @@ static int arizona_ldo1_probe(struct platform_device *pdev) 


	if (IS_ENABLED(CONFIG_OF)) {

		if (!dev_get_platdata(arizona->dev)) {

			ret = arizona_ldo1_of_get_pdata(&pdev->dev, arizona,

							&config, desc);

			ret = arizona_ldo1_of_get_pdata(&arizona->pdata.ldo1,

							&config, desc,

							&external_dcvdd);

			if (ret < 0)

				return ret;

		}

	}



	config.ena_gpio = arizona->pdata.ldoena;

	config.ena_gpio = arizona->pdata.ldo1.ldoena;



	if (arizona->pdata.ldo1)

		config.init_data = arizona->pdata.ldo1;

	if (arizona->pdata.ldo1.init_data)

		config.init_data = arizona->pdata.ldo1.init_data;

	else

		config.init_data = &ldo1->init_data;
@@ -303,6 +304,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev) 
	 */

	if (config.init_data->num_consumer_supplies == 0)

		arizona->external_dcvdd = true;

	else

		arizona->external_dcvdd = external_dcvdd;



	ldo1->regulator = devm_regulator_register(&pdev->dev, desc, &config);

include/linux/mfd/arizona/pdata.h

+2 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define _ARIZONA_PDATA_H



#include <dt-bindings/mfd/arizona.h>

#include <linux/regulator/arizona-ldo1.h>

#include <linux/regulator/arizona-micsupp.h>



#define ARIZONA_GPN_DIR_MASK                     0x8000  /* GPN_DIR */
@@ -77,13 +78,12 @@ struct arizona_micd_range { 


struct arizona_pdata {

	int reset;      /** GPIO controlling /RESET, if any */

	int ldoena;     /** GPIO controlling LODENA, if any */



	/** Regulator configuration for MICVDD */

	struct arizona_micsupp_pdata micvdd;



	/** Regulator configuration for LDO1 */

	struct regulator_init_data *ldo1;

	struct arizona_ldo1_pdata ldo1;



	/** If a direct 32kHz clock is provided on an MCLK specify it here */

	int clk32k_src;

include/linux/regulator/arizona-ldo1.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Platform data for Arizona LDO1 regulator

 *

 * Copyright 2017 Cirrus Logic

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef ARIZONA_LDO1_H

#define ARIZONA_LDO1_H



struct regulator_init_data;



struct arizona_ldo1_pdata {

	/** GPIO controlling LDOENA, if any */

	int ldoena;



	/** Regulator configuration for LDO1 */

	const struct regulator_init_data *init_data;

};



#endif