diff for duplicates of <20170307144500.GE10239@codeaurora.org> diff --git a/a/content_digest b/N1/content_digest index af44770..e3fb693 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,10 +4,10 @@ "Subject\0Re: [PATCH DO NOT MERGE 5/6] ARM: dts: omap4: add some sample clkctrl data\0" "Date\0Tue, 7 Mar 2017 06:45:00 -0800\0" "To\0Tero Kristo <t-kristo@ti.com>\0" - "Cc\0linux-clk@vger.kernel.org" - linux-omap@vger.kernel.org + "Cc\0tony@atomide.com" mturquette@baylibre.com - tony@atomide.com + linux-omap@vger.kernel.org + linux-clk@vger.kernel.org " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -79,4 +79,4 @@ "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" a Linux Foundation Collaborative Project -218fe68f3f4735be8a98fc4d11a2eb521225ef4138ad14f0432a8a02b4079044 +1a9ea9a515f38c1f7c6e4e78d2646c3d929d0a8d5ea6275ad0c950191f57602e
diff --git a/a/1.txt b/N2/1.txt index c7ed493..761ec5f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ On 02/13, Tero Kristo wrote: > @@ -131,27 +132,61 @@ > ranges = <0 0x4a000000 0x1000000>; > -> cm1: cm1@4000 { +> cm1: cm1 at 4000 { > - compatible = "ti,omap4-cm1"; > + compatible = "ti,omap4-cm1", "simple-bus"; > reg = <0x4000 0x2000>; @@ -16,7 +16,7 @@ On 02/13, Tero Kristo wrote: > #size-cells = <0>; > }; > -> + cm_abe: cm_abe@0 { +> + cm_abe: cm_abe at 0 { The unit address should be 500 here. @@ -26,7 +26,7 @@ The unit address should be 500 here. > + #size-cells = <1>; > + ranges = <0 0x500 0x100>; > + -> + cm_abe_clkctrl: cm_abe_clkctrl@20 { +> + cm_abe_clkctrl: cm_abe_clkctrl at 20 { > + compatible = "ti,omap4-clkctrl"; > + reg = <0x20 0x6c>; > + #clock-cells = <2>; @@ -37,7 +37,7 @@ The unit address should be 500 here. > }; > }; > -> cm2: cm2@8000 { +> cm2: cm2 at 8000 { > - compatible = "ti,omap4-cm2"; > + compatible = "ti,omap4-cm2", "simple-bus"; > reg = <0x8000 0x3000>; @@ -50,7 +50,7 @@ The unit address should be 500 here. > #size-cells = <0>; > }; > -> + cm_l4per: cm_l4per@0 { +> + cm_l4per: cm_l4per at 0 { and 1400 here. @@ -60,7 +60,7 @@ and 1400 here. > + #size-cells = <1>; > + ranges = <0 0x1400 0x200>; > + -> + cm_l4per_clkctrl: cm_l4per_clkctrl@20 { +> + cm_l4per_clkctrl: cm_l4per_clkctrl at 20 { -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, diff --git a/a/content_digest b/N2/content_digest index af44770..868e14f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,9 @@ "ref\01486992157-10673-1-git-send-email-t-kristo@ti.com\0" "ref\01486992157-10673-6-git-send-email-t-kristo@ti.com\0" - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" - "Subject\0Re: [PATCH DO NOT MERGE 5/6] ARM: dts: omap4: add some sample clkctrl data\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" + "Subject\0[PATCH DO NOT MERGE 5/6] ARM: dts: omap4: add some sample clkctrl data\0" "Date\0Tue, 7 Mar 2017 06:45:00 -0800\0" - "To\0Tero Kristo <t-kristo@ti.com>\0" - "Cc\0linux-clk@vger.kernel.org" - linux-omap@vger.kernel.org - mturquette@baylibre.com - tony@atomide.com - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 02/13, Tero Kristo wrote:\n" @@ -16,7 +11,7 @@ "> @@ -131,27 +132,61 @@\n" "> \t\t\tranges = <0 0x4a000000 0x1000000>;\n" "> \n" - "> \t\t\tcm1: cm1@4000 {\n" + "> \t\t\tcm1: cm1 at 4000 {\n" "> -\t\t\t\tcompatible = \"ti,omap4-cm1\";\n" "> +\t\t\t\tcompatible = \"ti,omap4-cm1\", \"simple-bus\";\n" "> \t\t\t\treg = <0x4000 0x2000>;\n" @@ -29,7 +24,7 @@ "> \t\t\t\t\t#size-cells = <0>;\n" "> \t\t\t\t};\n" "> \n" - "> +\t\t\t\tcm_abe: cm_abe@0 {\n" + "> +\t\t\t\tcm_abe: cm_abe at 0 {\n" "\n" "The unit address should be 500 here.\n" "\n" @@ -39,7 +34,7 @@ "> +\t\t\t\t\t#size-cells = <1>;\n" "> +\t\t\t\t\tranges = <0 0x500 0x100>;\n" "> +\n" - "> +\t\t\t\t\tcm_abe_clkctrl: cm_abe_clkctrl@20 {\n" + "> +\t\t\t\t\tcm_abe_clkctrl: cm_abe_clkctrl at 20 {\n" "> +\t\t\t\t\t\tcompatible = \"ti,omap4-clkctrl\";\n" "> +\t\t\t\t\t\treg = <0x20 0x6c>;\n" "> +\t\t\t\t\t\t#clock-cells = <2>;\n" @@ -50,7 +45,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcm2: cm2@8000 {\n" + "> \t\t\tcm2: cm2 at 8000 {\n" "> -\t\t\t\tcompatible = \"ti,omap4-cm2\";\n" "> +\t\t\t\tcompatible = \"ti,omap4-cm2\", \"simple-bus\";\n" "> \t\t\t\treg = <0x8000 0x3000>;\n" @@ -63,7 +58,7 @@ "> \t\t\t\t\t#size-cells = <0>;\n" "> \t\t\t\t};\n" "> \n" - "> +\t\t\t\tcm_l4per: cm_l4per@0 {\n" + "> +\t\t\t\tcm_l4per: cm_l4per at 0 {\n" "\n" "and 1400 here.\n" "\n" @@ -73,10 +68,10 @@ "> +\t\t\t\t\t#size-cells = <1>;\n" "> +\t\t\t\t\tranges = <0 0x1400 0x200>;\n" "> +\n" - "> +\t\t\t\t\tcm_l4per_clkctrl: cm_l4per_clkctrl@20 {\n" + "> +\t\t\t\t\tcm_l4per_clkctrl: cm_l4per_clkctrl at 20 {\n" "\n" "-- \n" "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" a Linux Foundation Collaborative Project -218fe68f3f4735be8a98fc4d11a2eb521225ef4138ad14f0432a8a02b4079044 +9a1de53c9b647d0170f7d463e8ffb63df8f5a37c77bb6c0bc968be5f3d4df29b
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.