3 files changed, 422 insertions, 0 deletions

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 6a7932822e37..1169a42519d5 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -139,6 +139,14 @@ config REGULATOR_AS3722
           AS3722 PMIC. This will enable support for all the software
           controllable DCDC/LDO regulators.
 
+config REGULATOR_BCM590XX
+        tristate "Broadcom BCM590xx PMU Regulators"
+        depends on MFD_BCM590XX
+        help
+          This driver provides support for the voltage regulators on the
+          BCM590xx PMUs. This will enable support for the software
+          controllable LDO/Switching regulators.
+
 config REGULATOR_DA903X
         tristate "Dialog Semiconductor DA9030/DA9034 regulators"
         depends on PMIC_DA903X
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 979f9ddcf259..e1ab514f03c5 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
 obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
 obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o
 obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o
+obj-$(CONFIG_REGULATOR_BCM590XX) += bcm590xx-regulator.o
 obj-$(CONFIG_REGULATOR_DA903X)  += da903x.o
 obj-$(CONFIG_REGULATOR_DA9052)  += da9052-regulator.o
 obj-$(CONFIG_REGULATOR_DA9055)  += da9055-regulator.o
diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c
new file mode 100644
index 000000000000..e6b2e8e08c41
--- /dev/null
+++ b/drivers/regulator/bcm590xx-regulator.c
@@ -0,0 +1,413 @@
+/*
+ * Broadcom BCM590xx regulator driver
+ *
+ * Copyright 2014 Linaro Limited
+ * Author: Matt Porter <mporter@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under  the terms of the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mfd/bcm590xx.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/slab.h>
+
+/* Register defs */
+#define BCM590XX_RFLDOPMCTRL1   0x60
+#define BCM590XX_IOSR1PMCTRL1   0x7a
+#define BCM590XX_IOSR2PMCTRL1   0x7c
+#define BCM590XX_CSRPMCTRL1     0x7e
+#define BCM590XX_SDSR1PMCTRL1   0x82
+#define BCM590XX_SDSR2PMCTRL1   0x86
+#define BCM590XX_MSRPMCTRL1     0x8a
+#define BCM590XX_VSRPMCTRL1     0x8e
+#define BCM590XX_REG_ENABLE     BIT(7)
+
+#define BCM590XX_RFLDOCTRL      0x96
+#define BCM590XX_CSRVOUT1       0xc0
+#define BCM590XX_LDO_VSEL_MASK  GENMASK(5, 3)
+#define BCM590XX_SR_VSEL_MASK   GENMASK(5, 0)
+
+/* LDO regulator IDs */
+#define BCM590XX_REG_RFLDO      0
+#define BCM590XX_REG_CAMLDO1    1
+#define BCM590XX_REG_CAMLDO2    2
+#define BCM590XX_REG_SIMLDO1    3
+#define BCM590XX_REG_SIMLDO2    4
+#define BCM590XX_REG_SDLDO      5
+#define BCM590XX_REG_SDXLDO     6
+#define BCM590XX_REG_MMCLDO1    7
+#define BCM590XX_REG_MMCLDO2    8
+#define BCM590XX_REG_AUDLDO     9
+#define BCM590XX_REG_MICLDO     10
+#define BCM590XX_REG_USBLDO     11
+#define BCM590XX_REG_VIBLDO     12
+
+/* DCDC regulator IDs */
+#define BCM590XX_REG_CSR        13
+#define BCM590XX_REG_IOSR1      14
+#define BCM590XX_REG_IOSR2      15
+#define BCM590XX_REG_MSR        16
+#define BCM590XX_REG_SDSR1      17
+#define BCM590XX_REG_SDSR2      18
+#define BCM590XX_REG_VSR        19
+
+#define BCM590XX_NUM_REGS       20
+
+#define BCM590XX_REG_IS_LDO(n)  (n < BCM590XX_REG_CSR)
+
+struct bcm590xx_board {
+        struct regulator_init_data *bcm590xx_pmu_init_data[BCM590XX_NUM_REGS];
+};
+
+/* LDO group A: supported voltages in microvolts */
+static const unsigned int ldo_a_table[] = {
+        1200000, 1800000, 2500000, 2700000, 2800000,
+        2900000, 3000000, 3300000,
+};
+
+/* LDO group C: supported voltages in microvolts */
+static const unsigned int ldo_c_table[] = {
+        3100000, 1800000, 2500000, 2700000, 2800000,
+        2900000, 3000000, 3300000,
+};
+
+/* DCDC group CSR: supported voltages in microvolts */
+static const struct regulator_linear_range dcdc_csr_ranges[] = {
+        REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000),
+        REGULATOR_LINEAR_RANGE(1360000, 51, 55, 20000),
+        REGULATOR_LINEAR_RANGE(900000, 56, 63, 0),
+};
+
+/* DCDC group IOSR1: supported voltages in microvolts */
+static const struct regulator_linear_range dcdc_iosr1_ranges[] = {
+        REGULATOR_LINEAR_RANGE(860000, 2, 51, 10000),
+        REGULATOR_LINEAR_RANGE(1500000, 52, 52, 0),
+        REGULATOR_LINEAR_RANGE(1800000, 53, 53, 0),
+        REGULATOR_LINEAR_RANGE(900000, 54, 63, 0),
+};
+
+/* DCDC group SDSR1: supported voltages in microvolts */
+static const struct regulator_linear_range dcdc_sdsr1_ranges[] = {
+        REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000),
+        REGULATOR_LINEAR_RANGE(1340000, 51, 51, 0),
+        REGULATOR_LINEAR_RANGE(900000, 52, 63, 0),
+};
+
+struct bcm590xx_info {
+        const char *name;
+        const char *vin_name;
+        u8 n_voltages;
+        const unsigned int *volt_table;
+        u8 n_linear_ranges;
+        const struct regulator_linear_range *linear_ranges;
+};
+
+#define BCM590XX_REG_TABLE(_name, _table) \
+        { \
+                .name = #_name, \
+                .n_voltages = ARRAY_SIZE(_table), \
+                .volt_table = _table, \
+        }
+
+#define BCM590XX_REG_RANGES(_name, _ranges) \
+        { \
+                .name = #_name, \
+                .n_linear_ranges = ARRAY_SIZE(_ranges), \
+                .linear_ranges = _ranges, \
+        }
+
+static struct bcm590xx_info bcm590xx_regs[] = {
+        BCM590XX_REG_TABLE(rfldo, ldo_a_table),
+        BCM590XX_REG_TABLE(camldo1, ldo_c_table),
+        BCM590XX_REG_TABLE(camldo2, ldo_c_table),
+        BCM590XX_REG_TABLE(simldo1, ldo_a_table),
+        BCM590XX_REG_TABLE(simldo2, ldo_a_table),
+        BCM590XX_REG_TABLE(sdldo, ldo_c_table),
+        BCM590XX_REG_TABLE(sdxldo, ldo_a_table),
+        BCM590XX_REG_TABLE(mmcldo1, ldo_a_table),
+        BCM590XX_REG_TABLE(mmcldo2, ldo_a_table),
+        BCM590XX_REG_TABLE(audldo, ldo_a_table),
+        BCM590XX_REG_TABLE(micldo, ldo_a_table),
+        BCM590XX_REG_TABLE(usbldo, ldo_a_table),
+        BCM590XX_REG_TABLE(vibldo, ldo_c_table),
+        BCM590XX_REG_RANGES(csr, dcdc_csr_ranges),
+        BCM590XX_REG_RANGES(iosr1, dcdc_iosr1_ranges),
+        BCM590XX_REG_RANGES(iosr2, dcdc_iosr1_ranges),
+        BCM590XX_REG_RANGES(msr, dcdc_iosr1_ranges),
+        BCM590XX_REG_RANGES(sdsr1, dcdc_sdsr1_ranges),
+        BCM590XX_REG_RANGES(sdsr2, dcdc_iosr1_ranges),
+        BCM590XX_REG_RANGES(vsr, dcdc_iosr1_ranges),
+};
+
+struct bcm590xx_reg {
+        struct regulator_desc *desc;
+        struct bcm590xx *mfd;
+        struct regulator_dev **rdev;
+        struct bcm590xx_info **info;
+};
+