diff for duplicates of <1909663.BCLINDXhVH@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 7dd7795..41d2926 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,8 @@ to work. 2 files changed, 9 insertions(+), 4 deletions(-) Index: renesas/arch/arm/boot/dts/r8a7790.dtsi -=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +++ renesas/arch/arm/boot/dts/r8a7790.dtsi @@ -885,7 +885,7 @@ #clock-cells = <1>; @@ -28,7 +29,7 @@ Index: renesas/arch/arm/boot/dts/r8a7790.dtsi /* Variable factor clocks */ @@ -1159,13 +1159,16 @@ - mstp5_clks: mstp5_clks@e6150144 { + mstp5_clks: mstp5_clks at e6150144 { compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; - clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>; @@ -45,10 +46,11 @@ Index: renesas/arch/arm/boot/dts/r8a7790.dtsi + clock-output-names = "audmac0", "audmac1", "adsp_mod", + "thermal", "pwm"; }; - mstp7_clks: mstp7_clks@e615014c { + mstp7_clks: mstp7_clks at e615014c { compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; Index: renesas/include/dt-bindings/clock/r8a7790-clock.h -=================================--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h +=================================================================== +--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h +++ renesas/include/dt-bindings/clock/r8a7790-clock.h @@ -22,6 +22,7 @@ #define R8A7790_CLK_SD1 8 diff --git a/a/content_digest b/N1/content_digest index aa6084e..231eecd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH] ARM: shmobile: r8a7790: add ADSP clocks\0" - "Date\0Tue, 30 Dec 2014 20:21:45 +0000\0" + "Date\0Tue, 30 Dec 2014 23:21:45 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -22,7 +22,8 @@ " 2 files changed, 9 insertions(+), 4 deletions(-)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7790.dtsi\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" "+++ renesas/arch/arm/boot/dts/r8a7790.dtsi\n" "@@ -885,7 +885,7 @@\n" " \t\t\t#clock-cells = <1>;\n" @@ -34,7 +35,7 @@ " \n" " \t\t/* Variable factor clocks */\n" "@@ -1159,13 +1159,16 @@\n" - " \t\tmstp5_clks: mstp5_clks@e6150144 {\n" + " \t\tmstp5_clks: mstp5_clks at e6150144 {\n" " \t\t\tcompatible = \"renesas,r8a7790-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n" " \t\t\treg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;\n" "-\t\t\tclocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>;\n" @@ -51,10 +52,11 @@ "+\t\t\tclock-output-names = \"audmac0\", \"audmac1\", \"adsp_mod\",\n" "+\t\t\t\t\t \"thermal\", \"pwm\";\n" " \t\t};\n" - " \t\tmstp7_clks: mstp7_clks@e615014c {\n" + " \t\tmstp7_clks: mstp7_clks at e615014c {\n" " \t\t\tcompatible = \"renesas,r8a7790-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n" "Index: renesas/include/dt-bindings/clock/r8a7790-clock.h\n" - "=================================--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h\n" + "===================================================================\n" + "--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h\n" "+++ renesas/include/dt-bindings/clock/r8a7790-clock.h\n" "@@ -22,6 +22,7 @@\n" " #define R8A7790_CLK_SD1\t\t\t8\n" @@ -72,4 +74,4 @@ " #define R8A7790_CLK_THERMAL\t\t22\n" " #define R8A7790_CLK_PWM\t\t\t23" -a03d4dfa3e2b83550683d88a9bab702ea5b18fdf33d8bcecebfaead006190782 +1d0bf6c4aaf56b5ab59f07afc247a7a65fc32d95d544cefa1b552abd41694426
diff --git a/a/1.txt b/N2/1.txt index 7dd7795..88c33c1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,7 +16,8 @@ to work. 2 files changed, 9 insertions(+), 4 deletions(-) Index: renesas/arch/arm/boot/dts/r8a7790.dtsi -=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +++ renesas/arch/arm/boot/dts/r8a7790.dtsi @@ -885,7 +885,7 @@ #clock-cells = <1>; @@ -48,7 +49,8 @@ Index: renesas/arch/arm/boot/dts/r8a7790.dtsi mstp7_clks: mstp7_clks@e615014c { compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; Index: renesas/include/dt-bindings/clock/r8a7790-clock.h -=================================--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h +=================================================================== +--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h +++ renesas/include/dt-bindings/clock/r8a7790-clock.h @@ -22,6 +22,7 @@ #define R8A7790_CLK_SD1 8 diff --git a/a/content_digest b/N2/content_digest index aa6084e..7cf9287 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,17 @@ "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH] ARM: shmobile: r8a7790: add ADSP clocks\0" - "Date\0Tue, 30 Dec 2014 20:21:45 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 30 Dec 2014 23:21:45 +0300\0" + "To\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\0" + "Cc\0magnus.damm@gmail.com" + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the ADSP clocks to the CPG and MSTP5 nodes of the R8A7790 device tree.\n" @@ -22,7 +32,8 @@ " 2 files changed, 9 insertions(+), 4 deletions(-)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7790.dtsi\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" "+++ renesas/arch/arm/boot/dts/r8a7790.dtsi\n" "@@ -885,7 +885,7 @@\n" " \t\t\t#clock-cells = <1>;\n" @@ -54,7 +65,8 @@ " \t\tmstp7_clks: mstp7_clks@e615014c {\n" " \t\t\tcompatible = \"renesas,r8a7790-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n" "Index: renesas/include/dt-bindings/clock/r8a7790-clock.h\n" - "=================================--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h\n" + "===================================================================\n" + "--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h\n" "+++ renesas/include/dt-bindings/clock/r8a7790-clock.h\n" "@@ -22,6 +22,7 @@\n" " #define R8A7790_CLK_SD1\t\t\t8\n" @@ -72,4 +84,4 @@ " #define R8A7790_CLK_THERMAL\t\t22\n" " #define R8A7790_CLK_PWM\t\t\t23" -a03d4dfa3e2b83550683d88a9bab702ea5b18fdf33d8bcecebfaead006190782 +22c1f3e63e5faef7ee3cf293b847344ee8f382cb591fa484d710493cd9416073
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.