2 files changed, 141 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/regulator/tps65090.txt b/Documentation/devicetree/bindings/regulator/tps65090.txt
new file mode 100644
index 000000000000..313a60ba61d8
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/tps65090.txt
@@ -0,0 +1,122 @@
+TPS65090 regulators
+
+Required properties:
+- compatible: "ti,tps65090"
+- reg: I2C slave address
+- interrupts: the interrupt outputs of the controller
+- regulators: A node that houses a sub-node for each regulator within the
+  device. Each sub-node is identified using the node's name, with valid
+  values listed below. The content of each sub-node is defined by the
+  standard binding for regulators; see regulator.txt.
+  dcdc[1-3], fet[1-7] and ldo[1-2] respectively.
+- vsys[1-3]-supply: The input supply for DCDC[1-3] respectively.
+- infet[1-7]-supply: The input supply for FET[1-7] respectively.
+- vsys-l[1-2]-supply: The input supply for LDO[1-2] respectively.
+
+Optional properties:
+- ti,enable-ext-control: This is applicable for DCDC1, DCDC2 and DCDC3.
+  If DCDCs are externally controlled then this property should be there.
+- "dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3.
+  If DCDCs are externally controlled and if it is from GPIO then GPIO
+  number should be provided. If it is externally controlled and no GPIO
+  entry then driver will just configure this rails as external control
+  and will not provide any enable/disable APIs.
+
+Each regulator is defined using the standard binding for regulators.
+
+Example:
+
+        tps65090@48 {
+                compatible = "ti,tps65090";
+                reg = <0x48>;
+                interrupts = <0 88 0x4>;
+
+                vsys1-supply = <&some_reg>;
+                vsys2-supply = <&some_reg>;
+                vsys3-supply = <&some_reg>;
+                infet1-supply = <&some_reg>;
+                infet2-supply = <&some_reg>;
+                infet3-supply = <&some_reg>;
+                infet4-supply = <&some_reg>;
+                infet5-supply = <&some_reg>;
+                infet6-supply = <&some_reg>;
+                infet7-supply = <&some_reg>;
+                vsys_l1-supply = <&some_reg>;
+                vsys_l2-supply = <&some_reg>;
+
+                regulators {
+                        dcdc1 {
+                                regulator-name = "dcdc1";
+                                regulator-boot-on;
+                                regulator-always-on;
+                                ti,enable-ext-control;
+                                dcdc-ext-control-gpios = <&gpio 10 0>;
+                        };
+
+                        dcdc2 {
+                                regulator-name = "dcdc2";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        dcdc3 {
+                                regulator-name = "dcdc3";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        fet1 {
+                                regulator-name = "fet1";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        fet2 {
+                                regulator-name = "fet2";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        fet3 {
+                                regulator-name = "fet3";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        fet4 {
+                                regulator-name = "fet4";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        fet5 {
+                                regulator-name = "fet5";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        fet6 {
+                                regulator-name = "fet6";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        fet7 {
+                                regulator-name = "fet7";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        ldo1 {
+                                regulator-name = "ldo1";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        ldo2 {
+                                regulator-name = "ldo2";
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                };
+        };
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index 8d12a8e00d9c..b49654587ce5 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -25,6 +25,8 @@
 #include <linux/i2c.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tps65090.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/err.h>
 
 #define NUM_INT_REG 2
@@ -148,18 +150,31 @@ static const struct regmap_config tps65090_regmap_config = {
         .volatile_reg = is_volatile_reg,
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id tps65090_of_match[] = {
+        { .compatible = "ti,tps65090",},
+        {},
+};
+MODULE_DEVICE_TABLE(of, tps65090_of_match);
+#endif
+
 static int tps65090_i2c_probe(struct i2c_client *client,
                                         const struct i2c_device_id *id)
 {
         struct tps65090_platform_data *pdata = client->dev.platform_data;
+        int irq_base = 0;
         struct tps65090 *tps65090;
         int ret;
 
-        if (!pdata) {
-                dev_err(&client->dev, "tps65090 requires platform data\n");
+        if (!pdata && !client->dev.of_node) {
+                dev_err(&client->dev,
+                        "tps65090 requires platform data or of_node\n");
                 return -EINVAL;
         }
 
+        if (pdata)
+                irq_base = pdata->irq_base;
+
         tps65090 = devm_kzalloc(&client->dev, sizeof(*tps65090), GFP_KERNEL);
         if (!tps65090) {
                 dev_err(&client->dev, "mem alloc for tps65090 failed\n");
@@ -178,7 +193,7 @@ static int tps65090_i2c_probe(struct i2c_client *client,
 
         if (client->irq) {
                 ret = regmap_add_irq_chip(tps65090->rmap, client->irq,
-                        IRQF_ONESHOT | IRQF_TRIGGER_LOW, pdata->irq_base,
+                        IRQF_ONESHOT | IRQF_TRIGGER_LOW, irq_base,
                         &tps65090_irq_chip, &tps65090->irq_data);
                         if (ret) {
                                 dev_err(&client->dev,
@@ -247,6 +262,7 @@ static struct i2c_driver tps65090_driver = {
         .driver = {
                 .name   = "tps65090",
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(tps65090_of_match),
                 .pm     = &tps65090_pm_ops,
         },
         .probe          = tps65090_i2c_probe,