diff for duplicates of <1474957662.3739.2.camel@toradex.com> diff --git a/a/1.txt b/N1/1.txt index 36f4045..d814f68 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,26 +6,26 @@ On Wed, 2016-09-21 at 16:54 +0530, Sanchayan Maity wrote: Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- -> ?arch/arm/boot/dts/Makefile???????????????????|???1 + -> ?arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++++ -> ?arch/arm/boot/dts/imx6qdl-colibri.dtsi???????| 890 +> arch/arm/boot/dts/Makefile | 1 + +> arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++++ +> arch/arm/boot/dts/imx6qdl-colibri.dtsi | 890 > +++++++++++++++++++++++++++ -> ?3 files changed, 1144 insertions(+) -> ?create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts -> ?create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi +> 3 files changed, 1144 insertions(+) +> create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +> create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index f79cac2..44ff380 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -323,6 +323,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ -> ? imx6dl-aristainetos_7.dtb \ -> ? imx6dl-aristainetos2_4.dtb \ -> ? imx6dl-aristainetos2_7.dtb \ +> imx6dl-aristainetos_7.dtb \ +> imx6dl-aristainetos2_4.dtb \ +> imx6dl-aristainetos2_7.dtb \ > + imx6dl-colibri-eval-v3.dtb \ -> ? imx6dl-cubox-i.dtb \ -> ? imx6dl-dfi-fs700-m60.dtb \ -> ? imx6dl-gw51xx.dtb \ +> imx6dl-cubox-i.dtb \ +> imx6dl-dfi-fs700-m60.dtb \ +> imx6dl-gw51xx.dtb \ > diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts > b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts > new file mode 100644 @@ -44,43 +44,43 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + * licensing only applies to this file, and not this project as a > + * whole. > + * -> + *??a) This file is free software; you can redistribute it and/or -> + *?????modify it under the terms of the GNU General Public License -> + *?????version 2 as published by the Free Software Foundation. +> + * a) This file is free software; you can redistribute it and/or +> + * modify it under the terms of the GNU General Public License +> + * version 2 as published by the Free Software Foundation. > + * -> + *?????This file is distributed in the hope that it will be useful -> + *?????but WITHOUT ANY WARRANTY; without even the implied warranty +> + * This file is distributed in the hope that it will be useful +> + * but WITHOUT ANY WARRANTY; without even the implied warranty > of -> + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the -> + *?????GNU General Public License for more details. +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> + * GNU General Public License for more details. > + * > + * Or, alternatively > + * -> + *??b) Permission is hereby granted, free of charge, to any person -> + *?????obtaining a copy of this software and associated +> + * b) Permission is hereby granted, free of charge, to any person +> + * obtaining a copy of this software and associated > documentation -> + *?????files (the "Software"), to deal in the Software without -> + *?????restriction, including without limitation the rights to use -> + *?????copy, modify, merge, publish, distribute, sublicense, and/or -> + *?????sell copies of the Software, and to permit persons to whom +> + * files (the "Software"), to deal in the Software without +> + * restriction, including without limitation the rights to use +> + * copy, modify, merge, publish, distribute, sublicense, and/or +> + * sell copies of the Software, and to permit persons to whom > the -> + *?????Software is furnished to do so, subject to the following -> + *?????conditions: +> + * Software is furnished to do so, subject to the following +> + * conditions: > + * -> + *?????The above copyright notice and this permission notice shall +> + * The above copyright notice and this permission notice shall > be -> + *?????included in all copies or substantial portions of the +> + * included in all copies or substantial portions of the > Software. > + * -> + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -> + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +> + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND +> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE > WARRANTIES -> + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -> + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -> + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -> + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -> + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -> + *?????OTHER DEALINGS IN THE SOFTWARE. +> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY +> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +> + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; @@ -95,7 +95,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Board V3"; > + compatible = "toradex,colibri_imx6dl-eval-v3", > "toradex,colibri_imx6dl", -> + ?????"fsl,imx6dl"; +> + "fsl,imx6dl"; > + > + aliases { > + i2c0 = &i2c2; @@ -109,7 +109,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + > + clocks { > + /* Fixed crystal dedicated to mcp251x */ -> + clk16m: clk at 1 { +> + clk16m: clk@1 { > + compatible = "fixed-clock"; > + reg = <1>; > + #clock-cells = <0>; @@ -133,7 +133,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + }; > + }; > + -> + lcd_display: display at di0 { +> + lcd_display: display@di0 { > + compatible = "fsl,imx-parallel-display"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -142,7 +142,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + pinctrl-0 = <&pinctrl_ipu1_lcdif>; > + status = "okay"; > + -> + port at 0 { +> + port@0 { > + reg = <0>; > + > + lcd_display_in: endpoint { @@ -150,7 +150,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + }; > + }; > + -> + port at 1 { +> + port@1 { > + reg = <1>; > + > + lcd_display_out: endpoint { @@ -161,9 +161,9 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + > + panel: panel { > + /* -> + ?* edt,et057090dhu: EDT 5.7" LCD TFT -> + ?* edt,et070080dh6: EDT 7.0" LCD TFT -> + ?*/ +> + * edt,et057090dhu: EDT 5.7" LCD TFT +> + * edt,et070080dh6: EDT 7.0" LCD TFT +> + */ > + compatible = "edt,et057090dhu"; > + backlight = <&backlight>; > + @@ -186,7 +186,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > +&ecspi4 { > + status = "okay"; > + -> + mcp251x0: mcp251x at 1 { +> + mcp251x0: mcp251x@1 { > + compatible = "microchip,mcp2515"; > + reg = <0>; > + clocks = <&clk16m>; @@ -209,7 +209,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + status = "okay"; > + > + /* M41T0M6 real time clock on carrier board */ -> + rtc_i2c: rtc at 68 { +> + rtc_i2c: rtc@68 { > + compatible = "st,m41t00"; > + reg = <0x68>; > + }; @@ -273,11 +273,11 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + > + /* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2 */ > + ranges = <0 0 0x08000000 0x02000000 -> + ??1 0 0x0a000000 0x02000000 -> + ??2 0 0x0c000000 0x02000000>; +> + 1 0 0x0a000000 0x02000000 +> + 2 0 0x0c000000 0x02000000>; > + > + /* SRAM on Colibri nEXT_CS0 */ -> + sram at 0,0 { +> + sram@0,0 { > + compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; > + reg = <0 0 0x00010000>; > + #address-cells = <1>; @@ -285,12 +285,12 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + bank-width = <2>; > + fsl,weim-cs-timing = <0x00010081 0x00000000 > 0x04000000 -> + ??????0x00000000 0x04000040 +> + 0x00000000 0x04000040 > 0x00000000>; > + }; > + > + /* SRAM on Colibri nEXT_CS1 */ -> + sram at 1,0 { +> + sram@1,0 { > + compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; > + reg = <1 0 0x00010000>; > + #address-cells = <1>; @@ -298,7 +298,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + bank-width = <2>; > + fsl,weim-cs-timing = <0x00010081 0x00000000 > 0x04000000 -> + ??????0x00000000 0x04000040 +> + 0x00000000 0x04000040 > 0x00000000>; > + }; > +}; @@ -320,43 +320,43 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + * licensing only applies to this file, and not this project as a > + * whole. > + * -> + *??a) This file is free software; you can redistribute it and/or -> + *?????modify it under the terms of the GNU General Public License -> + *?????version 2 as published by the Free Software Foundation. +> + * a) This file is free software; you can redistribute it and/or +> + * modify it under the terms of the GNU General Public License +> + * version 2 as published by the Free Software Foundation. > + * -> + *?????This file is distributed in the hope that it will be useful -> + *?????but WITHOUT ANY WARRANTY; without even the implied warranty +> + * This file is distributed in the hope that it will be useful +> + * but WITHOUT ANY WARRANTY; without even the implied warranty > of -> + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the -> + *?????GNU General Public License for more details. +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> + * GNU General Public License for more details. > + * > + * Or, alternatively > + * -> + *??b) Permission is hereby granted, free of charge, to any person -> + *?????obtaining a copy of this software and associated +> + * b) Permission is hereby granted, free of charge, to any person +> + * obtaining a copy of this software and associated > documentation -> + *?????files (the "Software"), to deal in the Software without -> + *?????restriction, including without limitation the rights to use -> + *?????copy, modify, merge, publish, distribute, sublicense, and/or -> + *?????sell copies of the Software, and to permit persons to whom +> + * files (the "Software"), to deal in the Software without +> + * restriction, including without limitation the rights to use +> + * copy, modify, merge, publish, distribute, sublicense, and/or +> + * sell copies of the Software, and to permit persons to whom > the -> + *?????Software is furnished to do so, subject to the following -> + *?????conditions: +> + * Software is furnished to do so, subject to the following +> + * conditions: > + * -> + *?????The above copyright notice and this permission notice shall +> + * The above copyright notice and this permission notice shall > be -> + *?????included in all copies or substantial portions of the +> + * included in all copies or substantial portions of the > Software. > + * -> + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -> + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +> + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND +> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE > WARRANTIES -> + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -> + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -> + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -> + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -> + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -> + *?????OTHER DEALINGS IN THE SOFTWARE. +> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY +> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +> + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +#include <dt-bindings/gpio/gpio.h> @@ -488,7 +488,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + pinctrl-0 = <&pinctrl_i2c2>; > + status = "okay"; > + -> + pmic: pfuze100 at 08 { +> + pmic: pfuze100@08 { > + compatible = "fsl,pfuze100"; > + reg = <0x08>; > + @@ -569,7 +569,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + }; > + }; > + -> + codec: sgtl5000 at 0a { +> + codec: sgtl5000@0a { > + compatible = "fsl,sgtl5000"; > + reg = <0x0a>; > + clocks = <&clks IMX6QDL_CLK_CKO>; @@ -578,7 +578,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + }; > + > + /* STMPE811 touch screen controller */ -> + stmpe811 at 41 { +> + stmpe811@41 { > + compatible = "st,stmpe811"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_touch_int>; @@ -602,10 +602,10 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + /* 7 length fractional part in z */ > + st,fraction-z = <7>; > + /* -> + ?* 50 mA typical 80 mA max touchscreen +> + * 50 mA typical 80 mA max touchscreen > drivers -> + ?* current limit value -> + ?*/ +> + * current limit value +> + */ > + st,i-drive = <1>; > + /* 12-bit ADC */ > + st,mod-12b = <1>; @@ -729,9 +729,9 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + > +&weim { > + pinctrl-names = "default"; -> + pinctrl-0 = <&pinctrl_weim_sram??&pinctrl_weim_cs0 -> + ?????&pinctrl_weim_cs1???&pinctrl_weim_cs2 -> + ?????&pinctrl_weim_rdnwr &pinctrl_weim_npwe>; +> + pinctrl-0 = <&pinctrl_weim_sram &pinctrl_weim_cs0 +> + &pinctrl_weim_cs1 &pinctrl_weim_cs2 +> + &pinctrl_weim_rdnwr &pinctrl_weim_npwe>; > + #address-cells = <2>; > + #size-cells = <1>; > + status = "disabled"; @@ -791,7 +791,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > x1b0b0 > + MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x > 1b0b0 -> + MX6QDL_PAD_GPIO_16__ENET_REF_CLK?????((1<<30 +> + MX6QDL_PAD_GPIO_16__ENET_REF_CLK ((1<<30 > ) | 0x1b0b0) > + >; > + }; @@ -1389,3 +1389,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + >; > + }; > +}; +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index f147a86..fe2981f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,14 @@ "ref\020160921112438.8661-1-maitysanchayan@gmail.com\0" - "From\0marcel.ziswiler@toradex.com (Marcel Ziswiler)\0" - "Subject\0[PATCH] ARM: dts: imx6: Add support for Toradex Colibri iMX6 module\0" + "From\0Marcel Ziswiler <marcel.ziswiler@toradex.com>\0" + "Subject\0Re: [PATCH] ARM: dts: imx6: Add support for Toradex Colibri iMX6 module\0" "Date\0Tue, 27 Sep 2016 06:27:43 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0shawnguo@kernel.org <shawnguo@kernel.org>" + " maitysanchayan@gmail.com <maitysanchayan@gmail.com>\0" + "Cc\0devicetree@vger.kernel.org <devicetree@vger.kernel.org>" + stefan@agner.ch <stefan@agner.ch> + robh+dt@kernel.org <robh+dt@kernel.org> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "On Wed, 2016-09-21 at 16:54 +0530, Sanchayan Maity wrote:\n" @@ -13,26 +19,26 @@ "Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>\n" "\n" "> ---\n" - "> ?arch/arm/boot/dts/Makefile???????????????????|???1 +\n" - "> ?arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++++\n" - "> ?arch/arm/boot/dts/imx6qdl-colibri.dtsi???????| 890\n" + "> \302\240arch/arm/boot/dts/Makefile\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\240\302\2401 +\n" + "> \302\240arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++++\n" + "> \302\240arch/arm/boot/dts/imx6qdl-colibri.dtsi\302\240\302\240\302\240\302\240\302\240\302\240\302\240| 890\n" "> +++++++++++++++++++++++++++\n" - "> ?3 files changed, 1144 insertions(+)\n" - "> ?create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts\n" - "> ?create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi\n" + "> \302\2403 files changed, 1144 insertions(+)\n" + "> \302\240create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts\n" + "> \302\240create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi\n" "> \n" "> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile\n" "> index f79cac2..44ff380 100644\n" "> --- a/arch/arm/boot/dts/Makefile\n" "> +++ b/arch/arm/boot/dts/Makefile\n" "> @@ -323,6 +323,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \\\n" - "> ?\timx6dl-aristainetos_7.dtb \\\n" - "> ?\timx6dl-aristainetos2_4.dtb \\\n" - "> ?\timx6dl-aristainetos2_7.dtb \\\n" + "> \302\240\timx6dl-aristainetos_7.dtb \\\n" + "> \302\240\timx6dl-aristainetos2_4.dtb \\\n" + "> \302\240\timx6dl-aristainetos2_7.dtb \\\n" "> +\timx6dl-colibri-eval-v3.dtb \\\n" - "> ?\timx6dl-cubox-i.dtb \\\n" - "> ?\timx6dl-dfi-fs700-m60.dtb \\\n" - "> ?\timx6dl-gw51xx.dtb \\\n" + "> \302\240\timx6dl-cubox-i.dtb \\\n" + "> \302\240\timx6dl-dfi-fs700-m60.dtb \\\n" + "> \302\240\timx6dl-gw51xx.dtb \\\n" "> diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts\n" "> b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts\n" "> new file mode 100644\n" @@ -51,43 +57,43 @@ "> + * licensing only applies to this file, and not this project as a\n" "> + * whole.\n" "> + *\n" - "> + *??a) This file is free software; you can redistribute it and/or\n" - "> + *?????modify it under the terms of the GNU General Public License\n" - "> + *?????version 2 as published by the Free Software Foundation.\n" + "> + *\302\240\302\240a) This file is free software; you can redistribute it and/or\n" + "> + *\302\240\302\240\302\240\302\240\302\240modify it under the terms of the GNU General Public License\n" + "> + *\302\240\302\240\302\240\302\240\302\240version 2 as published by the Free Software Foundation.\n" "> + *\n" - "> + *?????This file is distributed in the hope that it will be useful\n" - "> + *?????but WITHOUT ANY WARRANTY; without even the implied warranty\n" + "> + *\302\240\302\240\302\240\302\240\302\240This file is distributed in the hope that it will be useful\n" + "> + *\302\240\302\240\302\240\302\240\302\240but WITHOUT ANY WARRANTY; without even the implied warranty\n" "> of\n" - "> + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the\n" - "> + *?????GNU General Public License for more details.\n" + "> + *\302\240\302\240\302\240\302\240\302\240MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\302\240\302\240See the\n" + "> + *\302\240\302\240\302\240\302\240\302\240GNU General Public License for more details.\n" "> + *\n" "> + * Or, alternatively\n" "> + *\n" - "> + *??b) Permission is hereby granted, free of charge, to any person\n" - "> + *?????obtaining a copy of this software and associated\n" + "> + *\302\240\302\240b) Permission is hereby granted, free of charge, to any person\n" + "> + *\302\240\302\240\302\240\302\240\302\240obtaining a copy of this software and associated\n" "> documentation\n" - "> + *?????files (the \"Software\"), to deal in the Software without\n" - "> + *?????restriction, including without limitation the rights to use\n" - "> + *?????copy, modify, merge, publish, distribute, sublicense, and/or\n" - "> + *?????sell copies of the Software, and to permit persons to whom\n" + "> + *\302\240\302\240\302\240\302\240\302\240files (the \"Software\"), to deal in the Software without\n" + "> + *\302\240\302\240\302\240\302\240\302\240restriction, including without limitation the rights to use\n" + "> + *\302\240\302\240\302\240\302\240\302\240copy, modify, merge, publish, distribute, sublicense, and/or\n" + "> + *\302\240\302\240\302\240\302\240\302\240sell copies of the Software, and to permit persons to whom\n" "> the\n" - "> + *?????Software is furnished to do so, subject to the following\n" - "> + *?????conditions:\n" + "> + *\302\240\302\240\302\240\302\240\302\240Software is furnished to do so, subject to the following\n" + "> + *\302\240\302\240\302\240\302\240\302\240conditions:\n" "> + *\n" - "> + *?????The above copyright notice and this permission notice shall\n" + "> + *\302\240\302\240\302\240\302\240\302\240The above copyright notice and this permission notice shall\n" "> be\n" - "> + *?????included in all copies or substantial portions of the\n" + "> + *\302\240\302\240\302\240\302\240\302\240included in all copies or substantial portions of the\n" "> Software.\n" "> + *\n" - "> + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND\n" - "> + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" + "> + *\302\240\302\240\302\240\302\240\302\240THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND\n" + "> + *\302\240\302\240\302\240\302\240\302\240EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" "> WARRANTIES\n" - "> + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" - "> + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n" - "> + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY\n" - "> + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n" - "> + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n" - "> + *?????OTHER DEALINGS IN THE SOFTWARE.\n" + "> + *\302\240\302\240\302\240\302\240\302\240OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" + "> + *\302\240\302\240\302\240\302\240\302\240NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n" + "> + *\302\240\302\240\302\240\302\240\302\240HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY\n" + "> + *\302\240\302\240\302\240\302\240\302\240WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n" + "> + *\302\240\302\240\302\240\302\240\302\240FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n" + "> + *\302\240\302\240\302\240\302\240\302\240OTHER DEALINGS IN THE SOFTWARE.\n" "> + */\n" "> +\n" "> +/dts-v1/;\n" @@ -102,7 +108,7 @@ "> Board V3\";\n" "> +\tcompatible = \"toradex,colibri_imx6dl-eval-v3\",\n" "> \"toradex,colibri_imx6dl\",\n" - "> +\t\t?????\"fsl,imx6dl\";\n" + "> +\t\t\302\240\302\240\302\240\302\240\302\240\"fsl,imx6dl\";\n" "> +\n" "> +\taliases {\n" "> +\t\ti2c0 = &i2c2;\n" @@ -116,7 +122,7 @@ "> +\n" "> +\tclocks {\n" "> +\t\t/* Fixed crystal dedicated to mcp251x */\n" - "> +\t\tclk16m: clk at 1 {\n" + "> +\t\tclk16m: clk@1 {\n" "> +\t\t\tcompatible = \"fixed-clock\";\n" "> +\t\t\treg = <1>;\n" "> +\t\t\t#clock-cells = <0>;\n" @@ -140,7 +146,7 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> +\tlcd_display: display at di0 {\n" + "> +\tlcd_display: display@di0 {\n" "> +\t\tcompatible = \"fsl,imx-parallel-display\";\n" "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <0>;\n" @@ -149,7 +155,7 @@ "> +\t\tpinctrl-0 = <&pinctrl_ipu1_lcdif>;\n" "> +\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\tport at 0 {\n" + "> +\t\tport@0 {\n" "> +\t\t\treg = <0>;\n" "> +\n" "> +\t\t\tlcd_display_in: endpoint {\n" @@ -157,7 +163,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tport at 1 {\n" + "> +\t\tport@1 {\n" "> +\t\t\treg = <1>;\n" "> +\n" "> +\t\t\tlcd_display_out: endpoint {\n" @@ -168,9 +174,9 @@ "> +\n" "> +\tpanel: panel {\n" "> +\t\t/*\n" - "> +\t\t?* edt,et057090dhu: EDT 5.7\" LCD TFT\n" - "> +\t\t?* edt,et070080dh6: EDT 7.0\" LCD TFT\n" - "> +\t\t?*/\n" + "> +\t\t\302\240* edt,et057090dhu: EDT 5.7\" LCD TFT\n" + "> +\t\t\302\240* edt,et070080dh6: EDT 7.0\" LCD TFT\n" + "> +\t\t\302\240*/\n" "> +\t\tcompatible = \"edt,et057090dhu\";\n" "> +\t\tbacklight = <&backlight>;\n" "> +\n" @@ -193,7 +199,7 @@ "> +&ecspi4 {\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tmcp251x0: mcp251x at 1 {\n" + "> +\tmcp251x0: mcp251x@1 {\n" "> +\t\tcompatible = \"microchip,mcp2515\";\n" "> +\t\treg = <0>;\n" "> +\t\tclocks = <&clk16m>;\n" @@ -216,7 +222,7 @@ "> +\tstatus = \"okay\";\n" "> +\n" "> +\t/* M41T0M6 real time clock on carrier board */\n" - "> +\trtc_i2c: rtc at 68 {\n" + "> +\trtc_i2c: rtc@68 {\n" "> +\t\tcompatible = \"st,m41t00\";\n" "> +\t\treg = <0x68>;\n" "> +\t};\n" @@ -280,11 +286,11 @@ "> +\n" "> +\t/* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2 */\n" "> +\tranges = <0 0 0x08000000 0x02000000\n" - "> +\t\t??1 0 0x0a000000 0x02000000\n" - "> +\t\t??2 0 0x0c000000 0x02000000>;\n" + "> +\t\t\302\240\302\2401 0 0x0a000000 0x02000000\n" + "> +\t\t\302\240\302\2402 0 0x0c000000 0x02000000>;\n" "> +\n" "> +\t/* SRAM on Colibri nEXT_CS0 */\n" - "> +\tsram at 0,0 {\n" + "> +\tsram@0,0 {\n" "> +\t\tcompatible = \"cypress,cy7c1019dv33-10zsxi, mtd-ram\";\n" "> +\t\treg = <0 0 0x00010000>;\n" "> +\t\t#address-cells = <1>;\n" @@ -292,12 +298,12 @@ "> +\t\tbank-width = <2>;\n" "> +\t\tfsl,weim-cs-timing = <0x00010081 0x00000000\n" "> 0x04000000\n" - "> +\t\t\t\t??????0x00000000 0x04000040\n" + "> +\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\2400x00000000 0x04000040\n" "> 0x00000000>;\n" "> +\t};\n" "> +\n" "> +\t/* SRAM on Colibri nEXT_CS1 */\n" - "> +\tsram at 1,0 {\n" + "> +\tsram@1,0 {\n" "> +\t\tcompatible = \"cypress,cy7c1019dv33-10zsxi, mtd-ram\";\n" "> +\t\treg = <1 0 0x00010000>;\n" "> +\t\t#address-cells = <1>;\n" @@ -305,7 +311,7 @@ "> +\t\tbank-width = <2>;\n" "> +\t\tfsl,weim-cs-timing = <0x00010081 0x00000000\n" "> 0x04000000\n" - "> +\t\t\t\t??????0x00000000 0x04000040\n" + "> +\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\2400x00000000 0x04000040\n" "> 0x00000000>;\n" "> +\t};\n" "> +};\n" @@ -327,43 +333,43 @@ "> + * licensing only applies to this file, and not this project as a\n" "> + * whole.\n" "> + *\n" - "> + *??a) This file is free software; you can redistribute it and/or\n" - "> + *?????modify it under the terms of the GNU General Public License\n" - "> + *?????version 2 as published by the Free Software Foundation.\n" + "> + *\302\240\302\240a) This file is free software; you can redistribute it and/or\n" + "> + *\302\240\302\240\302\240\302\240\302\240modify it under the terms of the GNU General Public License\n" + "> + *\302\240\302\240\302\240\302\240\302\240version 2 as published by the Free Software Foundation.\n" "> + *\n" - "> + *?????This file is distributed in the hope that it will be useful\n" - "> + *?????but WITHOUT ANY WARRANTY; without even the implied warranty\n" + "> + *\302\240\302\240\302\240\302\240\302\240This file is distributed in the hope that it will be useful\n" + "> + *\302\240\302\240\302\240\302\240\302\240but WITHOUT ANY WARRANTY; without even the implied warranty\n" "> of\n" - "> + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the\n" - "> + *?????GNU General Public License for more details.\n" + "> + *\302\240\302\240\302\240\302\240\302\240MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\302\240\302\240See the\n" + "> + *\302\240\302\240\302\240\302\240\302\240GNU General Public License for more details.\n" "> + *\n" "> + * Or, alternatively\n" "> + *\n" - "> + *??b) Permission is hereby granted, free of charge, to any person\n" - "> + *?????obtaining a copy of this software and associated\n" + "> + *\302\240\302\240b) Permission is hereby granted, free of charge, to any person\n" + "> + *\302\240\302\240\302\240\302\240\302\240obtaining a copy of this software and associated\n" "> documentation\n" - "> + *?????files (the \"Software\"), to deal in the Software without\n" - "> + *?????restriction, including without limitation the rights to use\n" - "> + *?????copy, modify, merge, publish, distribute, sublicense, and/or\n" - "> + *?????sell copies of the Software, and to permit persons to whom\n" + "> + *\302\240\302\240\302\240\302\240\302\240files (the \"Software\"), to deal in the Software without\n" + "> + *\302\240\302\240\302\240\302\240\302\240restriction, including without limitation the rights to use\n" + "> + *\302\240\302\240\302\240\302\240\302\240copy, modify, merge, publish, distribute, sublicense, and/or\n" + "> + *\302\240\302\240\302\240\302\240\302\240sell copies of the Software, and to permit persons to whom\n" "> the\n" - "> + *?????Software is furnished to do so, subject to the following\n" - "> + *?????conditions:\n" + "> + *\302\240\302\240\302\240\302\240\302\240Software is furnished to do so, subject to the following\n" + "> + *\302\240\302\240\302\240\302\240\302\240conditions:\n" "> + *\n" - "> + *?????The above copyright notice and this permission notice shall\n" + "> + *\302\240\302\240\302\240\302\240\302\240The above copyright notice and this permission notice shall\n" "> be\n" - "> + *?????included in all copies or substantial portions of the\n" + "> + *\302\240\302\240\302\240\302\240\302\240included in all copies or substantial portions of the\n" "> Software.\n" "> + *\n" - "> + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND\n" - "> + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" + "> + *\302\240\302\240\302\240\302\240\302\240THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND\n" + "> + *\302\240\302\240\302\240\302\240\302\240EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" "> WARRANTIES\n" - "> + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" - "> + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n" - "> + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY\n" - "> + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n" - "> + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n" - "> + *?????OTHER DEALINGS IN THE SOFTWARE.\n" + "> + *\302\240\302\240\302\240\302\240\302\240OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" + "> + *\302\240\302\240\302\240\302\240\302\240NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n" + "> + *\302\240\302\240\302\240\302\240\302\240HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY\n" + "> + *\302\240\302\240\302\240\302\240\302\240WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n" + "> + *\302\240\302\240\302\240\302\240\302\240FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n" + "> + *\302\240\302\240\302\240\302\240\302\240OTHER DEALINGS IN THE SOFTWARE.\n" "> + */\n" "> +\n" "> +#include <dt-bindings/gpio/gpio.h>\n" @@ -495,7 +501,7 @@ "> +\tpinctrl-0 = <&pinctrl_i2c2>;\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tpmic: pfuze100 at 08 {\n" + "> +\tpmic: pfuze100@08 {\n" "> +\t\tcompatible = \"fsl,pfuze100\";\n" "> +\t\treg = <0x08>;\n" "> +\n" @@ -576,7 +582,7 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> +\tcodec: sgtl5000 at 0a {\n" + "> +\tcodec: sgtl5000@0a {\n" "> +\t\tcompatible = \"fsl,sgtl5000\";\n" "> +\t\treg = <0x0a>;\n" "> +\t\tclocks = <&clks IMX6QDL_CLK_CKO>;\n" @@ -585,7 +591,7 @@ "> +\t};\n" "> +\n" "> +\t/* STMPE811 touch screen controller */\n" - "> +\tstmpe811 at 41 {\n" + "> +\tstmpe811@41 {\n" "> +\t\tcompatible = \"st,stmpe811\";\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\t\tpinctrl-0 = <&pinctrl_touch_int>;\n" @@ -609,10 +615,10 @@ "> +\t\t\t/* 7 length fractional part in z */\n" "> +\t\t\tst,fraction-z = <7>;\n" "> +\t\t\t/*\n" - "> +\t\t\t?* 50 mA typical 80 mA max touchscreen\n" + "> +\t\t\t\302\240* 50 mA typical 80 mA max touchscreen\n" "> drivers\n" - "> +\t\t\t?* current limit value\n" - "> +\t\t\t?*/\n" + "> +\t\t\t\302\240* current limit value\n" + "> +\t\t\t\302\240*/\n" "> +\t\t\tst,i-drive = <1>;\n" "> +\t\t\t/* 12-bit ADC */\n" "> +\t\t\tst,mod-12b = <1>;\n" @@ -736,9 +742,9 @@ "> +\n" "> +&weim {\n" "> +\tpinctrl-names = \"default\";\n" - "> +\tpinctrl-0 = <&pinctrl_weim_sram??&pinctrl_weim_cs0\n" - "> +\t\t?????&pinctrl_weim_cs1???&pinctrl_weim_cs2\n" - "> +\t\t?????&pinctrl_weim_rdnwr &pinctrl_weim_npwe>;\n" + "> +\tpinctrl-0 = <&pinctrl_weim_sram\302\240\302\240&pinctrl_weim_cs0\n" + "> +\t\t\302\240\302\240\302\240\302\240\302\240&pinctrl_weim_cs1\302\240\302\240\302\240&pinctrl_weim_cs2\n" + "> +\t\t\302\240\302\240\302\240\302\240\302\240&pinctrl_weim_rdnwr &pinctrl_weim_npwe>;\n" "> +\t#address-cells = <2>;\n" "> +\t#size-cells = <1>;\n" "> +\tstatus = \"disabled\";\n" @@ -798,7 +804,7 @@ "> x1b0b0\n" "> +\t\t\tMX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN\t0x\n" "> 1b0b0\n" - "> +\t\t\tMX6QDL_PAD_GPIO_16__ENET_REF_CLK?????((1<<30\n" + "> +\t\t\tMX6QDL_PAD_GPIO_16__ENET_REF_CLK\302\240\302\240\302\240\302\240\302\240((1<<30\n" "> ) | 0x1b0b0)\n" "> +\t\t>;\n" "> +\t};\n" @@ -1395,6 +1401,10 @@ "> 0x1b0b0\n" "> +\t\t>;\n" "> +\t};\n" - > +}; + "> +};\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -60583ab0250c2b0680903caa12272fcc0cf601de7a9a6c9cf56f359fa76cdcd5 +acd2056dd3de3de4427916808c19eee15c61e389bbe164b36d7fdcb563a966b2
diff --git a/a/1.txt b/N2/1.txt index 36f4045..c6a0f2b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,26 +6,26 @@ On Wed, 2016-09-21 at 16:54 +0530, Sanchayan Maity wrote: Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- -> ?arch/arm/boot/dts/Makefile???????????????????|???1 + -> ?arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++++ -> ?arch/arm/boot/dts/imx6qdl-colibri.dtsi???????| 890 +> arch/arm/boot/dts/Makefile | 1 + +> arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++++ +> arch/arm/boot/dts/imx6qdl-colibri.dtsi | 890 > +++++++++++++++++++++++++++ -> ?3 files changed, 1144 insertions(+) -> ?create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts -> ?create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi +> 3 files changed, 1144 insertions(+) +> create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +> create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index f79cac2..44ff380 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -323,6 +323,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ -> ? imx6dl-aristainetos_7.dtb \ -> ? imx6dl-aristainetos2_4.dtb \ -> ? imx6dl-aristainetos2_7.dtb \ +> imx6dl-aristainetos_7.dtb \ +> imx6dl-aristainetos2_4.dtb \ +> imx6dl-aristainetos2_7.dtb \ > + imx6dl-colibri-eval-v3.dtb \ -> ? imx6dl-cubox-i.dtb \ -> ? imx6dl-dfi-fs700-m60.dtb \ -> ? imx6dl-gw51xx.dtb \ +> imx6dl-cubox-i.dtb \ +> imx6dl-dfi-fs700-m60.dtb \ +> imx6dl-gw51xx.dtb \ > diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts > b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts > new file mode 100644 @@ -44,43 +44,43 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + * licensing only applies to this file, and not this project as a > + * whole. > + * -> + *??a) This file is free software; you can redistribute it and/or -> + *?????modify it under the terms of the GNU General Public License -> + *?????version 2 as published by the Free Software Foundation. +> + * a) This file is free software; you can redistribute it and/or +> + * modify it under the terms of the GNU General Public License +> + * version 2 as published by the Free Software Foundation. > + * -> + *?????This file is distributed in the hope that it will be useful -> + *?????but WITHOUT ANY WARRANTY; without even the implied warranty +> + * This file is distributed in the hope that it will be useful +> + * but WITHOUT ANY WARRANTY; without even the implied warranty > of -> + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the -> + *?????GNU General Public License for more details. +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> + * GNU General Public License for more details. > + * > + * Or, alternatively > + * -> + *??b) Permission is hereby granted, free of charge, to any person -> + *?????obtaining a copy of this software and associated +> + * b) Permission is hereby granted, free of charge, to any person +> + * obtaining a copy of this software and associated > documentation -> + *?????files (the "Software"), to deal in the Software without -> + *?????restriction, including without limitation the rights to use -> + *?????copy, modify, merge, publish, distribute, sublicense, and/or -> + *?????sell copies of the Software, and to permit persons to whom +> + * files (the "Software"), to deal in the Software without +> + * restriction, including without limitation the rights to use +> + * copy, modify, merge, publish, distribute, sublicense, and/or +> + * sell copies of the Software, and to permit persons to whom > the -> + *?????Software is furnished to do so, subject to the following -> + *?????conditions: +> + * Software is furnished to do so, subject to the following +> + * conditions: > + * -> + *?????The above copyright notice and this permission notice shall +> + * The above copyright notice and this permission notice shall > be -> + *?????included in all copies or substantial portions of the +> + * included in all copies or substantial portions of the > Software. > + * -> + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -> + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +> + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND +> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE > WARRANTIES -> + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -> + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -> + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -> + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -> + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -> + *?????OTHER DEALINGS IN THE SOFTWARE. +> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY +> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +> + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; @@ -95,7 +95,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Board V3"; > + compatible = "toradex,colibri_imx6dl-eval-v3", > "toradex,colibri_imx6dl", -> + ?????"fsl,imx6dl"; +> + "fsl,imx6dl"; > + > + aliases { > + i2c0 = &i2c2; @@ -109,7 +109,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + > + clocks { > + /* Fixed crystal dedicated to mcp251x */ -> + clk16m: clk at 1 { +> + clk16m: clk@1 { > + compatible = "fixed-clock"; > + reg = <1>; > + #clock-cells = <0>; @@ -133,7 +133,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + }; > + }; > + -> + lcd_display: display at di0 { +> + lcd_display: display@di0 { > + compatible = "fsl,imx-parallel-display"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -142,7 +142,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + pinctrl-0 = <&pinctrl_ipu1_lcdif>; > + status = "okay"; > + -> + port at 0 { +> + port@0 { > + reg = <0>; > + > + lcd_display_in: endpoint { @@ -150,7 +150,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + }; > + }; > + -> + port at 1 { +> + port@1 { > + reg = <1>; > + > + lcd_display_out: endpoint { @@ -161,9 +161,9 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + > + panel: panel { > + /* -> + ?* edt,et057090dhu: EDT 5.7" LCD TFT -> + ?* edt,et070080dh6: EDT 7.0" LCD TFT -> + ?*/ +> + * edt,et057090dhu: EDT 5.7" LCD TFT +> + * edt,et070080dh6: EDT 7.0" LCD TFT +> + */ > + compatible = "edt,et057090dhu"; > + backlight = <&backlight>; > + @@ -186,7 +186,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > +&ecspi4 { > + status = "okay"; > + -> + mcp251x0: mcp251x at 1 { +> + mcp251x0: mcp251x@1 { > + compatible = "microchip,mcp2515"; > + reg = <0>; > + clocks = <&clk16m>; @@ -209,7 +209,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + status = "okay"; > + > + /* M41T0M6 real time clock on carrier board */ -> + rtc_i2c: rtc at 68 { +> + rtc_i2c: rtc@68 { > + compatible = "st,m41t00"; > + reg = <0x68>; > + }; @@ -273,11 +273,11 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + > + /* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2 */ > + ranges = <0 0 0x08000000 0x02000000 -> + ??1 0 0x0a000000 0x02000000 -> + ??2 0 0x0c000000 0x02000000>; +> + 1 0 0x0a000000 0x02000000 +> + 2 0 0x0c000000 0x02000000>; > + > + /* SRAM on Colibri nEXT_CS0 */ -> + sram at 0,0 { +> + sram@0,0 { > + compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; > + reg = <0 0 0x00010000>; > + #address-cells = <1>; @@ -285,12 +285,12 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + bank-width = <2>; > + fsl,weim-cs-timing = <0x00010081 0x00000000 > 0x04000000 -> + ??????0x00000000 0x04000040 +> + 0x00000000 0x04000040 > 0x00000000>; > + }; > + > + /* SRAM on Colibri nEXT_CS1 */ -> + sram at 1,0 { +> + sram@1,0 { > + compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; > + reg = <1 0 0x00010000>; > + #address-cells = <1>; @@ -298,7 +298,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + bank-width = <2>; > + fsl,weim-cs-timing = <0x00010081 0x00000000 > 0x04000000 -> + ??????0x00000000 0x04000040 +> + 0x00000000 0x04000040 > 0x00000000>; > + }; > +}; @@ -320,43 +320,43 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + * licensing only applies to this file, and not this project as a > + * whole. > + * -> + *??a) This file is free software; you can redistribute it and/or -> + *?????modify it under the terms of the GNU General Public License -> + *?????version 2 as published by the Free Software Foundation. +> + * a) This file is free software; you can redistribute it and/or +> + * modify it under the terms of the GNU General Public License +> + * version 2 as published by the Free Software Foundation. > + * -> + *?????This file is distributed in the hope that it will be useful -> + *?????but WITHOUT ANY WARRANTY; without even the implied warranty +> + * This file is distributed in the hope that it will be useful +> + * but WITHOUT ANY WARRANTY; without even the implied warranty > of -> + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the -> + *?????GNU General Public License for more details. +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> + * GNU General Public License for more details. > + * > + * Or, alternatively > + * -> + *??b) Permission is hereby granted, free of charge, to any person -> + *?????obtaining a copy of this software and associated +> + * b) Permission is hereby granted, free of charge, to any person +> + * obtaining a copy of this software and associated > documentation -> + *?????files (the "Software"), to deal in the Software without -> + *?????restriction, including without limitation the rights to use -> + *?????copy, modify, merge, publish, distribute, sublicense, and/or -> + *?????sell copies of the Software, and to permit persons to whom +> + * files (the "Software"), to deal in the Software without +> + * restriction, including without limitation the rights to use +> + * copy, modify, merge, publish, distribute, sublicense, and/or +> + * sell copies of the Software, and to permit persons to whom > the -> + *?????Software is furnished to do so, subject to the following -> + *?????conditions: +> + * Software is furnished to do so, subject to the following +> + * conditions: > + * -> + *?????The above copyright notice and this permission notice shall +> + * The above copyright notice and this permission notice shall > be -> + *?????included in all copies or substantial portions of the +> + * included in all copies or substantial portions of the > Software. > + * -> + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -> + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +> + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND +> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE > WARRANTIES -> + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -> + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -> + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -> + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -> + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -> + *?????OTHER DEALINGS IN THE SOFTWARE. +> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY +> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +> + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +#include <dt-bindings/gpio/gpio.h> @@ -488,7 +488,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + pinctrl-0 = <&pinctrl_i2c2>; > + status = "okay"; > + -> + pmic: pfuze100 at 08 { +> + pmic: pfuze100@08 { > + compatible = "fsl,pfuze100"; > + reg = <0x08>; > + @@ -569,7 +569,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + }; > + }; > + -> + codec: sgtl5000 at 0a { +> + codec: sgtl5000@0a { > + compatible = "fsl,sgtl5000"; > + reg = <0x0a>; > + clocks = <&clks IMX6QDL_CLK_CKO>; @@ -578,7 +578,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + }; > + > + /* STMPE811 touch screen controller */ -> + stmpe811 at 41 { +> + stmpe811@41 { > + compatible = "st,stmpe811"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_touch_int>; @@ -602,10 +602,10 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + /* 7 length fractional part in z */ > + st,fraction-z = <7>; > + /* -> + ?* 50 mA typical 80 mA max touchscreen +> + * 50 mA typical 80 mA max touchscreen > drivers -> + ?* current limit value -> + ?*/ +> + * current limit value +> + */ > + st,i-drive = <1>; > + /* 12-bit ADC */ > + st,mod-12b = <1>; @@ -729,9 +729,9 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > + > +&weim { > + pinctrl-names = "default"; -> + pinctrl-0 = <&pinctrl_weim_sram??&pinctrl_weim_cs0 -> + ?????&pinctrl_weim_cs1???&pinctrl_weim_cs2 -> + ?????&pinctrl_weim_rdnwr &pinctrl_weim_npwe>; +> + pinctrl-0 = <&pinctrl_weim_sram &pinctrl_weim_cs0 +> + &pinctrl_weim_cs1 &pinctrl_weim_cs2 +> + &pinctrl_weim_rdnwr &pinctrl_weim_npwe>; > + #address-cells = <2>; > + #size-cells = <1>; > + status = "disabled"; @@ -791,7 +791,7 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > x1b0b0 > + MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x > 1b0b0 -> + MX6QDL_PAD_GPIO_16__ENET_REF_CLK?????((1<<30 +> + MX6QDL_PAD_GPIO_16__ENET_REF_CLK ((1<<30 > ) | 0x1b0b0) > + >; > + }; diff --git a/a/content_digest b/N2/content_digest index f147a86..e963778 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,14 @@ "ref\020160921112438.8661-1-maitysanchayan@gmail.com\0" - "From\0marcel.ziswiler@toradex.com (Marcel Ziswiler)\0" - "Subject\0[PATCH] ARM: dts: imx6: Add support for Toradex Colibri iMX6 module\0" + "From\0Marcel Ziswiler <marcel.ziswiler@toradex.com>\0" + "Subject\0Re: [PATCH] ARM: dts: imx6: Add support for Toradex Colibri iMX6 module\0" "Date\0Tue, 27 Sep 2016 06:27:43 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0shawnguo@kernel.org <shawnguo@kernel.org>" + " maitysanchayan@gmail.com <maitysanchayan@gmail.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>" + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + stefan@agner.ch <stefan@agner.ch> + robh+dt@kernel.org <robh+dt@kernel.org> + " devicetree@vger.kernel.org <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" "On Wed, 2016-09-21 at 16:54 +0530, Sanchayan Maity wrote:\n" @@ -13,26 +19,26 @@ "Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>\n" "\n" "> ---\n" - "> ?arch/arm/boot/dts/Makefile???????????????????|???1 +\n" - "> ?arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++++\n" - "> ?arch/arm/boot/dts/imx6qdl-colibri.dtsi???????| 890\n" + "> \302\240arch/arm/boot/dts/Makefile\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\240\302\2401 +\n" + "> \302\240arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++++\n" + "> \302\240arch/arm/boot/dts/imx6qdl-colibri.dtsi\302\240\302\240\302\240\302\240\302\240\302\240\302\240| 890\n" "> +++++++++++++++++++++++++++\n" - "> ?3 files changed, 1144 insertions(+)\n" - "> ?create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts\n" - "> ?create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi\n" + "> \302\2403 files changed, 1144 insertions(+)\n" + "> \302\240create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts\n" + "> \302\240create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi\n" "> \n" "> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile\n" "> index f79cac2..44ff380 100644\n" "> --- a/arch/arm/boot/dts/Makefile\n" "> +++ b/arch/arm/boot/dts/Makefile\n" "> @@ -323,6 +323,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \\\n" - "> ?\timx6dl-aristainetos_7.dtb \\\n" - "> ?\timx6dl-aristainetos2_4.dtb \\\n" - "> ?\timx6dl-aristainetos2_7.dtb \\\n" + "> \302\240\timx6dl-aristainetos_7.dtb \\\n" + "> \302\240\timx6dl-aristainetos2_4.dtb \\\n" + "> \302\240\timx6dl-aristainetos2_7.dtb \\\n" "> +\timx6dl-colibri-eval-v3.dtb \\\n" - "> ?\timx6dl-cubox-i.dtb \\\n" - "> ?\timx6dl-dfi-fs700-m60.dtb \\\n" - "> ?\timx6dl-gw51xx.dtb \\\n" + "> \302\240\timx6dl-cubox-i.dtb \\\n" + "> \302\240\timx6dl-dfi-fs700-m60.dtb \\\n" + "> \302\240\timx6dl-gw51xx.dtb \\\n" "> diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts\n" "> b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts\n" "> new file mode 100644\n" @@ -51,43 +57,43 @@ "> + * licensing only applies to this file, and not this project as a\n" "> + * whole.\n" "> + *\n" - "> + *??a) This file is free software; you can redistribute it and/or\n" - "> + *?????modify it under the terms of the GNU General Public License\n" - "> + *?????version 2 as published by the Free Software Foundation.\n" + "> + *\302\240\302\240a) This file is free software; you can redistribute it and/or\n" + "> + *\302\240\302\240\302\240\302\240\302\240modify it under the terms of the GNU General Public License\n" + "> + *\302\240\302\240\302\240\302\240\302\240version 2 as published by the Free Software Foundation.\n" "> + *\n" - "> + *?????This file is distributed in the hope that it will be useful\n" - "> + *?????but WITHOUT ANY WARRANTY; without even the implied warranty\n" + "> + *\302\240\302\240\302\240\302\240\302\240This file is distributed in the hope that it will be useful\n" + "> + *\302\240\302\240\302\240\302\240\302\240but WITHOUT ANY WARRANTY; without even the implied warranty\n" "> of\n" - "> + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the\n" - "> + *?????GNU General Public License for more details.\n" + "> + *\302\240\302\240\302\240\302\240\302\240MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\302\240\302\240See the\n" + "> + *\302\240\302\240\302\240\302\240\302\240GNU General Public License for more details.\n" "> + *\n" "> + * Or, alternatively\n" "> + *\n" - "> + *??b) Permission is hereby granted, free of charge, to any person\n" - "> + *?????obtaining a copy of this software and associated\n" + "> + *\302\240\302\240b) Permission is hereby granted, free of charge, to any person\n" + "> + *\302\240\302\240\302\240\302\240\302\240obtaining a copy of this software and associated\n" "> documentation\n" - "> + *?????files (the \"Software\"), to deal in the Software without\n" - "> + *?????restriction, including without limitation the rights to use\n" - "> + *?????copy, modify, merge, publish, distribute, sublicense, and/or\n" - "> + *?????sell copies of the Software, and to permit persons to whom\n" + "> + *\302\240\302\240\302\240\302\240\302\240files (the \"Software\"), to deal in the Software without\n" + "> + *\302\240\302\240\302\240\302\240\302\240restriction, including without limitation the rights to use\n" + "> + *\302\240\302\240\302\240\302\240\302\240copy, modify, merge, publish, distribute, sublicense, and/or\n" + "> + *\302\240\302\240\302\240\302\240\302\240sell copies of the Software, and to permit persons to whom\n" "> the\n" - "> + *?????Software is furnished to do so, subject to the following\n" - "> + *?????conditions:\n" + "> + *\302\240\302\240\302\240\302\240\302\240Software is furnished to do so, subject to the following\n" + "> + *\302\240\302\240\302\240\302\240\302\240conditions:\n" "> + *\n" - "> + *?????The above copyright notice and this permission notice shall\n" + "> + *\302\240\302\240\302\240\302\240\302\240The above copyright notice and this permission notice shall\n" "> be\n" - "> + *?????included in all copies or substantial portions of the\n" + "> + *\302\240\302\240\302\240\302\240\302\240included in all copies or substantial portions of the\n" "> Software.\n" "> + *\n" - "> + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND\n" - "> + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" + "> + *\302\240\302\240\302\240\302\240\302\240THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND\n" + "> + *\302\240\302\240\302\240\302\240\302\240EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" "> WARRANTIES\n" - "> + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" - "> + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n" - "> + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY\n" - "> + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n" - "> + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n" - "> + *?????OTHER DEALINGS IN THE SOFTWARE.\n" + "> + *\302\240\302\240\302\240\302\240\302\240OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" + "> + *\302\240\302\240\302\240\302\240\302\240NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n" + "> + *\302\240\302\240\302\240\302\240\302\240HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY\n" + "> + *\302\240\302\240\302\240\302\240\302\240WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n" + "> + *\302\240\302\240\302\240\302\240\302\240FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n" + "> + *\302\240\302\240\302\240\302\240\302\240OTHER DEALINGS IN THE SOFTWARE.\n" "> + */\n" "> +\n" "> +/dts-v1/;\n" @@ -102,7 +108,7 @@ "> Board V3\";\n" "> +\tcompatible = \"toradex,colibri_imx6dl-eval-v3\",\n" "> \"toradex,colibri_imx6dl\",\n" - "> +\t\t?????\"fsl,imx6dl\";\n" + "> +\t\t\302\240\302\240\302\240\302\240\302\240\"fsl,imx6dl\";\n" "> +\n" "> +\taliases {\n" "> +\t\ti2c0 = &i2c2;\n" @@ -116,7 +122,7 @@ "> +\n" "> +\tclocks {\n" "> +\t\t/* Fixed crystal dedicated to mcp251x */\n" - "> +\t\tclk16m: clk at 1 {\n" + "> +\t\tclk16m: clk@1 {\n" "> +\t\t\tcompatible = \"fixed-clock\";\n" "> +\t\t\treg = <1>;\n" "> +\t\t\t#clock-cells = <0>;\n" @@ -140,7 +146,7 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> +\tlcd_display: display at di0 {\n" + "> +\tlcd_display: display@di0 {\n" "> +\t\tcompatible = \"fsl,imx-parallel-display\";\n" "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <0>;\n" @@ -149,7 +155,7 @@ "> +\t\tpinctrl-0 = <&pinctrl_ipu1_lcdif>;\n" "> +\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\tport at 0 {\n" + "> +\t\tport@0 {\n" "> +\t\t\treg = <0>;\n" "> +\n" "> +\t\t\tlcd_display_in: endpoint {\n" @@ -157,7 +163,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tport at 1 {\n" + "> +\t\tport@1 {\n" "> +\t\t\treg = <1>;\n" "> +\n" "> +\t\t\tlcd_display_out: endpoint {\n" @@ -168,9 +174,9 @@ "> +\n" "> +\tpanel: panel {\n" "> +\t\t/*\n" - "> +\t\t?* edt,et057090dhu: EDT 5.7\" LCD TFT\n" - "> +\t\t?* edt,et070080dh6: EDT 7.0\" LCD TFT\n" - "> +\t\t?*/\n" + "> +\t\t\302\240* edt,et057090dhu: EDT 5.7\" LCD TFT\n" + "> +\t\t\302\240* edt,et070080dh6: EDT 7.0\" LCD TFT\n" + "> +\t\t\302\240*/\n" "> +\t\tcompatible = \"edt,et057090dhu\";\n" "> +\t\tbacklight = <&backlight>;\n" "> +\n" @@ -193,7 +199,7 @@ "> +&ecspi4 {\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tmcp251x0: mcp251x at 1 {\n" + "> +\tmcp251x0: mcp251x@1 {\n" "> +\t\tcompatible = \"microchip,mcp2515\";\n" "> +\t\treg = <0>;\n" "> +\t\tclocks = <&clk16m>;\n" @@ -216,7 +222,7 @@ "> +\tstatus = \"okay\";\n" "> +\n" "> +\t/* M41T0M6 real time clock on carrier board */\n" - "> +\trtc_i2c: rtc at 68 {\n" + "> +\trtc_i2c: rtc@68 {\n" "> +\t\tcompatible = \"st,m41t00\";\n" "> +\t\treg = <0x68>;\n" "> +\t};\n" @@ -280,11 +286,11 @@ "> +\n" "> +\t/* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2 */\n" "> +\tranges = <0 0 0x08000000 0x02000000\n" - "> +\t\t??1 0 0x0a000000 0x02000000\n" - "> +\t\t??2 0 0x0c000000 0x02000000>;\n" + "> +\t\t\302\240\302\2401 0 0x0a000000 0x02000000\n" + "> +\t\t\302\240\302\2402 0 0x0c000000 0x02000000>;\n" "> +\n" "> +\t/* SRAM on Colibri nEXT_CS0 */\n" - "> +\tsram at 0,0 {\n" + "> +\tsram@0,0 {\n" "> +\t\tcompatible = \"cypress,cy7c1019dv33-10zsxi, mtd-ram\";\n" "> +\t\treg = <0 0 0x00010000>;\n" "> +\t\t#address-cells = <1>;\n" @@ -292,12 +298,12 @@ "> +\t\tbank-width = <2>;\n" "> +\t\tfsl,weim-cs-timing = <0x00010081 0x00000000\n" "> 0x04000000\n" - "> +\t\t\t\t??????0x00000000 0x04000040\n" + "> +\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\2400x00000000 0x04000040\n" "> 0x00000000>;\n" "> +\t};\n" "> +\n" "> +\t/* SRAM on Colibri nEXT_CS1 */\n" - "> +\tsram at 1,0 {\n" + "> +\tsram@1,0 {\n" "> +\t\tcompatible = \"cypress,cy7c1019dv33-10zsxi, mtd-ram\";\n" "> +\t\treg = <1 0 0x00010000>;\n" "> +\t\t#address-cells = <1>;\n" @@ -305,7 +311,7 @@ "> +\t\tbank-width = <2>;\n" "> +\t\tfsl,weim-cs-timing = <0x00010081 0x00000000\n" "> 0x04000000\n" - "> +\t\t\t\t??????0x00000000 0x04000040\n" + "> +\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\2400x00000000 0x04000040\n" "> 0x00000000>;\n" "> +\t};\n" "> +};\n" @@ -327,43 +333,43 @@ "> + * licensing only applies to this file, and not this project as a\n" "> + * whole.\n" "> + *\n" - "> + *??a) This file is free software; you can redistribute it and/or\n" - "> + *?????modify it under the terms of the GNU General Public License\n" - "> + *?????version 2 as published by the Free Software Foundation.\n" + "> + *\302\240\302\240a) This file is free software; you can redistribute it and/or\n" + "> + *\302\240\302\240\302\240\302\240\302\240modify it under the terms of the GNU General Public License\n" + "> + *\302\240\302\240\302\240\302\240\302\240version 2 as published by the Free Software Foundation.\n" "> + *\n" - "> + *?????This file is distributed in the hope that it will be useful\n" - "> + *?????but WITHOUT ANY WARRANTY; without even the implied warranty\n" + "> + *\302\240\302\240\302\240\302\240\302\240This file is distributed in the hope that it will be useful\n" + "> + *\302\240\302\240\302\240\302\240\302\240but WITHOUT ANY WARRANTY; without even the implied warranty\n" "> of\n" - "> + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the\n" - "> + *?????GNU General Public License for more details.\n" + "> + *\302\240\302\240\302\240\302\240\302\240MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\302\240\302\240See the\n" + "> + *\302\240\302\240\302\240\302\240\302\240GNU General Public License for more details.\n" "> + *\n" "> + * Or, alternatively\n" "> + *\n" - "> + *??b) Permission is hereby granted, free of charge, to any person\n" - "> + *?????obtaining a copy of this software and associated\n" + "> + *\302\240\302\240b) Permission is hereby granted, free of charge, to any person\n" + "> + *\302\240\302\240\302\240\302\240\302\240obtaining a copy of this software and associated\n" "> documentation\n" - "> + *?????files (the \"Software\"), to deal in the Software without\n" - "> + *?????restriction, including without limitation the rights to use\n" - "> + *?????copy, modify, merge, publish, distribute, sublicense, and/or\n" - "> + *?????sell copies of the Software, and to permit persons to whom\n" + "> + *\302\240\302\240\302\240\302\240\302\240files (the \"Software\"), to deal in the Software without\n" + "> + *\302\240\302\240\302\240\302\240\302\240restriction, including without limitation the rights to use\n" + "> + *\302\240\302\240\302\240\302\240\302\240copy, modify, merge, publish, distribute, sublicense, and/or\n" + "> + *\302\240\302\240\302\240\302\240\302\240sell copies of the Software, and to permit persons to whom\n" "> the\n" - "> + *?????Software is furnished to do so, subject to the following\n" - "> + *?????conditions:\n" + "> + *\302\240\302\240\302\240\302\240\302\240Software is furnished to do so, subject to the following\n" + "> + *\302\240\302\240\302\240\302\240\302\240conditions:\n" "> + *\n" - "> + *?????The above copyright notice and this permission notice shall\n" + "> + *\302\240\302\240\302\240\302\240\302\240The above copyright notice and this permission notice shall\n" "> be\n" - "> + *?????included in all copies or substantial portions of the\n" + "> + *\302\240\302\240\302\240\302\240\302\240included in all copies or substantial portions of the\n" "> Software.\n" "> + *\n" - "> + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND\n" - "> + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" + "> + *\302\240\302\240\302\240\302\240\302\240THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND\n" + "> + *\302\240\302\240\302\240\302\240\302\240EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" "> WARRANTIES\n" - "> + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" - "> + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n" - "> + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY\n" - "> + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n" - "> + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n" - "> + *?????OTHER DEALINGS IN THE SOFTWARE.\n" + "> + *\302\240\302\240\302\240\302\240\302\240OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" + "> + *\302\240\302\240\302\240\302\240\302\240NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n" + "> + *\302\240\302\240\302\240\302\240\302\240HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY\n" + "> + *\302\240\302\240\302\240\302\240\302\240WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n" + "> + *\302\240\302\240\302\240\302\240\302\240FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n" + "> + *\302\240\302\240\302\240\302\240\302\240OTHER DEALINGS IN THE SOFTWARE.\n" "> + */\n" "> +\n" "> +#include <dt-bindings/gpio/gpio.h>\n" @@ -495,7 +501,7 @@ "> +\tpinctrl-0 = <&pinctrl_i2c2>;\n" "> +\tstatus = \"okay\";\n" "> +\n" - "> +\tpmic: pfuze100 at 08 {\n" + "> +\tpmic: pfuze100@08 {\n" "> +\t\tcompatible = \"fsl,pfuze100\";\n" "> +\t\treg = <0x08>;\n" "> +\n" @@ -576,7 +582,7 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> +\tcodec: sgtl5000 at 0a {\n" + "> +\tcodec: sgtl5000@0a {\n" "> +\t\tcompatible = \"fsl,sgtl5000\";\n" "> +\t\treg = <0x0a>;\n" "> +\t\tclocks = <&clks IMX6QDL_CLK_CKO>;\n" @@ -585,7 +591,7 @@ "> +\t};\n" "> +\n" "> +\t/* STMPE811 touch screen controller */\n" - "> +\tstmpe811 at 41 {\n" + "> +\tstmpe811@41 {\n" "> +\t\tcompatible = \"st,stmpe811\";\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\t\tpinctrl-0 = <&pinctrl_touch_int>;\n" @@ -609,10 +615,10 @@ "> +\t\t\t/* 7 length fractional part in z */\n" "> +\t\t\tst,fraction-z = <7>;\n" "> +\t\t\t/*\n" - "> +\t\t\t?* 50 mA typical 80 mA max touchscreen\n" + "> +\t\t\t\302\240* 50 mA typical 80 mA max touchscreen\n" "> drivers\n" - "> +\t\t\t?* current limit value\n" - "> +\t\t\t?*/\n" + "> +\t\t\t\302\240* current limit value\n" + "> +\t\t\t\302\240*/\n" "> +\t\t\tst,i-drive = <1>;\n" "> +\t\t\t/* 12-bit ADC */\n" "> +\t\t\tst,mod-12b = <1>;\n" @@ -736,9 +742,9 @@ "> +\n" "> +&weim {\n" "> +\tpinctrl-names = \"default\";\n" - "> +\tpinctrl-0 = <&pinctrl_weim_sram??&pinctrl_weim_cs0\n" - "> +\t\t?????&pinctrl_weim_cs1???&pinctrl_weim_cs2\n" - "> +\t\t?????&pinctrl_weim_rdnwr &pinctrl_weim_npwe>;\n" + "> +\tpinctrl-0 = <&pinctrl_weim_sram\302\240\302\240&pinctrl_weim_cs0\n" + "> +\t\t\302\240\302\240\302\240\302\240\302\240&pinctrl_weim_cs1\302\240\302\240\302\240&pinctrl_weim_cs2\n" + "> +\t\t\302\240\302\240\302\240\302\240\302\240&pinctrl_weim_rdnwr &pinctrl_weim_npwe>;\n" "> +\t#address-cells = <2>;\n" "> +\t#size-cells = <1>;\n" "> +\tstatus = \"disabled\";\n" @@ -798,7 +804,7 @@ "> x1b0b0\n" "> +\t\t\tMX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN\t0x\n" "> 1b0b0\n" - "> +\t\t\tMX6QDL_PAD_GPIO_16__ENET_REF_CLK?????((1<<30\n" + "> +\t\t\tMX6QDL_PAD_GPIO_16__ENET_REF_CLK\302\240\302\240\302\240\302\240\302\240((1<<30\n" "> ) | 0x1b0b0)\n" "> +\t\t>;\n" "> +\t};\n" @@ -1397,4 +1403,4 @@ "> +\t};\n" > +}; -60583ab0250c2b0680903caa12272fcc0cf601de7a9a6c9cf56f359fa76cdcd5 +e930ce6bc4774aee2e178945976b166aebdeb5aa5801da7cbcec6cf1b342fa67
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.