diff for duplicates of <20180827065927.GE3850@dragon> diff --git a/a/1.txt b/N1/1.txt index 4b2c7f0..702ec15 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ On Fri, Aug 10, 2018 at 05:18:21PM +0200, Philipp Zabel wrote: > }; > }; > -> + pxp: pxp at 21cc000 { +> + pxp: pxp@21cc000 { > + compatible = "fsl,imx6ul-pxp"; > + reg = <0x021cc000 0x4000>; > + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; @@ -23,9 +23,9 @@ On Fri, Aug 10, 2018 at 05:18:21PM +0200, Philipp Zabel wrote: > + clocks = <&clks IMX6UL_CLK_PXP>; > + }; > + -> lcdif: lcdif at 21c8000 { +> lcdif: lcdif@21c8000 { -In order of unit-address, pxp at 21cc000 should go after lcdif at 21c8000. +In order of unit-address, pxp@21cc000 should go after lcdif@21c8000. Shawn diff --git a/a/content_digest b/N1/content_digest index dc349fe..4adbcad 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,15 @@ "ref\020180810151822.18650-1-p.zabel@pengutronix.de\0" "ref\020180810151822.18650-3-p.zabel@pengutronix.de\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH 2/3] ARM: dts: imx6ull: add pxp support\0" + "From\0Shawn Guo <shawnguo@kernel.org>\0" + "Subject\0Re: [PATCH 2/3] ARM: dts: imx6ull: add pxp support\0" "Date\0Mon, 27 Aug 2018 14:59:29 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Philipp Zabel <p.zabel@pengutronix.de>\0" + "Cc\0devicetree@vger.kernel.org" + Rob Herring <robh+dt@kernel.org> + kernel@pengutronix.de + Mauro Carvalho Chehab <mchehab@kernel.org> + linux-arm-kernel@lists.infradead.org + " linux-media@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, Aug 10, 2018 at 05:18:21PM +0200, Philipp Zabel wrote:\n" @@ -23,7 +29,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tpxp: pxp at 21cc000 {\n" + "> +\t\t\tpxp: pxp@21cc000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6ul-pxp\";\n" "> +\t\t\t\treg = <0x021cc000 0x4000>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -31,9 +37,9 @@ "> +\t\t\t\tclocks = <&clks IMX6UL_CLK_PXP>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tlcdif: lcdif at 21c8000 {\n" + "> \t\t\tlcdif: lcdif@21c8000 {\n" "\n" - "In order of unit-address, pxp at 21cc000 should go after lcdif at 21c8000.\n" + "In order of unit-address, pxp@21cc000 should go after lcdif@21c8000.\n" "\n" "Shawn\n" "\n" @@ -57,4 +63,4 @@ "> 2.18.0\n" > -4127d93c5d4b03dc1795930d8bea380c6534ca4a0fc7d4f1a550b807136ab6b6 +941704b64557b946800224b6fede35a8a9dc721fc34efb90e463e332d16f133b
diff --git a/a/1.txt b/N2/1.txt index 4b2c7f0..702ec15 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,7 +15,7 @@ On Fri, Aug 10, 2018 at 05:18:21PM +0200, Philipp Zabel wrote: > }; > }; > -> + pxp: pxp at 21cc000 { +> + pxp: pxp@21cc000 { > + compatible = "fsl,imx6ul-pxp"; > + reg = <0x021cc000 0x4000>; > + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; @@ -23,9 +23,9 @@ On Fri, Aug 10, 2018 at 05:18:21PM +0200, Philipp Zabel wrote: > + clocks = <&clks IMX6UL_CLK_PXP>; > + }; > + -> lcdif: lcdif at 21c8000 { +> lcdif: lcdif@21c8000 { -In order of unit-address, pxp at 21cc000 should go after lcdif at 21c8000. +In order of unit-address, pxp@21cc000 should go after lcdif@21c8000. Shawn diff --git a/a/content_digest b/N2/content_digest index dc349fe..5dff845 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,15 @@ "ref\020180810151822.18650-1-p.zabel@pengutronix.de\0" "ref\020180810151822.18650-3-p.zabel@pengutronix.de\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH 2/3] ARM: dts: imx6ull: add pxp support\0" + "From\0Shawn Guo <shawnguo@kernel.org>\0" + "Subject\0Re: [PATCH 2/3] ARM: dts: imx6ull: add pxp support\0" "Date\0Mon, 27 Aug 2018 14:59:29 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Philipp Zabel <p.zabel@pengutronix.de>\0" + "Cc\0linux-media@vger.kernel.org" + Mauro Carvalho Chehab <mchehab@kernel.org> + Rob Herring <robh+dt@kernel.org> + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " kernel@pengutronix.de\0" "\00:1\0" "b\0" "On Fri, Aug 10, 2018 at 05:18:21PM +0200, Philipp Zabel wrote:\n" @@ -23,7 +29,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tpxp: pxp at 21cc000 {\n" + "> +\t\t\tpxp: pxp@21cc000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6ul-pxp\";\n" "> +\t\t\t\treg = <0x021cc000 0x4000>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -31,9 +37,9 @@ "> +\t\t\t\tclocks = <&clks IMX6UL_CLK_PXP>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tlcdif: lcdif at 21c8000 {\n" + "> \t\t\tlcdif: lcdif@21c8000 {\n" "\n" - "In order of unit-address, pxp at 21cc000 should go after lcdif at 21c8000.\n" + "In order of unit-address, pxp@21cc000 should go after lcdif@21c8000.\n" "\n" "Shawn\n" "\n" @@ -57,4 +63,4 @@ "> 2.18.0\n" > -4127d93c5d4b03dc1795930d8bea380c6534ca4a0fc7d4f1a550b807136ab6b6 +3c5b7fe20dbdbec60129f83ac1e9a28d73cf242ba57a4995330643360f117c4c
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.