diff for duplicates of <503232E0.3000007@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 83b3b86..b661724 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,11 +8,11 @@ On 08/16/2012 03:08 AM, Shawn Guo wrote: > over to device tree, so that any new lookup to be added at later time > can just get done in DT instead of kernel. > -> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> +> Signed-off-by: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Looks good. For both patches: -Reviewed-by: Rob Herring <rob.herring@calxeda.com> +Reviewed-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> > --- > .../devicetree/bindings/clock/imx6q-clock.txt | 223 +++++++++++++++++ @@ -233,7 +233,7 @@ Reviewed-by: Rob Herring <rob.herring@calxeda.com> > + > +Examples: > + -> +clks: ccm at 020c4000 { +> +clks: ccm@020c4000 { > + compatible = "fsl,imx6q-ccm"; > + reg = <0x020c4000 0x4000>; > + interrupts = <0 87 0x04 0 88 0x04>; @@ -244,7 +244,7 @@ Reviewed-by: Rob Herring <rob.herring@calxeda.com> > + ...; > +}; > + -> +uart1: serial at 02020000 { +> +uart1: serial@02020000 { > + compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; > + reg = <0x02020000 0x4000>; > + interrupts = <0 26 0x04>; @@ -257,7 +257,7 @@ Reviewed-by: Rob Herring <rob.herring@calxeda.com> > --- a/arch/arm/boot/dts/imx6q-sabrelite.dts > +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts > @@ -111,6 +111,7 @@ -> codec: sgtl5000 at 0a { +> codec: sgtl5000@0a { > compatible = "fsl,sgtl5000"; > reg = <0x0a>; > + clocks = <&clks 169>; @@ -269,13 +269,13 @@ Reviewed-by: Rob Herring <rob.herring@calxeda.com> > --- a/arch/arm/boot/dts/imx6q.dtsi > +++ b/arch/arm/boot/dts/imx6q.dtsi > @@ -93,18 +93,23 @@ -> dma-apbh at 00110000 { +> dma-apbh@00110000 { > compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh"; > reg = <0x00110000 0x2000>; > + clocks = <&clks 106>; > }; > -> gpmi-nand at 00112000 { +> gpmi-nand@00112000 { > - compatible = "fsl,imx6q-gpmi-nand"; > - #address-cells = <1>; > - #size-cells = <1>; @@ -300,7 +300,7 @@ Reviewed-by: Rob Herring <rob.herring@calxeda.com> > + status = "disabled"; > }; > -> timer at 00a00600 { +> timer@00a00600 { > @@ -146,6 +151,8 @@ > compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; > reg = <0x02008000 0x4000>; @@ -395,8 +395,8 @@ Reviewed-by: Rob Herring <rob.herring@calxeda.com> > status = "disabled"; > }; > -> - ccm at 020c4000 { -> + clks: ccm at 020c4000 { +> - ccm@020c4000 { +> + clks: ccm@020c4000 { > compatible = "fsl,imx6q-ccm"; > reg = <0x020c4000 0x4000>; > interrupts = <0 87 0x04 0 88 0x04>; @@ -591,7 +591,7 @@ Reviewed-by: Rob Herring <rob.herring@calxeda.com> > + "end_of_list"; > }; > -> anatop at 020c8000 { +> anatop@020c8000 { > @@ -468,12 +679,14 @@ > compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; > reg = <0x020c9000 0x1000>; @@ -599,14 +599,14 @@ Reviewed-by: Rob Herring <rob.herring@calxeda.com> > + clocks = <&clks 182>; > }; > -> usbphy2: usbphy at 020ca000 { +> usbphy2: usbphy@020ca000 { > compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; > reg = <0x020ca000 0x1000>; > interrupts = <0 45 0x04>; > + clocks = <&clks 183>; > }; > -> snvs at 020cc000 { +> snvs@020cc000 { > @@ -608,6 +821,9 @@ > compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma"; > reg = <0x020ec000 0x4000>; diff --git a/a/content_digest b/N1/content_digest index 6d1f551..5a690e5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,14 @@ "ref\01345104526-14797-1-git-send-email-shawn.guo@linaro.org\0" "ref\01345104526-14797-3-git-send-email-shawn.guo@linaro.org\0" - "From\0robherring2@gmail.com (Rob Herring)\0" - "Subject\0[PATCH 2/2] ARM: imx6q: replace clk_register_clkdev with clock DT lookup\0" + "ref\01345104526-14797-3-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "From\0Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH 2/2] ARM: imx6q: replace clk_register_clkdev with clock DT lookup\0" "Date\0Mon, 20 Aug 2012 07:51:44 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Cc\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" + Mike Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On 08/16/2012 03:08 AM, Shawn Guo wrote:\n" @@ -16,11 +21,11 @@ "> over to device tree, so that any new lookup to be added at later time\n" "> can just get done in DT instead of kernel.\n" "> \n" - "> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>\n" + "> Signed-off-by: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" "\n" "Looks good. For both patches:\n" "\n" - "Reviewed-by: Rob Herring <rob.herring@calxeda.com>\n" + "Reviewed-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>\n" "\n" "> ---\n" "> .../devicetree/bindings/clock/imx6q-clock.txt | 223 +++++++++++++++++\n" @@ -241,7 +246,7 @@ "> +\n" "> +Examples:\n" "> +\n" - "> +clks: ccm at 020c4000 {\n" + "> +clks: ccm@020c4000 {\n" "> +\tcompatible = \"fsl,imx6q-ccm\";\n" "> +\treg = <0x020c4000 0x4000>;\n" "> +\tinterrupts = <0 87 0x04 0 88 0x04>;\n" @@ -252,7 +257,7 @@ "> +\t\t\t ...;\n" "> +};\n" "> +\n" - "> +uart1: serial at 02020000 {\n" + "> +uart1: serial@02020000 {\n" "> +\tcompatible = \"fsl,imx6q-uart\", \"fsl,imx21-uart\";\n" "> +\treg = <0x02020000 0x4000>;\n" "> +\tinterrupts = <0 26 0x04>;\n" @@ -265,7 +270,7 @@ "> --- a/arch/arm/boot/dts/imx6q-sabrelite.dts\n" "> +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts\n" "> @@ -111,6 +111,7 @@\n" - "> \t\t\t\tcodec: sgtl5000 at 0a {\n" + "> \t\t\t\tcodec: sgtl5000@0a {\n" "> \t\t\t\t\tcompatible = \"fsl,sgtl5000\";\n" "> \t\t\t\t\treg = <0x0a>;\n" "> +\t\t\t\t\tclocks = <&clks 169>;\n" @@ -277,13 +282,13 @@ "> --- a/arch/arm/boot/dts/imx6q.dtsi\n" "> +++ b/arch/arm/boot/dts/imx6q.dtsi\n" "> @@ -93,18 +93,23 @@\n" - "> \t\tdma-apbh at 00110000 {\n" + "> \t\tdma-apbh@00110000 {\n" "> \t\t\tcompatible = \"fsl,imx6q-dma-apbh\", \"fsl,imx28-dma-apbh\";\n" "> \t\t\treg = <0x00110000 0x2000>;\n" "> +\t\t\tclocks = <&clks 106>;\n" "> \t\t};\n" "> \n" - "> \t\tgpmi-nand at 00112000 {\n" + "> \t\tgpmi-nand@00112000 {\n" "> -\t\t compatible = \"fsl,imx6q-gpmi-nand\";\n" "> -\t\t #address-cells = <1>;\n" "> -\t\t #size-cells = <1>;\n" @@ -308,7 +313,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> \t\ttimer at 00a00600 {\n" + "> \t\ttimer@00a00600 {\n" "> @@ -146,6 +151,8 @@\n" "> \t\t\t\t\tcompatible = \"fsl,imx6q-ecspi\", \"fsl,imx51-ecspi\";\n" "> \t\t\t\t\treg = <0x02008000 0x4000>;\n" @@ -403,8 +408,8 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> -\t\t\tccm at 020c4000 {\n" - "> +\t\t\tclks: ccm at 020c4000 {\n" + "> -\t\t\tccm@020c4000 {\n" + "> +\t\t\tclks: ccm@020c4000 {\n" "> \t\t\t\tcompatible = \"fsl,imx6q-ccm\";\n" "> \t\t\t\treg = <0x020c4000 0x4000>;\n" "> \t\t\t\tinterrupts = <0 87 0x04 0 88 0x04>;\n" @@ -599,7 +604,7 @@ "> +\t\t\t\t\t\"end_of_list\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tanatop at 020c8000 {\n" + "> \t\t\tanatop@020c8000 {\n" "> @@ -468,12 +679,14 @@\n" "> \t\t\t\tcompatible = \"fsl,imx6q-usbphy\", \"fsl,imx23-usbphy\";\n" "> \t\t\t\treg = <0x020c9000 0x1000>;\n" @@ -607,14 +612,14 @@ "> +\t\t\t\tclocks = <&clks 182>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tusbphy2: usbphy at 020ca000 {\n" + "> \t\t\tusbphy2: usbphy@020ca000 {\n" "> \t\t\t\tcompatible = \"fsl,imx6q-usbphy\", \"fsl,imx23-usbphy\";\n" "> \t\t\t\treg = <0x020ca000 0x1000>;\n" "> \t\t\t\tinterrupts = <0 45 0x04>;\n" "> +\t\t\t\tclocks = <&clks 183>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tsnvs at 020cc000 {\n" + "> \t\t\tsnvs@020cc000 {\n" "> @@ -608,6 +821,9 @@\n" "> \t\t\t\tcompatible = \"fsl,imx6q-sdma\", \"fsl,imx35-sdma\";\n" "> \t\t\t\treg = <0x020ec000 0x4000>;\n" @@ -831,4 +836,4 @@ "> \t\tclk_put(cko1_sel);\n" > -41c1b68420b8e757e8e696ae0f268740db07c855aeb7a2b897107e2b7a4400c7 +5a3674bc21b2e37525b870947ea4fd391f31f8ba4216e42bc7065504a63617df
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.