On Tue, 28 Mar 2017, Steve Twiss wrote: > From: Steve Twiss <stwiss.opensource@xxxxxxxxxxx> > > 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. > > Delete the da9062-watchdog section and replace it with a link to the new > DA9061/62 binding information file. > > Acked-by: Rob Herring <robh@xxxxxxxxxx> > Signed-off-by: Steve Twiss <stwiss.opensource@xxxxxxxxxxx> > > --- > This patch applies against linux-next and v4.11-rc3 > > v6 -> v7 > - NO CODE CHANGE > > v5 -> v6 > - NO CODE CHANGE > - Rebased from v4.9 to v4.11-rc3 > > v4 -> v5 > - NO CODE CHANGE > - Rebased from v4.8 to v4.9 > > v3 -> v4 > - Patch renamed from [PATCH V3 4/9] to [PATCH V4 3/8] > - Remove double newline spacing in text file > - Added Acked-by Rob Herring > > v2 -> v3 > - Patch renamed from [PATCH V2 04/10] to [PATCH V3 4/9] > - Ensure binding description concentrates on the device not the > device driver > - Separate the DA9061 and DA9062 sub-device tables to distinguish > the difference between the two devices > - Update the commit message to describe this change > - Add e-mail information about associated patches from this set > without describing them as being explicitly dependent on this > binding > > 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, > > Added an Ack from Rob Herring for the PATCH V3 version. > > As previously: > Other information: > The device driver from this patch set (associated with this binding) is > > - [PATCH V5 4/8] mfd: da9061: MFD core support > > and also the following binding file changes: > > - Binding for onkey (already applied by Dmitry Torokhov) > - [PATCH V5 1/8] Binding for watchdog > - [PATCH V5 2/8] Binding for thermal > > Regards, > Steve Twiss, Dialog Semiconductor > > > Documentation/devicetree/bindings/mfd/da9062.txt | 49 +++++++++++++++++------- > 1 file changed, 36 insertions(+), 13 deletions(-) Applied, thanks. > diff --git a/Documentation/devicetree/bindings/mfd/da9062.txt b/Documentation/devicetree/bindings/mfd/da9062.txt > index 38802b5..c0a418c 100644 > --- a/Documentation/devicetree/bindings/mfd/da9062.txt > +++ b/Documentation/devicetree/bindings/mfd/da9062.txt > @@ -1,22 +1,39 @@ > * Dialog DA9062 Power Management Integrated Circuit (PMIC) > > -DA9062 consists of a large and varied group of sub-devices: > +Product information for the DA9062 and DA9061 devices can be found here: > +- http://www.dialog-semiconductor.com/products/da9062 > +- http://www.dialog-semiconductor.com/products/da9061 > + > +The DA9062 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 > + > +The DA9061 PMIC consists of: > + > +Device Supply Names Description > +------ ------------ ----------- > +da9062-regulator : : LDOs & BUCKs > +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 +42,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,19 +54,29 @@ 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 > > - > - rtc : This node defines settings required for the Real-Time Clock associated > 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 +91,6 @@ Example: > compatible = "dlg,da9062-rtc"; > }; > > - watchdog { > - compatible = "dlg,da9062-watchdog"; > - }; > - > regulators { > DA9062_BUCK1: buck1 { > regulator-name = "BUCK1"; -- 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 devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html