diff for duplicates of <57227C9F.6080705@ti.com> diff --git a/a/content_digest b/N1/content_digest index 065ecf2..1bc0d75 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,18 +5,18 @@ "Subject\0Re: [PATCH v7 2/9] ARM: dts: am437x: Add missing compatibles to PWM binding documents\0" "Date\0Thu, 28 Apr 2016 16:11:59 -0500\0" "To\0Rob Herring <robh@kernel.org>\0" - "Cc\0<thierry.reding@gmail.com>" - <tony@atomide.com> - <paul@pwsan.com> - <t-kristo@ti.com> - <linux-pwm@vger.kernel.org> - <devicetree@vger.kernel.org> - <linux-kernel@vger.kernel.org> - <linux-omap@vger.kernel.org> - <linux-arm-kernel@lists.infradead.org> - <linux-clk@vger.kernel.org> - <vigneshr@ti.com> - " <nsekhar@ti.com>\0" + "Cc\0thierry.reding@gmail.com" + tony@atomide.com + paul@pwsan.com + t-kristo@ti.com + linux-pwm@vger.kernel.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + linux-omap@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-clk@vger.kernel.org + vigneshr@ti.com + " nsekhar@ti.com\0" "\00:1\0" "b\0" "\n" @@ -104,4 +104,4 @@ "patches 3 and 4 fixes these unit address problems for all the bindings\n" all together to make things clear. -5f9c47352a86c0f56af4bde496e2cfc1f8fbef82578b1bad6c8789971b8a13a1 +f9774bceaec1b9f1b54d739a0e8ff75ddc46be0c506be44c0e1ebc14961669a3
diff --git a/a/1.txt b/N2/1.txt index d69aaf7..a005e7e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -31,11 +31,11 @@ On 04/28/2016 04:07 PM, Rob Herring wrote: >> - #pwm-cells: should be 3. See pwm.txt in this directory for a description of >> the cells format. The PWM channel index ranges from 0 to 4. The only third >> cell flag supported by this binding is PWM_POLARITY_INVERTED. ->> @@ -22,6 +23,13 @@ ecap0: ecap@0 { /* ECAP on am33xx */ +>> @@ -22,6 +23,13 @@ ecap0: ecap at 0 { /* ECAP on am33xx */ >> ti,hwmods = "ecap0"; >> }; >> ->> +ecap0: ecap@0 { /* ECAP on am4372 */ +>> +ecap0: ecap at 0 { /* ECAP on am4372 */ > > The unit address is wrong. > @@ -45,7 +45,7 @@ On 04/28/2016 04:07 PM, Rob Herring wrote: >> + ti,hwmods = "ecap0"; >> +}; >> + ->> ecap0: ecap@0 { /* ECAP on da850 */ +>> ecap0: ecap at 0 { /* ECAP on da850 */ >> compatible = "ti,da850-ecap", "ti,am33xx-ecap"; >> #pwm-cells = <3>; >> diff --git a/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt b/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt @@ -64,11 +64,11 @@ On 04/28/2016 04:07 PM, Rob Herring wrote: >> - #pwm-cells: should be 3. See pwm.txt in this directory for a description of >> the cells format. The only third cell flag supported by this binding is >> PWM_POLARITY_INVERTED. ->> @@ -22,6 +23,13 @@ ehrpwm0: ehrpwm@0 { /* EHRPWM on am33xx */ +>> @@ -22,6 +23,13 @@ ehrpwm0: ehrpwm at 0 { /* EHRPWM on am33xx */ >> ti,hwmods = "ehrpwm0"; >> }; >> ->> +ehrpwm0: ehrpwm@0 { /* EHRPWM on am4372 */ +>> +ehrpwm0: ehrpwm at 0 { /* EHRPWM on am4372 */ > > ditto > diff --git a/a/content_digest b/N2/content_digest index 065ecf2..9345baf 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,10 @@ "ref\01461710209-6563-1-git-send-email-fcooper@ti.com\0" "ref\01461710209-6563-3-git-send-email-fcooper@ti.com\0" "ref\020160428210716.GA12508@rob-hp-laptop\0" - "From\0Franklin S Cooper Jr. <fcooper@ti.com>\0" - "Subject\0Re: [PATCH v7 2/9] ARM: dts: am437x: Add missing compatibles to PWM binding documents\0" + "From\0fcooper@ti.com (Franklin S Cooper Jr.)\0" + "Subject\0[PATCH v7 2/9] ARM: dts: am437x: Add missing compatibles to PWM binding documents\0" "Date\0Thu, 28 Apr 2016 16:11:59 -0500\0" - "To\0Rob Herring <robh@kernel.org>\0" - "Cc\0<thierry.reding@gmail.com>" - <tony@atomide.com> - <paul@pwsan.com> - <t-kristo@ti.com> - <linux-pwm@vger.kernel.org> - <devicetree@vger.kernel.org> - <linux-kernel@vger.kernel.org> - <linux-omap@vger.kernel.org> - <linux-arm-kernel@lists.infradead.org> - <linux-clk@vger.kernel.org> - <vigneshr@ti.com> - " <nsekhar@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" @@ -52,11 +40,11 @@ ">> - #pwm-cells: should be 3. See pwm.txt in this directory for a description of\n" ">> the cells format. The PWM channel index ranges from 0 to 4. The only third\n" ">> cell flag supported by this binding is PWM_POLARITY_INVERTED.\n" - ">> @@ -22,6 +23,13 @@ ecap0: ecap@0 { /* ECAP on am33xx */\n" + ">> @@ -22,6 +23,13 @@ ecap0: ecap at 0 { /* ECAP on am33xx */\n" ">> \tti,hwmods = \"ecap0\";\n" ">> };\n" ">> \n" - ">> +ecap0: ecap@0 { /* ECAP on am4372 */\n" + ">> +ecap0: ecap at 0 { /* ECAP on am4372 */\n" "> \n" "> The unit address is wrong.\n" "> \n" @@ -66,7 +54,7 @@ ">> +\tti,hwmods = \"ecap0\";\n" ">> +};\n" ">> +\n" - ">> ecap0: ecap@0 { /* ECAP on da850 */\n" + ">> ecap0: ecap at 0 { /* ECAP on da850 */\n" ">> \tcompatible = \"ti,da850-ecap\", \"ti,am33xx-ecap\";\n" ">> \t#pwm-cells = <3>;\n" ">> diff --git a/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt b/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt\n" @@ -85,11 +73,11 @@ ">> - #pwm-cells: should be 3. See pwm.txt in this directory for a description of\n" ">> the cells format. The only third cell flag supported by this binding is\n" ">> PWM_POLARITY_INVERTED.\n" - ">> @@ -22,6 +23,13 @@ ehrpwm0: ehrpwm@0 { /* EHRPWM on am33xx */\n" + ">> @@ -22,6 +23,13 @@ ehrpwm0: ehrpwm at 0 { /* EHRPWM on am33xx */\n" ">> \tti,hwmods = \"ehrpwm0\";\n" ">> };\n" ">> \n" - ">> +ehrpwm0: ehrpwm@0 { /* EHRPWM on am4372 */\n" + ">> +ehrpwm0: ehrpwm at 0 { /* EHRPWM on am4372 */\n" "> \n" "> ditto\n" "> \n" @@ -104,4 +92,4 @@ "patches 3 and 4 fixes these unit address problems for all the bindings\n" all together to make things clear. -5f9c47352a86c0f56af4bde496e2cfc1f8fbef82578b1bad6c8789971b8a13a1 +c2cccec5006e600029a9c81344263c74a7eb9214506c45d7d88c4045336fc7bf
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.