diff for duplicates of <20140407060421.25826.64819.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 9dbc4b3..56b8d8b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> --- 0001/arch/arm/boot/dts/r8a7791.dtsi +++ work/arch/arm/boot/dts/r8a7791.dtsi 2014-04-07 14:49:43.000000000 +0900 @@ -774,19 +774,19 @@ - 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>; - clocks = <&mp_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>, @@ -30,11 +30,12 @@ Signed-off-by: Magnus Damm <damm@opensource.se> R8A7791_CLK_SCIF0 R8A7791_CLK_DU1 R8A7791_CLK_DU0 R8A7791_CLK_LVDS0 >; - clock-output-names - "hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0", + clock-output-names = +- "hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0", + "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 { --- 0001/include/dt-bindings/clock/r8a7791-clock.h +++ work/include/dt-bindings/clock/r8a7791-clock.h 2014-04-07 14:49:43.000000000 +0900 @@ -63,6 +63,7 @@ diff --git a/a/content_digest b/N1/content_digest index 8ac49e0..e73c573 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\0201404050349.56764.sergei.shtylyov@cogentembedded.com\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock\0" - "Date\0Mon, 07 Apr 2014 06:04:21 +0000\0" + "Date\0Mon, 07 Apr 2014 15:04:21 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -21,7 +20,7 @@ "--- 0001/arch/arm/boot/dts/r8a7791.dtsi\n" "+++ work/arch/arm/boot/dts/r8a7791.dtsi\t2014-04-07 14:49:43.000000000 +0900\n" "@@ -774,19 +774,19 @@\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-clocks\";\n" " \t\t\treg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>;\n" "-\t\t\tclocks = <&mp_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>,\n" @@ -37,11 +36,12 @@ " \t\t\t\tR8A7791_CLK_SCIF0 R8A7791_CLK_DU1 R8A7791_CLK_DU0\n" " \t\t\t\tR8A7791_CLK_LVDS0\n" " \t\t\t>;\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\"ehci\", \"hsusb\", \"hscif2\", \"scif5\", \"scif4\", \"hscif1\", \"hscif0\",\n" " \t\t\t\t\"scif3\", \"scif2\", \"scif1\", \"scif0\", \"du1\", \"du0\", \"lvds0\";\n" " \t\t};\n" - " \t\tmstp8_clks: mstp8_clks@e6150990 {\n" + " \t\tmstp8_clks: mstp8_clks at e6150990 {\n" "--- 0001/include/dt-bindings/clock/r8a7791-clock.h\n" "+++ work/include/dt-bindings/clock/r8a7791-clock.h\t2014-04-07 14:49:43.000000000 +0900\n" "@@ -63,6 +63,7 @@\n" @@ -53,4 +53,4 @@ " #define R8A7791_CLK_HSCIF2\t\t13\n" " #define R8A7791_CLK_SCIF5\t\t14" -401828ac083d0ac8487cbec9a0d33a8152b9c9cd12f87b96d6afcfce21671540 +5d325acd4112ef4494b7bbef112214ab7ec66d63a23f34594fac2ada6468de0a
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.