diff for duplicates of <20160128074256.GL9070@tiger> diff --git a/a/1.txt b/N1/1.txt index 2170f2d..4a3bab1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,8 +24,8 @@ On Tue, Dec 15, 2015 at 02:07:49PM +0800, Bai Ping wrote: > #address-cells = <1>; > #size-cells = <0>; > -> - cpu@0 { -> + cpu0: cpu@0 { +> - cpu at 0 { +> + cpu0: cpu at 0 { > compatible = "arm,cortex-a9"; > device_type = "cpu"; > reg = <0>; @@ -63,7 +63,7 @@ Do you not need to include "imx6qdl.dtsi" here? > + }; > + > + soc { -> + ocram_2: sram@00940000 { +> + ocram_2: sram at 00940000 { The label can just be ocram2. @@ -72,7 +72,7 @@ The label can just be ocram2. > + clocks = <&clks IMX6QDL_CLK_OCRAM>; > + }; > + -> + ocram_3: sram@00960000 { +> + ocram_3: sram at 00960000 { ocram3 @@ -81,7 +81,7 @@ ocram3 > + clocks = <&clks IMX6QDL_CLK_OCRAM>; > + }; > + -> + pcie: pcie@0x01000000 { +> + pcie: pcie at 0x01000000 { > + compatible = "fsl,imx6qp-pcie", "snps,dw-pcie"; > + reg = <0x01ffc000 0x4000>, <0x01f00000 0x80000>; > + reg-names = "dbi", "config"; @@ -106,8 +106,8 @@ ocram3 > + status = "disabled"; > + }; > + -> + aips-bus@02100000 { /* AIPS2 */ -> + pre1: pre@021c8000 { +> + aips-bus at 02100000 { /* AIPS2 */ +> + pre1: pre at 021c8000 { > + compatible = "fsl,imx6q-pre"; Is there already a device tree binding and driver for this block in @@ -120,7 +120,7 @@ upstream kernel? I do not accepted any unestablished device. > + status = "disabled"; > + }; > + -> + pre2: pre@021c9000 { +> + pre2: pre at 021c9000 { > + compatible = "fsl,imx6q-pre"; > + reg = <0x021c9000 0x1000>; > + clocks = <&clks IMX6QDL_CLK_PRE1>; @@ -129,7 +129,7 @@ upstream kernel? I do not accepted any unestablished device. > + status = "disabled"; > + }; > + -> + pre3: pre@021ca000 { +> + pre3: pre at 021ca000 { > + compatible = "fsl,imx6q-pre"; > + reg = <0x021ca000 0x1000>; > + clocks = <&clks IMX6QDL_CLK_PRE2>; @@ -138,7 +138,7 @@ upstream kernel? I do not accepted any unestablished device. > + status = "disabled"; > + }; > + -> + pre4: pre@021cb000 { +> + pre4: pre at 021cb000 { > + compatible = "fsl,imx6q-pre"; > + reg = <0x021cb000 0x1000>; > + clocks = <&clks IMX6QDL_CLK_PRE3>; @@ -147,7 +147,7 @@ upstream kernel? I do not accepted any unestablished device. > + status = "disabled"; > + }; > + -> + prg1: prg@021cc000 { +> + prg1: prg at 021cc000 { > + compatible = "fsl,imx6q-prg"; Ditto @@ -160,7 +160,7 @@ Ditto > + status = "disabled"; > + }; > + -> + prg2: prg@021cd000 { +> + prg2: prg at 021cd000 { > + compatible = "fsl,imx6q-prg"; > + reg = <0x021cd000 0x1000>; > + clocks = <&clks IMX6QDL_CLK_PRG1_AXI>, @@ -171,7 +171,7 @@ Ditto > + }; > + }; > + -> + ipu1: ipu@02400000 { +> + ipu1: ipu at 02400000 { > + compatible = "fsl,imx6qp-ipu", "fsl,imx6q-ipu"; > + clocks = <&clks IMX6QDL_CLK_IPU1>, > + <&clks IMX6QDL_CLK_IPU1_DI0>, <&clks IMX6QDL_CLK_IPU1_DI1>, @@ -184,7 +184,7 @@ Ditto > + "ldb_di0", "ldb_di1", "prg"; > + }; > + -> + ipu2: ipu@02800000 { +> + ipu2: ipu at 02800000 { > + compatible = "fsl,imx6qp-ipu", "fsl,imx6q-ipu"; > + clocks = <&clks IMX6QDL_CLK_IPU2>, > + <&clks IMX6QDL_CLK_IPU2_DI0>, <&clks IMX6QDL_CLK_IPU2_DI1>, @@ -197,7 +197,7 @@ Ditto > + "ldb_di0", "ldb_di1", "prg"; > + }; > + -> + sata: sata@02200000 { +> + sata: sata at 02200000 { > + compatible = "fsl,imx6qp-ahci"; > + reg = <0x02200000 0x4000>; > + interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>; diff --git a/a/content_digest b/N1/content_digest index 092fcbf..5309c96 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,9 @@ "ref\01450159673-27314-1-git-send-email-b51503@freescale.com\0" "ref\01450159673-27314-2-git-send-email-b51503@freescale.com\0" - "From\0Shawn Guo <shawnguo@kernel.org>\0" - "Subject\0Re: [PATCH v2 1/5] ARM: dts: imx: Add basic dts support for imx6qp SOC\0" + "From\0shawnguo@kernel.org (Shawn Guo)\0" + "Subject\0[PATCH v2 1/5] ARM: dts: imx: Add basic dts support for imx6qp SOC\0" "Date\0Thu, 28 Jan 2016 15:42:56 +0800\0" - "To\0Bai Ping <b51503@freescale.com>\0" - "Cc\0kernel@pengutronix.de" - pawel.moll@arm.com - robh+dt@kernel.org - mturquette@baylibre.com - sboyd@codeaurora.org - linux-arm-kernel@lists.infradead.org - linux-clk@vger.kernel.org - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, Dec 15, 2015 at 02:07:49PM +0800, Bai Ping wrote:\n" @@ -40,8 +32,8 @@ "> \t\t#address-cells = <1>;\n" "> \t\t#size-cells = <0>;\n" "> \n" - "> -\t\tcpu@0 {\n" - "> +\t\tcpu0: cpu@0 {\n" + "> -\t\tcpu at 0 {\n" + "> +\t\tcpu0: cpu at 0 {\n" "> \t\t\tcompatible = \"arm,cortex-a9\";\n" "> \t\t\tdevice_type = \"cpu\";\n" "> \t\t\treg = <0>;\n" @@ -79,7 +71,7 @@ "> +\t};\n" "> +\n" "> +\tsoc {\n" - "> +\t\tocram_2: sram@00940000 {\n" + "> +\t\tocram_2: sram at 00940000 {\n" "\n" "The label can just be ocram2.\n" "\n" @@ -88,7 +80,7 @@ "> +\t\t\tclocks = <&clks IMX6QDL_CLK_OCRAM>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tocram_3: sram@00960000 {\n" + "> +\t\tocram_3: sram at 00960000 {\n" "\n" "ocram3\n" "\n" @@ -97,7 +89,7 @@ "> +\t\t\tclocks = <&clks IMX6QDL_CLK_OCRAM>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tpcie: pcie@0x01000000 {\n" + "> +\t\tpcie: pcie at 0x01000000 {\n" "> +\t\t\tcompatible = \"fsl,imx6qp-pcie\", \"snps,dw-pcie\";\n" "> +\t\t\treg = <0x01ffc000 0x4000>, <0x01f00000 0x80000>;\n" "> +\t\t\treg-names = \"dbi\", \"config\";\n" @@ -122,8 +114,8 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\taips-bus@02100000 { /* AIPS2 */\n" - "> +\t\t\tpre1: pre@021c8000 {\n" + "> +\t\taips-bus at 02100000 { /* AIPS2 */\n" + "> +\t\t\tpre1: pre at 021c8000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6q-pre\";\n" "\n" "Is there already a device tree binding and driver for this block in\n" @@ -136,7 +128,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpre2: pre@021c9000 {\n" + "> +\t\t\tpre2: pre at 021c9000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6q-pre\";\n" "> +\t\t\t\treg = <0x021c9000 0x1000>;\n" "> +\t\t\t\tclocks = <&clks IMX6QDL_CLK_PRE1>;\n" @@ -145,7 +137,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpre3: pre@021ca000 {\n" + "> +\t\t\tpre3: pre at 021ca000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6q-pre\";\n" "> +\t\t\t\treg = <0x021ca000 0x1000>;\n" "> +\t\t\t\tclocks = <&clks IMX6QDL_CLK_PRE2>;\n" @@ -154,7 +146,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tpre4: pre@021cb000 {\n" + "> +\t\t\tpre4: pre at 021cb000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6q-pre\";\n" "> +\t\t\t\treg = <0x021cb000 0x1000>;\n" "> +\t\t\t\tclocks = <&clks IMX6QDL_CLK_PRE3>;\n" @@ -163,7 +155,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tprg1: prg@021cc000 {\n" + "> +\t\t\tprg1: prg at 021cc000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6q-prg\";\n" "\n" "Ditto\n" @@ -176,7 +168,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tprg2: prg@021cd000 {\n" + "> +\t\t\tprg2: prg at 021cd000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6q-prg\";\n" "> +\t\t\t\treg = <0x021cd000 0x1000>;\n" "> +\t\t\t\tclocks = <&clks IMX6QDL_CLK_PRG1_AXI>,\n" @@ -187,7 +179,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tipu1: ipu@02400000 {\n" + "> +\t\tipu1: ipu at 02400000 {\n" "> +\t\t\tcompatible = \"fsl,imx6qp-ipu\", \"fsl,imx6q-ipu\";\n" "> +\t\t\tclocks = <&clks IMX6QDL_CLK_IPU1>,\n" "> +\t\t\t\t <&clks IMX6QDL_CLK_IPU1_DI0>, <&clks IMX6QDL_CLK_IPU1_DI1>,\n" @@ -200,7 +192,7 @@ "> +\t\t\t\t \"ldb_di0\", \"ldb_di1\", \"prg\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tipu2: ipu@02800000 {\n" + "> +\t\tipu2: ipu at 02800000 {\n" "> +\t\t\tcompatible = \"fsl,imx6qp-ipu\", \"fsl,imx6q-ipu\";\n" "> +\t\t\tclocks = <&clks IMX6QDL_CLK_IPU2>,\n" "> +\t\t\t\t <&clks IMX6QDL_CLK_IPU2_DI0>, <&clks IMX6QDL_CLK_IPU2_DI1>,\n" @@ -213,7 +205,7 @@ "> +\t\t\t\t \"ldb_di0\", \"ldb_di1\", \"prg\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsata: sata@02200000 {\n" + "> +\t\tsata: sata at 02200000 {\n" "> +\t\t\tcompatible = \"fsl,imx6qp-ahci\";\n" "> +\t\t\treg = <0x02200000 0x4000>;\n" "> +\t\t\tinterrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -267,4 +259,4 @@ "> \n" > -24b5a15c1204c2cc172dfc9b7141ed2600b9a3496f0e3b4d3798a4ec9c23080c +59f6b5ce8362d203eba076f4177ba6404e98f8a4bdd2fa76d9d2525a4c350cf8
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.