Message ID | 0e5e8a32cbb9cf307858c860cf25107cb71c8e32.1477501000.git.stwiss.opensource@diasemi.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Wed, Oct 26, 2016 at 05:56:38PM +0100, Steve Twiss wrote: > From: Steve Twiss <stwiss.opensource@diasemi.com> > > Extend existing DA9062 binding information to include the DA9061 PMIC for > MFD core and regulators. > > Add a da9062-onkey link to the existing onkey binding file. > > Add a da9062-thermal link to the new temperature monitoring binding file > found in [PATCH V2 03/10]. > > Delete the da9062-watchdog section and replace it with a link to the new > DA9061/62 binding information file added by [PATCH V2 02/10]. > > Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com> > > --- > This patch applies against linux-next and v4.8 > > v1 -> v2 > - Patch renamed from [PATCH V1 09/10] to [PATCH V2 04/10] -- these > changes were made to fix checkpatch warnings caused by the patch > set dependency order > > Hi, > > This patch depends on acceptance of the main code for the DA9061 MFD: > > - [PATCH V2 1/10] mfd: da9061: MFD core support > > and also from the following binding file changes: > > - [PATCH V2 01/10] Binding for onkey > - [PATCH V2 02/10] Binding for watchdog > - [PATCH V2 03/10] Binding for thermal > > Regards, > Steve Twiss, Dialog Semiconductor Ltd. > > > Documentation/devicetree/bindings/mfd/da9062.txt | 45 +++++++++++++++++------- > 1 file changed, 33 insertions(+), 12 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mfd/da9062.txt b/Documentation/devicetree/bindings/mfd/da9062.txt > index 38802b5..38ba5e2 100644 > --- a/Documentation/devicetree/bindings/mfd/da9062.txt > +++ b/Documentation/devicetree/bindings/mfd/da9062.txt > @@ -1,22 +1,32 @@ > * Dialog DA9062 Power Management Integrated Circuit (PMIC) > > -DA9062 consists of a large and varied group of sub-devices: > +The DA9062 driver is compatible with the DA9062 and DA9061 devices. Describe the device, not driver. > + > +Product information can be found here: > +- http://www.dialog-semiconductor.com/products/da9062 > +- http://www.dialog-semiconductor.com/products/da9061 > + > +DA9062 driver consists of a large and varied group of sub-devices: DA9062/DA9061 PMIC consists of... > > Device Supply Names Description > ------ ------------ ----------- > da9062-regulator : : LDOs & BUCKs > da9062-rtc : : Real-Time Clock > +da9062-onkey : : On Key > da9062-watchdog : : Watchdog Timer > +da9062-thermal : : Thermal > > ====== > > Required properties: > > -- compatible : Should be "dlg,da9062". > +- compatible : Should be > + "dlg,da9062" for DA9062 > + "dlg,da9061" for DA9061 > - 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 DA9062. > + the DA9062 or DA9061. > - interrupts : IRQ line information. > - interrupt-controller > > @@ -25,8 +35,8 @@ further information on IRQ bindings. > > Sub-nodes: > > -- regulators : This node defines the settings for the LDOs and BUCKs. The > - DA9062 regulators are bound using their names listed below: > +- regulators : This node defines the settings for the LDOs and BUCKs. > + The DA9062 regulators are bound using their names listed below: > > buck1 : BUCK_1 > buck2 : BUCK_2 > @@ -37,6 +47,16 @@ Sub-nodes: > ldo3 : LDO_3 > ldo4 : LDO_4 > > + The DA9061 regulators are bound using their names listed below: > + > + buck1 : BUCK_1 > + buck2 : BUCK_2 > + buck3 : BUCK_3 > + ldo1 : LDO_1 > + ldo2 : LDO_2 > + ldo3 : LDO_3 > + ldo4 : LDO_4 > + > 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 > @@ -46,9 +66,14 @@ Sub-nodes: > with the DA9062. There are currently no entries in this binding, however > compatible = "dlg,da9062-rtc" should be added if a node is created. > > -- watchdog: This node defines the settings for the watchdog driver associated > - with the DA9062 PMIC. The compatible = "dlg,da9062-watchdog" should be added > - if a node is created. > + > +- onkey : See ../input/da9062-onkey.txt > + > + > +- watchdog: See ../watchdog/da9062-watchdog.txt > + > + > +- thermal : See ../thermal/da9062-thermal.txt > > > Example: > @@ -64,10 +89,6 @@ Example: > compatible = "dlg,da9062-rtc"; > }; > > - watchdog { > - compatible = "dlg,da9062-watchdog"; > - }; > - > regulators { > DA9062_BUCK1: buck1 { > regulator-name = "BUCK1"; > -- > end-of-patch for PATCH V2 > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/mfd/da9062.txt b/Documentation/devicetree/bindings/mfd/da9062.txt index 38802b5..38ba5e2 100644 --- a/Documentation/devicetree/bindings/mfd/da9062.txt +++ b/Documentation/devicetree/bindings/mfd/da9062.txt @@ -1,22 +1,32 @@ * Dialog DA9062 Power Management Integrated Circuit (PMIC) -DA9062 consists of a large and varied group of sub-devices: +The DA9062 driver is compatible with the DA9062 and DA9061 devices. + +Product information can be found here: +- http://www.dialog-semiconductor.com/products/da9062 +- http://www.dialog-semiconductor.com/products/da9061 + +DA9062 driver consists of a large and varied group of sub-devices: Device Supply Names Description ------ ------------ ----------- da9062-regulator : : LDOs & BUCKs da9062-rtc : : Real-Time Clock +da9062-onkey : : On Key da9062-watchdog : : Watchdog Timer +da9062-thermal : : Thermal ====== Required properties: -- compatible : Should be "dlg,da9062". +- compatible : Should be + "dlg,da9062" for DA9062 + "dlg,da9061" for DA9061 - 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 DA9062. + the DA9062 or DA9061. - interrupts : IRQ line information. - interrupt-controller @@ -25,8 +35,8 @@ further information on IRQ bindings. Sub-nodes: -- regulators : This node defines the settings for the LDOs and BUCKs. The - DA9062 regulators are bound using their names listed below: +- regulators : This node defines the settings for the LDOs and BUCKs. + The DA9062 regulators are bound using their names listed below: buck1 : BUCK_1 buck2 : BUCK_2 @@ -37,6 +47,16 @@ Sub-nodes: ldo3 : LDO_3 ldo4 : LDO_4 + The DA9061 regulators are bound using their names listed below: + + buck1 : BUCK_1 + buck2 : BUCK_2 + buck3 : BUCK_3 + ldo1 : LDO_1 + ldo2 : LDO_2 + ldo3 : LDO_3 + ldo4 : LDO_4 + 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 @@ -46,9 +66,14 @@ Sub-nodes: with the DA9062. There are currently no entries in this binding, however compatible = "dlg,da9062-rtc" should be added if a node is created. -- watchdog: This node defines the settings for the watchdog driver associated - with the DA9062 PMIC. The compatible = "dlg,da9062-watchdog" should be added - if a node is created. + +- onkey : See ../input/da9062-onkey.txt + + +- watchdog: See ../watchdog/da9062-watchdog.txt + + +- thermal : See ../thermal/da9062-thermal.txt Example: @@ -64,10 +89,6 @@ Example: compatible = "dlg,da9062-rtc"; }; - watchdog { - compatible = "dlg,da9062-watchdog"; - }; - regulators { DA9062_BUCK1: buck1 { regulator-name = "BUCK1";