diff for duplicates of <20130802224613.6450.5857@quantum> diff --git a/a/1.txt b/N1/1.txt index 1b2fe18..42613cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,8 +8,7 @@ Quoting Gerhard Sittig (2013-07-22 05:14:43) > common include (the 66MHz IPS bus already was there), add > override values for the ifm AC14xx board which deviates from > the reference design (25MHz xtal, 80MHz IPS bus) -> = - +> > Signed-off-by: Gerhard Sittig <gsi@denx.de> Reviewed-by: Mike Turquette <mturquette@linaro.org> @@ -18,79 +17,67 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > arch/powerpc/boot/dts/ac14xx.dts | 7 +++++++ > arch/powerpc/boot/dts/mpc5121.dtsi | 15 ++++++++++++++- > 2 files changed, 21 insertions(+), 1 deletion(-) -> = - -> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac1= -4xx.dts +> +> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts > index a543c40..a1b8837 100644 > --- a/arch/powerpc/boot/dts/ac14xx.dts > +++ b/arch/powerpc/boot/dts/ac14xx.dts > @@ -139,7 +139,14 @@ > }; > }; -> = - +> > + clocks { > + osc { -> + clock-frequency =3D <25000000>; +> + clock-frequency = <25000000>; > + }; > + }; > + -> soc@80000000 { -> + bus-frequency =3D <80000000>; /* 80 MHz ips bus */ -> = - -> clock@f00 { -> compatible =3D "fsl,mpc5121rev2-clock", "fsl,mpc5= -121-clock"; -> diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/m= -pc5121.dtsi +> soc at 80000000 { +> + bus-frequency = <80000000>; /* 80 MHz ips bus */ +> +> clock at f00 { +> compatible = "fsl,mpc5121rev2-clock", "fsl,mpc5121-clock"; +> diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi > index bd14c00..8f4cba0 100644 > --- a/arch/powerpc/boot/dts/mpc5121.dtsi > +++ b/arch/powerpc/boot/dts/mpc5121.dtsi > @@ -9,6 +9,8 @@ > * option) any later version. > */ -> = - +> > +#include <dt-bindings/clock/mpc512x-clock.h> > + > /dts-v1/; -> = - +> > / { > @@ -73,6 +75,16 @@ -> ranges =3D <0x0 0x0 0xfc000000 0x04000000>; +> ranges = <0x0 0x0 0xfc000000 0x04000000>; > }; -> = - +> > + clocks { -> + #address-cells =3D <1>; -> + #size-cells =3D <0>; +> + #address-cells = <1>; +> + #size-cells = <0>; > + > + osc { -> + compatible =3D "fsl,mpc512x-osc", "fixed-clock"; -> + clock-frequency =3D <33000000>; +> + compatible = "fsl,mpc512x-osc", "fixed-clock"; +> + clock-frequency = <33000000>; > + }; > + }; > + -> soc@80000000 { -> compatible =3D "fsl,mpc5121-immr"; -> #address-cells =3D <1>; +> soc at 80000000 { +> compatible = "fsl,mpc5121-immr"; +> #address-cells = <1>; > @@ -118,9 +130,10 @@ > }; -> = - +> > /* Clock control */ -> - clock@f00 { -> + clks: clock@f00 { -> compatible =3D "fsl,mpc5121-clock"; -> reg =3D <0xf00 0x100>; -> + #clock-cells =3D <1>; +> - clock at f00 { +> + clks: clock at f00 { +> compatible = "fsl,mpc5121-clock"; +> reg = <0xf00 0x100>; +> + #clock-cells = <1>; > }; -> = - +> > /* Power Management Controller */ -> -- = - +> -- > 1.7.10.4 diff --git a/a/content_digest b/N1/content_digest index a47e365..381c529 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,10 @@ "ref\01374166855-7280-1-git-send-email-gsi@denx.de\0" "ref\01374495298-22019-1-git-send-email-gsi@denx.de\0" "ref\01374495298-22019-17-git-send-email-gsi@denx.de\0" - "From\0Mike Turquette <mturquette@linaro.org>\0" - "Subject\0Re: [PATCH v3 16/31] dts: mpc512x: add clock related device tree specs\0" + "From\0mturquette@linaro.org (Mike Turquette)\0" + "Subject\0[PATCH v3 16/31] dts: mpc512x: add clock related device tree specs\0" "Date\0Fri, 02 Aug 2013 15:46:13 -0700\0" - "To\0Gerhard Sittig <gsi@denx.de>" - linuxppc-dev@lists.ozlabs.org - Anatolij Gustschin <agust@denx.de> - linux-arm-kernel@lists.infradead.org - " devicetree-discuss@lists.ozlabs.org\0" - "Cc\0Detlev Zundel <dzu@denx.de>" - Wolfram Sang <wsa@the-dreams.de> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Gerhard Sittig <gsi@denx.de> - Rob Herring <rob.herring@calxeda.com> - Mark Brown <broonie@kernel.org> - Marc Kleine-Budde <mkl@pengutronix.de> - David Woodhouse <dwmw2@infradead.org> - Wolfgang Grandegger <wg@grandegger.com> - " Mauro Carvalho Chehab <m.chehab@samsung.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Quoting Gerhard Sittig (2013-07-22 05:14:43)\n" @@ -31,8 +17,7 @@ "> common include (the 66MHz IPS bus already was there), add\n" "> override values for the ifm AC14xx board which deviates from\n" "> the reference design (25MHz xtal, 80MHz IPS bus)\n" - "> =\n" - "\n" + "> \n" "> Signed-off-by: Gerhard Sittig <gsi@denx.de>\n" "\n" "Reviewed-by: Mike Turquette <mturquette@linaro.org>\n" @@ -41,81 +26,69 @@ "> arch/powerpc/boot/dts/ac14xx.dts | 7 +++++++\n" "> arch/powerpc/boot/dts/mpc5121.dtsi | 15 ++++++++++++++-\n" "> 2 files changed, 21 insertions(+), 1 deletion(-)\n" - "> =\n" - "\n" - "> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac1=\n" - "4xx.dts\n" + "> \n" + "> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts\n" "> index a543c40..a1b8837 100644\n" "> --- a/arch/powerpc/boot/dts/ac14xx.dts\n" "> +++ b/arch/powerpc/boot/dts/ac14xx.dts\n" "> @@ -139,7 +139,14 @@\n" "> };\n" "> };\n" - "> =\n" - "\n" + "> \n" "> + clocks {\n" "> + osc {\n" - "> + clock-frequency =3D <25000000>;\n" + "> + clock-frequency = <25000000>;\n" "> + };\n" "> + };\n" "> +\n" - "> soc@80000000 {\n" - "> + bus-frequency =3D <80000000>; /* 80 MHz ips bus */\n" - "> =\n" - "\n" - "> clock@f00 {\n" - "> compatible =3D \"fsl,mpc5121rev2-clock\", \"fsl,mpc5=\n" - "121-clock\";\n" - "> diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/m=\n" - "pc5121.dtsi\n" + "> soc at 80000000 {\n" + "> + bus-frequency = <80000000>; /* 80 MHz ips bus */\n" + "> \n" + "> clock at f00 {\n" + "> compatible = \"fsl,mpc5121rev2-clock\", \"fsl,mpc5121-clock\";\n" + "> diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi\n" "> index bd14c00..8f4cba0 100644\n" "> --- a/arch/powerpc/boot/dts/mpc5121.dtsi\n" "> +++ b/arch/powerpc/boot/dts/mpc5121.dtsi\n" "> @@ -9,6 +9,8 @@\n" "> * option) any later version.\n" "> */\n" - "> =\n" - "\n" + "> \n" "> +#include <dt-bindings/clock/mpc512x-clock.h>\n" "> +\n" "> /dts-v1/;\n" - "> =\n" - "\n" + "> \n" "> / {\n" "> @@ -73,6 +75,16 @@\n" - "> ranges =3D <0x0 0x0 0xfc000000 0x04000000>;\n" + "> ranges = <0x0 0x0 0xfc000000 0x04000000>;\n" "> };\n" - "> =\n" - "\n" + "> \n" "> + clocks {\n" - "> + #address-cells =3D <1>;\n" - "> + #size-cells =3D <0>;\n" + "> + #address-cells = <1>;\n" + "> + #size-cells = <0>;\n" "> +\n" "> + osc {\n" - "> + compatible =3D \"fsl,mpc512x-osc\", \"fixed-clock\";\n" - "> + clock-frequency =3D <33000000>;\n" + "> + compatible = \"fsl,mpc512x-osc\", \"fixed-clock\";\n" + "> + clock-frequency = <33000000>;\n" "> + };\n" "> + };\n" "> +\n" - "> soc@80000000 {\n" - "> compatible =3D \"fsl,mpc5121-immr\";\n" - "> #address-cells =3D <1>;\n" + "> soc at 80000000 {\n" + "> compatible = \"fsl,mpc5121-immr\";\n" + "> #address-cells = <1>;\n" "> @@ -118,9 +130,10 @@\n" "> };\n" - "> =\n" - "\n" + "> \n" "> /* Clock control */\n" - "> - clock@f00 {\n" - "> + clks: clock@f00 {\n" - "> compatible =3D \"fsl,mpc5121-clock\";\n" - "> reg =3D <0xf00 0x100>;\n" - "> + #clock-cells =3D <1>;\n" + "> - clock at f00 {\n" + "> + clks: clock at f00 {\n" + "> compatible = \"fsl,mpc5121-clock\";\n" + "> reg = <0xf00 0x100>;\n" + "> + #clock-cells = <1>;\n" "> };\n" - "> =\n" - "\n" + "> \n" "> /* Power Management Controller */\n" - "> -- =\n" - "\n" + "> -- \n" > 1.7.10.4 -199660c221033fc84beef8d0f1af4c412ca655286ebce013f4f807f098d2f96b +a9bf4f268f54a5fa628f344d75ea566c81ddb23610de3e4704bc8c3b7eddcb2d
diff --git a/a/1.txt b/N2/1.txt index 1b2fe18..760042c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,8 +8,7 @@ Quoting Gerhard Sittig (2013-07-22 05:14:43) > common include (the 66MHz IPS bus already was there), add > override values for the ifm AC14xx board which deviates from > the reference design (25MHz xtal, 80MHz IPS bus) -> = - +> > Signed-off-by: Gerhard Sittig <gsi@denx.de> Reviewed-by: Mike Turquette <mturquette@linaro.org> @@ -18,79 +17,67 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > arch/powerpc/boot/dts/ac14xx.dts | 7 +++++++ > arch/powerpc/boot/dts/mpc5121.dtsi | 15 ++++++++++++++- > 2 files changed, 21 insertions(+), 1 deletion(-) -> = - -> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac1= -4xx.dts +> +> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts > index a543c40..a1b8837 100644 > --- a/arch/powerpc/boot/dts/ac14xx.dts > +++ b/arch/powerpc/boot/dts/ac14xx.dts > @@ -139,7 +139,14 @@ > }; > }; -> = - +> > + clocks { > + osc { -> + clock-frequency =3D <25000000>; +> + clock-frequency = <25000000>; > + }; > + }; > + > soc@80000000 { -> + bus-frequency =3D <80000000>; /* 80 MHz ips bus */ -> = - +> + bus-frequency = <80000000>; /* 80 MHz ips bus */ +> > clock@f00 { -> compatible =3D "fsl,mpc5121rev2-clock", "fsl,mpc5= -121-clock"; -> diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/m= -pc5121.dtsi +> compatible = "fsl,mpc5121rev2-clock", "fsl,mpc5121-clock"; +> diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi > index bd14c00..8f4cba0 100644 > --- a/arch/powerpc/boot/dts/mpc5121.dtsi > +++ b/arch/powerpc/boot/dts/mpc5121.dtsi > @@ -9,6 +9,8 @@ > * option) any later version. > */ -> = - +> > +#include <dt-bindings/clock/mpc512x-clock.h> > + > /dts-v1/; -> = - +> > / { > @@ -73,6 +75,16 @@ -> ranges =3D <0x0 0x0 0xfc000000 0x04000000>; +> ranges = <0x0 0x0 0xfc000000 0x04000000>; > }; -> = - +> > + clocks { -> + #address-cells =3D <1>; -> + #size-cells =3D <0>; +> + #address-cells = <1>; +> + #size-cells = <0>; > + > + osc { -> + compatible =3D "fsl,mpc512x-osc", "fixed-clock"; -> + clock-frequency =3D <33000000>; +> + compatible = "fsl,mpc512x-osc", "fixed-clock"; +> + clock-frequency = <33000000>; > + }; > + }; > + > soc@80000000 { -> compatible =3D "fsl,mpc5121-immr"; -> #address-cells =3D <1>; +> compatible = "fsl,mpc5121-immr"; +> #address-cells = <1>; > @@ -118,9 +130,10 @@ > }; -> = - +> > /* Clock control */ > - clock@f00 { > + clks: clock@f00 { -> compatible =3D "fsl,mpc5121-clock"; -> reg =3D <0xf00 0x100>; -> + #clock-cells =3D <1>; +> compatible = "fsl,mpc5121-clock"; +> reg = <0xf00 0x100>; +> + #clock-cells = <1>; > }; -> = - +> > /* Power Management Controller */ -> -- = - +> -- > 1.7.10.4 diff --git a/a/content_digest b/N2/content_digest index a47e365..718a3b0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,8 +4,7 @@ "From\0Mike Turquette <mturquette@linaro.org>\0" "Subject\0Re: [PATCH v3 16/31] dts: mpc512x: add clock related device tree specs\0" "Date\0Fri, 02 Aug 2013 15:46:13 -0700\0" - "To\0Gerhard Sittig <gsi@denx.de>" - linuxppc-dev@lists.ozlabs.org + "To\0linuxppc-dev@lists.ozlabs.org" Anatolij Gustschin <agust@denx.de> linux-arm-kernel@lists.infradead.org " devicetree-discuss@lists.ozlabs.org\0" @@ -31,8 +30,7 @@ "> common include (the 66MHz IPS bus already was there), add\n" "> override values for the ifm AC14xx board which deviates from\n" "> the reference design (25MHz xtal, 80MHz IPS bus)\n" - "> =\n" - "\n" + "> \n" "> Signed-off-by: Gerhard Sittig <gsi@denx.de>\n" "\n" "Reviewed-by: Mike Turquette <mturquette@linaro.org>\n" @@ -41,81 +39,69 @@ "> arch/powerpc/boot/dts/ac14xx.dts | 7 +++++++\n" "> arch/powerpc/boot/dts/mpc5121.dtsi | 15 ++++++++++++++-\n" "> 2 files changed, 21 insertions(+), 1 deletion(-)\n" - "> =\n" - "\n" - "> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac1=\n" - "4xx.dts\n" + "> \n" + "> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts\n" "> index a543c40..a1b8837 100644\n" "> --- a/arch/powerpc/boot/dts/ac14xx.dts\n" "> +++ b/arch/powerpc/boot/dts/ac14xx.dts\n" "> @@ -139,7 +139,14 @@\n" "> };\n" "> };\n" - "> =\n" - "\n" + "> \n" "> + clocks {\n" "> + osc {\n" - "> + clock-frequency =3D <25000000>;\n" + "> + clock-frequency = <25000000>;\n" "> + };\n" "> + };\n" "> +\n" "> soc@80000000 {\n" - "> + bus-frequency =3D <80000000>; /* 80 MHz ips bus */\n" - "> =\n" - "\n" + "> + bus-frequency = <80000000>; /* 80 MHz ips bus */\n" + "> \n" "> clock@f00 {\n" - "> compatible =3D \"fsl,mpc5121rev2-clock\", \"fsl,mpc5=\n" - "121-clock\";\n" - "> diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/m=\n" - "pc5121.dtsi\n" + "> compatible = \"fsl,mpc5121rev2-clock\", \"fsl,mpc5121-clock\";\n" + "> diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi\n" "> index bd14c00..8f4cba0 100644\n" "> --- a/arch/powerpc/boot/dts/mpc5121.dtsi\n" "> +++ b/arch/powerpc/boot/dts/mpc5121.dtsi\n" "> @@ -9,6 +9,8 @@\n" "> * option) any later version.\n" "> */\n" - "> =\n" - "\n" + "> \n" "> +#include <dt-bindings/clock/mpc512x-clock.h>\n" "> +\n" "> /dts-v1/;\n" - "> =\n" - "\n" + "> \n" "> / {\n" "> @@ -73,6 +75,16 @@\n" - "> ranges =3D <0x0 0x0 0xfc000000 0x04000000>;\n" + "> ranges = <0x0 0x0 0xfc000000 0x04000000>;\n" "> };\n" - "> =\n" - "\n" + "> \n" "> + clocks {\n" - "> + #address-cells =3D <1>;\n" - "> + #size-cells =3D <0>;\n" + "> + #address-cells = <1>;\n" + "> + #size-cells = <0>;\n" "> +\n" "> + osc {\n" - "> + compatible =3D \"fsl,mpc512x-osc\", \"fixed-clock\";\n" - "> + clock-frequency =3D <33000000>;\n" + "> + compatible = \"fsl,mpc512x-osc\", \"fixed-clock\";\n" + "> + clock-frequency = <33000000>;\n" "> + };\n" "> + };\n" "> +\n" "> soc@80000000 {\n" - "> compatible =3D \"fsl,mpc5121-immr\";\n" - "> #address-cells =3D <1>;\n" + "> compatible = \"fsl,mpc5121-immr\";\n" + "> #address-cells = <1>;\n" "> @@ -118,9 +130,10 @@\n" "> };\n" - "> =\n" - "\n" + "> \n" "> /* Clock control */\n" "> - clock@f00 {\n" "> + clks: clock@f00 {\n" - "> compatible =3D \"fsl,mpc5121-clock\";\n" - "> reg =3D <0xf00 0x100>;\n" - "> + #clock-cells =3D <1>;\n" + "> compatible = \"fsl,mpc5121-clock\";\n" + "> reg = <0xf00 0x100>;\n" + "> + #clock-cells = <1>;\n" "> };\n" - "> =\n" - "\n" + "> \n" "> /* Power Management Controller */\n" - "> -- =\n" - "\n" + "> -- \n" > 1.7.10.4 -199660c221033fc84beef8d0f1af4c412ca655286ebce013f4f807f098d2f96b +7cb79f0dee5681a9496f08d1de93f9cd23b3603b7b43ed56081975edfdb5a5e9
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.