diff for duplicates of <20150528034555.22384.65723@quantum> diff --git a/a/1.txt b/N1/1.txt index 9920feb..6e5ee52 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,18 +1,13 @@ Quoting Joachim Eastwood (2015-05-18 15:35:58) > Add DT binding documentation for lpc1850-ccu clk driver. -> = - +> > Signed-off-by: Joachim Eastwood <manabian@gmail.com> > --- -> .../devicetree/bindings/clock/lpc1850-ccu.txt | 146 +++++++++++++++= -++++++ +> .../devicetree/bindings/clock/lpc1850-ccu.txt | 146 +++++++++++++++++++++ > 1 file changed, 146 insertions(+) -> create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-ccu.t= -xt -> = - -> diff --git a/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt b/Do= -cumentation/devicetree/bindings/clock/lpc1850-ccu.txt +> create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-ccu.txt +> +> diff --git a/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt b/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt > new file mode 100644 > index 000000000000..aca46805c10a > --- /dev/null @@ -49,8 +44,7 @@ cumentation/devicetree/bindings/clock/lpc1850-ccu.txt > +CCU1 branch clocks: > +Base clock Branch clock Description > +BASE_APB3_CLK CLK_APB3_BUS APB3 bus clock. -> + CLK_APB3_I2C1 Clock to the I2C1 register interf= -ace +> + CLK_APB3_I2C1 Clock to the I2C1 register interface > + and I2C1 peripheral clock. You don't need to make these explicit here. Just specify that the header @@ -79,34 +73,33 @@ Mike > +Example board file: > + > +soc { -> + ccu1: clock-controller@40051000 { -> + compatible =3D "nxp,lpc1850-ccu"; -> + reg =3D <0x40051000 0x1000>; -> + #clock-cells =3D <1>; -> + clocks =3D <&cgu BASE_APB3_CLK>, <&cgu BASE_APB1_CLK>, +> + ccu1: clock-controller at 40051000 { +> + compatible = "nxp,lpc1850-ccu"; +> + reg = <0x40051000 0x1000>; +> + #clock-cells = <1>; +> + clocks = <&cgu BASE_APB3_CLK>, <&cgu BASE_APB1_CLK>, > + <&cgu BASE_SPIFI_CLK>, <&cgu BASE_CPU_CLK>, > + <&cgu BASE_PERIPH_CLK>, <&cgu BASE_USB0_CLK>, > + <&cgu BASE_USB1_CLK>, <&cgu BASE_SPI_CLK>; > + }; > + -> + ccu2: clock-controller@40052000 { -> + compatible =3D "nxp,lpc1850-ccu"; -> + reg =3D <0x40052000 0x1000>; -> + #clock-cells =3D <1>; -> + clocks =3D <&cgu BASE_AUDIO_CLK>, <&cgu BASE_UART3_CLK>, +> + ccu2: clock-controller at 40052000 { +> + compatible = "nxp,lpc1850-ccu"; +> + reg = <0x40052000 0x1000>; +> + #clock-cells = <1>; +> + clocks = <&cgu BASE_AUDIO_CLK>, <&cgu BASE_UART3_CLK>, > + <&cgu BASE_UART2_CLK>, <&cgu BASE_UART1_CLK>, > + <&cgu BASE_UART0_CLK>, <&cgu BASE_SSP1_CLK>, > + <&cgu BASE_SSP0_CLK>, <&cgu BASE_SDIO_CLK>; > + }; > + > + /* A user of CCU brach clocks */ -> + uart1: serial@40082000 { +> + uart1: serial at 40082000 { > + ... -> + clocks =3D <&ccu2 CLK_APB0_UART1>, <&ccu1 CLK_CPU_UART1>; +> + clocks = <&ccu2 CLK_APB0_UART1>, <&ccu1 CLK_CPU_UART1>; > + ... > + }; > +}; -> -- = - +> -- > 1.8.0 ->=20 +> diff --git a/a/content_digest b/N1/content_digest index 958ad7d..3396973 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,32 +1,21 @@ "ref\01431988559-23338-1-git-send-email-manabian@gmail.com\0" "ref\01431988559-23338-6-git-send-email-manabian@gmail.com\0" - "From\0Michael Turquette <mturquette@linaro.org>\0" - "Subject\0Re: [PATCH v3 5/6] doc: dt: add documentation for lpc1850-ccu clk driver\0" + "From\0mturquette@linaro.org (Michael Turquette)\0" + "Subject\0[PATCH v3 5/6] doc: dt: add documentation for lpc1850-ccu clk driver\0" "Date\0Wed, 27 May 2015 20:45:55 -0700\0" - "To\0Joachim Eastwood <manabian@gmail.com>" - " sboyd@codeaurora.org\0" - "Cc\0Joachim Eastwood <manabian@gmail.com>" - devicetree@vger.kernel.org - linux-clk@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " ezequiel@vanguardiasur.com.ar\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Quoting Joachim Eastwood (2015-05-18 15:35:58)\n" "> Add DT binding documentation for lpc1850-ccu clk driver.\n" - "> =\n" - "\n" + "> \n" "> Signed-off-by: Joachim Eastwood <manabian@gmail.com>\n" "> ---\n" - "> .../devicetree/bindings/clock/lpc1850-ccu.txt | 146 +++++++++++++++=\n" - "++++++\n" + "> .../devicetree/bindings/clock/lpc1850-ccu.txt | 146 +++++++++++++++++++++\n" "> 1 file changed, 146 insertions(+)\n" - "> create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-ccu.t=\n" - "xt\n" - "> =\n" - "\n" - "> diff --git a/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt b/Do=\n" - "cumentation/devicetree/bindings/clock/lpc1850-ccu.txt\n" + "> create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-ccu.txt\n" + "> \n" + "> diff --git a/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt b/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt\n" "> new file mode 100644\n" "> index 000000000000..aca46805c10a\n" "> --- /dev/null\n" @@ -63,8 +52,7 @@ "> +CCU1 branch clocks:\n" "> +Base clock Branch clock Description\n" "> +BASE_APB3_CLK CLK_APB3_BUS APB3 bus clock.\n" - "> + CLK_APB3_I2C1 Clock to the I2C1 register interf=\n" - "ace\n" + "> + CLK_APB3_I2C1 Clock to the I2C1 register interface\n" "> + and I2C1 peripheral clock.\n" "\n" "You don't need to make these explicit here. Just specify that the header\n" @@ -93,36 +81,35 @@ "> +Example board file:\n" "> +\n" "> +soc {\n" - "> + ccu1: clock-controller@40051000 {\n" - "> + compatible =3D \"nxp,lpc1850-ccu\";\n" - "> + reg =3D <0x40051000 0x1000>;\n" - "> + #clock-cells =3D <1>;\n" - "> + clocks =3D <&cgu BASE_APB3_CLK>, <&cgu BASE_APB1_CLK>,\n" + "> + ccu1: clock-controller at 40051000 {\n" + "> + compatible = \"nxp,lpc1850-ccu\";\n" + "> + reg = <0x40051000 0x1000>;\n" + "> + #clock-cells = <1>;\n" + "> + clocks = <&cgu BASE_APB3_CLK>, <&cgu BASE_APB1_CLK>,\n" "> + <&cgu BASE_SPIFI_CLK>, <&cgu BASE_CPU_CLK>,\n" "> + <&cgu BASE_PERIPH_CLK>, <&cgu BASE_USB0_CLK>,\n" "> + <&cgu BASE_USB1_CLK>, <&cgu BASE_SPI_CLK>;\n" "> + };\n" "> +\n" - "> + ccu2: clock-controller@40052000 {\n" - "> + compatible =3D \"nxp,lpc1850-ccu\";\n" - "> + reg =3D <0x40052000 0x1000>;\n" - "> + #clock-cells =3D <1>;\n" - "> + clocks =3D <&cgu BASE_AUDIO_CLK>, <&cgu BASE_UART3_CLK>,\n" + "> + ccu2: clock-controller at 40052000 {\n" + "> + compatible = \"nxp,lpc1850-ccu\";\n" + "> + reg = <0x40052000 0x1000>;\n" + "> + #clock-cells = <1>;\n" + "> + clocks = <&cgu BASE_AUDIO_CLK>, <&cgu BASE_UART3_CLK>,\n" "> + <&cgu BASE_UART2_CLK>, <&cgu BASE_UART1_CLK>,\n" "> + <&cgu BASE_UART0_CLK>, <&cgu BASE_SSP1_CLK>,\n" "> + <&cgu BASE_SSP0_CLK>, <&cgu BASE_SDIO_CLK>;\n" "> + };\n" "> +\n" "> + /* A user of CCU brach clocks */\n" - "> + uart1: serial@40082000 {\n" + "> + uart1: serial at 40082000 {\n" "> + ...\n" - "> + clocks =3D <&ccu2 CLK_APB0_UART1>, <&ccu1 CLK_CPU_UART1>;\n" + "> + clocks = <&ccu2 CLK_APB0_UART1>, <&ccu1 CLK_CPU_UART1>;\n" "> + ...\n" "> + };\n" "> +};\n" - "> -- =\n" - "\n" + "> -- \n" "> 1.8.0\n" - >=20 + > -c3e3c01767dcb417e8b4f8b9c53dbecb97d2c08b7ded23b5d9008521a8967cee +f1d1e039624d4d5b715f47b1b0f341317400b033cad1e156a7ee0d92cc3f2469
diff --git a/a/1.txt b/N2/1.txt index 9920feb..ec08f66 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,18 +1,13 @@ Quoting Joachim Eastwood (2015-05-18 15:35:58) > Add DT binding documentation for lpc1850-ccu clk driver. -> = - -> Signed-off-by: Joachim Eastwood <manabian@gmail.com> +> +> Signed-off-by: Joachim Eastwood <manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- -> .../devicetree/bindings/clock/lpc1850-ccu.txt | 146 +++++++++++++++= -++++++ +> .../devicetree/bindings/clock/lpc1850-ccu.txt | 146 +++++++++++++++++++++ > 1 file changed, 146 insertions(+) -> create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-ccu.t= -xt -> = - -> diff --git a/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt b/Do= -cumentation/devicetree/bindings/clock/lpc1850-ccu.txt +> create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-ccu.txt +> +> diff --git a/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt b/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt > new file mode 100644 > index 000000000000..aca46805c10a > --- /dev/null @@ -49,8 +44,7 @@ cumentation/devicetree/bindings/clock/lpc1850-ccu.txt > +CCU1 branch clocks: > +Base clock Branch clock Description > +BASE_APB3_CLK CLK_APB3_BUS APB3 bus clock. -> + CLK_APB3_I2C1 Clock to the I2C1 register interf= -ace +> + CLK_APB3_I2C1 Clock to the I2C1 register interface > + and I2C1 peripheral clock. You don't need to make these explicit here. Just specify that the header @@ -80,20 +74,20 @@ Mike > + > +soc { > + ccu1: clock-controller@40051000 { -> + compatible =3D "nxp,lpc1850-ccu"; -> + reg =3D <0x40051000 0x1000>; -> + #clock-cells =3D <1>; -> + clocks =3D <&cgu BASE_APB3_CLK>, <&cgu BASE_APB1_CLK>, +> + compatible = "nxp,lpc1850-ccu"; +> + reg = <0x40051000 0x1000>; +> + #clock-cells = <1>; +> + clocks = <&cgu BASE_APB3_CLK>, <&cgu BASE_APB1_CLK>, > + <&cgu BASE_SPIFI_CLK>, <&cgu BASE_CPU_CLK>, > + <&cgu BASE_PERIPH_CLK>, <&cgu BASE_USB0_CLK>, > + <&cgu BASE_USB1_CLK>, <&cgu BASE_SPI_CLK>; > + }; > + > + ccu2: clock-controller@40052000 { -> + compatible =3D "nxp,lpc1850-ccu"; -> + reg =3D <0x40052000 0x1000>; -> + #clock-cells =3D <1>; -> + clocks =3D <&cgu BASE_AUDIO_CLK>, <&cgu BASE_UART3_CLK>, +> + compatible = "nxp,lpc1850-ccu"; +> + reg = <0x40052000 0x1000>; +> + #clock-cells = <1>; +> + clocks = <&cgu BASE_AUDIO_CLK>, <&cgu BASE_UART3_CLK>, > + <&cgu BASE_UART2_CLK>, <&cgu BASE_UART1_CLK>, > + <&cgu BASE_UART0_CLK>, <&cgu BASE_SSP1_CLK>, > + <&cgu BASE_SSP0_CLK>, <&cgu BASE_SDIO_CLK>; @@ -102,11 +96,14 @@ Mike > + /* A user of CCU brach clocks */ > + uart1: serial@40082000 { > + ... -> + clocks =3D <&ccu2 CLK_APB0_UART1>, <&ccu1 CLK_CPU_UART1>; +> + clocks = <&ccu2 CLK_APB0_UART1>, <&ccu1 CLK_CPU_UART1>; > + ... > + }; > +}; -> -- = - +> -- > 1.8.0 ->=20 +> +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 958ad7d..b9aaa49 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,32 +1,27 @@ "ref\01431988559-23338-1-git-send-email-manabian@gmail.com\0" "ref\01431988559-23338-6-git-send-email-manabian@gmail.com\0" - "From\0Michael Turquette <mturquette@linaro.org>\0" + "ref\01431988559-23338-6-git-send-email-manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Michael Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCH v3 5/6] doc: dt: add documentation for lpc1850-ccu clk driver\0" "Date\0Wed, 27 May 2015 20:45:55 -0700\0" - "To\0Joachim Eastwood <manabian@gmail.com>" - " sboyd@codeaurora.org\0" - "Cc\0Joachim Eastwood <manabian@gmail.com>" - devicetree@vger.kernel.org - linux-clk@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " ezequiel@vanguardiasur.com.ar\0" + "To\0sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org\0" + "Cc\0Joachim Eastwood <manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " ezequiel-30ULvvUtt6G51wMPkGsGjgyUoB5FGQPZ@public.gmane.org\0" "\00:1\0" "b\0" "Quoting Joachim Eastwood (2015-05-18 15:35:58)\n" "> Add DT binding documentation for lpc1850-ccu clk driver.\n" - "> =\n" - "\n" - "> Signed-off-by: Joachim Eastwood <manabian@gmail.com>\n" + "> \n" + "> Signed-off-by: Joachim Eastwood <manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "> ---\n" - "> .../devicetree/bindings/clock/lpc1850-ccu.txt | 146 +++++++++++++++=\n" - "++++++\n" + "> .../devicetree/bindings/clock/lpc1850-ccu.txt | 146 +++++++++++++++++++++\n" "> 1 file changed, 146 insertions(+)\n" - "> create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-ccu.t=\n" - "xt\n" - "> =\n" - "\n" - "> diff --git a/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt b/Do=\n" - "cumentation/devicetree/bindings/clock/lpc1850-ccu.txt\n" + "> create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-ccu.txt\n" + "> \n" + "> diff --git a/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt b/Documentation/devicetree/bindings/clock/lpc1850-ccu.txt\n" "> new file mode 100644\n" "> index 000000000000..aca46805c10a\n" "> --- /dev/null\n" @@ -63,8 +58,7 @@ "> +CCU1 branch clocks:\n" "> +Base clock Branch clock Description\n" "> +BASE_APB3_CLK CLK_APB3_BUS APB3 bus clock.\n" - "> + CLK_APB3_I2C1 Clock to the I2C1 register interf=\n" - "ace\n" + "> + CLK_APB3_I2C1 Clock to the I2C1 register interface\n" "> + and I2C1 peripheral clock.\n" "\n" "You don't need to make these explicit here. Just specify that the header\n" @@ -94,20 +88,20 @@ "> +\n" "> +soc {\n" "> + ccu1: clock-controller@40051000 {\n" - "> + compatible =3D \"nxp,lpc1850-ccu\";\n" - "> + reg =3D <0x40051000 0x1000>;\n" - "> + #clock-cells =3D <1>;\n" - "> + clocks =3D <&cgu BASE_APB3_CLK>, <&cgu BASE_APB1_CLK>,\n" + "> + compatible = \"nxp,lpc1850-ccu\";\n" + "> + reg = <0x40051000 0x1000>;\n" + "> + #clock-cells = <1>;\n" + "> + clocks = <&cgu BASE_APB3_CLK>, <&cgu BASE_APB1_CLK>,\n" "> + <&cgu BASE_SPIFI_CLK>, <&cgu BASE_CPU_CLK>,\n" "> + <&cgu BASE_PERIPH_CLK>, <&cgu BASE_USB0_CLK>,\n" "> + <&cgu BASE_USB1_CLK>, <&cgu BASE_SPI_CLK>;\n" "> + };\n" "> +\n" "> + ccu2: clock-controller@40052000 {\n" - "> + compatible =3D \"nxp,lpc1850-ccu\";\n" - "> + reg =3D <0x40052000 0x1000>;\n" - "> + #clock-cells =3D <1>;\n" - "> + clocks =3D <&cgu BASE_AUDIO_CLK>, <&cgu BASE_UART3_CLK>,\n" + "> + compatible = \"nxp,lpc1850-ccu\";\n" + "> + reg = <0x40052000 0x1000>;\n" + "> + #clock-cells = <1>;\n" + "> + clocks = <&cgu BASE_AUDIO_CLK>, <&cgu BASE_UART3_CLK>,\n" "> + <&cgu BASE_UART2_CLK>, <&cgu BASE_UART1_CLK>,\n" "> + <&cgu BASE_UART0_CLK>, <&cgu BASE_SSP1_CLK>,\n" "> + <&cgu BASE_SSP0_CLK>, <&cgu BASE_SDIO_CLK>;\n" @@ -116,13 +110,16 @@ "> + /* A user of CCU brach clocks */\n" "> + uart1: serial@40082000 {\n" "> + ...\n" - "> + clocks =3D <&ccu2 CLK_APB0_UART1>, <&ccu1 CLK_CPU_UART1>;\n" + "> + clocks = <&ccu2 CLK_APB0_UART1>, <&ccu1 CLK_CPU_UART1>;\n" "> + ...\n" "> + };\n" "> +};\n" - "> -- =\n" - "\n" + "> -- \n" "> 1.8.0\n" - >=20 + "> \n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -c3e3c01767dcb417e8b4f8b9c53dbecb97d2c08b7ded23b5d9008521a8967cee +1f5853ca30090825a7584248835e1529b1538ef9a6949860ceddbc13698441c8
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.