diff for duplicates of <1854497.ZhKYzhMEAC@avalon> diff --git a/a/1.txt b/N1/1.txt index 1fb10e7..168b762 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,10 +19,11 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > 2 files changed, 16 insertions(+), 10 deletions(-) > > Index: renesas/arch/arm/boot/dts/r8a7791.dtsi -> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi +> =================================================================== +> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi > +++ renesas/arch/arm/boot/dts/r8a7791.dtsi > @@ -774,20 +774,25 @@ -> mstp7_clks: mstp7_clks@e615014c { +> mstp7_clks: mstp7_clks at e615014c { > compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp- clocks"; > reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>; @@ -50,18 +51,20 @@ clocks"; > > >; > -> clock-output-names > - "hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0", +> clock-output-names = +> - "hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0", > - "scif3", "scif2", "scif1", "scif0", "du1", "du0", "lvds0"; > + "ehci", "hsusb", "hscif2", "scif5", > + "scif4", "hscif1", "hscif0", "scif3", > + "scif2", "scif1", "scif0", "du1", > + "du0", "lvds0"; > }; -> mstp8_clks: mstp8_clks@e6150990 { +> mstp8_clks: mstp8_clks at e6150990 { > compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp- clocks"; > Index: renesas/include/dt-bindings/clock/r8a7791-clock.h -> =================================> --- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h +> =================================================================== +> --- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h > +++ renesas/include/dt-bindings/clock/r8a7791-clock.h > @@ -63,6 +63,7 @@ > #define R8A7791_CLK_PWM 23 @@ -73,7 +76,7 @@ clocks"; > #define R8A7791_CLK_SCIF5 14 > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- diff --git a/a/content_digest b/N1/content_digest index 7ba5f6c..8f0b116 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201404050349.56764.sergei.shtylyov@cogentembedded.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support\0" - "Date\0Mon, 07 Apr 2014 10:30:53 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support\0" + "Date\0Mon, 07 Apr 2014 12:30:53 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -26,10 +26,11 @@ "> 2 files changed, 16 insertions(+), 10 deletions(-)\n" "> \n" "> Index: renesas/arch/arm/boot/dts/r8a7791.dtsi\n" - "> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" + "> ===================================================================\n" + "> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" "> +++ renesas/arch/arm/boot/dts/r8a7791.dtsi\n" "> @@ -774,20 +774,25 @@\n" - "> \t\tmstp7_clks: mstp7_clks@e615014c {\n" + "> \t\tmstp7_clks: mstp7_clks at e615014c {\n" "> \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-\n" "clocks\";\n" "> \t\t\treg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>;\n" @@ -57,18 +58,20 @@ "> \n" "> \t\t\t>;\n" "> \n" - "> \t\t\tclock-output-names > -\t\t\t\t\"hsusb\", \"hscif2\", \"scif5\", \"scif4\", \"hscif1\", \"hscif0\",\n" + "> \t\t\tclock-output-names =\n" + "> -\t\t\t\t\"hsusb\", \"hscif2\", \"scif5\", \"scif4\", \"hscif1\", \"hscif0\",\n" "> -\t\t\t\t\"scif3\", \"scif2\", \"scif1\", \"scif0\", \"du1\", \"du0\", \"lvds0\";\n" "> +\t\t\t\t\"ehci\", \"hsusb\", \"hscif2\", \"scif5\",\n" "> +\t\t\t\t\"scif4\", \"hscif1\", \"hscif0\", \"scif3\",\n" "> +\t\t\t\t\"scif2\", \"scif1\", \"scif0\", \"du1\",\n" "> +\t\t\t\t\"du0\", \"lvds0\";\n" "> \t\t};\n" - "> \t\tmstp8_clks: mstp8_clks@e6150990 {\n" + "> \t\tmstp8_clks: mstp8_clks at e6150990 {\n" "> \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-\n" "clocks\";\n" "> Index: renesas/include/dt-bindings/clock/r8a7791-clock.h\n" - "> =================================> --- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h\n" + "> ===================================================================\n" + "> --- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h\n" "> +++ renesas/include/dt-bindings/clock/r8a7791-clock.h\n" "> @@ -63,6 +63,7 @@\n" "> #define R8A7791_CLK_PWM\t\t\t23\n" @@ -80,7 +83,7 @@ "> #define R8A7791_CLK_SCIF5\t\t14\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-sh\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "\n" "-- \n" @@ -88,4 +91,4 @@ "\n" Laurent Pinchart -e1cb6c2467b246eeffad40157c01100be55105da9c2fcadcd6e148058a1ef904 +9db0f2a5d53bb0a4d4bbb62725c1ff8e34c50785eee4000e22b4d6e9476d0be6
diff --git a/a/1.txt b/N2/1.txt index 1fb10e7..d93a095 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,7 +19,8 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > 2 files changed, 16 insertions(+), 10 deletions(-) > > Index: renesas/arch/arm/boot/dts/r8a7791.dtsi -> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi +> =================================================================== +> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi > +++ renesas/arch/arm/boot/dts/r8a7791.dtsi > @@ -774,20 +774,25 @@ > mstp7_clks: mstp7_clks@e615014c { @@ -50,7 +51,8 @@ clocks"; > > >; > -> clock-output-names > - "hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0", +> clock-output-names = +> - "hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0", > - "scif3", "scif2", "scif1", "scif0", "du1", "du0", "lvds0"; > + "ehci", "hsusb", "hscif2", "scif5", > + "scif4", "hscif1", "hscif0", "scif3", @@ -61,7 +63,8 @@ clocks"; > compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp- clocks"; > Index: renesas/include/dt-bindings/clock/r8a7791-clock.h -> =================================> --- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h +> =================================================================== +> --- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h > +++ renesas/include/dt-bindings/clock/r8a7791-clock.h > @@ -63,6 +63,7 @@ > #define R8A7791_CLK_PWM 23 diff --git a/a/content_digest b/N2/content_digest index 7ba5f6c..e7fa856 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,19 @@ "ref\0201404050349.56764.sergei.shtylyov@cogentembedded.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support\0" - "Date\0Mon, 07 Apr 2014 10:30:53 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Mon, 07 Apr 2014 12:30:53 +0200\0" + "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "Cc\0horms@verge.net.au" + linux-sh@vger.kernel.org + devicetree@vger.kernel.org + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + magnus.damm@gmail.com + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Sergei,\n" @@ -26,7 +37,8 @@ "> 2 files changed, 16 insertions(+), 10 deletions(-)\n" "> \n" "> Index: renesas/arch/arm/boot/dts/r8a7791.dtsi\n" - "> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" + "> ===================================================================\n" + "> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" "> +++ renesas/arch/arm/boot/dts/r8a7791.dtsi\n" "> @@ -774,20 +774,25 @@\n" "> \t\tmstp7_clks: mstp7_clks@e615014c {\n" @@ -57,7 +69,8 @@ "> \n" "> \t\t\t>;\n" "> \n" - "> \t\t\tclock-output-names > -\t\t\t\t\"hsusb\", \"hscif2\", \"scif5\", \"scif4\", \"hscif1\", \"hscif0\",\n" + "> \t\t\tclock-output-names =\n" + "> -\t\t\t\t\"hsusb\", \"hscif2\", \"scif5\", \"scif4\", \"hscif1\", \"hscif0\",\n" "> -\t\t\t\t\"scif3\", \"scif2\", \"scif1\", \"scif0\", \"du1\", \"du0\", \"lvds0\";\n" "> +\t\t\t\t\"ehci\", \"hsusb\", \"hscif2\", \"scif5\",\n" "> +\t\t\t\t\"scif4\", \"hscif1\", \"hscif0\", \"scif3\",\n" @@ -68,7 +81,8 @@ "> \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-\n" "clocks\";\n" "> Index: renesas/include/dt-bindings/clock/r8a7791-clock.h\n" - "> =================================> --- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h\n" + "> ===================================================================\n" + "> --- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h\n" "> +++ renesas/include/dt-bindings/clock/r8a7791-clock.h\n" "> @@ -63,6 +63,7 @@\n" "> #define R8A7791_CLK_PWM\t\t\t23\n" @@ -88,4 +102,4 @@ "\n" Laurent Pinchart -e1cb6c2467b246eeffad40157c01100be55105da9c2fcadcd6e148058a1ef904 +1f6e847283ea2daa23bf2480a0395f7641da4c835add08f5b056d2deaa62b3f9
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.