diff for duplicates of <20151030172414.GC4058@x1> diff --git a/a/1.txt b/N1/1.txt index d15a029..2a1f114 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,40 +1,34 @@ On Fri, 30 Oct 2015, Alim Akhtar wrote: > From: Thomas Abraham <thomas.ab@samsung.com> ->=20 +> > Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device -> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulator= -s. +> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators. > This also supports RTC and three 32.768KHz clock outputs. ->=20 +> > Cc: devicetree@vger.kernel.org > Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> > Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com> > --- -> Documentation/devicetree/bindings/mfd/s2mps11.txt | 21 ++++++++++++++-= ------- +> Documentation/devicetree/bindings/mfd/s2mps11.txt | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) Applied, thanks. -> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Document= -ation/devicetree/bindings/mfd/s2mps11.txt +> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt > index 890f0b0e1643..4c0543ceec25 100644 > --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt > +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt > @@ -1,5 +1,5 @@ -> =20 -> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regu= -lator +> +> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator > +* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator -> =20 -> The Samsung S2MPS11 is a multi-function device which includes voltage an= -d +> +> The Samsung S2MPS11 is a multi-function device which includes voltage and > current regulators, RTC, charger controller and other sub-blocks. It is -> @@ -7,8 +7,12 @@ interfaced to the host controller using an I2C interface= -. Each sub-block is +> @@ -7,8 +7,12 @@ interfaced to the host controller using an I2C interface. Each sub-block is > addressed by the host system using different I2C slave addresses. -> =20 +> > Required properties: > -- compatible: Should be "samsung,s2mps11-pmic" or "samsung,s2mps13-pmic" > - or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic". @@ -44,22 +38,17 @@ d > + - "samsung,s2mps14-pmic" > + - "samsung,s2mps15-pmic" > + - "samsung,s2mpu02-pmic". -> - reg: Specifies the I2C slave address of the pmic block. It should be 0= -x66. -> =20 +> - reg: Specifies the I2C slave address of the pmic block. It should be 0x66. +> > Optional properties: > @@ -24,7 +28,7 @@ Optional properties: > unwanted buck warm reset (setting buck voltages to default values). -> =20 +> > Optional nodes: -> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered = -32.768 -> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) = -buffered 32.768 -> KHz outputs, so to register these as clocks with common clock framewor= -k -> instantiate a sub-node named "clocks". It uses the common clock bindin= -g +> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768 +> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) buffered 32.768 +> KHz outputs, so to register these as clocks with common clock framework +> instantiate a sub-node named "clocks". It uses the common clock binding > documented in : > @@ -37,12 +41,13 @@ Optional nodes: > the clock which they consume. @@ -71,17 +60,13 @@ g > + 32KhzAP 0 S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767 > + 32KhzCP 1 S2MPS11, S2MPS13, S2MPS15, S5M8767 > + 32KhzBT 2 S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767 -> =20 -> - compatible: Should be one of: "samsung,s2mps11-clk", "samsung,s2mps1= -3-clk", +> +> - compatible: Should be one of: "samsung,s2mps11-clk", "samsung,s2mps13-clk", > "samsung,s2mps14-clk", "samsung,s5m8767-clk" -> + The s2msp15 uses the same compatible as s2mps13, as both provides si= -milar clocks. -> =20 -> - regulators: The regulators of s2mps11 that have to be instantiated sho= -uld be -> included in a sub-node named 'regulators'. Regulator nodes included in t= -his +> + The s2msp15 uses the same compatible as s2mps13, as both provides similar clocks. +> +> - regulators: The regulators of s2mps11 that have to be instantiated should be +> included in a sub-node named 'regulators'. Regulator nodes included in this > @@ -90,6 +95,7 @@ as per the datasheet of s2mps11. > - S2MPS11: 1 to 38 > - S2MPS13: 1 to 40 @@ -97,23 +82,10 @@ his > + - S2MPS15: 1 to 10 > - S2MPU02: 1 to 7 > - Example: BUCK1, BUCK2, BUCK9 -> =20 +> ---=20 +-- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org =E2=94=82 Open source software for ARM SoCs +Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog - ---=20 ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N1/content_digest index de5d0d0..082f31a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01446186334-16510-1-git-send-email-alim.akhtar@samsung.com\0" "ref\01446186334-16510-2-git-send-email-alim.akhtar@samsung.com\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH v5 1/4] dt-bindings: mfd: s2mps11: add documentation for s2mps15 PMIC\0" + "Subject\0Re: [PATCH v5 1/4] dt-bindings: mfd: s2mps11: add documentation for s2mps15 PMIC\0" "Date\0Fri, 30 Oct 2015 17:24:14 +0000\0" "To\0Alim Akhtar <alim.akhtar@samsung.com>\0" "Cc\0broonie@kernel.org" @@ -16,40 +16,34 @@ "On Fri, 30 Oct 2015, Alim Akhtar wrote:\n" "\n" "> From: Thomas Abraham <thomas.ab@samsung.com>\n" - ">=20\n" + "> \n" "> Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device\n" - "> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulator=\n" - "s.\n" + "> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.\n" "> This also supports RTC and three 32.768KHz clock outputs.\n" - ">=20\n" + "> \n" "> Cc: devicetree@vger.kernel.org\n" "> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>\n" "> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>\n" "> ---\n" - "> Documentation/devicetree/bindings/mfd/s2mps11.txt | 21 ++++++++++++++-=\n" - "------\n" + "> Documentation/devicetree/bindings/mfd/s2mps11.txt | 21 ++++++++++++++-------\n" "> 1 file changed, 14 insertions(+), 7 deletions(-)\n" "\n" "Applied, thanks.\n" "\n" - "> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Document=\n" - "ation/devicetree/bindings/mfd/s2mps11.txt\n" + "> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt\n" "> index 890f0b0e1643..4c0543ceec25 100644\n" "> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt\n" "> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt\n" "> @@ -1,5 +1,5 @@\n" - "> =20\n" - "> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regu=\n" - "lator\n" + "> \n" + "> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator\n" "> +* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator\n" - "> =20\n" - "> The Samsung S2MPS11 is a multi-function device which includes voltage an=\n" - "d\n" + "> \n" + "> The Samsung S2MPS11 is a multi-function device which includes voltage and\n" "> current regulators, RTC, charger controller and other sub-blocks. It is\n" - "> @@ -7,8 +7,12 @@ interfaced to the host controller using an I2C interface=\n" - ". Each sub-block is\n" + "> @@ -7,8 +7,12 @@ interfaced to the host controller using an I2C interface. Each sub-block is\n" "> addressed by the host system using different I2C slave addresses.\n" - "> =20\n" + "> \n" "> Required properties:\n" "> -- compatible: Should be \"samsung,s2mps11-pmic\" or \"samsung,s2mps13-pmic\"\n" "> -\t or \"samsung,s2mps14-pmic\" or \"samsung,s2mpu02-pmic\".\n" @@ -59,22 +53,17 @@ "> +\t- \"samsung,s2mps14-pmic\"\n" "> +\t- \"samsung,s2mps15-pmic\"\n" "> +\t- \"samsung,s2mpu02-pmic\".\n" - "> - reg: Specifies the I2C slave address of the pmic block. It should be 0=\n" - "x66.\n" - "> =20\n" + "> - reg: Specifies the I2C slave address of the pmic block. It should be 0x66.\n" + "> \n" "> Optional properties:\n" "> @@ -24,7 +28,7 @@ Optional properties:\n" "> unwanted buck warm reset (setting buck voltages to default values).\n" - "> =20\n" + "> \n" "> Optional nodes:\n" - "> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered =\n" - "32.768\n" - "> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) =\n" - "buffered 32.768\n" - "> KHz outputs, so to register these as clocks with common clock framewor=\n" - "k\n" - "> instantiate a sub-node named \"clocks\". It uses the common clock bindin=\n" - "g\n" + "> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768\n" + "> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) buffered 32.768\n" + "> KHz outputs, so to register these as clocks with common clock framework\n" + "> instantiate a sub-node named \"clocks\". It uses the common clock binding\n" "> documented in :\n" "> @@ -37,12 +41,13 @@ Optional nodes:\n" "> the clock which they consume.\n" @@ -86,17 +75,13 @@ "> + 32KhzAP\t\t0 S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767\n" "> + 32KhzCP\t\t1 S2MPS11, S2MPS13, S2MPS15, S5M8767\n" "> + 32KhzBT\t\t2 S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767\n" - "> =20\n" - "> - compatible: Should be one of: \"samsung,s2mps11-clk\", \"samsung,s2mps1=\n" - "3-clk\",\n" + "> \n" + "> - compatible: Should be one of: \"samsung,s2mps11-clk\", \"samsung,s2mps13-clk\",\n" "> \t\t\"samsung,s2mps14-clk\", \"samsung,s5m8767-clk\"\n" - "> + The s2msp15 uses the same compatible as s2mps13, as both provides si=\n" - "milar clocks.\n" - "> =20\n" - "> - regulators: The regulators of s2mps11 that have to be instantiated sho=\n" - "uld be\n" - "> included in a sub-node named 'regulators'. Regulator nodes included in t=\n" - "his\n" + "> + The s2msp15 uses the same compatible as s2mps13, as both provides similar clocks.\n" + "> \n" + "> - regulators: The regulators of s2mps11 that have to be instantiated should be\n" + "> included in a sub-node named 'regulators'. Regulator nodes included in this\n" "> @@ -90,6 +95,7 @@ as per the datasheet of s2mps11.\n" "> \t\t\t- S2MPS11: 1 to 38\n" "> \t\t\t- S2MPS13: 1 to 40\n" @@ -112,25 +97,12 @@ "> +\t\t\t- S2MPS15: 1 to 10\n" "> \t\t\t- S2MPU02: 1 to 7\n" "> \t\t - Example: BUCK1, BUCK2, BUCK9\n" - "> =20\n" + "> \n" "\n" - "--=20\n" + "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" - "Follow Linaro: Facebook | Twitter | Blog\n" - "\n" - "--=20\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "Linaro.org \342\224\202 Open source software for ARM SoCs\n" + Follow Linaro: Facebook | Twitter | Blog -da6c909254c6f1c5cd596daa2adc6a8baea0229753a3ed7c55e001be165027ea +1c98c40dfc9f343f4183d323befdfaed5bd33e2fe3b89368fd4b707c975b0bb3
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.