* [PATCH v4 0/4] Add support for the TI TPS65086 PMIC
@ 2015-11-19 23:01 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
This series adds support for the TPS65086 PMIC. It is a MFD with an I2C
interface, several regulators and load switches, and a GPO controller.
v1 can be found here: [1] v2: [2] v3: [3]
Changes from v3:
- Removed compatible strings from DT sub-nodes
- Rearranged DT bindings
- Small fixes
Changes from v2:
- Use DT match callback in regulator
- Typo fixes
Changes from v1:
- Split up DT Docs into separate patches
- Use mfd core to instantiate sub-devices
- Several small fixes as discussed in v1 thread
[1] http://www.spinics.net/lists/devicetree/msg98403.html
[2] http://www.spinics.net/lists/kernel/msg2111345.html
[3] https://lkml.org/lkml/2015/11/4/393
Andrew F. Davis (4):
Documentation: tps65086: Add DT bindings for the TPS65086 PMIC
mfd: tps65086: Add driver for the TPS65086 PMIC
regulator: tps65086: Add regulator driver for the TPS65086 PMIC
gpio: tps65086: Add GPO driver for the TPS65086 PMIC
Documentation/devicetree/bindings/mfd/tps65086.txt | 55 +++++
drivers/gpio/Kconfig | 6 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-tps65086.c | 144 ++++++++++++
drivers/mfd/Kconfig | 13 ++
drivers/mfd/Makefile | 1 +
drivers/mfd/tps65086.c | 150 ++++++++++++
drivers/regulator/Kconfig | 7 +
drivers/regulator/Makefile | 1 +
drivers/regulator/tps65086-regulator.c | 251 +++++++++++++++++++++
include/linux/mfd/tps65086.h | 118 ++++++++++
11 files changed, 747 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
create mode 100644 drivers/gpio/gpio-tps65086.c
create mode 100644 drivers/mfd/tps65086.c
create mode 100644 drivers/regulator/tps65086-regulator.c
create mode 100644 include/linux/mfd/tps65086.h
--
1.9.1
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 0/4] Add support for the TI TPS65086 PMIC
@ 2015-11-19 23:01 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
This series adds support for the TPS65086 PMIC. It is a MFD with an I2C
interface, several regulators and load switches, and a GPO controller.
v1 can be found here: [1] v2: [2] v3: [3]
Changes from v3:
- Removed compatible strings from DT sub-nodes
- Rearranged DT bindings
- Small fixes
Changes from v2:
- Use DT match callback in regulator
- Typo fixes
Changes from v1:
- Split up DT Docs into separate patches
- Use mfd core to instantiate sub-devices
- Several small fixes as discussed in v1 thread
[1] http://www.spinics.net/lists/devicetree/msg98403.html
[2] http://www.spinics.net/lists/kernel/msg2111345.html
[3] https://lkml.org/lkml/2015/11/4/393
Andrew F. Davis (4):
Documentation: tps65086: Add DT bindings for the TPS65086 PMIC
mfd: tps65086: Add driver for the TPS65086 PMIC
regulator: tps65086: Add regulator driver for the TPS65086 PMIC
gpio: tps65086: Add GPO driver for the TPS65086 PMIC
Documentation/devicetree/bindings/mfd/tps65086.txt | 55 +++++
drivers/gpio/Kconfig | 6 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-tps65086.c | 144 ++++++++++++
drivers/mfd/Kconfig | 13 ++
drivers/mfd/Makefile | 1 +
drivers/mfd/tps65086.c | 150 ++++++++++++
drivers/regulator/Kconfig | 7 +
drivers/regulator/Makefile | 1 +
drivers/regulator/tps65086-regulator.c | 251 +++++++++++++++++++++
include/linux/mfd/tps65086.h | 118 ++++++++++
11 files changed, 747 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
create mode 100644 drivers/gpio/gpio-tps65086.c
create mode 100644 drivers/mfd/tps65086.c
create mode 100644 drivers/regulator/tps65086-regulator.c
create mode 100644 include/linux/mfd/tps65086.h
--
1.9.1
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 1/4] Documentation: tps65086: Add DT bindings for the TPS65086 PMIC
2015-11-19 23:01 ` Andrew F. Davis
@ 2015-11-19 23:01 ` Andrew F. Davis
-1 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
The TPS65086 PMIC contains several regulators and a GPO controller.
Add bindings for the TPS65086 PMIC.
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
Documentation/devicetree/bindings/mfd/tps65086.txt | 55 ++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
diff --git a/Documentation/devicetree/bindings/mfd/tps65086.txt b/Documentation/devicetree/bindings/mfd/tps65086.txt
new file mode 100644
index 0000000..6b50613
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/tps65086.txt
@@ -0,0 +1,55 @@
+* TPS65086 Power Management Integrated Circuit bindings
+
+Required properties:
+ - compatible : Should be "ti,tps65086".
+ - reg : I2C slave address.
+ - interrupt-parent : Phandle to he parent interrupt controller.
+ - interrupts : The interrupt line the device is connected to.
+ - interrupt-controller : Marks the device node as an interrupt controller.
+ - #interrupt-cells : The number of cells to describe an IRQ, should be 2.
+ The first cell is the IRQ number.
+ The second cell is the flags, encoded as trigger
+ masks from ../interrupt-controller/interrupts.txt.
+ - gpio-controller : Marks the device node as a GPIO Controller.
+ - #gpio-cells : Should be two. The first cell is the pin number and
+ the second cell is used to specify flags.
+ See ../gpio/gpio.txt for more information.
+ - regulators: : List of child nodes that specify the regulator
+ initialization data. Child nodes must be named
+ after their hardware counterparts: buck[1-6],
+ ldoa[1-3], swa1, swb[1-2], and vtt. Each child
+ nodes is defined using the standard binding for
+ regulators and the optional regulator properties
+ defined below.
+
+Optional regulator properties:
+ - ti,regulator-step-size-25mv : This is applicable for buck[1,2,6], set this
+ if the regulator is factory set with a 25mv
+ step voltage mapping.
+ - ti,regulator-decay : This is applicable for buck[1-6], set this if
+ the output needs to decay, default is for
+ the output to slew down.
+
+Example:
+
+ pmic: tps65086@5e {
+ compatible = "ti,tps65086";
+ reg = <0x5e>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ regulators {
+ buck1 {
+ regulator-name = "vcc1";
+ regulator-min-microvolt = <1600000>;
+ regulator-max-microvolt = <1600000>;
+ regulator-boot-on;
+ ti,regulator-decay;
+ ti,regulator-step-size-25mv;
+ };
+ };
+ };
--
1.9.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 1/4] Documentation: tps65086: Add DT bindings for the TPS65086 PMIC
@ 2015-11-19 23:01 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
The TPS65086 PMIC contains several regulators and a GPO controller.
Add bindings for the TPS65086 PMIC.
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
Documentation/devicetree/bindings/mfd/tps65086.txt | 55 ++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
diff --git a/Documentation/devicetree/bindings/mfd/tps65086.txt b/Documentation/devicetree/bindings/mfd/tps65086.txt
new file mode 100644
index 0000000..6b50613
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/tps65086.txt
@@ -0,0 +1,55 @@
+* TPS65086 Power Management Integrated Circuit bindings
+
+Required properties:
+ - compatible : Should be "ti,tps65086".
+ - reg : I2C slave address.
+ - interrupt-parent : Phandle to he parent interrupt controller.
+ - interrupts : The interrupt line the device is connected to.
+ - interrupt-controller : Marks the device node as an interrupt controller.
+ - #interrupt-cells : The number of cells to describe an IRQ, should be 2.
+ The first cell is the IRQ number.
+ The second cell is the flags, encoded as trigger
+ masks from ../interrupt-controller/interrupts.txt.
+ - gpio-controller : Marks the device node as a GPIO Controller.
+ - #gpio-cells : Should be two. The first cell is the pin number and
+ the second cell is used to specify flags.
+ See ../gpio/gpio.txt for more information.
+ - regulators: : List of child nodes that specify the regulator
+ initialization data. Child nodes must be named
+ after their hardware counterparts: buck[1-6],
+ ldoa[1-3], swa1, swb[1-2], and vtt. Each child
+ nodes is defined using the standard binding for
+ regulators and the optional regulator properties
+ defined below.
+
+Optional regulator properties:
+ - ti,regulator-step-size-25mv : This is applicable for buck[1,2,6], set this
+ if the regulator is factory set with a 25mv
+ step voltage mapping.
+ - ti,regulator-decay : This is applicable for buck[1-6], set this if
+ the output needs to decay, default is for
+ the output to slew down.
+
+Example:
+
+ pmic: tps65086@5e {
+ compatible = "ti,tps65086";
+ reg = <0x5e>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ regulators {
+ buck1 {
+ regulator-name = "vcc1";
+ regulator-min-microvolt = <1600000>;
+ regulator-max-microvolt = <1600000>;
+ regulator-boot-on;
+ ti,regulator-decay;
+ ti,regulator-step-size-25mv;
+ };
+ };
+ };
--
1.9.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 2/4] mfd: tps65086: Add driver for the TPS65086 PMIC
2015-11-19 23:01 ` Andrew F. Davis
@ 2015-11-19 23:01 ` Andrew F. Davis
-1 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
Add support for the TPS65912 device. It provides communication
through I2C and contains the following components:
- Regulators
- Load switches
- GPO controller
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
drivers/mfd/Kconfig | 13 ++++
drivers/mfd/Makefile | 1 +
drivers/mfd/tps65086.c | 150 +++++++++++++++++++++++++++++++++++++++++++
include/linux/mfd/tps65086.h | 118 ++++++++++++++++++++++++++++++++++
4 files changed, 282 insertions(+)
create mode 100644 drivers/mfd/tps65086.c
create mode 100644 include/linux/mfd/tps65086.h
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 4d92df6..232a911 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1106,6 +1106,19 @@ config TPS6507X
This driver can also be built as a module. If so, the module
will be called tps6507x.
+config MFD_TPS65086
+ tristate "TI TPS65086 Power Management Integrated Chips (PMICs)"
+ select REGMAP
+ select REGMAP_IRQ
+ select REGMAP_I2C
+ depends on I2C
+ help
+ If you say yes here you get support for the TPS65086 series of
+ Power Management chips.
+ This driver provides common support for accessing the device,
+ additional drivers must be enabled in order to use the
+ functionality of the device.
+
config TPS65911_COMPARATOR
tristate
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a8b76b8..3dcfec6 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -66,6 +66,7 @@ obj-$(CONFIG_MFD_WM8994) += wm8994-core.o wm8994-irq.o wm8994-regmap.o
obj-$(CONFIG_TPS6105X) += tps6105x.o
obj-$(CONFIG_TPS65010) += tps65010.o
obj-$(CONFIG_TPS6507X) += tps6507x.o
+obj-$(CONFIG_MFD_TPS65086) += tps65086.o
obj-$(CONFIG_MFD_TPS65217) += tps65217.o
obj-$(CONFIG_MFD_TPS65218) += tps65218.o
obj-$(CONFIG_MFD_TPS65910) += tps65910.o
diff --git a/drivers/mfd/tps65086.c b/drivers/mfd/tps65086.c
new file mode 100644
index 0000000..e1edfc0
--- /dev/null
+++ b/drivers/mfd/tps65086.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Andrew F. Davis <afd@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License version 2 for more details.
+ *
+ * Based on the TPS65912 driver
+ */
+
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/core.h>
+#include <linux/module.h>
+
+#include <linux/mfd/tps65086.h>
+
+static const struct mfd_cell tps65086_cells[] = {
+ { .name = "tps65086-regulator", },
+ { .name = "tps65086-gpio", },
+};
+
+static const struct regmap_range tps65086_yes_ranges[] = {
+ regmap_reg_range(TPS65086_IRQ, TPS65086_IRQ),
+ regmap_reg_range(TPS65086_PMICSTAT, TPS65086_SHUTDNSRC),
+ regmap_reg_range(TPS65086_GPOCTRL, TPS65086_GPOCTRL),
+ regmap_reg_range(TPS65086_PG_STATUS1, TPS65086_OC_STATUS),
+};
+
+static const struct regmap_access_table tps65086_volatile_table = {
+ .yes_ranges = tps65086_yes_ranges,
+ .n_yes_ranges = ARRAY_SIZE(tps65086_yes_ranges),
+};
+
+static const struct regmap_config tps65086_regmap_config = {
+ .reg_bits = 8,
+ .val_bits = 8,
+ .cache_type = REGCACHE_RBTREE,
+ .volatile_table = &tps65086_volatile_table,
+};
+
+static const struct regmap_irq tps65086_irqs[] = {
+ REGMAP_IRQ_REG(TPS65086_IRQ_DIETEMP, 0, TPS65086_IRQ_DIETEMP_MASK),
+ REGMAP_IRQ_REG(TPS65086_IRQ_SHUTDN, 0, TPS65086_IRQ_SHUTDN_MASK),
+ REGMAP_IRQ_REG(TPS65086_IRQ_FAULT, 0, TPS65086_IRQ_FAULT_MASK),
+};
+
+static struct regmap_irq_chip tps65086_irq_chip = {
+ .name = "tps65086",
+ .status_base = TPS65086_IRQ,
+ .mask_base = TPS65086_IRQ_MASK,
+ .ack_base = TPS65086_IRQ,
+ .init_ack_masked = true,
+ .num_regs = 1,
+ .irqs = tps65086_irqs,
+ .num_irqs = ARRAY_SIZE(tps65086_irqs),
+};
+
+static const struct of_device_id tps65086_of_match_table[] = {
+ { .compatible = "ti,tps65086", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, tps65086_of_match_table);
+
+static int tps65086_probe(struct i2c_client *client,
+ const struct i2c_device_id *ids)
+{
+ struct tps65086 *tps;
+ unsigned int version;
+ int ret;
+
+ tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
+ if (!tps)
+ return -ENOMEM;
+
+ i2c_set_clientdata(client, tps);
+ tps->dev = &client->dev;
+ tps->irq = client->irq;
+
+ tps->regmap = devm_regmap_init_i2c(client, &tps65086_regmap_config);
+ if (IS_ERR(tps->regmap)) {
+ dev_err(tps->dev, "Failed to initialize register map\n");
+ return PTR_ERR(tps->regmap);
+ }
+
+ ret = regmap_read(tps->regmap, TPS65086_DEVICEID, &version);
+ if (ret) {
+ dev_err(tps->dev, "Failed to read revision register\n");
+ return ret;
+ }
+
+ dev_info(tps->dev, "Device: TPS65086%01lX, OTP: %c, Rev: %ld\n",
+ (version & TPS65086_DEVICEID_PART_MASK),
+ (char)((version & TPS65086_DEVICEID_OTP_MASK) >> 4) + 'A',
+ (version & TPS65086_DEVICEID_REV_MASK) >> 6);
+
+ ret = regmap_add_irq_chip(tps->regmap, tps->irq, IRQF_ONESHOT, 0,
+ &tps65086_irq_chip, &tps->irq_data);
+ if (ret) {
+ dev_err(tps->dev, "Failed to register IRQ chip\n");
+ return ret;
+ }
+
+ ret = mfd_add_devices(tps->dev, PLATFORM_DEVID_AUTO, tps65086_cells,
+ ARRAY_SIZE(tps65086_cells), NULL, 0,
+ regmap_irq_get_domain(tps->irq_data));
+ if (ret) {
+ regmap_del_irq_chip(tps->irq, tps->irq_data);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int tps65086_remove(struct i2c_client *client)
+{
+ struct tps65086 *tps = i2c_get_clientdata(client);
+
+ regmap_del_irq_chip(tps->irq, tps->irq_data);
+
+ return 0;
+}
+
+static const struct i2c_device_id tps65086_id_table[] = {
+ { "tps65086", 0 },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(i2c, tps65086_id_table);
+
+static struct i2c_driver tps65086_driver = {
+ .driver = {
+ .name = "tps65086",
+ .of_match_table = tps65086_of_match_table,
+ },
+ .probe = tps65086_probe,
+ .remove = tps65086_remove,
+ .id_table = tps65086_id_table,
+};
+module_i2c_driver(tps65086_driver);
+
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65086 PMIC Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/include/linux/mfd/tps65086.h b/include/linux/mfd/tps65086.h
new file mode 100644
index 0000000..0c50452
--- /dev/null
+++ b/include/linux/mfd/tps65086.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Andrew F. Davis <afd@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License version 2 for more details.
+ *
+ * Based on the TPS65912 driver
+ */
+
+#ifndef __LINUX_MFD_TPS65086_H
+#define __LINUX_MFD_TPS65086_H
+
+#include <linux/device.h>
+#include <linux/regmap.h>
+
+/* List of registers for TPS65086 */
+#define TPS65086_DEVICEID 0x01
+#define TPS65086_IRQ 0x02
+#define TPS65086_IRQ_MASK 0x03
+#define TPS65086_PMICSTAT 0x04
+#define TPS65086_SHUTDNSRC 0x05
+#define TPS65086_BUCK1CTRL 0x20
+#define TPS65086_BUCK2CTRL 0x21
+#define TPS65086_BUCK3DECAY 0x22
+#define TPS65086_BUCK3VID 0x23
+#define TPS65086_BUCK3SLPCTRL 0x24
+#define TPS65086_BUCK4CTRL 0x25
+#define TPS65086_BUCK5CTRL 0x26
+#define TPS65086_BUCK6CTRL 0x27
+#define TPS65086_LDOA2CTRL 0x28
+#define TPS65086_LDOA3CTRL 0x29
+#define TPS65086_DISCHCTRL1 0x40
+#define TPS65086_DISCHCTRL2 0x41
+#define TPS65086_DISCHCTRL3 0x42
+#define TPS65086_PG_DELAY1 0x43
+#define TPS65086_FORCESHUTDN 0x91
+#define TPS65086_BUCK1SLPCTRL 0x92
+#define TPS65086_BUCK2SLPCTRL 0x93
+#define TPS65086_BUCK4VID 0x94
+#define TPS65086_BUCK4SLPVID 0x95
+#define TPS65086_BUCK5VID 0x96
+#define TPS65086_BUCK5SLPVID 0x97
+#define TPS65086_BUCK6VID 0x98
+#define TPS65086_BUCK6SLPVID 0x99
+#define TPS65086_LDOA2VID 0x9A
+#define TPS65086_LDOA3VID 0x9B
+#define TPS65086_BUCK123CTRL 0x9C
+#define TPS65086_PG_DELAY2 0x9D
+#define TPS65086_PIN_EN_MASK1 0x9E
+#define TPS65086_PIN_EN_MASK2 0x9F
+#define TPS65086_SWVTT_EN 0x9F
+#define TPS65086_PIN_EN_OVR1 0xA0
+#define TPS65086_PIN_EN_OVR2 0xA1
+#define TPS65086_GPOCTRL 0xA1
+#define TPS65086_PWR_FAULT_MASK1 0xA2
+#define TPS65086_PWR_FAULT_MASK2 0xA3
+#define TPS65086_GPO1PG_CTRL1 0xA4
+#define TPS65086_GPO1PG_CTRL2 0xA5
+#define TPS65086_GPO4PG_CTRL1 0xA6
+#define TPS65086_GPO4PG_CTRL2 0xA7
+#define TPS65086_GPO2PG_CTRL1 0xA8
+#define TPS65086_GPO2PG_CTRL2 0xA9
+#define TPS65086_GPO3PG_CTRL1 0xAA
+#define TPS65086_GPO3PG_CTRL2 0xAB
+#define TPS65086_LDOA1CTRL 0xAE
+#define TPS65086_PG_STATUS1 0xB0
+#define TPS65086_PG_STATUS2 0xB1
+#define TPS65086_PWR_FAULT_STATUS1 0xB2
+#define TPS65086_PWR_FAULT_STATUS2 0xB3
+#define TPS65086_TEMPCRIT 0xB4
+#define TPS65086_TEMPHOT 0xB5
+#define TPS65086_OC_STATUS 0xB6
+
+/* IRQ Register field definitions */
+#define TPS65086_IRQ_DIETEMP_MASK BIT(0)
+#define TPS65086_IRQ_SHUTDN_MASK BIT(3)
+#define TPS65086_IRQ_FAULT_MASK BIT(7)
+
+/* DEVICEID Register field definitions */
+#define TPS65086_DEVICEID_PART_MASK GENMASK(3, 0)
+#define TPS65086_DEVICEID_OTP_MASK GENMASK(5, 4)
+#define TPS65086_DEVICEID_REV_MASK GENMASK(7, 6)
+
+/* VID Masks */
+#define BUCK_VID_MASK GENMASK(7, 1)
+#define VDOA1_VID_MASK GENMASK(4, 1)
+#define VDOA23_VID_MASK GENMASK(3, 0)
+
+/* Define the TPS65086 IRQ numbers */
+enum tps65086_irqs {
+ TPS65086_IRQ_DIETEMP,
+ TPS65086_IRQ_SHUTDN,
+ TPS65086_IRQ_FAULT,
+};
+
+/*
+ * struct tps65086 - state holder for the tps65086 driver
+ *
+ * Device data may be used to access the TPS65086 chip
+ */
+struct tps65086 {
+ struct device *dev;
+ struct regmap *regmap;
+
+ /* IRQ Data */
+ int irq;
+ struct regmap_irq_chip_data *irq_data;
+};
+
+#endif /* __LINUX_MFD_TPS65086_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 2/4] mfd: tps65086: Add driver for the TPS65086 PMIC
@ 2015-11-19 23:01 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
Add support for the TPS65912 device. It provides communication
through I2C and contains the following components:
- Regulators
- Load switches
- GPO controller
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
drivers/mfd/Kconfig | 13 ++++
drivers/mfd/Makefile | 1 +
drivers/mfd/tps65086.c | 150 +++++++++++++++++++++++++++++++++++++++++++
include/linux/mfd/tps65086.h | 118 ++++++++++++++++++++++++++++++++++
4 files changed, 282 insertions(+)
create mode 100644 drivers/mfd/tps65086.c
create mode 100644 include/linux/mfd/tps65086.h
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 4d92df6..232a911 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1106,6 +1106,19 @@ config TPS6507X
This driver can also be built as a module. If so, the module
will be called tps6507x.
+config MFD_TPS65086
+ tristate "TI TPS65086 Power Management Integrated Chips (PMICs)"
+ select REGMAP
+ select REGMAP_IRQ
+ select REGMAP_I2C
+ depends on I2C
+ help
+ If you say yes here you get support for the TPS65086 series of
+ Power Management chips.
+ This driver provides common support for accessing the device,
+ additional drivers must be enabled in order to use the
+ functionality of the device.
+
config TPS65911_COMPARATOR
tristate
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a8b76b8..3dcfec6 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -66,6 +66,7 @@ obj-$(CONFIG_MFD_WM8994) += wm8994-core.o wm8994-irq.o wm8994-regmap.o
obj-$(CONFIG_TPS6105X) += tps6105x.o
obj-$(CONFIG_TPS65010) += tps65010.o
obj-$(CONFIG_TPS6507X) += tps6507x.o
+obj-$(CONFIG_MFD_TPS65086) += tps65086.o
obj-$(CONFIG_MFD_TPS65217) += tps65217.o
obj-$(CONFIG_MFD_TPS65218) += tps65218.o
obj-$(CONFIG_MFD_TPS65910) += tps65910.o
diff --git a/drivers/mfd/tps65086.c b/drivers/mfd/tps65086.c
new file mode 100644
index 0000000..e1edfc0
--- /dev/null
+++ b/drivers/mfd/tps65086.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Andrew F. Davis <afd@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License version 2 for more details.
+ *
+ * Based on the TPS65912 driver
+ */
+
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/core.h>
+#include <linux/module.h>
+
+#include <linux/mfd/tps65086.h>
+
+static const struct mfd_cell tps65086_cells[] = {
+ { .name = "tps65086-regulator", },
+ { .name = "tps65086-gpio", },
+};
+
+static const struct regmap_range tps65086_yes_ranges[] = {
+ regmap_reg_range(TPS65086_IRQ, TPS65086_IRQ),
+ regmap_reg_range(TPS65086_PMICSTAT, TPS65086_SHUTDNSRC),
+ regmap_reg_range(TPS65086_GPOCTRL, TPS65086_GPOCTRL),
+ regmap_reg_range(TPS65086_PG_STATUS1, TPS65086_OC_STATUS),
+};
+
+static const struct regmap_access_table tps65086_volatile_table = {
+ .yes_ranges = tps65086_yes_ranges,
+ .n_yes_ranges = ARRAY_SIZE(tps65086_yes_ranges),
+};
+
+static const struct regmap_config tps65086_regmap_config = {
+ .reg_bits = 8,
+ .val_bits = 8,
+ .cache_type = REGCACHE_RBTREE,
+ .volatile_table = &tps65086_volatile_table,
+};
+
+static const struct regmap_irq tps65086_irqs[] = {
+ REGMAP_IRQ_REG(TPS65086_IRQ_DIETEMP, 0, TPS65086_IRQ_DIETEMP_MASK),
+ REGMAP_IRQ_REG(TPS65086_IRQ_SHUTDN, 0, TPS65086_IRQ_SHUTDN_MASK),
+ REGMAP_IRQ_REG(TPS65086_IRQ_FAULT, 0, TPS65086_IRQ_FAULT_MASK),
+};
+
+static struct regmap_irq_chip tps65086_irq_chip = {
+ .name = "tps65086",
+ .status_base = TPS65086_IRQ,
+ .mask_base = TPS65086_IRQ_MASK,
+ .ack_base = TPS65086_IRQ,
+ .init_ack_masked = true,
+ .num_regs = 1,
+ .irqs = tps65086_irqs,
+ .num_irqs = ARRAY_SIZE(tps65086_irqs),
+};
+
+static const struct of_device_id tps65086_of_match_table[] = {
+ { .compatible = "ti,tps65086", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, tps65086_of_match_table);
+
+static int tps65086_probe(struct i2c_client *client,
+ const struct i2c_device_id *ids)
+{
+ struct tps65086 *tps;
+ unsigned int version;
+ int ret;
+
+ tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
+ if (!tps)
+ return -ENOMEM;
+
+ i2c_set_clientdata(client, tps);
+ tps->dev = &client->dev;
+ tps->irq = client->irq;
+
+ tps->regmap = devm_regmap_init_i2c(client, &tps65086_regmap_config);
+ if (IS_ERR(tps->regmap)) {
+ dev_err(tps->dev, "Failed to initialize register map\n");
+ return PTR_ERR(tps->regmap);
+ }
+
+ ret = regmap_read(tps->regmap, TPS65086_DEVICEID, &version);
+ if (ret) {
+ dev_err(tps->dev, "Failed to read revision register\n");
+ return ret;
+ }
+
+ dev_info(tps->dev, "Device: TPS65086%01lX, OTP: %c, Rev: %ld\n",
+ (version & TPS65086_DEVICEID_PART_MASK),
+ (char)((version & TPS65086_DEVICEID_OTP_MASK) >> 4) + 'A',
+ (version & TPS65086_DEVICEID_REV_MASK) >> 6);
+
+ ret = regmap_add_irq_chip(tps->regmap, tps->irq, IRQF_ONESHOT, 0,
+ &tps65086_irq_chip, &tps->irq_data);
+ if (ret) {
+ dev_err(tps->dev, "Failed to register IRQ chip\n");
+ return ret;
+ }
+
+ ret = mfd_add_devices(tps->dev, PLATFORM_DEVID_AUTO, tps65086_cells,
+ ARRAY_SIZE(tps65086_cells), NULL, 0,
+ regmap_irq_get_domain(tps->irq_data));
+ if (ret) {
+ regmap_del_irq_chip(tps->irq, tps->irq_data);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int tps65086_remove(struct i2c_client *client)
+{
+ struct tps65086 *tps = i2c_get_clientdata(client);
+
+ regmap_del_irq_chip(tps->irq, tps->irq_data);
+
+ return 0;
+}
+
+static const struct i2c_device_id tps65086_id_table[] = {
+ { "tps65086", 0 },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(i2c, tps65086_id_table);
+
+static struct i2c_driver tps65086_driver = {
+ .driver = {
+ .name = "tps65086",
+ .of_match_table = tps65086_of_match_table,
+ },
+ .probe = tps65086_probe,
+ .remove = tps65086_remove,
+ .id_table = tps65086_id_table,
+};
+module_i2c_driver(tps65086_driver);
+
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65086 PMIC Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/include/linux/mfd/tps65086.h b/include/linux/mfd/tps65086.h
new file mode 100644
index 0000000..0c50452
--- /dev/null
+++ b/include/linux/mfd/tps65086.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Andrew F. Davis <afd@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License version 2 for more details.
+ *
+ * Based on the TPS65912 driver
+ */
+
+#ifndef __LINUX_MFD_TPS65086_H
+#define __LINUX_MFD_TPS65086_H
+
+#include <linux/device.h>
+#include <linux/regmap.h>
+
+/* List of registers for TPS65086 */
+#define TPS65086_DEVICEID 0x01
+#define TPS65086_IRQ 0x02
+#define TPS65086_IRQ_MASK 0x03
+#define TPS65086_PMICSTAT 0x04
+#define TPS65086_SHUTDNSRC 0x05
+#define TPS65086_BUCK1CTRL 0x20
+#define TPS65086_BUCK2CTRL 0x21
+#define TPS65086_BUCK3DECAY 0x22
+#define TPS65086_BUCK3VID 0x23
+#define TPS65086_BUCK3SLPCTRL 0x24
+#define TPS65086_BUCK4CTRL 0x25
+#define TPS65086_BUCK5CTRL 0x26
+#define TPS65086_BUCK6CTRL 0x27
+#define TPS65086_LDOA2CTRL 0x28
+#define TPS65086_LDOA3CTRL 0x29
+#define TPS65086_DISCHCTRL1 0x40
+#define TPS65086_DISCHCTRL2 0x41
+#define TPS65086_DISCHCTRL3 0x42
+#define TPS65086_PG_DELAY1 0x43
+#define TPS65086_FORCESHUTDN 0x91
+#define TPS65086_BUCK1SLPCTRL 0x92
+#define TPS65086_BUCK2SLPCTRL 0x93
+#define TPS65086_BUCK4VID 0x94
+#define TPS65086_BUCK4SLPVID 0x95
+#define TPS65086_BUCK5VID 0x96
+#define TPS65086_BUCK5SLPVID 0x97
+#define TPS65086_BUCK6VID 0x98
+#define TPS65086_BUCK6SLPVID 0x99
+#define TPS65086_LDOA2VID 0x9A
+#define TPS65086_LDOA3VID 0x9B
+#define TPS65086_BUCK123CTRL 0x9C
+#define TPS65086_PG_DELAY2 0x9D
+#define TPS65086_PIN_EN_MASK1 0x9E
+#define TPS65086_PIN_EN_MASK2 0x9F
+#define TPS65086_SWVTT_EN 0x9F
+#define TPS65086_PIN_EN_OVR1 0xA0
+#define TPS65086_PIN_EN_OVR2 0xA1
+#define TPS65086_GPOCTRL 0xA1
+#define TPS65086_PWR_FAULT_MASK1 0xA2
+#define TPS65086_PWR_FAULT_MASK2 0xA3
+#define TPS65086_GPO1PG_CTRL1 0xA4
+#define TPS65086_GPO1PG_CTRL2 0xA5
+#define TPS65086_GPO4PG_CTRL1 0xA6
+#define TPS65086_GPO4PG_CTRL2 0xA7
+#define TPS65086_GPO2PG_CTRL1 0xA8
+#define TPS65086_GPO2PG_CTRL2 0xA9
+#define TPS65086_GPO3PG_CTRL1 0xAA
+#define TPS65086_GPO3PG_CTRL2 0xAB
+#define TPS65086_LDOA1CTRL 0xAE
+#define TPS65086_PG_STATUS1 0xB0
+#define TPS65086_PG_STATUS2 0xB1
+#define TPS65086_PWR_FAULT_STATUS1 0xB2
+#define TPS65086_PWR_FAULT_STATUS2 0xB3
+#define TPS65086_TEMPCRIT 0xB4
+#define TPS65086_TEMPHOT 0xB5
+#define TPS65086_OC_STATUS 0xB6
+
+/* IRQ Register field definitions */
+#define TPS65086_IRQ_DIETEMP_MASK BIT(0)
+#define TPS65086_IRQ_SHUTDN_MASK BIT(3)
+#define TPS65086_IRQ_FAULT_MASK BIT(7)
+
+/* DEVICEID Register field definitions */
+#define TPS65086_DEVICEID_PART_MASK GENMASK(3, 0)
+#define TPS65086_DEVICEID_OTP_MASK GENMASK(5, 4)
+#define TPS65086_DEVICEID_REV_MASK GENMASK(7, 6)
+
+/* VID Masks */
+#define BUCK_VID_MASK GENMASK(7, 1)
+#define VDOA1_VID_MASK GENMASK(4, 1)
+#define VDOA23_VID_MASK GENMASK(3, 0)
+
+/* Define the TPS65086 IRQ numbers */
+enum tps65086_irqs {
+ TPS65086_IRQ_DIETEMP,
+ TPS65086_IRQ_SHUTDN,
+ TPS65086_IRQ_FAULT,
+};
+
+/*
+ * struct tps65086 - state holder for the tps65086 driver
+ *
+ * Device data may be used to access the TPS65086 chip
+ */
+struct tps65086 {
+ struct device *dev;
+ struct regmap *regmap;
+
+ /* IRQ Data */
+ int irq;
+ struct regmap_irq_chip_data *irq_data;
+};
+
+#endif /* __LINUX_MFD_TPS65086_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
2015-11-19 23:01 ` Andrew F. Davis
@ 2015-11-19 23:01 ` Andrew F. Davis
-1 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
Add support for TPS65086 PMIC regulators.
The regulators set consists of 3 Step-down Controllers, 3 Step-down
Converters, 3 LDOs, 3 Load Switches, and a Sink and Source LDO. The
output voltages are configurable and are meant to supply power to a
SoC and/or other components.
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
drivers/regulator/Kconfig | 7 +
drivers/regulator/Makefile | 1 +
drivers/regulator/tps65086-regulator.c | 251 +++++++++++++++++++++++++++++++++
3 files changed, 259 insertions(+)
create mode 100644 drivers/regulator/tps65086-regulator.c
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 8df0b0e..b45fc60 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -680,6 +680,13 @@ config REGULATOR_TPS6507X
three step-down converters and two general-purpose LDO voltage regulators.
It supports TI's software based Class-2 SmartReflex implementation.
+config REGULATOR_TPS65086
+ tristate "TI TPS65086 Power regulators"
+ depends on MFD_TPS65086
+ help
+ This driver provides support for the voltage regulators on
+ TI TPS65086 PMICs.
+
config REGULATOR_TPS65090
tristate "TI TPS65090 Power regulator"
depends on MFD_TPS65090
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 0f81749..945d8ec 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -85,6 +85,7 @@ obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o
obj-$(CONFIG_REGULATOR_TPS62360) += tps62360-regulator.o
obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o
obj-$(CONFIG_REGULATOR_TPS6507X) += tps6507x-regulator.o
+obj-$(CONFIG_REGULATOR_TPS65086) += tps65086-regulator.o
obj-$(CONFIG_REGULATOR_TPS65090) += tps65090-regulator.o
obj-$(CONFIG_REGULATOR_TPS65217) += tps65217-regulator.o
obj-$(CONFIG_REGULATOR_TPS65218) += tps65218-regulator.o
diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c
new file mode 100644
index 0000000..d59cd19
--- /dev/null
+++ b/drivers/regulator/tps65086-regulator.c
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Andrew F. Davis <afd@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License version 2 for more details.
+ *
+ * Based on the TPS65912 driver
+ */
+
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+
+#include <linux/mfd/tps65086.h>
+
+enum tps65086_regulators { BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6, LDOA1,
+ LDOA2, LDOA3, SWA1, SWB1, SWB2, VTT };
+
+#define TPS65086_REGULATOR(_name, _of, _id, _nv, _vr, _vm, _er, _em, _lr, _dr, _dm) \
+ [_id] = { \
+ .desc = { \
+ .name = _name, \
+ .of_match = _of, \
+ .regulators_node = "regulators", \
+ .of_parse_cb = tps65086_of_parse_cb, \
+ .id = _id, \
+ .ops = ®_ops, \
+ .n_voltages = _nv, \
+ .type = REGULATOR_VOLTAGE, \
+ .owner = THIS_MODULE, \
+ .vsel_reg = _vr, \
+ .vsel_mask = _vm, \
+ .enable_reg = _er, \
+ .enable_mask = _em, \
+ .volt_table = NULL, \
+ .linear_ranges = _lr, \
+ .n_linear_ranges = ARRAY_SIZE(_lr), \
+ }, \
+ .decay_reg = _dr, \
+ .decay_mask = _dm, \
+ }
+
+#define TPS65086_SWITCH(_name, _of, _id, _er, _em) \
+ [_id] = { \
+ .desc = { \
+ .name = _name, \
+ .of_match = _of, \
+ .regulators_node = "regulators", \
+ .of_parse_cb = tps65086_of_parse_cb, \
+ .id = _id, \
+ .ops = &switch_ops, \
+ .type = REGULATOR_VOLTAGE, \
+ .owner = THIS_MODULE, \
+ .enable_reg = _er, \
+ .enable_mask = _em, \
+ }, \
+ }
+
+struct tps65086_regulator {
+ struct regulator_desc desc;
+ unsigned int decay_reg;
+ unsigned int decay_mask;
+};
+
+static const struct regulator_linear_range tps65086_buck126_10mv_ranges[] = {
+ REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),
+ REGULATOR_LINEAR_RANGE(410000, 0x1, 0x7F, 10000),
+};
+
+static const struct regulator_linear_range tps65086_buck126_25mv_ranges[] = {
+ REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),
+ REGULATOR_LINEAR_RANGE(1000000, 0x1, 0x18, 0),
+ REGULATOR_LINEAR_RANGE(1025000, 0x19, 0x7F, 25000),
+};
+
+static const struct regulator_linear_range tps65086_buck345_ranges[] = {
+ REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),
+ REGULATOR_LINEAR_RANGE(425000, 0x1, 0x7F, 25000),
+};
+
+static const struct regulator_linear_range tps65086_ldoa1_ranges[] = {
+ REGULATOR_LINEAR_RANGE(1350000, 0x0, 0x0, 0),
+ REGULATOR_LINEAR_RANGE(1500000, 0x1, 0x7, 100000),
+ REGULATOR_LINEAR_RANGE(2300000, 0x8, 0xA, 100000),
+ REGULATOR_LINEAR_RANGE(2700000, 0xB, 0xD, 150000),
+ REGULATOR_LINEAR_RANGE(3300000, 0xE, 0xE, 0),
+};
+
+static const struct regulator_linear_range tps65086_ldoa23_ranges[] = {
+ REGULATOR_LINEAR_RANGE(700000, 0x0, 0xD, 50000),
+ REGULATOR_LINEAR_RANGE(1400000, 0xE, 0xF, 100000),
+};
+
+/* Operations permitted on regulators */
+static struct regulator_ops reg_ops = {
+ .enable = regulator_enable_regmap,
+ .disable = regulator_disable_regmap,
+ .is_enabled = regulator_is_enabled_regmap,
+ .set_voltage_sel = regulator_set_voltage_sel_regmap,
+ .map_voltage = regulator_map_voltage_linear_range,
+ .get_voltage_sel = regulator_get_voltage_sel_regmap,
+ .list_voltage = regulator_list_voltage_linear_range,
+};
+
+/* Operations permitted on load switches */
+static struct regulator_ops switch_ops = {
+ .enable = regulator_enable_regmap,
+ .disable = regulator_disable_regmap,
+ .is_enabled = regulator_is_enabled_regmap,
+};
+
+static int tps65086_of_parse_cb(struct device_node *dev,
+ const struct regulator_desc *desc,
+ struct regulator_config *config);
+
+static struct tps65086_regulator regulators[] = {
+ TPS65086_REGULATOR("BUCK1", "buck1", BUCK1, 0x80, TPS65086_BUCK1CTRL,
+ BUCK_VID_MASK, TPS65086_BUCK123CTRL, BIT(0),
+ tps65086_buck126_10mv_ranges, TPS65086_BUCK1CTRL,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK2", "buck2", BUCK2, 0x80, TPS65086_BUCK2CTRL,
+ BUCK_VID_MASK, TPS65086_BUCK123CTRL, BIT(1),
+ tps65086_buck126_10mv_ranges, TPS65086_BUCK2CTRL,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK3", "buck3", BUCK3, 0x80, TPS65086_BUCK3VID,
+ BUCK_VID_MASK, TPS65086_BUCK123CTRL, BIT(2),
+ tps65086_buck345_ranges, TPS65086_BUCK3DECAY,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK4", "buck4", BUCK4, 0x80, TPS65086_BUCK4VID,
+ BUCK_VID_MASK, TPS65086_BUCK4CTRL, BIT(0),
+ tps65086_buck345_ranges, TPS65086_BUCK4VID,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK5", "buck5", BUCK5, 0x80, TPS65086_BUCK5VID,
+ BUCK_VID_MASK, TPS65086_BUCK5CTRL, BIT(0),
+ tps65086_buck345_ranges, TPS65086_BUCK5CTRL,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK6", "buck6", BUCK6, 0x80, TPS65086_BUCK6VID,
+ BUCK_VID_MASK, TPS65086_BUCK6CTRL, BIT(0),
+ tps65086_buck126_10mv_ranges, TPS65086_BUCK6CTRL,
+ BIT(0)),
+ TPS65086_REGULATOR("LDOA1", "ldoa1", LDOA1, 0xF, TPS65086_LDOA1CTRL,
+ VDOA1_VID_MASK, TPS65086_LDOA1CTRL, BIT(0),
+ tps65086_ldoa1_ranges, 0, 0),
+ TPS65086_REGULATOR("LDOA2", "ldoa2", LDOA2, 0x10, TPS65086_LDOA2VID,
+ VDOA23_VID_MASK, TPS65086_LDOA2CTRL, BIT(0),
+ tps65086_ldoa23_ranges, 0, 0),
+ TPS65086_REGULATOR("LDOA3", "ldoa3", LDOA3, 0x10, TPS65086_LDOA3VID,
+ VDOA23_VID_MASK, TPS65086_LDOA3CTRL, BIT(0),
+ tps65086_ldoa23_ranges, 0, 0),
+ TPS65086_SWITCH("SWA1", "swa1", SWA1, TPS65086_SWVTT_EN, BIT(5)),
+ TPS65086_SWITCH("SWB1", "swa2", SWB1, TPS65086_SWVTT_EN, BIT(6)),
+ TPS65086_SWITCH("SWB2", "swa3", SWB2, TPS65086_SWVTT_EN, BIT(7)),
+ TPS65086_SWITCH("VTT", "vtt", VTT, TPS65086_SWVTT_EN, BIT(4)),
+};
+
+static inline bool has_25mv_mode(int id)
+{
+ switch (id) {
+ case BUCK1:
+ case BUCK2:
+ case BUCK6:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static int tps65086_of_parse_cb(struct device_node *dev,
+ const struct regulator_desc *desc,
+ struct regulator_config *config)
+{
+ int ret;
+
+ /* Check for 25mV step mode */
+ if (has_25mv_mode(desc->id) &&
+ of_property_read_bool(config->of_node, "ti,regulator-step-size-25mv")) {
+ regulators[desc->id].desc.linear_ranges =
+ tps65086_buck126_25mv_ranges;
+ regulators[desc->id].desc.n_linear_ranges =
+ ARRAY_SIZE(tps65086_buck126_25mv_ranges);
+ }
+
+ /* Check for decay mode */
+ if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, "ti,regulator-decay")) {
+ ret = regmap_write_bits(config->regmap,
+ regulators[desc->id].decay_reg,
+ regulators[desc->id].decay_mask,
+ regulators[desc->id].decay_mask);
+ if (ret) {
+ dev_err(config->dev, "Error setting decay\n");
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+static int tps65086_regulator_probe(struct platform_device *pdev)
+{
+ struct tps65086 *tps = dev_get_drvdata(pdev->dev.parent);
+ struct regulator_config config = { };
+ struct regulator_dev *rdev;
+ int i;
+
+ platform_set_drvdata(pdev, tps);
+
+ config.dev = &pdev->dev;
+ config.dev->of_node = tps->dev->of_node;
+ config.driver_data = tps;
+ config.regmap = tps->regmap;
+
+ for (i = 0; i < ARRAY_SIZE(regulators); i++) {
+ rdev = devm_regulator_register(&pdev->dev, ®ulators[i].desc,
+ &config);
+ if (IS_ERR(rdev)) {
+ dev_err(tps->dev, "failed to register %s regulator\n",
+ pdev->name);
+ return PTR_ERR(rdev);
+ }
+ }
+
+ return 0;
+}
+
+static const struct platform_device_id tps65086_regulator_id_table[] = {
+ { "tps65086-regulator", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, tps65086_regulator_id_table);
+
+static struct platform_driver tps65086_regulator_driver = {
+ .driver = {
+ .name = "tps65086-regulator",
+ },
+ .probe = tps65086_regulator_probe,
+ .id_table = tps65086_regulator_id_table,
+};
+module_platform_driver(tps65086_regulator_driver);
+
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65086 Regulator driver");
+MODULE_LICENSE("GPL v2");
--
1.9.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
@ 2015-11-19 23:01 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
Add support for TPS65086 PMIC regulators.
The regulators set consists of 3 Step-down Controllers, 3 Step-down
Converters, 3 LDOs, 3 Load Switches, and a Sink and Source LDO. The
output voltages are configurable and are meant to supply power to a
SoC and/or other components.
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
drivers/regulator/Kconfig | 7 +
drivers/regulator/Makefile | 1 +
drivers/regulator/tps65086-regulator.c | 251 +++++++++++++++++++++++++++++++++
3 files changed, 259 insertions(+)
create mode 100644 drivers/regulator/tps65086-regulator.c
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 8df0b0e..b45fc60 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -680,6 +680,13 @@ config REGULATOR_TPS6507X
three step-down converters and two general-purpose LDO voltage regulators.
It supports TI's software based Class-2 SmartReflex implementation.
+config REGULATOR_TPS65086
+ tristate "TI TPS65086 Power regulators"
+ depends on MFD_TPS65086
+ help
+ This driver provides support for the voltage regulators on
+ TI TPS65086 PMICs.
+
config REGULATOR_TPS65090
tristate "TI TPS65090 Power regulator"
depends on MFD_TPS65090
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 0f81749..945d8ec 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -85,6 +85,7 @@ obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o
obj-$(CONFIG_REGULATOR_TPS62360) += tps62360-regulator.o
obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o
obj-$(CONFIG_REGULATOR_TPS6507X) += tps6507x-regulator.o
+obj-$(CONFIG_REGULATOR_TPS65086) += tps65086-regulator.o
obj-$(CONFIG_REGULATOR_TPS65090) += tps65090-regulator.o
obj-$(CONFIG_REGULATOR_TPS65217) += tps65217-regulator.o
obj-$(CONFIG_REGULATOR_TPS65218) += tps65218-regulator.o
diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c
new file mode 100644
index 0000000..d59cd19
--- /dev/null
+++ b/drivers/regulator/tps65086-regulator.c
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Andrew F. Davis <afd@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License version 2 for more details.
+ *
+ * Based on the TPS65912 driver
+ */
+
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+
+#include <linux/mfd/tps65086.h>
+
+enum tps65086_regulators { BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6, LDOA1,
+ LDOA2, LDOA3, SWA1, SWB1, SWB2, VTT };
+
+#define TPS65086_REGULATOR(_name, _of, _id, _nv, _vr, _vm, _er, _em, _lr, _dr, _dm) \
+ [_id] = { \
+ .desc = { \
+ .name = _name, \
+ .of_match = _of, \
+ .regulators_node = "regulators", \
+ .of_parse_cb = tps65086_of_parse_cb, \
+ .id = _id, \
+ .ops = ®_ops, \
+ .n_voltages = _nv, \
+ .type = REGULATOR_VOLTAGE, \
+ .owner = THIS_MODULE, \
+ .vsel_reg = _vr, \
+ .vsel_mask = _vm, \
+ .enable_reg = _er, \
+ .enable_mask = _em, \
+ .volt_table = NULL, \
+ .linear_ranges = _lr, \
+ .n_linear_ranges = ARRAY_SIZE(_lr), \
+ }, \
+ .decay_reg = _dr, \
+ .decay_mask = _dm, \
+ }
+
+#define TPS65086_SWITCH(_name, _of, _id, _er, _em) \
+ [_id] = { \
+ .desc = { \
+ .name = _name, \
+ .of_match = _of, \
+ .regulators_node = "regulators", \
+ .of_parse_cb = tps65086_of_parse_cb, \
+ .id = _id, \
+ .ops = &switch_ops, \
+ .type = REGULATOR_VOLTAGE, \
+ .owner = THIS_MODULE, \
+ .enable_reg = _er, \
+ .enable_mask = _em, \
+ }, \
+ }
+
+struct tps65086_regulator {
+ struct regulator_desc desc;
+ unsigned int decay_reg;
+ unsigned int decay_mask;
+};
+
+static const struct regulator_linear_range tps65086_buck126_10mv_ranges[] = {
+ REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),
+ REGULATOR_LINEAR_RANGE(410000, 0x1, 0x7F, 10000),
+};
+
+static const struct regulator_linear_range tps65086_buck126_25mv_ranges[] = {
+ REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),
+ REGULATOR_LINEAR_RANGE(1000000, 0x1, 0x18, 0),
+ REGULATOR_LINEAR_RANGE(1025000, 0x19, 0x7F, 25000),
+};
+
+static const struct regulator_linear_range tps65086_buck345_ranges[] = {
+ REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),
+ REGULATOR_LINEAR_RANGE(425000, 0x1, 0x7F, 25000),
+};
+
+static const struct regulator_linear_range tps65086_ldoa1_ranges[] = {
+ REGULATOR_LINEAR_RANGE(1350000, 0x0, 0x0, 0),
+ REGULATOR_LINEAR_RANGE(1500000, 0x1, 0x7, 100000),
+ REGULATOR_LINEAR_RANGE(2300000, 0x8, 0xA, 100000),
+ REGULATOR_LINEAR_RANGE(2700000, 0xB, 0xD, 150000),
+ REGULATOR_LINEAR_RANGE(3300000, 0xE, 0xE, 0),
+};
+
+static const struct regulator_linear_range tps65086_ldoa23_ranges[] = {
+ REGULATOR_LINEAR_RANGE(700000, 0x0, 0xD, 50000),
+ REGULATOR_LINEAR_RANGE(1400000, 0xE, 0xF, 100000),
+};
+
+/* Operations permitted on regulators */
+static struct regulator_ops reg_ops = {
+ .enable = regulator_enable_regmap,
+ .disable = regulator_disable_regmap,
+ .is_enabled = regulator_is_enabled_regmap,
+ .set_voltage_sel = regulator_set_voltage_sel_regmap,
+ .map_voltage = regulator_map_voltage_linear_range,
+ .get_voltage_sel = regulator_get_voltage_sel_regmap,
+ .list_voltage = regulator_list_voltage_linear_range,
+};
+
+/* Operations permitted on load switches */
+static struct regulator_ops switch_ops = {
+ .enable = regulator_enable_regmap,
+ .disable = regulator_disable_regmap,
+ .is_enabled = regulator_is_enabled_regmap,
+};
+
+static int tps65086_of_parse_cb(struct device_node *dev,
+ const struct regulator_desc *desc,
+ struct regulator_config *config);
+
+static struct tps65086_regulator regulators[] = {
+ TPS65086_REGULATOR("BUCK1", "buck1", BUCK1, 0x80, TPS65086_BUCK1CTRL,
+ BUCK_VID_MASK, TPS65086_BUCK123CTRL, BIT(0),
+ tps65086_buck126_10mv_ranges, TPS65086_BUCK1CTRL,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK2", "buck2", BUCK2, 0x80, TPS65086_BUCK2CTRL,
+ BUCK_VID_MASK, TPS65086_BUCK123CTRL, BIT(1),
+ tps65086_buck126_10mv_ranges, TPS65086_BUCK2CTRL,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK3", "buck3", BUCK3, 0x80, TPS65086_BUCK3VID,
+ BUCK_VID_MASK, TPS65086_BUCK123CTRL, BIT(2),
+ tps65086_buck345_ranges, TPS65086_BUCK3DECAY,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK4", "buck4", BUCK4, 0x80, TPS65086_BUCK4VID,
+ BUCK_VID_MASK, TPS65086_BUCK4CTRL, BIT(0),
+ tps65086_buck345_ranges, TPS65086_BUCK4VID,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK5", "buck5", BUCK5, 0x80, TPS65086_BUCK5VID,
+ BUCK_VID_MASK, TPS65086_BUCK5CTRL, BIT(0),
+ tps65086_buck345_ranges, TPS65086_BUCK5CTRL,
+ BIT(0)),
+ TPS65086_REGULATOR("BUCK6", "buck6", BUCK6, 0x80, TPS65086_BUCK6VID,
+ BUCK_VID_MASK, TPS65086_BUCK6CTRL, BIT(0),
+ tps65086_buck126_10mv_ranges, TPS65086_BUCK6CTRL,
+ BIT(0)),
+ TPS65086_REGULATOR("LDOA1", "ldoa1", LDOA1, 0xF, TPS65086_LDOA1CTRL,
+ VDOA1_VID_MASK, TPS65086_LDOA1CTRL, BIT(0),
+ tps65086_ldoa1_ranges, 0, 0),
+ TPS65086_REGULATOR("LDOA2", "ldoa2", LDOA2, 0x10, TPS65086_LDOA2VID,
+ VDOA23_VID_MASK, TPS65086_LDOA2CTRL, BIT(0),
+ tps65086_ldoa23_ranges, 0, 0),
+ TPS65086_REGULATOR("LDOA3", "ldoa3", LDOA3, 0x10, TPS65086_LDOA3VID,
+ VDOA23_VID_MASK, TPS65086_LDOA3CTRL, BIT(0),
+ tps65086_ldoa23_ranges, 0, 0),
+ TPS65086_SWITCH("SWA1", "swa1", SWA1, TPS65086_SWVTT_EN, BIT(5)),
+ TPS65086_SWITCH("SWB1", "swa2", SWB1, TPS65086_SWVTT_EN, BIT(6)),
+ TPS65086_SWITCH("SWB2", "swa3", SWB2, TPS65086_SWVTT_EN, BIT(7)),
+ TPS65086_SWITCH("VTT", "vtt", VTT, TPS65086_SWVTT_EN, BIT(4)),
+};
+
+static inline bool has_25mv_mode(int id)
+{
+ switch (id) {
+ case BUCK1:
+ case BUCK2:
+ case BUCK6:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static int tps65086_of_parse_cb(struct device_node *dev,
+ const struct regulator_desc *desc,
+ struct regulator_config *config)
+{
+ int ret;
+
+ /* Check for 25mV step mode */
+ if (has_25mv_mode(desc->id) &&
+ of_property_read_bool(config->of_node, "ti,regulator-step-size-25mv")) {
+ regulators[desc->id].desc.linear_ranges =
+ tps65086_buck126_25mv_ranges;
+ regulators[desc->id].desc.n_linear_ranges =
+ ARRAY_SIZE(tps65086_buck126_25mv_ranges);
+ }
+
+ /* Check for decay mode */
+ if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, "ti,regulator-decay")) {
+ ret = regmap_write_bits(config->regmap,
+ regulators[desc->id].decay_reg,
+ regulators[desc->id].decay_mask,
+ regulators[desc->id].decay_mask);
+ if (ret) {
+ dev_err(config->dev, "Error setting decay\n");
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+static int tps65086_regulator_probe(struct platform_device *pdev)
+{
+ struct tps65086 *tps = dev_get_drvdata(pdev->dev.parent);
+ struct regulator_config config = { };
+ struct regulator_dev *rdev;
+ int i;
+
+ platform_set_drvdata(pdev, tps);
+
+ config.dev = &pdev->dev;
+ config.dev->of_node = tps->dev->of_node;
+ config.driver_data = tps;
+ config.regmap = tps->regmap;
+
+ for (i = 0; i < ARRAY_SIZE(regulators); i++) {
+ rdev = devm_regulator_register(&pdev->dev, ®ulators[i].desc,
+ &config);
+ if (IS_ERR(rdev)) {
+ dev_err(tps->dev, "failed to register %s regulator\n",
+ pdev->name);
+ return PTR_ERR(rdev);
+ }
+ }
+
+ return 0;
+}
+
+static const struct platform_device_id tps65086_regulator_id_table[] = {
+ { "tps65086-regulator", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, tps65086_regulator_id_table);
+
+static struct platform_driver tps65086_regulator_driver = {
+ .driver = {
+ .name = "tps65086-regulator",
+ },
+ .probe = tps65086_regulator_probe,
+ .id_table = tps65086_regulator_id_table,
+};
+module_platform_driver(tps65086_regulator_driver);
+
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65086 Regulator driver");
+MODULE_LICENSE("GPL v2");
--
1.9.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 4/4] gpio: tps65086: Add GPO driver for the TPS65086 PMIC
2015-11-19 23:01 ` Andrew F. Davis
@ 2015-11-19 23:01 ` Andrew F. Davis
-1 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
Add support for the TPS65086 PMIC GPOs.
TPS65086 has four configurable GPOs that can be used for several
purposes. These are output only.
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
drivers/gpio/Kconfig | 6 ++
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-tps65086.c | 144 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 151 insertions(+)
create mode 100644 drivers/gpio/gpio-tps65086.c
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index b18bea0..f357a2e 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -838,6 +838,12 @@ config GPIO_TIMBERDALE
---help---
Add support for the GPIO IP in the timberdale FPGA.
+config GPIO_TPS65086
+ tristate "TI TPS65086 GPO"
+ depends on MFD_TPS65086
+ help
+ This driver supports the GPO on TI TPS65086x PMICs.
+
config GPIO_TPS6586X
bool "TPS6586X GPIO"
depends on MFD_TPS6586X
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 986dbd8..fd98126 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -95,6 +95,7 @@ obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o
obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o
obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
+obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
diff --git a/drivers/gpio/gpio-tps65086.c b/drivers/gpio/gpio-tps65086.c
new file mode 100644
index 0000000..22bd796
--- /dev/null
+++ b/drivers/gpio/gpio-tps65086.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Andrew F. Davis <afd@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License version 2 for more details.
+ *
+ * Based on the TPS65912 driver
+ */
+
+#include <linux/gpio.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <linux/mfd/tps65086.h>
+
+struct tps65086_gpio {
+ struct gpio_chip chip;
+ struct tps65086 *tps;
+};
+
+static inline struct tps65086_gpio *to_tps65086_gpio(struct gpio_chip *chip)
+{
+ return container_of(chip, struct tps65086_gpio, chip);
+}
+
+static int tps65086_gpio_get_direction(struct gpio_chip *chip,
+ unsigned offset)
+{
+ return GPIOF_DIR_OUT;
+}
+
+static int tps65086_gpio_direction_input(struct gpio_chip *chip,
+ unsigned offset)
+{
+ /* This device is output only */
+ return -EINVAL;
+}
+
+static int tps65086_gpio_direction_output(struct gpio_chip *chip,
+ unsigned offset, int value)
+{
+ struct tps65086_gpio *gpio = to_tps65086_gpio(chip);
+
+ /* Set the initial value */
+ regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL,
+ BIT(4 + offset), value ? BIT(4 + offset) : 0);
+
+ return 0;
+}
+
+static int tps65086_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+ struct tps65086_gpio *gpio = to_tps65086_gpio(chip);
+ int ret, val;
+
+ ret = regmap_read(gpio->tps->regmap, TPS65086_GPOCTRL, &val);
+ if (ret < 0)
+ return ret;
+
+ return val & BIT(4 + offset);
+}
+
+static void tps65086_gpio_set(struct gpio_chip *chip, unsigned offset,
+ int value)
+{
+ struct tps65086_gpio *gpio = to_tps65086_gpio(chip);
+
+ regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL,
+ BIT(4 + offset), value ? BIT(4 + offset) : 0);
+}
+
+static struct gpio_chip template_chip = {
+ .label = "tps65086-gpio",
+ .owner = THIS_MODULE,
+ .get_direction = tps65086_gpio_get_direction,
+ .direction_input = tps65086_gpio_direction_input,
+ .direction_output = tps65086_gpio_direction_output,
+ .get = tps65086_gpio_get,
+ .set = tps65086_gpio_set,
+ .base = -1,
+ .ngpio = 4,
+ .can_sleep = true,
+};
+
+static int tps65086_gpio_probe(struct platform_device *pdev)
+{
+ struct tps65086_gpio *gpio;
+ int ret;
+
+ gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
+ if (!gpio)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, gpio);
+
+ gpio->tps = dev_get_drvdata(pdev->dev.parent);
+ gpio->chip = template_chip;
+ gpio->chip.dev = gpio->tps->dev;
+
+ ret = gpiochip_add(&gpio->chip);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int tps65086_gpio_remove(struct platform_device *pdev)
+{
+ struct tps65086_gpio *gpio = platform_get_drvdata(pdev);
+
+ gpiochip_remove(&gpio->chip);
+
+ return 0;
+}
+
+static const struct platform_device_id tps65086_gpio_id_table[] = {
+ { "tps65086-gpio", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, tps65086_gpio_id_table);
+
+static struct platform_driver tps65086_gpio_driver = {
+ .driver = {
+ .name = "tps65086-gpio",
+ },
+ .probe = tps65086_gpio_probe,
+ .remove = tps65086_gpio_remove,
+ .id_table = tps65086_gpio_id_table,
+};
+module_platform_driver(tps65086_gpio_driver);
+
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65086 GPIO driver");
+MODULE_LICENSE("GPL v2");
--
1.9.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 4/4] gpio: tps65086: Add GPO driver for the TPS65086 PMIC
@ 2015-11-19 23:01 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-19 23:01 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown
Cc: devicetree, linux-gpio, linux-kernel, Andrew F. Davis
Add support for the TPS65086 PMIC GPOs.
TPS65086 has four configurable GPOs that can be used for several
purposes. These are output only.
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
drivers/gpio/Kconfig | 6 ++
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-tps65086.c | 144 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 151 insertions(+)
create mode 100644 drivers/gpio/gpio-tps65086.c
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index b18bea0..f357a2e 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -838,6 +838,12 @@ config GPIO_TIMBERDALE
---help---
Add support for the GPIO IP in the timberdale FPGA.
+config GPIO_TPS65086
+ tristate "TI TPS65086 GPO"
+ depends on MFD_TPS65086
+ help
+ This driver supports the GPO on TI TPS65086x PMICs.
+
config GPIO_TPS6586X
bool "TPS6586X GPIO"
depends on MFD_TPS6586X
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 986dbd8..fd98126 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -95,6 +95,7 @@ obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o
obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o
obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
+obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
diff --git a/drivers/gpio/gpio-tps65086.c b/drivers/gpio/gpio-tps65086.c
new file mode 100644
index 0000000..22bd796
--- /dev/null
+++ b/drivers/gpio/gpio-tps65086.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Andrew F. Davis <afd@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License version 2 for more details.
+ *
+ * Based on the TPS65912 driver
+ */
+
+#include <linux/gpio.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <linux/mfd/tps65086.h>
+
+struct tps65086_gpio {
+ struct gpio_chip chip;
+ struct tps65086 *tps;
+};
+
+static inline struct tps65086_gpio *to_tps65086_gpio(struct gpio_chip *chip)
+{
+ return container_of(chip, struct tps65086_gpio, chip);
+}
+
+static int tps65086_gpio_get_direction(struct gpio_chip *chip,
+ unsigned offset)
+{
+ return GPIOF_DIR_OUT;
+}
+
+static int tps65086_gpio_direction_input(struct gpio_chip *chip,
+ unsigned offset)
+{
+ /* This device is output only */
+ return -EINVAL;
+}
+
+static int tps65086_gpio_direction_output(struct gpio_chip *chip,
+ unsigned offset, int value)
+{
+ struct tps65086_gpio *gpio = to_tps65086_gpio(chip);
+
+ /* Set the initial value */
+ regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL,
+ BIT(4 + offset), value ? BIT(4 + offset) : 0);
+
+ return 0;
+}
+
+static int tps65086_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+ struct tps65086_gpio *gpio = to_tps65086_gpio(chip);
+ int ret, val;
+
+ ret = regmap_read(gpio->tps->regmap, TPS65086_GPOCTRL, &val);
+ if (ret < 0)
+ return ret;
+
+ return val & BIT(4 + offset);
+}
+
+static void tps65086_gpio_set(struct gpio_chip *chip, unsigned offset,
+ int value)
+{
+ struct tps65086_gpio *gpio = to_tps65086_gpio(chip);
+
+ regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL,
+ BIT(4 + offset), value ? BIT(4 + offset) : 0);
+}
+
+static struct gpio_chip template_chip = {
+ .label = "tps65086-gpio",
+ .owner = THIS_MODULE,
+ .get_direction = tps65086_gpio_get_direction,
+ .direction_input = tps65086_gpio_direction_input,
+ .direction_output = tps65086_gpio_direction_output,
+ .get = tps65086_gpio_get,
+ .set = tps65086_gpio_set,
+ .base = -1,
+ .ngpio = 4,
+ .can_sleep = true,
+};
+
+static int tps65086_gpio_probe(struct platform_device *pdev)
+{
+ struct tps65086_gpio *gpio;
+ int ret;
+
+ gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
+ if (!gpio)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, gpio);
+
+ gpio->tps = dev_get_drvdata(pdev->dev.parent);
+ gpio->chip = template_chip;
+ gpio->chip.dev = gpio->tps->dev;
+
+ ret = gpiochip_add(&gpio->chip);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int tps65086_gpio_remove(struct platform_device *pdev)
+{
+ struct tps65086_gpio *gpio = platform_get_drvdata(pdev);
+
+ gpiochip_remove(&gpio->chip);
+
+ return 0;
+}
+
+static const struct platform_device_id tps65086_gpio_id_table[] = {
+ { "tps65086-gpio", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, tps65086_gpio_id_table);
+
+static struct platform_driver tps65086_gpio_driver = {
+ .driver = {
+ .name = "tps65086-gpio",
+ },
+ .probe = tps65086_gpio_probe,
+ .remove = tps65086_gpio_remove,
+ .id_table = tps65086_gpio_id_table,
+};
+module_platform_driver(tps65086_gpio_driver);
+
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65086 GPIO driver");
+MODULE_LICENSE("GPL v2");
--
1.9.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH v4 1/4] Documentation: tps65086: Add DT bindings for the TPS65086 PMIC
2015-11-19 23:01 ` Andrew F. Davis
(?)
@ 2015-11-20 16:33 ` Rob Herring
-1 siblings, 0 replies; 26+ messages in thread
From: Rob Herring @ 2015-11-20 16:33 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, Mark Brown, devicetree, linux-gpio, linux-kernel
On Thu, Nov 19, 2015 at 05:01:39PM -0600, Andrew F. Davis wrote:
> The TPS65086 PMIC contains several regulators and a GPO controller.
> Add bindings for the TPS65086 PMIC.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
Acked-by: Rob Herring <robh@kernel.org>
> ---
> Documentation/devicetree/bindings/mfd/tps65086.txt | 55 ++++++++++++++++++++++
> 1 file changed, 55 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
>
> diff --git a/Documentation/devicetree/bindings/mfd/tps65086.txt b/Documentation/devicetree/bindings/mfd/tps65086.txt
> new file mode 100644
> index 0000000..6b50613
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/tps65086.txt
> @@ -0,0 +1,55 @@
> +* TPS65086 Power Management Integrated Circuit bindings
> +
> +Required properties:
> + - compatible : Should be "ti,tps65086".
> + - reg : I2C slave address.
> + - interrupt-parent : Phandle to he parent interrupt controller.
> + - interrupts : The interrupt line the device is connected to.
> + - interrupt-controller : Marks the device node as an interrupt controller.
> + - #interrupt-cells : The number of cells to describe an IRQ, should be 2.
> + The first cell is the IRQ number.
> + The second cell is the flags, encoded as trigger
> + masks from ../interrupt-controller/interrupts.txt.
> + - gpio-controller : Marks the device node as a GPIO Controller.
> + - #gpio-cells : Should be two. The first cell is the pin number and
> + the second cell is used to specify flags.
> + See ../gpio/gpio.txt for more information.
> + - regulators: : List of child nodes that specify the regulator
> + initialization data. Child nodes must be named
> + after their hardware counterparts: buck[1-6],
> + ldoa[1-3], swa1, swb[1-2], and vtt. Each child
> + nodes is defined using the standard binding for
> + regulators and the optional regulator properties
> + defined below.
> +
> +Optional regulator properties:
> + - ti,regulator-step-size-25mv : This is applicable for buck[1,2,6], set this
> + if the regulator is factory set with a 25mv
> + step voltage mapping.
> + - ti,regulator-decay : This is applicable for buck[1-6], set this if
> + the output needs to decay, default is for
> + the output to slew down.
> +
> +Example:
> +
> + pmic: tps65086@5e {
> + compatible = "ti,tps65086";
> + reg = <0x5e>;
> + interrupt-parent = <&gpio1>;
> + interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + regulators {
> + buck1 {
> + regulator-name = "vcc1";
> + regulator-min-microvolt = <1600000>;
> + regulator-max-microvolt = <1600000>;
> + regulator-boot-on;
> + ti,regulator-decay;
> + ti,regulator-step-size-25mv;
> + };
> + };
> + };
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
2015-11-19 23:01 ` Andrew F. Davis
(?)
@ 2015-11-21 13:37 ` Mark Brown
2015-11-21 20:40 ` Andrew F. Davis
-1 siblings, 1 reply; 26+ messages in thread
From: Mark Brown @ 2015-11-21 13:37 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 515 bytes --]
On Thu, Nov 19, 2015 at 05:01:41PM -0600, Andrew F. Davis wrote:
> Add support for TPS65086 PMIC regulators.
>
> The regulators set consists of 3 Step-down Controllers, 3 Step-down
> Converters, 3 LDOs, 3 Load Switches, and a Sink and Source LDO. The
> output voltages are configurable and are meant to supply power to a
> SoC and/or other components.
An earlier version of this patch has already been applied, please don't
resend already applied patches but send incremental patches with any
changes.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
2015-11-21 13:37 ` Mark Brown
@ 2015-11-21 20:40 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-21 20:40 UTC (permalink / raw)
To: Mark Brown
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
On 11/21/2015 07:37 AM, Mark Brown wrote:
> On Thu, Nov 19, 2015 at 05:01:41PM -0600, Andrew F. Davis wrote:
>> Add support for TPS65086 PMIC regulators.
>>
>> The regulators set consists of 3 Step-down Controllers, 3 Step-down
>> Converters, 3 LDOs, 3 Load Switches, and a Sink and Source LDO. The
>> output voltages are configurable and are meant to supply power to a
>> SoC and/or other components.
>
> An earlier version of this patch has already been applied, please don't
> resend already applied patches but send incremental patches with any
> changes.
>
Odd, I didn't seem to get any message for this getting applied. Looks
like only a couple lines difference from the version in the regulators
branch, I don't imagine you are able to rebase that with these changes?
Anyway the reason that line needed changed is over a confusion in
what the 'of_node' does in 'struct regulator_config'. The description
seems to make it seem like it is the node that gets checked for
init data.
> * @of_node: OpenFirmware node to parse for device tree bindings (may be
> * NULL).
But the 'of_node' that is actually searched is the one given in
regulator_config->dev->of_node. Is this intended behavior (drivers
assume it is so it probably has to be now) and if so, the above
description might need to be clarified as too what that 'of_node'
pointer really does?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
@ 2015-11-21 20:40 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-21 20:40 UTC (permalink / raw)
To: Mark Brown
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
On 11/21/2015 07:37 AM, Mark Brown wrote:
> On Thu, Nov 19, 2015 at 05:01:41PM -0600, Andrew F. Davis wrote:
>> Add support for TPS65086 PMIC regulators.
>>
>> The regulators set consists of 3 Step-down Controllers, 3 Step-down
>> Converters, 3 LDOs, 3 Load Switches, and a Sink and Source LDO. The
>> output voltages are configurable and are meant to supply power to a
>> SoC and/or other components.
>
> An earlier version of this patch has already been applied, please don't
> resend already applied patches but send incremental patches with any
> changes.
>
Odd, I didn't seem to get any message for this getting applied. Looks
like only a couple lines difference from the version in the regulators
branch, I don't imagine you are able to rebase that with these changes?
Anyway the reason that line needed changed is over a confusion in
what the 'of_node' does in 'struct regulator_config'. The description
seems to make it seem like it is the node that gets checked for
init data.
> * @of_node: OpenFirmware node to parse for device tree bindings (may be
> * NULL).
But the 'of_node' that is actually searched is the one given in
regulator_config->dev->of_node. Is this intended behavior (drivers
assume it is so it probably has to be now) and if so, the above
description might need to be clarified as too what that 'of_node'
pointer really does?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
2015-11-21 20:40 ` Andrew F. Davis
(?)
@ 2015-11-22 13:13 ` Mark Brown
2015-11-23 17:40 ` Andrew F. Davis
-1 siblings, 1 reply; 26+ messages in thread
From: Mark Brown @ 2015-11-22 13:13 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1425 bytes --]
On Sat, Nov 21, 2015 at 02:40:50PM -0600, Andrew F. Davis wrote:
> On 11/21/2015 07:37 AM, Mark Brown wrote:
> >An earlier version of this patch has already been applied, please don't
> >resend already applied patches but send incremental patches with any
> >changes.
> Odd, I didn't seem to get any message for this getting applied. Looks
> like only a couple lines difference from the version in the regulators
> branch, I don't imagine you are able to rebase that with these changes?
As a matter of policy I try to avoid rewriting history unless it is
really required.
> Anyway the reason that line needed changed is over a confusion in
> what the 'of_node' does in 'struct regulator_config'. The description
> seems to make it seem like it is the node that gets checked for
> init data.
The current behaviour is the intended behaviour.
> >* @of_node: OpenFirmware node to parse for device tree bindings (may be
> >* NULL).
> But the 'of_node' that is actually searched is the one given in
> regulator_config->dev->of_node. Is this intended behavior (drivers
> assume it is so it probably has to be now) and if so, the above
> description might need to be clarified as too what that 'of_node'
> pointer really does?
Please submit a patch with any clarification you think is needed.
of_node is the name of the container subnode of the main node for the
device where we look for init data - both are used.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 1/4] Documentation: tps65086: Add DT bindings for the TPS65086 PMIC
2015-11-19 23:01 ` Andrew F. Davis
@ 2015-11-23 16:09 ` Lee Jones
-1 siblings, 0 replies; 26+ messages in thread
From: Lee Jones @ 2015-11-23 16:09 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Liam Girdwood,
Mark Brown, devicetree, linux-gpio, linux-kernel
On Thu, 19 Nov 2015, Andrew F. Davis wrote:
> The TPS65086 PMIC contains several regulators and a GPO controller.
> Add bindings for the TPS65086 PMIC.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
> Documentation/devicetree/bindings/mfd/tps65086.txt | 55 ++++++++++++++++++++++
> 1 file changed, 55 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
>
> diff --git a/Documentation/devicetree/bindings/mfd/tps65086.txt b/Documentation/devicetree/bindings/mfd/tps65086.txt
> new file mode 100644
> index 0000000..6b50613
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/tps65086.txt
> @@ -0,0 +1,55 @@
> +* TPS65086 Power Management Integrated Circuit bindings
s/Circuit/Circuit (PMIC)/
> +Required properties:
> + - compatible : Should be "ti,tps65086".
> + - reg : I2C slave address.
> + - interrupt-parent : Phandle to he parent interrupt controller.
s/he/the/
> + - interrupts : The interrupt line the device is connected to.
> + - interrupt-controller : Marks the device node as an interrupt controller.
> + - #interrupt-cells : The number of cells to describe an IRQ, should be 2.
> + The first cell is the IRQ number.
> + The second cell is the flags, encoded as trigger
> + masks from ../interrupt-controller/interrupts.txt.
> + - gpio-controller : Marks the device node as a GPIO Controller.
> + - #gpio-cells : Should be two. The first cell is the pin number and
> + the second cell is used to specify flags.
> + See ../gpio/gpio.txt for more information.
> + - regulators: : List of child nodes that specify the regulator
> + initialization data. Child nodes must be named
> + after their hardware counterparts: buck[1-6],
> + ldoa[1-3], swa1, swb[1-2], and vtt. Each child
> + nodes is defined using the standard binding for
s/is/are/
> + regulators and the optional regulator properties
> + defined below.
> +
> +Optional regulator properties:
> + - ti,regulator-step-size-25mv : This is applicable for buck[1,2,6], set this
> + if the regulator is factory set with a 25mv
> + step voltage mapping.
> + - ti,regulator-decay : This is applicable for buck[1-6], set this if
> + the output needs to decay, default is for
> + the output to slew down.
> +
> +Example:
> +
> + pmic: tps65086@5e {
> + compatible = "ti,tps65086";
> + reg = <0x5e>;
> + interrupt-parent = <&gpio1>;
> + interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + regulators {
> + buck1 {
> + regulator-name = "vcc1";
> + regulator-min-microvolt = <1600000>;
> + regulator-max-microvolt = <1600000>;
> + regulator-boot-on;
> + ti,regulator-decay;
> + ti,regulator-step-size-25mv;
> + };
> + };
> + };
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 1/4] Documentation: tps65086: Add DT bindings for the TPS65086 PMIC
@ 2015-11-23 16:09 ` Lee Jones
0 siblings, 0 replies; 26+ messages in thread
From: Lee Jones @ 2015-11-23 16:09 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Liam Girdwood,
Mark Brown, devicetree, linux-gpio, linux-kernel
On Thu, 19 Nov 2015, Andrew F. Davis wrote:
> The TPS65086 PMIC contains several regulators and a GPO controller.
> Add bindings for the TPS65086 PMIC.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
> Documentation/devicetree/bindings/mfd/tps65086.txt | 55 ++++++++++++++++++++++
> 1 file changed, 55 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
>
> diff --git a/Documentation/devicetree/bindings/mfd/tps65086.txt b/Documentation/devicetree/bindings/mfd/tps65086.txt
> new file mode 100644
> index 0000000..6b50613
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/tps65086.txt
> @@ -0,0 +1,55 @@
> +* TPS65086 Power Management Integrated Circuit bindings
s/Circuit/Circuit (PMIC)/
> +Required properties:
> + - compatible : Should be "ti,tps65086".
> + - reg : I2C slave address.
> + - interrupt-parent : Phandle to he parent interrupt controller.
s/he/the/
> + - interrupts : The interrupt line the device is connected to.
> + - interrupt-controller : Marks the device node as an interrupt controller.
> + - #interrupt-cells : The number of cells to describe an IRQ, should be 2.
> + The first cell is the IRQ number.
> + The second cell is the flags, encoded as trigger
> + masks from ../interrupt-controller/interrupts.txt.
> + - gpio-controller : Marks the device node as a GPIO Controller.
> + - #gpio-cells : Should be two. The first cell is the pin number and
> + the second cell is used to specify flags.
> + See ../gpio/gpio.txt for more information.
> + - regulators: : List of child nodes that specify the regulator
> + initialization data. Child nodes must be named
> + after their hardware counterparts: buck[1-6],
> + ldoa[1-3], swa1, swb[1-2], and vtt. Each child
> + nodes is defined using the standard binding for
s/is/are/
> + regulators and the optional regulator properties
> + defined below.
> +
> +Optional regulator properties:
> + - ti,regulator-step-size-25mv : This is applicable for buck[1,2,6], set this
> + if the regulator is factory set with a 25mv
> + step voltage mapping.
> + - ti,regulator-decay : This is applicable for buck[1-6], set this if
> + the output needs to decay, default is for
> + the output to slew down.
> +
> +Example:
> +
> + pmic: tps65086@5e {
> + compatible = "ti,tps65086";
> + reg = <0x5e>;
> + interrupt-parent = <&gpio1>;
> + interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + gpio-controller;
> + #gpio-cells = <2>;
> +
> + regulators {
> + buck1 {
> + regulator-name = "vcc1";
> + regulator-min-microvolt = <1600000>;
> + regulator-max-microvolt = <1600000>;
> + regulator-boot-on;
> + ti,regulator-decay;
> + ti,regulator-step-size-25mv;
> + };
> + };
> + };
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 2/4] mfd: tps65086: Add driver for the TPS65086 PMIC
2015-11-19 23:01 ` Andrew F. Davis
(?)
@ 2015-11-23 16:20 ` Lee Jones
-1 siblings, 0 replies; 26+ messages in thread
From: Lee Jones @ 2015-11-23 16:20 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Liam Girdwood,
Mark Brown, devicetree, linux-gpio, linux-kernel
On Thu, 19 Nov 2015, Andrew F. Davis wrote:
> Add support for the TPS65912 device. It provides communication
> through I2C and contains the following components:
>
> - Regulators
> - Load switches
> - GPO controller
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
> drivers/mfd/Kconfig | 13 ++++
> drivers/mfd/Makefile | 1 +
> drivers/mfd/tps65086.c | 150 +++++++++++++++++++++++++++++++++++++++++++
> include/linux/mfd/tps65086.h | 118 ++++++++++++++++++++++++++++++++++
> 4 files changed, 282 insertions(+)
> create mode 100644 drivers/mfd/tps65086.c
> create mode 100644 include/linux/mfd/tps65086.h
For my own reference:
Acked-by: Lee Jones <lee.jones@linaro.org>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 4d92df6..232a911 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -1106,6 +1106,19 @@ config TPS6507X
> This driver can also be built as a module. If so, the module
> will be called tps6507x.
>
> +config MFD_TPS65086
> + tristate "TI TPS65086 Power Management Integrated Chips (PMICs)"
> + select REGMAP
> + select REGMAP_IRQ
> + select REGMAP_I2C
> + depends on I2C
> + help
> + If you say yes here you get support for the TPS65086 series of
> + Power Management chips.
> + This driver provides common support for accessing the device,
> + additional drivers must be enabled in order to use the
> + functionality of the device.
> +
> config TPS65911_COMPARATOR
> tristate
>
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index a8b76b8..3dcfec6 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -66,6 +66,7 @@ obj-$(CONFIG_MFD_WM8994) += wm8994-core.o wm8994-irq.o wm8994-regmap.o
> obj-$(CONFIG_TPS6105X) += tps6105x.o
> obj-$(CONFIG_TPS65010) += tps65010.o
> obj-$(CONFIG_TPS6507X) += tps6507x.o
> +obj-$(CONFIG_MFD_TPS65086) += tps65086.o
> obj-$(CONFIG_MFD_TPS65217) += tps65217.o
> obj-$(CONFIG_MFD_TPS65218) += tps65218.o
> obj-$(CONFIG_MFD_TPS65910) += tps65910.o
> diff --git a/drivers/mfd/tps65086.c b/drivers/mfd/tps65086.c
> new file mode 100644
> index 0000000..e1edfc0
> --- /dev/null
> +++ b/drivers/mfd/tps65086.c
> @@ -0,0 +1,150 @@
> +/*
> + * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
> + *
> + * Author: Andrew F. Davis <afd@ti.com>
> + *
> + * 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.
> + *
> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any
> + * kind, whether expressed or implied; without even the implied warranty
> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License version 2 for more details.
> + *
> + * Based on the TPS65912 driver
> + */
> +
> +#include <linux/i2c.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/core.h>
> +#include <linux/module.h>
> +
> +#include <linux/mfd/tps65086.h>
> +
> +static const struct mfd_cell tps65086_cells[] = {
> + { .name = "tps65086-regulator", },
> + { .name = "tps65086-gpio", },
> +};
> +
> +static const struct regmap_range tps65086_yes_ranges[] = {
> + regmap_reg_range(TPS65086_IRQ, TPS65086_IRQ),
> + regmap_reg_range(TPS65086_PMICSTAT, TPS65086_SHUTDNSRC),
> + regmap_reg_range(TPS65086_GPOCTRL, TPS65086_GPOCTRL),
> + regmap_reg_range(TPS65086_PG_STATUS1, TPS65086_OC_STATUS),
> +};
> +
> +static const struct regmap_access_table tps65086_volatile_table = {
> + .yes_ranges = tps65086_yes_ranges,
> + .n_yes_ranges = ARRAY_SIZE(tps65086_yes_ranges),
> +};
> +
> +static const struct regmap_config tps65086_regmap_config = {
> + .reg_bits = 8,
> + .val_bits = 8,
> + .cache_type = REGCACHE_RBTREE,
> + .volatile_table = &tps65086_volatile_table,
> +};
> +
> +static const struct regmap_irq tps65086_irqs[] = {
> + REGMAP_IRQ_REG(TPS65086_IRQ_DIETEMP, 0, TPS65086_IRQ_DIETEMP_MASK),
> + REGMAP_IRQ_REG(TPS65086_IRQ_SHUTDN, 0, TPS65086_IRQ_SHUTDN_MASK),
> + REGMAP_IRQ_REG(TPS65086_IRQ_FAULT, 0, TPS65086_IRQ_FAULT_MASK),
> +};
> +
> +static struct regmap_irq_chip tps65086_irq_chip = {
> + .name = "tps65086",
> + .status_base = TPS65086_IRQ,
> + .mask_base = TPS65086_IRQ_MASK,
> + .ack_base = TPS65086_IRQ,
> + .init_ack_masked = true,
> + .num_regs = 1,
> + .irqs = tps65086_irqs,
> + .num_irqs = ARRAY_SIZE(tps65086_irqs),
> +};
> +
> +static const struct of_device_id tps65086_of_match_table[] = {
> + { .compatible = "ti,tps65086", },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, tps65086_of_match_table);
> +
> +static int tps65086_probe(struct i2c_client *client,
> + const struct i2c_device_id *ids)
> +{
> + struct tps65086 *tps;
> + unsigned int version;
> + int ret;
> +
> + tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
> + if (!tps)
> + return -ENOMEM;
> +
> + i2c_set_clientdata(client, tps);
> + tps->dev = &client->dev;
> + tps->irq = client->irq;
> +
> + tps->regmap = devm_regmap_init_i2c(client, &tps65086_regmap_config);
> + if (IS_ERR(tps->regmap)) {
> + dev_err(tps->dev, "Failed to initialize register map\n");
> + return PTR_ERR(tps->regmap);
> + }
> +
> + ret = regmap_read(tps->regmap, TPS65086_DEVICEID, &version);
> + if (ret) {
> + dev_err(tps->dev, "Failed to read revision register\n");
> + return ret;
> + }
> +
> + dev_info(tps->dev, "Device: TPS65086%01lX, OTP: %c, Rev: %ld\n",
> + (version & TPS65086_DEVICEID_PART_MASK),
> + (char)((version & TPS65086_DEVICEID_OTP_MASK) >> 4) + 'A',
> + (version & TPS65086_DEVICEID_REV_MASK) >> 6);
> +
> + ret = regmap_add_irq_chip(tps->regmap, tps->irq, IRQF_ONESHOT, 0,
> + &tps65086_irq_chip, &tps->irq_data);
> + if (ret) {
> + dev_err(tps->dev, "Failed to register IRQ chip\n");
> + return ret;
> + }
> +
> + ret = mfd_add_devices(tps->dev, PLATFORM_DEVID_AUTO, tps65086_cells,
> + ARRAY_SIZE(tps65086_cells), NULL, 0,
> + regmap_irq_get_domain(tps->irq_data));
> + if (ret) {
> + regmap_del_irq_chip(tps->irq, tps->irq_data);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static int tps65086_remove(struct i2c_client *client)
> +{
> + struct tps65086 *tps = i2c_get_clientdata(client);
> +
> + regmap_del_irq_chip(tps->irq, tps->irq_data);
> +
> + return 0;
> +}
> +
> +static const struct i2c_device_id tps65086_id_table[] = {
> + { "tps65086", 0 },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(i2c, tps65086_id_table);
> +
> +static struct i2c_driver tps65086_driver = {
> + .driver = {
> + .name = "tps65086",
> + .of_match_table = tps65086_of_match_table,
> + },
> + .probe = tps65086_probe,
> + .remove = tps65086_remove,
> + .id_table = tps65086_id_table,
> +};
> +module_i2c_driver(tps65086_driver);
> +
> +MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
> +MODULE_DESCRIPTION("TPS65086 PMIC Driver");
> +MODULE_LICENSE("GPL v2");
> diff --git a/include/linux/mfd/tps65086.h b/include/linux/mfd/tps65086.h
> new file mode 100644
> index 0000000..0c50452
> --- /dev/null
> +++ b/include/linux/mfd/tps65086.h
> @@ -0,0 +1,118 @@
> +/*
> + * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
> + *
> + * Author: Andrew F. Davis <afd@ti.com>
> + *
> + * 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.
> + *
> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any
> + * kind, whether expressed or implied; without even the implied warranty
> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License version 2 for more details.
> + *
> + * Based on the TPS65912 driver
> + */
> +
> +#ifndef __LINUX_MFD_TPS65086_H
> +#define __LINUX_MFD_TPS65086_H
> +
> +#include <linux/device.h>
> +#include <linux/regmap.h>
> +
> +/* List of registers for TPS65086 */
> +#define TPS65086_DEVICEID 0x01
> +#define TPS65086_IRQ 0x02
> +#define TPS65086_IRQ_MASK 0x03
> +#define TPS65086_PMICSTAT 0x04
> +#define TPS65086_SHUTDNSRC 0x05
> +#define TPS65086_BUCK1CTRL 0x20
> +#define TPS65086_BUCK2CTRL 0x21
> +#define TPS65086_BUCK3DECAY 0x22
> +#define TPS65086_BUCK3VID 0x23
> +#define TPS65086_BUCK3SLPCTRL 0x24
> +#define TPS65086_BUCK4CTRL 0x25
> +#define TPS65086_BUCK5CTRL 0x26
> +#define TPS65086_BUCK6CTRL 0x27
> +#define TPS65086_LDOA2CTRL 0x28
> +#define TPS65086_LDOA3CTRL 0x29
> +#define TPS65086_DISCHCTRL1 0x40
> +#define TPS65086_DISCHCTRL2 0x41
> +#define TPS65086_DISCHCTRL3 0x42
> +#define TPS65086_PG_DELAY1 0x43
> +#define TPS65086_FORCESHUTDN 0x91
> +#define TPS65086_BUCK1SLPCTRL 0x92
> +#define TPS65086_BUCK2SLPCTRL 0x93
> +#define TPS65086_BUCK4VID 0x94
> +#define TPS65086_BUCK4SLPVID 0x95
> +#define TPS65086_BUCK5VID 0x96
> +#define TPS65086_BUCK5SLPVID 0x97
> +#define TPS65086_BUCK6VID 0x98
> +#define TPS65086_BUCK6SLPVID 0x99
> +#define TPS65086_LDOA2VID 0x9A
> +#define TPS65086_LDOA3VID 0x9B
> +#define TPS65086_BUCK123CTRL 0x9C
> +#define TPS65086_PG_DELAY2 0x9D
> +#define TPS65086_PIN_EN_MASK1 0x9E
> +#define TPS65086_PIN_EN_MASK2 0x9F
> +#define TPS65086_SWVTT_EN 0x9F
> +#define TPS65086_PIN_EN_OVR1 0xA0
> +#define TPS65086_PIN_EN_OVR2 0xA1
> +#define TPS65086_GPOCTRL 0xA1
> +#define TPS65086_PWR_FAULT_MASK1 0xA2
> +#define TPS65086_PWR_FAULT_MASK2 0xA3
> +#define TPS65086_GPO1PG_CTRL1 0xA4
> +#define TPS65086_GPO1PG_CTRL2 0xA5
> +#define TPS65086_GPO4PG_CTRL1 0xA6
> +#define TPS65086_GPO4PG_CTRL2 0xA7
> +#define TPS65086_GPO2PG_CTRL1 0xA8
> +#define TPS65086_GPO2PG_CTRL2 0xA9
> +#define TPS65086_GPO3PG_CTRL1 0xAA
> +#define TPS65086_GPO3PG_CTRL2 0xAB
> +#define TPS65086_LDOA1CTRL 0xAE
> +#define TPS65086_PG_STATUS1 0xB0
> +#define TPS65086_PG_STATUS2 0xB1
> +#define TPS65086_PWR_FAULT_STATUS1 0xB2
> +#define TPS65086_PWR_FAULT_STATUS2 0xB3
> +#define TPS65086_TEMPCRIT 0xB4
> +#define TPS65086_TEMPHOT 0xB5
> +#define TPS65086_OC_STATUS 0xB6
> +
> +/* IRQ Register field definitions */
> +#define TPS65086_IRQ_DIETEMP_MASK BIT(0)
> +#define TPS65086_IRQ_SHUTDN_MASK BIT(3)
> +#define TPS65086_IRQ_FAULT_MASK BIT(7)
> +
> +/* DEVICEID Register field definitions */
> +#define TPS65086_DEVICEID_PART_MASK GENMASK(3, 0)
> +#define TPS65086_DEVICEID_OTP_MASK GENMASK(5, 4)
> +#define TPS65086_DEVICEID_REV_MASK GENMASK(7, 6)
> +
> +/* VID Masks */
> +#define BUCK_VID_MASK GENMASK(7, 1)
> +#define VDOA1_VID_MASK GENMASK(4, 1)
> +#define VDOA23_VID_MASK GENMASK(3, 0)
> +
> +/* Define the TPS65086 IRQ numbers */
> +enum tps65086_irqs {
> + TPS65086_IRQ_DIETEMP,
> + TPS65086_IRQ_SHUTDN,
> + TPS65086_IRQ_FAULT,
> +};
> +
> +/*
> + * struct tps65086 - state holder for the tps65086 driver
> + *
> + * Device data may be used to access the TPS65086 chip
> + */
> +struct tps65086 {
> + struct device *dev;
> + struct regmap *regmap;
> +
> + /* IRQ Data */
> + int irq;
> + struct regmap_irq_chip_data *irq_data;
> +};
> +
> +#endif /* __LINUX_MFD_TPS65086_H */
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
2015-11-22 13:13 ` Mark Brown
@ 2015-11-23 17:40 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-23 17:40 UTC (permalink / raw)
To: Mark Brown
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
On 11/22/2015 07:13 AM, Mark Brown wrote:
> On Sat, Nov 21, 2015 at 02:40:50PM -0600, Andrew F. Davis wrote:
>> On 11/21/2015 07:37 AM, Mark Brown wrote:
>
>>> An earlier version of this patch has already been applied, please don't
>>> resend already applied patches but send incremental patches with any
>>> changes.
>
>> Odd, I didn't seem to get any message for this getting applied. Looks
>> like only a couple lines difference from the version in the regulators
>> branch, I don't imagine you are able to rebase that with these changes?
>
> As a matter of policy I try to avoid rewriting history unless it is
> really required.
>
Makes sense, I'll push the patch once the rest of this driver gets
pulled in-case more changes are needed.
>> Anyway the reason that line needed changed is over a confusion in
>> what the 'of_node' does in 'struct regulator_config'. The description
>> seems to make it seem like it is the node that gets checked for
>> init data.
>
> The current behaviour is the intended behaviour.
>
>>> * @of_node: OpenFirmware node to parse for device tree bindings (may be
>>> * NULL).
>
>> But the 'of_node' that is actually searched is the one given in
>> regulator_config->dev->of_node. Is this intended behavior (drivers
>> assume it is so it probably has to be now) and if so, the above
>> description might need to be clarified as too what that 'of_node'
>> pointer really does?
>
> Please submit a patch with any clarification you think is needed.
> of_node is the name of the container subnode of the main node for the
> device where we look for init data - both are used.
>
But which of_node?
regulator_config->of_node
regulator_config->dev->of_node
The second is the only one I see getting used, the first is only
used when drivers provide their own init_data and automatic init
data getting fails.
The same issue is present in GPIO (gpiolib.c:612), where the of_node
in the config takes precedence over the one in config->dev, the
opposite is true for regulators, this is very confusing and should be
standardized.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
@ 2015-11-23 17:40 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-23 17:40 UTC (permalink / raw)
To: Mark Brown
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
On 11/22/2015 07:13 AM, Mark Brown wrote:
> On Sat, Nov 21, 2015 at 02:40:50PM -0600, Andrew F. Davis wrote:
>> On 11/21/2015 07:37 AM, Mark Brown wrote:
>
>>> An earlier version of this patch has already been applied, please don't
>>> resend already applied patches but send incremental patches with any
>>> changes.
>
>> Odd, I didn't seem to get any message for this getting applied. Looks
>> like only a couple lines difference from the version in the regulators
>> branch, I don't imagine you are able to rebase that with these changes?
>
> As a matter of policy I try to avoid rewriting history unless it is
> really required.
>
Makes sense, I'll push the patch once the rest of this driver gets
pulled in-case more changes are needed.
>> Anyway the reason that line needed changed is over a confusion in
>> what the 'of_node' does in 'struct regulator_config'. The description
>> seems to make it seem like it is the node that gets checked for
>> init data.
>
> The current behaviour is the intended behaviour.
>
>>> * @of_node: OpenFirmware node to parse for device tree bindings (may be
>>> * NULL).
>
>> But the 'of_node' that is actually searched is the one given in
>> regulator_config->dev->of_node. Is this intended behavior (drivers
>> assume it is so it probably has to be now) and if so, the above
>> description might need to be clarified as too what that 'of_node'
>> pointer really does?
>
> Please submit a patch with any clarification you think is needed.
> of_node is the name of the container subnode of the main node for the
> device where we look for init data - both are used.
>
But which of_node?
regulator_config->of_node
regulator_config->dev->of_node
The second is the only one I see getting used, the first is only
used when drivers provide their own init_data and automatic init
data getting fails.
The same issue is present in GPIO (gpiolib.c:612), where the of_node
in the config takes precedence over the one in config->dev, the
opposite is true for regulators, this is very confusing and should be
standardized.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
2015-11-23 17:40 ` Andrew F. Davis
(?)
@ 2015-11-23 19:00 ` Mark Brown
2015-11-23 19:18 ` Andrew F. Davis
-1 siblings, 1 reply; 26+ messages in thread
From: Mark Brown @ 2015-11-23 19:00 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]
On Mon, Nov 23, 2015 at 11:40:55AM -0600, Andrew F. Davis wrote:
> But which of_node?
> regulator_config->of_node
> regulator_config->dev->of_node
> The second is the only one I see getting used, the first is only
> used when drivers provide their own init_data and automatic init
> data getting fails.
The configuration of_node is there to override the device one if there
were some reason to do it. This should only happen in a situation where
we weren't able to use the core parsing, with modern drivers it
indicates a problematic binding so the code deliberately doesn't handle
it. Anything with a problematic binding will have generated the
init_data in driver code anyway. If we come up with a reason to extend
the interface we can do that but for now there is no need.
> The same issue is present in GPIO (gpiolib.c:612), where the of_node
Line number references are complately unhelpful if you don't say what
you're looking at (for me that's a call to irq_find_mapping() which I'm
guessing isn't what you were talking about).
> in the config takes precedence over the one in config->dev, the
> opposite is true for regulators, this is very confusing and should be
> standardized.
No, they both do the same thing.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
2015-11-23 19:00 ` Mark Brown
@ 2015-11-23 19:18 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-23 19:18 UTC (permalink / raw)
To: Mark Brown
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
On 11/23/2015 01:00 PM, Mark Brown wrote:
> On Mon, Nov 23, 2015 at 11:40:55AM -0600, Andrew F. Davis wrote:
>
>> But which of_node?
>
>> regulator_config->of_node
>> regulator_config->dev->of_node
>
>> The second is the only one I see getting used, the first is only
>> used when drivers provide their own init_data and automatic init
>> data getting fails.
>
> The configuration of_node is there to override the device one if there
> were some reason to do it. This should only happen in a situation where
> we weren't able to use the core parsing, with modern drivers it
> indicates a problematic binding so the code deliberately doesn't handle
> it. Anything with a problematic binding will have generated the
> init_data in driver code anyway. If we come up with a reason to extend
> the interface we can do that but for now there is no need.
>
Right, so this is the kind of description that would be nice with the
declaration.
>> The same issue is present in GPIO (gpiolib.c:612), where the of_node
>
> Line number references are complately unhelpful if you don't say what
> you're looking at (for me that's a call to irq_find_mapping() which I'm
> guessing isn't what you were talking about).
>
My bad, that is for v4.4-rc1 line 694. The lines are:
> of_node = gpiochip->dev->of_node;
> #ifdef CONFIG_OF_GPIO
> /*
> * If the gpiochip has an assigned OF node this takes precedence
> * FIXME: get rid of this and use gpiochip->dev->of_node everywhere
> */
> if (gpiochip->of_node)
> of_node = gpiochip->of_node;
> #endif
So, if we have a config->of_node it is used over config->dev->of_node.
>> in the config takes precedence over the one in config->dev, the
>> opposite is true for regulators, this is very confusing and should be
>> standardized.
>
> No, they both do the same thing.
>
I don't see that, config->dev->of_node is checked for the init data in
regulator_of_get_init_data, then config->of_node is then ignored if that
succeeds.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
@ 2015-11-23 19:18 ` Andrew F. Davis
0 siblings, 0 replies; 26+ messages in thread
From: Andrew F. Davis @ 2015-11-23 19:18 UTC (permalink / raw)
To: Mark Brown
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
On 11/23/2015 01:00 PM, Mark Brown wrote:
> On Mon, Nov 23, 2015 at 11:40:55AM -0600, Andrew F. Davis wrote:
>
>> But which of_node?
>
>> regulator_config->of_node
>> regulator_config->dev->of_node
>
>> The second is the only one I see getting used, the first is only
>> used when drivers provide their own init_data and automatic init
>> data getting fails.
>
> The configuration of_node is there to override the device one if there
> were some reason to do it. This should only happen in a situation where
> we weren't able to use the core parsing, with modern drivers it
> indicates a problematic binding so the code deliberately doesn't handle
> it. Anything with a problematic binding will have generated the
> init_data in driver code anyway. If we come up with a reason to extend
> the interface we can do that but for now there is no need.
>
Right, so this is the kind of description that would be nice with the
declaration.
>> The same issue is present in GPIO (gpiolib.c:612), where the of_node
>
> Line number references are complately unhelpful if you don't say what
> you're looking at (for me that's a call to irq_find_mapping() which I'm
> guessing isn't what you were talking about).
>
My bad, that is for v4.4-rc1 line 694. The lines are:
> of_node = gpiochip->dev->of_node;
> #ifdef CONFIG_OF_GPIO
> /*
> * If the gpiochip has an assigned OF node this takes precedence
> * FIXME: get rid of this and use gpiochip->dev->of_node everywhere
> */
> if (gpiochip->of_node)
> of_node = gpiochip->of_node;
> #endif
So, if we have a config->of_node it is used over config->dev->of_node.
>> in the config takes precedence over the one in config->dev, the
>> opposite is true for regulators, this is very confusing and should be
>> standardized.
>
> No, they both do the same thing.
>
I don't see that, config->dev->of_node is checked for the init data in
regulator_of_get_init_data, then config->of_node is then ignored if that
succeeds.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 3/4] regulator: tps65086: Add regulator driver for the TPS65086 PMIC
2015-11-23 19:18 ` Andrew F. Davis
(?)
@ 2015-11-24 12:11 ` Mark Brown
-1 siblings, 0 replies; 26+ messages in thread
From: Mark Brown @ 2015-11-24 12:11 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Linus Walleij, Alexandre Courbot, Samuel Ortiz, Lee Jones,
Liam Girdwood, devicetree, linux-gpio, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 881 bytes --]
On Mon, Nov 23, 2015 at 01:18:15PM -0600, Andrew F. Davis wrote:
> Right, so this is the kind of description that would be nice with the
> declaration.
Feel free to send patches for the documentation, bearing in mind that
there is a limit to how large we cna make it.
> >>in the config takes precedence over the one in config->dev, the
> >>opposite is true for regulators, this is very confusing and should be
> >>standardized.
> >No, they both do the same thing.
> I don't see that, config->dev->of_node is checked for the init data in
> regulator_of_get_init_data, then config->of_node is then ignored if that
> succeeds.
Right, like I say this is because nobody should ever actually be using
that capability if they also have good bindings. If anyone did have a
sensible use case that'd be where it would go but as things stand they
will be pushed to do the right thing.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 4/4] gpio: tps65086: Add GPO driver for the TPS65086 PMIC
2015-11-19 23:01 ` Andrew F. Davis
@ 2015-11-30 8:50 ` Linus Walleij
-1 siblings, 0 replies; 26+ messages in thread
From: Linus Walleij @ 2015-11-30 8:50 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Alexandre Courbot, Samuel Ortiz, Lee Jones, Liam Girdwood,
Mark Brown, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
On Fri, Nov 20, 2015 at 12:01 AM, Andrew F. Davis <afd-l0cyMroinI0@public.gmane.org> wrote:
> Add support for the TPS65086 PMIC GPOs.
>
> TPS65086 has four configurable GPOs that can be used for several
> purposes. These are output only.
>
> Signed-off-by: Andrew F. Davis <afd-l0cyMroinI0@public.gmane.org>
(...)
> + gpio->tps = dev_get_drvdata(pdev->dev.parent);
> + gpio->chip = template_chip;
> + gpio->chip.dev = gpio->tps->dev;
We have renamed this to .parent in linux-next and it needs to
be altered to compile upstream.
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 4/4] gpio: tps65086: Add GPO driver for the TPS65086 PMIC
@ 2015-11-30 8:50 ` Linus Walleij
0 siblings, 0 replies; 26+ messages in thread
From: Linus Walleij @ 2015-11-30 8:50 UTC (permalink / raw)
To: Andrew F. Davis
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Alexandre Courbot, Samuel Ortiz, Lee Jones, Liam Girdwood,
Mark Brown, devicetree, linux-gpio, linux-kernel
On Fri, Nov 20, 2015 at 12:01 AM, Andrew F. Davis <afd@ti.com> wrote:
> Add support for the TPS65086 PMIC GPOs.
>
> TPS65086 has four configurable GPOs that can be used for several
> purposes. These are output only.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
(...)
> + gpio->tps = dev_get_drvdata(pdev->dev.parent);
> + gpio->chip = template_chip;
> + gpio->chip.dev = gpio->tps->dev;
We have renamed this to .parent in linux-next and it needs to
be altered to compile upstream.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2015-11-30 8:51 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-19 23:01 [PATCH v4 0/4] Add support for the TI TPS65086 PMIC Andrew F. Davis
2015-11-19 23:01 ` Andrew F. Davis
2015-11-19 23:01 ` [PATCH v4 1/4] Documentation: tps65086: Add DT bindings for the " Andrew F. Davis
2015-11-19 23:01 ` Andrew F. Davis
2015-11-20 16:33 ` Rob Herring
2015-11-23 16:09 ` Lee Jones
2015-11-23 16:09 ` Lee Jones
2015-11-19 23:01 ` [PATCH v4 2/4] mfd: tps65086: Add driver " Andrew F. Davis
2015-11-19 23:01 ` Andrew F. Davis
2015-11-23 16:20 ` Lee Jones
2015-11-19 23:01 ` [PATCH v4 3/4] regulator: tps65086: Add regulator " Andrew F. Davis
2015-11-19 23:01 ` Andrew F. Davis
2015-11-21 13:37 ` Mark Brown
2015-11-21 20:40 ` Andrew F. Davis
2015-11-21 20:40 ` Andrew F. Davis
2015-11-22 13:13 ` Mark Brown
2015-11-23 17:40 ` Andrew F. Davis
2015-11-23 17:40 ` Andrew F. Davis
2015-11-23 19:00 ` Mark Brown
2015-11-23 19:18 ` Andrew F. Davis
2015-11-23 19:18 ` Andrew F. Davis
2015-11-24 12:11 ` Mark Brown
2015-11-19 23:01 ` [PATCH v4 4/4] gpio: tps65086: Add GPO " Andrew F. Davis
2015-11-19 23:01 ` Andrew F. Davis
[not found] ` <1447974102-24938-5-git-send-email-afd-l0cyMroinI0@public.gmane.org>
2015-11-30 8:50 ` Linus Walleij
2015-11-30 8:50 ` Linus Walleij
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.