diff for duplicates of <11119685.9RVVTTLT6z@avalon> diff --git a/a/1.txt b/N1/1.txt index 0b373af..b295cf6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,8 +30,8 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > }; > > /* Special CPG clocks */ -> - cpg_clocks: cpg_clocks@0xe6150000 { -> + cpg_clocks: clocks@ffc80000 { +> - cpg_clocks: cpg_clocks at 0xe6150000 { +> + cpg_clocks: clocks at ffc80000 { > compatible = "renesas,r8a7779-cpg-clocks"; > reg = <0xffc80000 0x30>; > clocks = <&extal_clk>; @@ -40,7 +40,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > /* Gate clocks */ > - mstp0_clks: mstp0_clks { -> + mstp0_clks: clocks@ffc80030 { +> + mstp0_clks: clocks at ffc80030 { > compatible = "renesas,r8a7779-mstp-clocks", > "renesas,cpg-mstp-clocks"; > reg = <0xffc80030 4>; @@ -49,7 +49,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > "i2c0"; > }; > - mstp1_clks: mstp1_clks { -> + mstp1_clks: clocks@ffc80034 { +> + mstp1_clks: clocks at ffc80034 { > compatible = "renesas,r8a7779-mstp-clocks", > "renesas,cpg-mstp-clocks"; > reg = <0xffc80034 4>, <0xffc80044 4>; @@ -58,7 +58,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > "pcie", "vin3"; > }; > - mstp3_clks: mstp3_clks { -> + mstp3_clks: clocks@ffc8003c { +> + mstp3_clks: clocks at ffc8003c { > compatible = "renesas,r8a7779-mstp-clocks", > "renesas,cpg-mstp-clocks"; > reg = <0xffc8003c 4>; diff --git a/a/content_digest b/N1/content_digest index f381fc4..0c9a306 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01400831180-20409-1-git-send-email-geert+renesas@glider.be\0" "ref\01400831180-20409-3-git-send-email-geert+renesas@glider.be\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v2 2/2] ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks\0" - "Date\0Fri, 23 May 2014 09:36:51 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v2 2/2] ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks\0" + "Date\0Fri, 23 May 2014 11:36:51 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -38,8 +38,8 @@ "> \t\t};\n" "> \n" "> \t\t/* Special CPG clocks */\n" - "> -\t\tcpg_clocks: cpg_clocks@0xe6150000 {\n" - "> +\t\tcpg_clocks: clocks@ffc80000 {\n" + "> -\t\tcpg_clocks: cpg_clocks at 0xe6150000 {\n" + "> +\t\tcpg_clocks: clocks at ffc80000 {\n" "> \t\t\tcompatible = \"renesas,r8a7779-cpg-clocks\";\n" "> \t\t\treg = <0xffc80000 0x30>;\n" "> \t\t\tclocks = <&extal_clk>;\n" @@ -48,7 +48,7 @@ "> \n" "> \t\t/* Gate clocks */\n" "> -\t\tmstp0_clks: mstp0_clks {\n" - "> +\t\tmstp0_clks: clocks@ffc80030 {\n" + "> +\t\tmstp0_clks: clocks at ffc80030 {\n" "> \t\t\tcompatible = \"renesas,r8a7779-mstp-clocks\",\n" "> \t\t\t \"renesas,cpg-mstp-clocks\";\n" "> \t\t\treg = <0xffc80030 4>;\n" @@ -57,7 +57,7 @@ "> \t\t\t\t\"i2c0\";\n" "> \t\t};\n" "> -\t\tmstp1_clks: mstp1_clks {\n" - "> +\t\tmstp1_clks: clocks@ffc80034 {\n" + "> +\t\tmstp1_clks: clocks at ffc80034 {\n" "> \t\t\tcompatible = \"renesas,r8a7779-mstp-clocks\",\n" "> \t\t\t \"renesas,cpg-mstp-clocks\";\n" "> \t\t\treg = <0xffc80034 4>, <0xffc80044 4>;\n" @@ -66,7 +66,7 @@ "> \t\t\t\t\"pcie\", \"vin3\";\n" "> \t\t};\n" "> -\t\tmstp3_clks: mstp3_clks {\n" - "> +\t\tmstp3_clks: clocks@ffc8003c {\n" + "> +\t\tmstp3_clks: clocks at ffc8003c {\n" "> \t\t\tcompatible = \"renesas,r8a7779-mstp-clocks\",\n" "> \t\t\t \"renesas,cpg-mstp-clocks\";\n" "> \t\t\treg = <0xffc8003c 4>;\n" @@ -76,4 +76,4 @@ "\n" Laurent Pinchart -259e81fc9eba68a949acb74645d5db6af5d410bf174d36fd5e80f8c205323643 +abd26efafdb9e2aa6129debdb2922858c49710485a365da73f5619eda3b9bff4
diff --git a/a/content_digest b/N2/content_digest index f381fc4..78b8208 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,14 @@ "ref\01400831180-20409-3-git-send-email-geert+renesas@glider.be\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v2 2/2] ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks\0" - "Date\0Fri, 23 May 2014 09:36:51 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Fri, 23 May 2014 11:36:51 +0200\0" + "To\0Geert Uytterhoeven <geert+renesas@glider.be>\0" + "Cc\0Simon Horman <horms@verge.net.au>" + Magnus Damm <magnus.damm@gmail.com> + linux-sh@vger.kernel.org + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " Geert Uytterhoeven <geert@linux-m68k.org>\0" "\00:1\0" "b\0" "Hi Geert,\n" @@ -76,4 +82,4 @@ "\n" Laurent Pinchart -259e81fc9eba68a949acb74645d5db6af5d410bf174d36fd5e80f8c205323643 +59ad43e238367a6a9eb6c4010dc2fc6a4460b5adf8e38aaab5fe0c451d4f561a
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.