arm, imx6, dts: add DT for aristainetos2 board
Subsystems (3)
PATCH v3 1/1 arm, imx6, dts: add DT for aristainetos2 board
This patch add support for the imx6dl based aristainetos2 board with following configuration:
CPU: Freescale i.MX6DL rev1.1 at 792 MHz MReset cause: POR MBoard: aristaitenos2 DRAM: 1 GiB NAND: 1024 MiB MMC: FSL_SDHC: 0, FSL_SDHC: 1 SF: Detected N25Q128A with page size 256 Bytes, erase size 64 KiB, total 16 MiB Display: lb07wv8 (800x480)
As this board can used with 2 different display types, the differences between them are extracted into 2 DTS files, and the common settings are collected in a common file.
---
Changes in v3:
- add comments from Shawn Guo
- change license to GPL/X11 dual licence
- rename touch node name to "touch"
- add DTB in Makefile
- remove "status = "okay"" from backlight node
- rename "pinctrl_ipu1_1_80Ohm_clk" to "pinctrl_ipu_disp"
- remove "status = "okay"" from "display at di0" node
- remove "dma-names;" in ecspix nodes
- use macro for clock ID and gpio
- move iomuxc to the bottom of the file
- configure pinctrl_backlight in the device node, not from the hog group
- provide a proper pad configuration value rather than 0x8000000.
- in the iomuxc node, save one level of the sub-node
needs patch:
LinusW queued patch 5fcdf6a7ed95 ("pinctrl: imx: Allow parsing DT without function nodes")
- add comments from Philipp Zabel
- get rid of "fsl,panel" to connect a drm_panel to the parallel-display instead switch to the common of-graph bindings.
need patch: "drm/imx: parallel-display: fix drm_panel support" from Philipp Zabel
Changes in v2:
- add comments from Sascha Hauer:
- remove "clock-frequency" property in i2c nodes
- correct indentation in some pinctrl nodes
- move pin settings out of "gpiogrp" where it was possible led pins not moved, as they used through sysfs
arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 174 ++++++++ arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 103 +++++ arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 634 +++++++++++++++++++++++++++ 4 files changed, 913 insertions(+) create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos2_4.dts create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos2_7.dts create mode 100644 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
arch/arm/boot/dts/Makefile +2 -0
@@ -256,6 +256,8 @@ dtb-$(CONFIG_SOC_IMX53) += \ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-aristainetos_4.dtb \ imx6dl-aristainetos_7.dtb \ + imx6dl-aristainetos2_4.dtb \ + imx6dl-aristainetos2_7.dtb \ imx6dl-cubox-i.dtb \ imx6dl-dfi-fs700-m60.dtb \ imx6dl-gw51xx.dtb \
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +174 -0
174 lines not on this page · raw message
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +103 -0
103 lines not on this page · raw message
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +634 -0
634 lines not on this page · raw message
Signature · 1 line
2.1.0
Hi Heiko,
Am Mittwoch, den 20.05.2015, 07:31 +0200 schrieb Heiko Schocher:
[...]
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts line 2
Quoted 8 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +2
-0@@ -0,0 +1,174 @@ +/* + * support fot the imx6 based aristainetos2 board
Typo, "support for".
Quoted 12 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +12
-0+ * + * Copyright (C) 2015 Heiko Schocher <[email protected]> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * 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 as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version.
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts line 24
Quoted 10 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +10
-0+ * + * 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. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA
checkpatch warns that you should not include this paragraph because the mail address might change in the future and it is contained in COPYING.
[...]
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts line 56
Quoted 7 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +7
-0+/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-aristainetos2.dtsi" + +/ { + model = "aristainetos2 i.MX6 Dual Lite Board 4"; + compatible = "fsl,imx6dl";
Doesn't this board get its own compatible?
[...]
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts line 74
Quoted 5 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +5
-0+ display0: display at di0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx-parallel-display"; + interface-pix-fmt = "rgb24";
It's ok to keep this property for now, but in the future I'd like it to be removed. The panel driver should provide all necessary information using drm_display_info_set_bus_formats. The imx parallel-display driver then needs to be made aware of the connector display_info->bus_formats.
[...]
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts line 2
Quoted 8 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +2
-0@@ -0,0 +1,103 @@ +/* + * support fot the imx6 based aristainetos2 board
Typo, "support for".
Quoted 11 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +11
-0+ * Copyright (C) 2015 Heiko Schocher <[email protected]> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * 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 as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version.
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts line 23
Quoted 10 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +10
-0+ * + * 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. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA
Same comment as above.
[...]
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts line 56
Quoted 3 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +3
-0+/ { + model = "aristainetos2 i.MX6 Dual Lite Board 7"; + compatible = "fsl,imx6dl";
Same comment as above.
Quoted 13 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +13
-0+&ldb { + status = "okay"; + + lvds-channel at 0 { + fsl,data-mapping = "spwg"; + fsl,data-width = <24>; + status = "okay"; + + display-timings { + native-mode = <&timing0>; + timing0: 800x480p60 { + clock-frequency = <33246000>; + hactive = <800>;
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts line 102
Quoted 10 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +10
-0+ vactive = <480>; + hfront-porch = <88>; + hback-porch = <88>; + hsync-len = <80>; + vback-porch = <10>; + vfront-porch = <10>; + vsync-len = <25>; + }; + }; + };
What panel is this? I'd prefer if you used the panel-simple driver here and connected it to the ldb channel using OF graph bindings same as the parallel display above. That would allow to remove the fsl,data-mapping and fsl,data-width properties and the display-timings node.
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi line 2
Quoted 9 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +1
-0+};arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +2
-0@@ -0,0 +1,634 @@ +/* + * support fot the imx6 based aristainetos2 board
Typo, "support for". Also, maybe s/board/boards/ as this contains the common parts for both the 4 and 7 variant?
Quoted 12 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +12
-0+ * + * Copyright (C) 2015 Heiko Schocher <[email protected]> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * 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 as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version.
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi line 24
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +10
-0+ * + * 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. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA
Same comment as above.
[...]
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi line 156
Quoted 7 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +7
-0+&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; + + pmic at 58 { + compatible = "dialog,da9063";
This should be "dlg,da9063" as perDocumentation/devicetree/bindings/mfd/da9063.txt.
[...]
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi line 307
Quoted 2 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +2
-0+&i2c4 { + clocks = <&clks IMX6DL_CLK_I2C4>;
The clocks property is already contained in imx6dl.dtsi
[...]
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi line 46
Quoted 13 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +13
-0+&fec +&gpmi +&pcie +&pwm1 +&uart1 +&uart2 +&uart3 +&uart4 +&usbh1 +&usbotg +&usdhc1 +&usdhc2 +&iomuxc
Do all aristainetos2 boards have all of these ports routed out? (Should the status = "okay" properties be set here, or in the per-board .dts files?)
regards
Philipp
Hello Philipp,
Am 20.05.2015 12:38, schrieb Philipp Zabel:
Quoted 4 lines
Hi Heiko,
Am Mittwoch, den 20.05.2015, 07:31 +0200 schrieb Heiko Schocher:
[...]
Quoted 10 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts line 2
Quoted 8 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +2
-0@@ -0,0 +1,174 @@ +/* + * support fot the imx6 based aristainetos2 boardTypo, "support for".
Oh, thanks! Fixed (for all files)
Quoted 23 lines
Quoted 12 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +12
-0+ * + * Copyright (C) 2015 Heiko Schocher <[email protected]> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * 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 as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version.arch/arm/boot/dts/imx6dl-aristainetos2_4.dts line 24
Quoted 10 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +10
-0+ * + * 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. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA
Quoted 2 lines
checkpatch warns that you should not include this paragraph because the mail address might change in the future and it is contained in COPYING.
Hmm... Shawn mentioned to change it to the "GPL/X11 dual licence" as in the arch/arm/boot/dts/imx6sl-warp.dts file ... so I copied this from there ... is there a better option for this?
Quoted 10 lines
[...]
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts line 56
Quoted 7 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +7
-0+/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-aristainetos2.dtsi" + +/ { + model = "aristainetos2 i.MX6 Dual Lite Board 4"; + compatible = "fsl,imx6dl";Doesn't this board get its own compatible?
Hmm... why?
Quoted 11 lines
[...]
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts line 74
Quoted 5 lines
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts new file +5
-0+ display0: display at di0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx-parallel-display"; + interface-pix-fmt = "rgb24";It's ok to keep this property for now, but in the future I'd like it to be removed. The panel driver should provide all necessary information using
drm_display_info_set_bus_formats. The imx parallel-display driver then needs to be made aware of the connectordisplay_info->bus_formats.
Ok.
Quoted 11 lines
[...]
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts line 2
Quoted 8 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +2
-0@@ -0,0 +1,103 @@ +/* + * support fot the imx6 based aristainetos2 boardTypo, "support for".
fixed.
Quoted 51 lines
Quoted 11 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +11
-0+ * Copyright (C) 2015 Heiko Schocher <[email protected]> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * 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 as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version.arch/arm/boot/dts/imx6dl-aristainetos2_7.dts line 23
Quoted 10 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +10
-0+ * + * 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. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USASame comment as above.
[...]
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts line 56
Quoted 3 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +3
-0+/ { + model = "aristainetos2 i.MX6 Dual Lite Board 7"; + compatible = "fsl,imx6dl";Same comment as above.
Quoted 20 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +20
-0+&ldb { + status = "okay"; + + lvds-channel at 0 { + fsl,data-mapping = "spwg"; + fsl,data-width = <24>; + status = "okay"; + + display-timings { + native-mode = <&timing0>; + timing0: 800x480p60 { + clock-frequency = <33246000>; + hactive = <800>; + vactive = <480>; + hfront-porch = <88>; + hback-porch = <88>; + hsync-len = <80>; + vback-porch = <10>; + vfront-porch = <10>; + vsync-len = <25>;
Quoted 8 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts line 49
Quoted 3 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +3
-0+ }; + }; + };What panel is this? I'd prefer if you used the panel-simple driver here and connected it to the ldb channel using OF graph bindings same as the parallel display above. That would allow to remove the fsl,data-mapping and fsl,data-width properties and the display-timings node.
It is an Display from LG, MODEL LB070WV8, SUFFIX SL01 I try to add it to the panel-simple driver
Quoted 4 lines
Quoted 4 lines
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts new file +1
-0+};arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +0
-0
Quoted 8 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi line 2
Quoted 5 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +2
-0@@ -0,0 +1,634 @@ +/* + * support fot the imx6 based aristainetos2 boardTypo, "support for". Also, maybe s/board/boards/ as this contains the common parts for both the 4 and 7 variant?
Yep, fixed.
Quoted 26 lines
Quoted 12 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +12
-0+ * + * Copyright (C) 2015 Heiko Schocher <[email protected]> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * 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 as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version.arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi line 24
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +10
-0+ * + * 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. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USASame comment as above.
[...]
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi line 156
Quoted 7 lines
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +7
-0+&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; + + pmic at 58 { + compatible = "dialog,da9063";This should be "dlg,da9063" as per
Documentation/devicetree/bindings/mfd/da9063.txt.
fixed.
Quoted 4 lines
[...]
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi line 307
Quoted 2 lines
+&i2c4 {
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi new file +1
-0+ clocks = <&clks IMX6DL_CLK_I2C4>;
i> The clocks property is already contained in imx6dl.dtsi
removed.
Quoted 15 lines
[...]
Quoted 5 lines
+&fec
+&gpmi
+&pcie
+&pwm1
+&uart1Quoted 8 lines
+&uart2
+&uart3
+&uart4
+&usbh1
+&usbotg
+&usdhc1
+&usdhc2
+&iomuxc
Quoted 3 lines
Do all aristainetos2 boards have all of these ports routed out? (Should the status = "okay" properties be set here, or in the per-board .dts files?)
All aristainetos2 variants use this ports, yes.
Thanks for your review!
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 22 lines · Heiko Schocher
Quoted 22 lines
Quoted 21 lines
+ * Copyright (C) 2015 Heiko Schocher <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * 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 as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA
Quoted 6 lines
Quoted 2 lines
checkpatch warns that you should not include this paragraph because the mail address might change in the future and it is contained in COPYING.
Hmm... Shawn mentioned to change it to the "GPL/X11 dual licence" as in the
arch/arm/boot/dts/imx6sl-warp.dtsfile ... so I copied this from there ... is there a better option for this?
It seems I pointed you to a bad example. Let me try again, see arch/arm/boot/dts/imx6q-hummingboard.dts for example.
Shawn
Quoted 26 lines · Shawn Guo
Quoted 25 lines · Heiko Schocher
Quoted 24 lines
Quoted 8 lines
+ * Copyright (C) 2015 Heiko Schocher <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/orQuoted 13 lines
+ * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USAcheckpatch warns that you should not include this paragraph because the mail address might change in the future and it is contained in COPYING.
Quoted 6 lines
Quoted 3 lines
Hmm... Shawn mentioned to change it to the "GPL/X11 dual licence" as in the
arch/arm/boot/dts/imx6sl-warp.dtsfile ... so I copied this from there ... is there a better option for this?It seems I pointed you to a bad example. Let me try again, see
arch/arm/boot/dts/imx6q-hummingboard.dtsfor example.
Just saw a patch from Fabio fixing license text a bit for the file, the following is the one with the fix-up.
/*
* Copyright (C) 2014 Rabeeh Khoury (rabeeh at solid-run.com)
* Based on dt work by Russell King
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* 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.
*
* 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. * * Or, alternatively * * 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 the * Software is furnished to do so, subject to the following * conditions: * * The above copyright notice and this permission notice shall be * 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 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.
*/
Hello Shawn,
Am 21.05.2015 03:04, schrieb Shawn Guo:
Quoted 26 lines · Heiko Schocher
Quoted 25 lines
Quoted 24 lines
Quoted 8 lines
+ * Copyright (C) 2015 Heiko Schocher <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/orQuoted 13 lines
+ * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USAcheckpatch warns that you should not include this paragraph because the mail address might change in the future and it is contained in COPYING.
Quoted 6 lines
Quoted 3 lines
Hmm... Shawn mentioned to change it to the "GPL/X11 dual licence" as in the
arch/arm/boot/dts/imx6sl-warp.dtsfile ... so I copied this from there ... is there a better option for this?It seems I pointed you to a bad example. Let me try again, see
arch/arm/boot/dts/imx6q-hummingboard.dtsfor example.
Ok, changed, thanks!
Hmm.. why not using the SPDX license identifier? This would save a lot of lines ...
I try the changes Philipp suggested for the 7" display (using the panel-simple driver for it) and post a v4.
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany