devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH V3 1/2] mfd: da9063: Add device tree support
  2015-01-20 13:54 [PATCH V3 0/2] Add device tree support for DA9063 Steve Twiss
@ 2015-01-20 13:54 ` Steve Twiss
  2015-01-20 15:53   ` Lee Jones
  2015-01-20 17:03   ` Lee Jones
  2015-01-20 13:54 ` [PATCH V3 2/2] devicetree: Add bindings for DA9063 Steve Twiss
  1 sibling, 2 replies; 9+ messages in thread
From: Steve Twiss @ 2015-01-20 13:54 UTC (permalink / raw)
  To: Grant Likely, Lee Jones, Mark Brown, Rob Herring, Samuel Ortiz
  Cc: DT, David Dajun Chen, Ian Campbell, Kumar Gala, LKML,
	Mark Rutland, Pawel Moll, Philipp Zabel, Support Opensource

From: Steve Twiss <stwiss.opensource@diasemi.com>

Add device tree support for DA9063 regulators; Real-Time Clock
and Watchdog.

This patch is dependent on PATCH V2 2/2 

Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>

---
This patch applies against linux-next and v3.19-rc4 

 drivers/mfd/da9063-core.c       | 2 ++
 drivers/mfd/da9063-i2c.c        | 9 +++++++++
 include/linux/mfd/da9063/core.h | 1 +
 3 files changed, 12 insertions(+)

diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
index f38bc98..facd361 100644
--- a/drivers/mfd/da9063-core.c
+++ b/drivers/mfd/da9063-core.c
@@ -86,6 +86,7 @@ static const struct mfd_cell da9063_devs[] = {
 	},
 	{
 		.name		= DA9063_DRVNAME_WATCHDOG,
+		.of_compatible	= "dlg,da9063-watchdog",
 	},
 	{
 		.name		= DA9063_DRVNAME_HWMON,
@@ -101,6 +102,7 @@ static const struct mfd_cell da9063_devs[] = {
 		.name		= DA9063_DRVNAME_RTC,
 		.num_resources	= ARRAY_SIZE(da9063_rtc_resources),
 		.resources	= da9063_rtc_resources,
+		.of_compatible	= "dlg,da9063-rtc",
 	},
 	{
 		.name		= DA9063_DRVNAME_VIBRATION,
diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
index 21fd8d9..6f3a7c0 100644
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -25,6 +25,9 @@
 #include <linux/mfd/da9063/pdata.h>
 #include <linux/mfd/da9063/registers.h>
 
+#include <linux/of.h>
+#include <linux/regulator/of_regulator.h>
+
 static const struct regmap_range da9063_ad_readable_ranges[] = {
 	{
 		.range_min = DA9063_REG_PAGE_CON,
@@ -203,6 +206,11 @@ static struct regmap_config da9063_regmap_config = {
 	.cache_type = REGCACHE_RBTREE,
 };
 
+static const struct of_device_id da9063_dt_ids[] = {
+	{ .compatible = "dlg,da9063", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, da9063_dt_ids);
 static int da9063_i2c_probe(struct i2c_client *i2c,
 	const struct i2c_device_id *id)
 {
@@ -257,6 +265,7 @@ static struct i2c_driver da9063_i2c_driver = {
 	.driver = {
 		.name = "da9063",
 		.owner = THIS_MODULE,
+		.of_match_table = of_match_ptr(da9063_dt_ids),
 	},
 	.probe    = da9063_i2c_probe,
 	.remove   = da9063_i2c_remove,
diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
index b92a326..79f4d82 100644
--- a/include/linux/mfd/da9063/core.h
+++ b/include/linux/mfd/da9063/core.h
@@ -36,6 +36,7 @@ enum da9063_models {
 enum da9063_variant_codes {
 	PMIC_DA9063_AD = 0x3,
 	PMIC_DA9063_BB = 0x5,
+	PMIC_DA9063_CA = 0x6,
 };
 
 /* Interrupts */
-- 
end-of-patch for PATCH V3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH V3 0/2]  Add device tree support for DA9063
@ 2015-01-20 13:54 Steve Twiss
  2015-01-20 13:54 ` [PATCH V3 1/2] mfd: da9063: Add device tree support Steve Twiss
  2015-01-20 13:54 ` [PATCH V3 2/2] devicetree: Add bindings for DA9063 Steve Twiss
  0 siblings, 2 replies; 9+ messages in thread
From: Steve Twiss @ 2015-01-20 13:54 UTC (permalink / raw)
  To: David Dajun Chen, Grant Likely, Ian Campbell, Kumar Gala,
	Lee Jones, Mark Brown, Mark Rutland, Pawel Moll, Philipp Zabel,
	Rob Herring, Samuel Ortiz, Steve Twiss, Support Opensource
  Cc: DT, LKML

From: Steve Twiss <stwiss.opensource@diasemi.com>

This patch set adds device tree support for the Dialog
Semiconductor DA9063 PMIC. Support is provided for the
Regulators; Real-Time Clock and Watchdog.

[PATCH V2 1/2]: kernel driver device tree support
[PATCH V2 2/2]: device tree bindings document

Change History:

[PATCH V3]: remove device tree information that explicitly
            identifies different silicon variants
[PATCH V2]: split into two patches and move the compatibility
            strings to the end of the structures.
[PATCH V1]: initial submission

Thank you,
Steve Twiss, Dialog Semiconductor Ltd.

S Twiss (2):
  mfd: da9063: Add device tree support
  devicetree: Add bindings for DA9063

 Documentation/devicetree/bindings/mfd/da9063.txt | 93 ++++++++++++++++++++++++
 drivers/mfd/da9063-core.c                        |  2 +
 drivers/mfd/da9063-i2c.c                         |  9 +++
 include/linux/mfd/da9063/core.h                  |  1 +
 4 files changed, 105 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt

-- 
end-of-patch for PATCH V3

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH V3 2/2] devicetree: Add bindings for DA9063
  2015-01-20 13:54 [PATCH V3 0/2] Add device tree support for DA9063 Steve Twiss
  2015-01-20 13:54 ` [PATCH V3 1/2] mfd: da9063: Add device tree support Steve Twiss
@ 2015-01-20 13:54 ` Steve Twiss
  2015-01-20 15:54   ` Lee Jones
  1 sibling, 1 reply; 9+ messages in thread
From: Steve Twiss @ 2015-01-20 13:54 UTC (permalink / raw)
  To: Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll
  Cc: DT, David Dajun Chen, Grant Likely, LKML, Lee Jones, Mark Brown,
	Philipp Zabel, Rob Herring, Samuel Ortiz, Support Opensource

From: Steve Twiss <stwiss.opensource@diasemi.com>

Add device tree bindings for DA9063 regulators; Real-Time Clock
and Watchdog.

This patch is dependent on PATCH V2 1/2 

Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>

---
This patch applies against linux-next and v3.19-rc4 

 Documentation/devicetree/bindings/mfd/da9063.txt | 93 ++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt

diff --git a/Documentation/devicetree/bindings/mfd/da9063.txt b/Documentation/devicetree/bindings/mfd/da9063.txt
new file mode 100644
index 0000000..42c6fa6
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/da9063.txt
@@ -0,0 +1,93 @@
+* Dialog DA9063 Power Management Integrated Circuit (PMIC)
+
+DA9093 consists of a large and varied group of sub-devices (I2C Only):
+
+Device                   Supply Names    Description
+------                   ------------    -----------
+da9063-regulator        :               : LDOs & BUCKs
+da9063-rtc              :               : Real-Time Clock
+da9063-watchdog         :               : Watchdog
+
+======
+
+Required properties:
+
+- compatible : Should be "dlg,da9063"
+- reg : Specifies the I2C slave address (this defaults to 0x58 but it can be
+  modified to match the chip's OTP settings).
+- interrupt-parent : Specifies the reference to the interrupt controller for
+  the DA9063.
+- interrupts : IRQ line information.
+- interrupt-controller
+
+Sub-nodes:
+
+- regulators : This node defines the settings for the LDOs and BUCKs. The
+  DA9063 regulators are bound using their names listed below:
+
+    bcore1    : BUCK CORE1
+    bcore2    : BUCK CORE2
+    bpro      : BUCK PRO
+    bmem      : BUCK MEM
+    bio       : BUCK IO
+    bperi     : BUCK PERI
+    ldo1      : LDO_1
+    ldo2      : LDO_2
+    ldo3      : LDO_3
+    ldo4      : LDO_4
+    ldo5      : LDO_5
+    ldo6      : LDO_6
+    ldo7      : LDO_7
+    ldo8      : LDO_8
+    ldo9      : LDO_9
+    ldo10     : LDO_10
+    ldo11     : LDO_11
+
+  The component follows the standard regulator framework and the bindings
+  details of individual regulator device can be found in:
+  Documentation/devicetree/bindings/regulator/regulator.txt
+
+- rtc : This node defines settings for the Real-Time Clock associated with
+  the DA9063. There are currently no entries in this binding, however
+  compatible = "dlg,da9063-rtc" should be added if a node is created.
+
+- watchdog : This node defines settings for the Watchdog timer associated
+  with the DA9063. There are currently no entries in this binding, however
+  compatible = "dlg,da9063-watchdog" should be added if a node is created.
+
+
+Example:
+
+	pmic0: da9063@58 {
+		compatible = "dlg,da9063"
+		reg = <0x58>;
+		interrupt-parent = <&gpio6>;
+		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-controller;
+
+		rtc {
+			compatible = "dlg,da9063-rtc";
+		};
+
+		wdt {
+			compatible = "dlg,da9063-watchdog";
+		};
+
+		regulators {
+			DA9063_BCORE1: bcore1 {
+				regulator-name = "BCORE1";
+				regulator-min-microvolt = <300000>;
+				regulator-max-microvolt = <1570000>;
+				regulator-min-microamp = <500000>;
+				regulator-max-microamp = <2000000>;
+				regulator-boot-on;
+			};
+			DA9063_LDO11: ldo11 {
+				regulator-name = "LDO_11";
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <3600000>;
+				regulator-boot-on;
+			};
+		};
+	};
+
-- 
end-of-patch for PATCH V3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH V3 1/2] mfd: da9063: Add device tree support
  2015-01-20 13:54 ` [PATCH V3 1/2] mfd: da9063: Add device tree support Steve Twiss
@ 2015-01-20 15:53   ` Lee Jones
  2015-01-20 17:03   ` Lee Jones
  1 sibling, 0 replies; 9+ messages in thread
From: Lee Jones @ 2015-01-20 15:53 UTC (permalink / raw)
  To: Steve Twiss
  Cc: Grant Likely, Mark Brown, Philipp Zabel, Rob Herring,
	Samuel Ortiz, DT, David Dajun Chen, Ian Campbell, Kumar Gala,
	LKML, Mark Rutland, Pawel Moll, Support Opensource

On Tue, 20 Jan 2015, Steve Twiss wrote:

> From: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> Add device tree support for DA9063 regulators; Real-Time Clock
> and Watchdog.
> 
> This patch is dependent on PATCH V2 2/2 
> 
> Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> ---
> This patch applies against linux-next and v3.19-rc4 
> 
>  drivers/mfd/da9063-core.c       | 2 ++
>  drivers/mfd/da9063-i2c.c        | 9 +++++++++
>  include/linux/mfd/da9063/core.h | 1 +
>  3 files changed, 12 insertions(+)

Nice.  Looks good to me now.

Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
> index f38bc98..facd361 100644
> --- a/drivers/mfd/da9063-core.c
> +++ b/drivers/mfd/da9063-core.c
> @@ -86,6 +86,7 @@ static const struct mfd_cell da9063_devs[] = {
>  	},
>  	{
>  		.name		= DA9063_DRVNAME_WATCHDOG,
> +		.of_compatible	= "dlg,da9063-watchdog",
>  	},
>  	{
>  		.name		= DA9063_DRVNAME_HWMON,
> @@ -101,6 +102,7 @@ static const struct mfd_cell da9063_devs[] = {
>  		.name		= DA9063_DRVNAME_RTC,
>  		.num_resources	= ARRAY_SIZE(da9063_rtc_resources),
>  		.resources	= da9063_rtc_resources,
> +		.of_compatible	= "dlg,da9063-rtc",
>  	},
>  	{
>  		.name		= DA9063_DRVNAME_VIBRATION,
> diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
> index 21fd8d9..6f3a7c0 100644
> --- a/drivers/mfd/da9063-i2c.c
> +++ b/drivers/mfd/da9063-i2c.c
> @@ -25,6 +25,9 @@
>  #include <linux/mfd/da9063/pdata.h>
>  #include <linux/mfd/da9063/registers.h>
>  
> +#include <linux/of.h>
> +#include <linux/regulator/of_regulator.h>
> +
>  static const struct regmap_range da9063_ad_readable_ranges[] = {
>  	{
>  		.range_min = DA9063_REG_PAGE_CON,
> @@ -203,6 +206,11 @@ static struct regmap_config da9063_regmap_config = {
>  	.cache_type = REGCACHE_RBTREE,
>  };
>  
> +static const struct of_device_id da9063_dt_ids[] = {
> +	{ .compatible = "dlg,da9063", },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, da9063_dt_ids);
>  static int da9063_i2c_probe(struct i2c_client *i2c,
>  	const struct i2c_device_id *id)
>  {
> @@ -257,6 +265,7 @@ static struct i2c_driver da9063_i2c_driver = {
>  	.driver = {
>  		.name = "da9063",
>  		.owner = THIS_MODULE,
> +		.of_match_table = of_match_ptr(da9063_dt_ids),
>  	},
>  	.probe    = da9063_i2c_probe,
>  	.remove   = da9063_i2c_remove,
> diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
> index b92a326..79f4d82 100644
> --- a/include/linux/mfd/da9063/core.h
> +++ b/include/linux/mfd/da9063/core.h
> @@ -36,6 +36,7 @@ enum da9063_models {
>  enum da9063_variant_codes {
>  	PMIC_DA9063_AD = 0x3,
>  	PMIC_DA9063_BB = 0x5,
> +	PMIC_DA9063_CA = 0x6,
>  };
>  
>  /* Interrupts */

-- 
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] 9+ messages in thread

* Re: [PATCH V3 2/2] devicetree: Add bindings for DA9063
  2015-01-20 13:54 ` [PATCH V3 2/2] devicetree: Add bindings for DA9063 Steve Twiss
@ 2015-01-20 15:54   ` Lee Jones
  2015-01-20 16:35     ` Opensource [Steve Twiss]
  2015-01-20 17:04     ` Lee Jones
  0 siblings, 2 replies; 9+ messages in thread
From: Lee Jones @ 2015-01-20 15:54 UTC (permalink / raw)
  To: Steve Twiss
  Cc: Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring,
	DT, David Dajun Chen, Grant Likely, LKML, Mark Brown,
	Philipp Zabel, Samuel Ortiz, Support Opensource

On Tue, 20 Jan 2015, Steve Twiss wrote:

> From: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> Add device tree bindings for DA9063 regulators; Real-Time Clock
> and Watchdog.
> 
> This patch is dependent on PATCH V2 1/2 
> 
> Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> ---
> This patch applies against linux-next and v3.19-rc4 
> 
>  Documentation/devicetree/bindings/mfd/da9063.txt | 93 ++++++++++++++++++++++++
>  1 file changed, 93 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt

I already Acked this?  Any reason that wasn't carried forward to this
submission?  Has anything changed?

> diff --git a/Documentation/devicetree/bindings/mfd/da9063.txt b/Documentation/devicetree/bindings/mfd/da9063.txt
> new file mode 100644
> index 0000000..42c6fa6
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/da9063.txt
> @@ -0,0 +1,93 @@
> +* Dialog DA9063 Power Management Integrated Circuit (PMIC)
> +
> +DA9093 consists of a large and varied group of sub-devices (I2C Only):
> +
> +Device                   Supply Names    Description
> +------                   ------------    -----------
> +da9063-regulator        :               : LDOs & BUCKs
> +da9063-rtc              :               : Real-Time Clock
> +da9063-watchdog         :               : Watchdog
> +
> +======
> +
> +Required properties:
> +
> +- compatible : Should be "dlg,da9063"
> +- reg : Specifies the I2C slave address (this defaults to 0x58 but it can be
> +  modified to match the chip's OTP settings).
> +- interrupt-parent : Specifies the reference to the interrupt controller for
> +  the DA9063.
> +- interrupts : IRQ line information.
> +- interrupt-controller
> +
> +Sub-nodes:
> +
> +- regulators : This node defines the settings for the LDOs and BUCKs. The
> +  DA9063 regulators are bound using their names listed below:
> +
> +    bcore1    : BUCK CORE1
> +    bcore2    : BUCK CORE2
> +    bpro      : BUCK PRO
> +    bmem      : BUCK MEM
> +    bio       : BUCK IO
> +    bperi     : BUCK PERI
> +    ldo1      : LDO_1
> +    ldo2      : LDO_2
> +    ldo3      : LDO_3
> +    ldo4      : LDO_4
> +    ldo5      : LDO_5
> +    ldo6      : LDO_6
> +    ldo7      : LDO_7
> +    ldo8      : LDO_8
> +    ldo9      : LDO_9
> +    ldo10     : LDO_10
> +    ldo11     : LDO_11
> +
> +  The component follows the standard regulator framework and the bindings
> +  details of individual regulator device can be found in:
> +  Documentation/devicetree/bindings/regulator/regulator.txt
> +
> +- rtc : This node defines settings for the Real-Time Clock associated with
> +  the DA9063. There are currently no entries in this binding, however
> +  compatible = "dlg,da9063-rtc" should be added if a node is created.
> +
> +- watchdog : This node defines settings for the Watchdog timer associated
> +  with the DA9063. There are currently no entries in this binding, however
> +  compatible = "dlg,da9063-watchdog" should be added if a node is created.
> +
> +
> +Example:
> +
> +	pmic0: da9063@58 {
> +		compatible = "dlg,da9063"
> +		reg = <0x58>;
> +		interrupt-parent = <&gpio6>;
> +		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
> +		interrupt-controller;
> +
> +		rtc {
> +			compatible = "dlg,da9063-rtc";
> +		};
> +
> +		wdt {
> +			compatible = "dlg,da9063-watchdog";
> +		};
> +
> +		regulators {
> +			DA9063_BCORE1: bcore1 {
> +				regulator-name = "BCORE1";
> +				regulator-min-microvolt = <300000>;
> +				regulator-max-microvolt = <1570000>;
> +				regulator-min-microamp = <500000>;
> +				regulator-max-microamp = <2000000>;
> +				regulator-boot-on;
> +			};
> +			DA9063_LDO11: ldo11 {
> +				regulator-name = "LDO_11";
> +				regulator-min-microvolt = <900000>;
> +				regulator-max-microvolt = <3600000>;
> +				regulator-boot-on;
> +			};
> +		};
> +	};
> +

-- 
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] 9+ messages in thread

* RE: [PATCH V3 2/2] devicetree: Add bindings for DA9063
  2015-01-20 15:54   ` Lee Jones
@ 2015-01-20 16:35     ` Opensource [Steve Twiss]
  2015-01-20 17:04     ` Lee Jones
  1 sibling, 0 replies; 9+ messages in thread
From: Opensource [Steve Twiss] @ 2015-01-20 16:35 UTC (permalink / raw)
  To: Lee Jones
  Cc: Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring,
	DT, David Dajun Chen, Grant Likely, LKML, Mark Brown,
	Philipp Zabel, Samuel Ortiz, Support Opensource

On 20 January 2015 15:54 Lee Jones wrote:

[...]

> >  Documentation/devicetree/bindings/mfd/da9063.txt | 93
> ++++++++++++++++++++++++
> >  1 file changed, 93 insertions(+)
> >  create mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt
> 
> I already Acked this?  Any reason that wasn't carried forward to this
> submission?  Has anything changed?
> 

Yes, I had to alter this bindings document because of the compatible change ...
See below:

> > new file mode 100644
> > index 0000000..42c6fa6
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/mfd/da9063.txt
> > @@ -0,0 +1,93 @@
> > +* Dialog DA9063 Power Management Integrated Circuit (PMIC)
> > +
> > +DA9093 consists of a large and varied group of sub-devices (I2C Only):
> > +
> > +Device                   Supply Names    Description
> > +------                   ------------    -----------
> > +da9063-regulator        :               : LDOs & BUCKs
> > +da9063-rtc              :               : Real-Time Clock
> > +da9063-watchdog         :               : Watchdog
> > +
> > +======
> > +
> > +Required properties:
> > +
> > +- compatible : Should be "dlg,da9063"

The line above used to say "dlg,da9063-ad", "dlg,da9063-bb", etc.
Now it just says "dlg,da9063"

[...]

> > +
> > +Example:
> > +
> > +	pmic0: da9063@58 {
> > +		compatible = "dlg,da9063"

And I also change a  line in the example for the same reason.
Sorry for the confusion.

Regards,
Steve


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH V3 1/2] mfd: da9063: Add device tree support
  2015-01-20 13:54 ` [PATCH V3 1/2] mfd: da9063: Add device tree support Steve Twiss
  2015-01-20 15:53   ` Lee Jones
@ 2015-01-20 17:03   ` Lee Jones
  1 sibling, 0 replies; 9+ messages in thread
From: Lee Jones @ 2015-01-20 17:03 UTC (permalink / raw)
  To: Steve Twiss
  Cc: Grant Likely, Mark Brown, Philipp Zabel, Rob Herring,
	Samuel Ortiz, DT, David Dajun Chen, Ian Campbell, Kumar Gala,
	LKML, Mark Rutland, Pawel Moll, Support Opensource

On Tue, 20 Jan 2015, Steve Twiss wrote:

> From: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> Add device tree support for DA9063 regulators; Real-Time Clock
> and Watchdog.
> 
> This patch is dependent on PATCH V2 2/2 
> 
> Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> ---
> This patch applies against linux-next and v3.19-rc4 
> 
>  drivers/mfd/da9063-core.c       | 2 ++
>  drivers/mfd/da9063-i2c.c        | 9 +++++++++
>  include/linux/mfd/da9063/core.h | 1 +
>  3 files changed, 12 insertions(+)

Applied, thanks.

> diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
> index f38bc98..facd361 100644
> --- a/drivers/mfd/da9063-core.c
> +++ b/drivers/mfd/da9063-core.c
> @@ -86,6 +86,7 @@ static const struct mfd_cell da9063_devs[] = {
>  	},
>  	{
>  		.name		= DA9063_DRVNAME_WATCHDOG,
> +		.of_compatible	= "dlg,da9063-watchdog",
>  	},
>  	{
>  		.name		= DA9063_DRVNAME_HWMON,
> @@ -101,6 +102,7 @@ static const struct mfd_cell da9063_devs[] = {
>  		.name		= DA9063_DRVNAME_RTC,
>  		.num_resources	= ARRAY_SIZE(da9063_rtc_resources),
>  		.resources	= da9063_rtc_resources,
> +		.of_compatible	= "dlg,da9063-rtc",
>  	},
>  	{
>  		.name		= DA9063_DRVNAME_VIBRATION,
> diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
> index 21fd8d9..6f3a7c0 100644
> --- a/drivers/mfd/da9063-i2c.c
> +++ b/drivers/mfd/da9063-i2c.c
> @@ -25,6 +25,9 @@
>  #include <linux/mfd/da9063/pdata.h>
>  #include <linux/mfd/da9063/registers.h>
>  
> +#include <linux/of.h>
> +#include <linux/regulator/of_regulator.h>
> +
>  static const struct regmap_range da9063_ad_readable_ranges[] = {
>  	{
>  		.range_min = DA9063_REG_PAGE_CON,
> @@ -203,6 +206,11 @@ static struct regmap_config da9063_regmap_config = {
>  	.cache_type = REGCACHE_RBTREE,
>  };
>  
> +static const struct of_device_id da9063_dt_ids[] = {
> +	{ .compatible = "dlg,da9063", },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, da9063_dt_ids);
>  static int da9063_i2c_probe(struct i2c_client *i2c,
>  	const struct i2c_device_id *id)
>  {
> @@ -257,6 +265,7 @@ static struct i2c_driver da9063_i2c_driver = {
>  	.driver = {
>  		.name = "da9063",
>  		.owner = THIS_MODULE,
> +		.of_match_table = of_match_ptr(da9063_dt_ids),
>  	},
>  	.probe    = da9063_i2c_probe,
>  	.remove   = da9063_i2c_remove,
> diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
> index b92a326..79f4d82 100644
> --- a/include/linux/mfd/da9063/core.h
> +++ b/include/linux/mfd/da9063/core.h
> @@ -36,6 +36,7 @@ enum da9063_models {
>  enum da9063_variant_codes {
>  	PMIC_DA9063_AD = 0x3,
>  	PMIC_DA9063_BB = 0x5,
> +	PMIC_DA9063_CA = 0x6,
>  };
>  
>  /* Interrupts */

-- 
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] 9+ messages in thread

* Re: [PATCH V3 2/2] devicetree: Add bindings for DA9063
  2015-01-20 15:54   ` Lee Jones
  2015-01-20 16:35     ` Opensource [Steve Twiss]
@ 2015-01-20 17:04     ` Lee Jones
  2015-01-21  7:53       ` Opensource [Steve Twiss]
  1 sibling, 1 reply; 9+ messages in thread
From: Lee Jones @ 2015-01-20 17:04 UTC (permalink / raw)
  To: Steve Twiss
  Cc: Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring,
	DT, David Dajun Chen, Grant Likely, LKML, Mark Brown,
	Philipp Zabel, Samuel Ortiz, Support Opensource

On Tue, 20 Jan 2015, Lee Jones wrote:

> On Tue, 20 Jan 2015, Steve Twiss wrote:
> 
> > From: Steve Twiss <stwiss.opensource@diasemi.com>
> > 
> > Add device tree bindings for DA9063 regulators; Real-Time Clock
> > and Watchdog.
> > 
> > This patch is dependent on PATCH V2 1/2 
> > 
> > Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
> > 
> > ---
> > This patch applies against linux-next and v3.19-rc4 
> > 
> >  Documentation/devicetree/bindings/mfd/da9063.txt | 93 ++++++++++++++++++++++++
> >  1 file changed, 93 insertions(+)
> >  create mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt
> 
> I already Acked this?  Any reason that wasn't carried forward to this
> submission?  Has anything changed?

This is why in-patch changelogs are helpful. ;)

Applied now, thanks.

> > diff --git a/Documentation/devicetree/bindings/mfd/da9063.txt b/Documentation/devicetree/bindings/mfd/da9063.txt
> > new file mode 100644
> > index 0000000..42c6fa6
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/mfd/da9063.txt
> > @@ -0,0 +1,93 @@
> > +* Dialog DA9063 Power Management Integrated Circuit (PMIC)
> > +
> > +DA9093 consists of a large and varied group of sub-devices (I2C Only):
> > +
> > +Device                   Supply Names    Description
> > +------                   ------------    -----------
> > +da9063-regulator        :               : LDOs & BUCKs
> > +da9063-rtc              :               : Real-Time Clock
> > +da9063-watchdog         :               : Watchdog
> > +
> > +======
> > +
> > +Required properties:
> > +
> > +- compatible : Should be "dlg,da9063"
> > +- reg : Specifies the I2C slave address (this defaults to 0x58 but it can be
> > +  modified to match the chip's OTP settings).
> > +- interrupt-parent : Specifies the reference to the interrupt controller for
> > +  the DA9063.
> > +- interrupts : IRQ line information.
> > +- interrupt-controller
> > +
> > +Sub-nodes:
> > +
> > +- regulators : This node defines the settings for the LDOs and BUCKs. The
> > +  DA9063 regulators are bound using their names listed below:
> > +
> > +    bcore1    : BUCK CORE1
> > +    bcore2    : BUCK CORE2
> > +    bpro      : BUCK PRO
> > +    bmem      : BUCK MEM
> > +    bio       : BUCK IO
> > +    bperi     : BUCK PERI
> > +    ldo1      : LDO_1
> > +    ldo2      : LDO_2
> > +    ldo3      : LDO_3
> > +    ldo4      : LDO_4
> > +    ldo5      : LDO_5
> > +    ldo6      : LDO_6
> > +    ldo7      : LDO_7
> > +    ldo8      : LDO_8
> > +    ldo9      : LDO_9
> > +    ldo10     : LDO_10
> > +    ldo11     : LDO_11
> > +
> > +  The component follows the standard regulator framework and the bindings
> > +  details of individual regulator device can be found in:
> > +  Documentation/devicetree/bindings/regulator/regulator.txt
> > +
> > +- rtc : This node defines settings for the Real-Time Clock associated with
> > +  the DA9063. There are currently no entries in this binding, however
> > +  compatible = "dlg,da9063-rtc" should be added if a node is created.
> > +
> > +- watchdog : This node defines settings for the Watchdog timer associated
> > +  with the DA9063. There are currently no entries in this binding, however
> > +  compatible = "dlg,da9063-watchdog" should be added if a node is created.
> > +
> > +
> > +Example:
> > +
> > +	pmic0: da9063@58 {
> > +		compatible = "dlg,da9063"
> > +		reg = <0x58>;
> > +		interrupt-parent = <&gpio6>;
> > +		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
> > +		interrupt-controller;
> > +
> > +		rtc {
> > +			compatible = "dlg,da9063-rtc";
> > +		};
> > +
> > +		wdt {
> > +			compatible = "dlg,da9063-watchdog";
> > +		};
> > +
> > +		regulators {
> > +			DA9063_BCORE1: bcore1 {
> > +				regulator-name = "BCORE1";
> > +				regulator-min-microvolt = <300000>;
> > +				regulator-max-microvolt = <1570000>;
> > +				regulator-min-microamp = <500000>;
> > +				regulator-max-microamp = <2000000>;
> > +				regulator-boot-on;
> > +			};
> > +			DA9063_LDO11: ldo11 {
> > +				regulator-name = "LDO_11";
> > +				regulator-min-microvolt = <900000>;
> > +				regulator-max-microvolt = <3600000>;
> > +				regulator-boot-on;
> > +			};
> > +		};
> > +	};
> > +
> 

-- 
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] 9+ messages in thread

* RE: [PATCH V3 2/2] devicetree: Add bindings for DA9063
  2015-01-20 17:04     ` Lee Jones
@ 2015-01-21  7:53       ` Opensource [Steve Twiss]
  0 siblings, 0 replies; 9+ messages in thread
From: Opensource [Steve Twiss] @ 2015-01-21  7:53 UTC (permalink / raw)
  To: Lee Jones; +Cc: DT, LKML

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 581 bytes --]

On 20 January 2015 17:04 Lee Jones wrote:

> On Tue, 20 Jan 2015, Lee Jones wrote:
> > On Tue, 20 Jan 2015, Steve Twiss wrote:
> > > From: Steve Twiss <stwiss.opensource@diasemi.com>
> > >
> > > Add device tree bindings for DA9063 regulators; Real-Time Clock
> > > and Watchdog.

[...]

> This is why in-patch changelogs are helpful. ;)

Will do in-patch changelogs in future.

> Applied now, thanks.

Thanks!

Regards,
Steve
N‹§²æìr¸›yúèšØb²X¬¶Ç§vØ^–)Þº{.nÇ+‰·zøœzÚÞz)í…æèw*\x1fjg¬±¨\x1e¶‰šŽŠÝ¢j.ïÛ°\½½MŽúgjÌæa×\x02››–' ™©Þ¢¸\f¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾\a«‘êçzZ+ƒùšŽŠÝ¢j"ú!¶i

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2015-01-21  7:53 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-20 13:54 [PATCH V3 0/2] Add device tree support for DA9063 Steve Twiss
2015-01-20 13:54 ` [PATCH V3 1/2] mfd: da9063: Add device tree support Steve Twiss
2015-01-20 15:53   ` Lee Jones
2015-01-20 17:03   ` Lee Jones
2015-01-20 13:54 ` [PATCH V3 2/2] devicetree: Add bindings for DA9063 Steve Twiss
2015-01-20 15:54   ` Lee Jones
2015-01-20 16:35     ` Opensource [Steve Twiss]
2015-01-20 17:04     ` Lee Jones
2015-01-21  7:53       ` Opensource [Steve Twiss]

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).