From: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> To: lee.jones@linaro.org, broonie@kernel.org, linus.walleij@linaro.org, gnurou@gmail.com, robh+dt@kernel.org, tglx@linutronix.de, jason@lakedaemon.net Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Subject: [PATCH v6 08/17] regulator: arizona-ldo1: Add support for Cirrus Logic Madera codecs Date: Thu, 23 Nov 2017 17:13:07 +0000 [thread overview] Message-ID: <20171123171316.10868-9-rf@opensource.wolfsonmicro.com> (raw) In-Reply-To: <20171123171316.10868-1-rf@opensource.wolfsonmicro.com> This adds a new driver identity "madera-ldo1" and probe function so that this driver can be used to control the LDO1 regulator on some Cirrus Logic Madera codecs. Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> --- drivers/regulator/Kconfig | 8 ++-- drivers/regulator/arizona-ldo1.c | 82 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 53639a6bd888..3db4f994aea8 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -126,12 +126,12 @@ config REGULATOR_AB8500 signal AB8500 PMIC config REGULATOR_ARIZONA_LDO1 - tristate "Wolfson Arizona class devices LDO1" - depends on MFD_ARIZONA + tristate "Cirrus Madera and Wolfson Arizona class devices LDO1" + depends on MFD_ARIZONA || MFD_MADERA depends on SND_SOC help - Support for the LDO1 regulators found on Wolfson Arizona class - devices. + Support for the LDO1 regulators found on Cirrus Logic Madera codecs + and Wolfson Arizona codecs. config REGULATOR_ARIZONA_MICSUPP tristate "Cirrus Madera and Wolfson Arizona class devices MICSUPP" diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index 96fddfff5dc4..c64625e76124 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c @@ -31,6 +31,10 @@ #include <linux/mfd/arizona/pdata.h> #include <linux/mfd/arizona/registers.h> +#include <linux/mfd/madera/core.h> +#include <linux/mfd/madera/pdata.h> +#include <linux/mfd/madera/registers.h> + struct arizona_ldo1 { struct regulator_dev *regulator; struct regmap *regmap; @@ -188,6 +192,31 @@ static const struct regulator_init_data arizona_ldo1_wm5110 = { .num_consumer_supplies = 1, }; +static const struct regulator_desc madera_ldo1 = { + .name = "LDO1", + .supply_name = "LDOVDD", + .type = REGULATOR_VOLTAGE, + .ops = &arizona_ldo1_ops, + + .vsel_reg = MADERA_LDO1_CONTROL_1, + .vsel_mask = MADERA_LDO1_VSEL_MASK, + .min_uV = 900000, + .uV_step = 25000, + .n_voltages = 13, + .enable_time = 3000, + + .owner = THIS_MODULE, +}; + +static const struct regulator_init_data madera_ldo1_default = { + .constraints = { + .min_uV = 1200000, + .max_uV = 1200000, + .valid_ops_mask = REGULATOR_CHANGE_STATUS, + }, + .num_consumer_supplies = 1, +}; + static int arizona_ldo1_of_get_pdata(struct arizona_ldo1_pdata *pdata, struct regulator_config *config, const struct regulator_desc *desc, @@ -341,6 +370,32 @@ static int arizona_ldo1_probe(struct platform_device *pdev) return ret; } +static int madera_ldo1_probe(struct platform_device *pdev) +{ + struct madera *madera = dev_get_drvdata(pdev->dev.parent); + struct arizona_ldo1 *ldo1; + bool external_dcvdd; + int ret; + + ldo1 = devm_kzalloc(&pdev->dev, sizeof(*ldo1), GFP_KERNEL); + if (!ldo1) + return -ENOMEM; + + ldo1->regmap = madera->regmap; + + ldo1->init_data = madera_ldo1_default; + + ret = arizona_ldo1_common_init(pdev, ldo1, &arizona_ldo1, + &madera->pdata.ldo1, + &external_dcvdd); + if (ret) + return ret; + + madera->internal_dcvdd = !external_dcvdd; + + return 0; +} + static struct platform_driver arizona_ldo1_driver = { .probe = arizona_ldo1_probe, .driver = { @@ -348,10 +403,35 @@ static struct platform_driver arizona_ldo1_driver = { }, }; -module_platform_driver(arizona_ldo1_driver); +static struct platform_driver madera_ldo1_driver = { + .probe = madera_ldo1_probe, + .driver = { + .name = "madera-ldo1", + }, +}; + +static struct platform_driver * const madera_ldo1_drivers[] = { + &arizona_ldo1_driver, + &madera_ldo1_driver, +}; + +static int __init arizona_ldo1_init(void) +{ + return platform_register_drivers(madera_ldo1_drivers, + ARRAY_SIZE(madera_ldo1_drivers)); +} +module_init(arizona_ldo1_init); + +static void __exit madera_ldo1_exit(void) +{ + platform_unregister_drivers(madera_ldo1_drivers, + ARRAY_SIZE(madera_ldo1_drivers)); +} +module_exit(madera_ldo1_exit); /* Module information */ MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>"); MODULE_DESCRIPTION("Arizona LDO1 driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:arizona-ldo1"); +MODULE_ALIAS("platform:madera-ldo1"); -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> To: <lee.jones@linaro.org>, <broonie@kernel.org>, <linus.walleij@linaro.org>, <gnurou@gmail.com>, <robh+dt@kernel.org>, <tglx@linutronix.de>, <jason@lakedaemon.net> Cc: <alsa-devel@alsa-project.org>, <patches@opensource.wolfsonmicro.com>, <linux-gpio@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Subject: [PATCH v6 08/17] regulator: arizona-ldo1: Add support for Cirrus Logic Madera codecs Date: Thu, 23 Nov 2017 17:13:07 +0000 [thread overview] Message-ID: <20171123171316.10868-9-rf@opensource.wolfsonmicro.com> (raw) In-Reply-To: <20171123171316.10868-1-rf@opensource.wolfsonmicro.com> This adds a new driver identity "madera-ldo1" and probe function so that this driver can be used to control the LDO1 regulator on some Cirrus Logic Madera codecs. Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> --- drivers/regulator/Kconfig | 8 ++-- drivers/regulator/arizona-ldo1.c | 82 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 53639a6bd888..3db4f994aea8 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -126,12 +126,12 @@ config REGULATOR_AB8500 signal AB8500 PMIC config REGULATOR_ARIZONA_LDO1 - tristate "Wolfson Arizona class devices LDO1" - depends on MFD_ARIZONA + tristate "Cirrus Madera and Wolfson Arizona class devices LDO1" + depends on MFD_ARIZONA || MFD_MADERA depends on SND_SOC help - Support for the LDO1 regulators found on Wolfson Arizona class - devices. + Support for the LDO1 regulators found on Cirrus Logic Madera codecs + and Wolfson Arizona codecs. config REGULATOR_ARIZONA_MICSUPP tristate "Cirrus Madera and Wolfson Arizona class devices MICSUPP" diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index 96fddfff5dc4..c64625e76124 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c @@ -31,6 +31,10 @@ #include <linux/mfd/arizona/pdata.h> #include <linux/mfd/arizona/registers.h> +#include <linux/mfd/madera/core.h> +#include <linux/mfd/madera/pdata.h> +#include <linux/mfd/madera/registers.h> + struct arizona_ldo1 { struct regulator_dev *regulator; struct regmap *regmap; @@ -188,6 +192,31 @@ static const struct regulator_init_data arizona_ldo1_wm5110 = { .num_consumer_supplies = 1, }; +static const struct regulator_desc madera_ldo1 = { + .name = "LDO1", + .supply_name = "LDOVDD", + .type = REGULATOR_VOLTAGE, + .ops = &arizona_ldo1_ops, + + .vsel_reg = MADERA_LDO1_CONTROL_1, + .vsel_mask = MADERA_LDO1_VSEL_MASK, + .min_uV = 900000, + .uV_step = 25000, + .n_voltages = 13, + .enable_time = 3000, + + .owner = THIS_MODULE, +}; + +static const struct regulator_init_data madera_ldo1_default = { + .constraints = { + .min_uV = 1200000, + .max_uV = 1200000, + .valid_ops_mask = REGULATOR_CHANGE_STATUS, + }, + .num_consumer_supplies = 1, +}; + static int arizona_ldo1_of_get_pdata(struct arizona_ldo1_pdata *pdata, struct regulator_config *config, const struct regulator_desc *desc, @@ -341,6 +370,32 @@ static int arizona_ldo1_probe(struct platform_device *pdev) return ret; } +static int madera_ldo1_probe(struct platform_device *pdev) +{ + struct madera *madera = dev_get_drvdata(pdev->dev.parent); + struct arizona_ldo1 *ldo1; + bool external_dcvdd; + int ret; + + ldo1 = devm_kzalloc(&pdev->dev, sizeof(*ldo1), GFP_KERNEL); + if (!ldo1) + return -ENOMEM; + + ldo1->regmap = madera->regmap; + + ldo1->init_data = madera_ldo1_default; + + ret = arizona_ldo1_common_init(pdev, ldo1, &arizona_ldo1, + &madera->pdata.ldo1, + &external_dcvdd); + if (ret) + return ret; + + madera->internal_dcvdd = !external_dcvdd; + + return 0; +} + static struct platform_driver arizona_ldo1_driver = { .probe = arizona_ldo1_probe, .driver = { @@ -348,10 +403,35 @@ static struct platform_driver arizona_ldo1_driver = { }, }; -module_platform_driver(arizona_ldo1_driver); +static struct platform_driver madera_ldo1_driver = { + .probe = madera_ldo1_probe, + .driver = { + .name = "madera-ldo1", + }, +}; + +static struct platform_driver * const madera_ldo1_drivers[] = { + &arizona_ldo1_driver, + &madera_ldo1_driver, +}; + +static int __init arizona_ldo1_init(void) +{ + return platform_register_drivers(madera_ldo1_drivers, + ARRAY_SIZE(madera_ldo1_drivers)); +} +module_init(arizona_ldo1_init); + +static void __exit madera_ldo1_exit(void) +{ + platform_unregister_drivers(madera_ldo1_drivers, + ARRAY_SIZE(madera_ldo1_drivers)); +} +module_exit(madera_ldo1_exit); /* Module information */ MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>"); MODULE_DESCRIPTION("Arizona LDO1 driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:arizona-ldo1"); +MODULE_ALIAS("platform:madera-ldo1"); -- 2.11.0
next prev parent reply other threads:[~2017-11-23 17:13 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-23 17:12 [PATCH v6 00/17] Add support for Cirrus Logic CS47L35/L85/L90/L91 codecs Richard Fitzgerald 2017-11-23 17:12 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 01/17] mfd: madera: Add register definitions for Cirrus Logic Madera codecs Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 02/17] mfd: madera: Add DT bindings " Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 03/17] mfd: madera: Add common support " Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-29 10:18 ` Linus Walleij 2017-11-29 10:18 ` Linus Walleij 2017-11-29 11:36 ` Richard Fitzgerald 2017-11-29 11:36 ` Richard Fitzgerald [not found] ` <1eff5a38-cff3-449b-bda4-047f50a9f1d4-MRjWshV2NDGMZzV0eMwobdBPR1lH4CV8@public.gmane.org> 2017-12-02 12:10 ` Linus Walleij 2017-12-02 12:10 ` Linus Walleij 2017-12-04 9:47 ` Richard Fitzgerald 2017-12-04 9:47 ` Richard Fitzgerald [not found] ` <ce3772d8-3ae7-474f-b9c2-8008bb39fd0b-MRjWshV2NDGMZzV0eMwobdBPR1lH4CV8@public.gmane.org> 2017-12-07 8:54 ` Linus Walleij 2017-12-07 8:54 ` Linus Walleij 2017-12-07 10:52 ` Richard Fitzgerald 2017-12-07 10:52 ` Richard Fitzgerald 2017-12-12 23:51 ` Linus Walleij 2017-12-12 23:51 ` Linus Walleij 2017-11-23 17:13 ` [PATCH v6 04/17] mfd: madera: Register map tables for Cirrus Logic CS47L35 Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 05/17] mfd: madera: Register map tables for Cirrus Logic CS47L85 Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 06/17] mfd: madera: Register map tables for Cirrus Logic CS47L90/91 Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 07/17] regulator: arizona-micsupp: Add support for Cirrus Logic Madera codecs Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald [this message] 2017-11-23 17:13 ` [PATCH v6 08/17] regulator: arizona-ldo1: " Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 09/17] irqchip: Add driver " Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald [not found] ` <20171123171316.10868-10-rf-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org> 2017-11-26 13:47 ` kbuild test robot 2017-11-26 13:47 ` kbuild test robot 2017-11-23 17:13 ` [PATCH v6 10/17] pinctrl: madera: Add DT bindings " Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-29 10:21 ` Linus Walleij 2017-11-29 10:21 ` Linus Walleij 2017-11-23 17:13 ` [PATCH v6 11/17] pinctrl: madera: Add driver " Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 12/17] gpio: madera: Support Cirrus Logic Madera class codecs Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 14/17] ASoC: madera: Add common support for Cirrus Logic Madera codecs Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald [not found] ` <e30c2ed9-de46-4f2e-a70f-e857d44c28e1-MRjWshV2NDGMZzV0eMwobdBPR1lH4CV8@public.gmane.org> 2017-11-26 12:13 ` kbuild test robot 2017-11-26 12:13 ` kbuild test robot 2017-11-26 17:40 ` kbuild test robot 2017-11-26 17:40 ` kbuild test robot 2017-11-23 17:13 ` [PATCH v6 15/17] ASoC: cs47l35: Add codec driver for Cirrus Logic CS47L35 Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald [not found] ` <20171123171316.10868-1-rf-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org> 2017-11-23 17:13 ` [PATCH v6 13/17] ASoC: madera: Add DT bindings for Cirrus Logic Madera codecs Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 16/17] ASoC: cs47l85: Add codec driver for Cirrus Logic CS47L85 Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald 2017-11-23 17:13 ` [PATCH v6 17/17] ASoC: cs47l90: Add codec driver for Cirrus Logic CS47L90 Richard Fitzgerald 2017-11-23 17:13 ` Richard Fitzgerald
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=20171123171316.10868-9-rf@opensource.wolfsonmicro.com \ --to=rf@opensource.wolfsonmicro.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=gnurou@gmail.com \ --cc=jason@lakedaemon.net \ --cc=lee.jones@linaro.org \ --cc=linus.walleij@linaro.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=patches@opensource.wolfsonmicro.com \ --cc=robh+dt@kernel.org \ --cc=tglx@linutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.