* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro [not found] <1463957258-4893-1-git-send-email-christopher.spinrath@rwth-aachen.de> @ 2016-05-22 22:47 ` christopher.spinrath at rwth-aachen.de 2016-05-23 17:49 ` Fabio Estevam ` (3 more replies) 0 siblings, 4 replies; 18+ messages in thread From: christopher.spinrath at rwth-aachen.de @ 2016-05-22 22:47 UTC (permalink / raw) To: linux-arm-kernel From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> The CompuLab Utilite Pro is a miniature fanless desktop pc based on the i.MX6 Quad powered cm-fx6 module. It features two serial ports, USB OTG, 4x USB, analog audio and S/PDIF, 2x Gb Ethernet, HDMI and DVI ports, an on-board 32GB SSD, a mmc slot, and on-board wifi/bt. Add initial support for it including USB, Ethernet (both ports), sata and HDMI support. Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6q-utilite-pro.dts | 128 ++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 arch/arm/boot/dts/imx6q-utilite-pro.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 515a428..287044c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -369,6 +369,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-tx6q-1110.dtb \ imx6q-tx6q-11x0-mb7.dtb \ imx6q-udoo.dtb \ + imx6q-utilite-pro.dtb \ imx6q-wandboard.dtb \ imx6q-wandboard-revb1.dtb \ imx6qp-nitrogen6_max.dtb \ diff --git a/arch/arm/boot/dts/imx6q-utilite-pro.dts b/arch/arm/boot/dts/imx6q-utilite-pro.dts new file mode 100644 index 0000000..bcd8e0d --- /dev/null +++ b/arch/arm/boot/dts/imx6q-utilite-pro.dts @@ -0,0 +1,128 @@ +/* + * Copyright 2016 Christopher Spinrath + * Copyright 2013 CompuLab Ltd. + * + * Based on the GPLv2 licensed devicetree distributed with the vendor + * kernel for the Utilite Pro: + * Copyright 2013 CompuLab Ltd. + * Author: Valentin Raevsky <valentin@compulab.co.il> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include "imx6q-cm-fx6.dts" + +/ { + model = "CompuLab Utilite Pro"; + compatible = "compulab,utilite-pro", "compulab,cm-fx6", "fsl,imx6q"; + + aliases { + ethernet1 = ð1; + rtc0 = &em3027; + rtc1 = &snvs_rtc; + }; + + gpio-keys { + compatible = "gpio-keys"; + power { + label = "Power Button"; + gpios = <&gpio1 29 1>; + linux,code = <116>; /* KEY_POWER */ + gpio-key,wakeup; + }; + }; +}; + +&hdmi { + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; + + eeprom at 50 { + compatible = "at24,24c02"; + reg = <0x50>; + pagesize = <16>; + }; + + em3027: rtc at 56 { + compatible = "emmicro,em3027"; + reg = <0x56>; + }; +}; + +&i2c2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + hog { + pinctrl_hog: hoggrp { + fsl,pins = < + /* power button */ + MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 + >; + }; + }; + + imx6q-utilite-pro { + pinctrl_i2c1: i2c1grp { + fsl,pins = < + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 + MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 + >; + }; + + pinctrl_uart2: uart2grp { + fsl,pins = < + MX6QDL_PAD_GPIO_7__UART2_TX_DATA 0x1b0b1 + MX6QDL_PAD_GPIO_8__UART2_RX_DATA 0x1b0b1 + MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1 + MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1 + >; + }; + }; +}; + +&pcie { + pcie at 0,0 { + reg = <0x000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + + /* non-removable i211 ethernet card */ + eth1: intel,i211 at pcie0,0 { + reg = <0x010000 0 0 0 0>; + }; + }; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2>; + fsl,uart-has-rtscts; + dma-names = "rx", "tx"; + dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; + status = "okay"; +}; -- 2.8.2 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-05-22 22:47 ` [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro christopher.spinrath at rwth-aachen.de @ 2016-05-23 17:49 ` Fabio Estevam 2016-05-26 8:28 ` Igor Grinberg [not found] ` <a6cc6b85d2fa4994b3cb7e2b047f800d@rwthex-w2-b.rwth-ad.de> 2016-05-23 20:56 ` Stefan Wahren ` (2 subsequent siblings) 3 siblings, 2 replies; 18+ messages in thread From: Fabio Estevam @ 2016-05-23 17:49 UTC (permalink / raw) To: linux-arm-kernel On Sun, May 22, 2016 at 7:47 PM, <christopher.spinrath@rwth-aachen.de> wrote: > diff --git a/arch/arm/boot/dts/imx6q-utilite-pro.dts b/arch/arm/boot/dts/imx6q-utilite-pro.dts > new file mode 100644 > index 0000000..bcd8e0d > --- /dev/null > +++ b/arch/arm/boot/dts/imx6q-utilite-pro.dts > @@ -0,0 +1,128 @@ > +/* > + * Copyright 2016 Christopher Spinrath > + * Copyright 2013 CompuLab Ltd. > + * > + * Based on the GPLv2 licensed devicetree distributed with the vendor > + * kernel for the Utilite Pro: > + * Copyright 2013 CompuLab Ltd. > + * Author: Valentin Raevsky <valentin@compulab.co.il> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: Can you make this dual GPL/X11 license? For reference take a look at: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/imx6sl-warp.dts?id=refs/tags/v4.6 > + gpio-keys { > + compatible = "gpio-keys"; > + power { > + label = "Power Button"; > + gpios = <&gpio1 29 1>; Better to use a label like: gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; > +&iomuxc { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hog>; > + > + hog { > + pinctrl_hog: hoggrp { > + fsl,pins = < > + /* power button */ > + MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 Better to avoid 0x80000000. Replace it with the real iomux value instead so that you don't need to rely on the bootloader configuration. > + > + imx6q-utilite-pro { > + pinctrl_i2c1: i2c1grp { > + fsl,pins = < > + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 > + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 > + >; > + }; You should better remove one level of indentation. Check this commit for reference: https://git.kernel.org/cgit/linux/kernel/git/shawnguo/linux.git/commit/arch/arm/boot/dts/imx6q-tbs2910.dts?h=for-next&id=aa7871b53bc3c36b4adefe67f728143e2deeec93 > +&uart2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart2>; > + fsl,uart-has-rtscts; > + dma-names = "rx", "tx"; > + dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; No need to add the dma nodes as they are already present in imx6qdl.dtsi. ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-05-23 17:49 ` Fabio Estevam @ 2016-05-26 8:28 ` Igor Grinberg [not found] ` <a6cc6b85d2fa4994b3cb7e2b047f800d@rwthex-w2-b.rwth-ad.de> 1 sibling, 0 replies; 18+ messages in thread From: Igor Grinberg @ 2016-05-26 8:28 UTC (permalink / raw) To: linux-arm-kernel Hi Fabio, On 05/23/2016 08:49 PM, Fabio Estevam wrote: > On Sun, May 22, 2016 at 7:47 PM, <christopher.spinrath@rwth-aachen.de> wrote: > >> diff --git a/arch/arm/boot/dts/imx6q-utilite-pro.dts b/arch/arm/boot/dts/imx6q-utilite-pro.dts >> new file mode 100644 >> index 0000000..bcd8e0d >> --- /dev/null >> +++ b/arch/arm/boot/dts/imx6q-utilite-pro.dts >> @@ -0,0 +1,128 @@ >> +/* >> + * Copyright 2016 Christopher Spinrath >> + * Copyright 2013 CompuLab Ltd. >> + * >> + * Based on the GPLv2 licensed devicetree distributed with the vendor >> + * kernel for the Utilite Pro: >> + * Copyright 2013 CompuLab Ltd. >> + * Author: Valentin Raevsky <valentin@compulab.co.il> >> + * >> + * The code contained herein is licensed under the GNU General Public >> + * License. You may obtain a copy of the GNU General Public License >> + * Version 2 or later at the following locations: > > Can you make this dual GPL/X11 license? > > For reference take a look at: > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/imx6sl-warp.dts?id=refs/tags/v4.6 Please excuse me my ignorance, what is the rationale for this change? -- Regards, Igor. ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <a6cc6b85d2fa4994b3cb7e2b047f800d@rwthex-w2-b.rwth-ad.de>]
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro [not found] ` <a6cc6b85d2fa4994b3cb7e2b047f800d@rwthex-w2-b.rwth-ad.de> @ 2016-05-26 14:26 ` Christopher Spinrath 2016-05-26 22:20 ` Fabio Estevam 0 siblings, 1 reply; 18+ messages in thread From: Christopher Spinrath @ 2016-05-26 14:26 UTC (permalink / raw) To: linux-arm-kernel Hi Igor, On 05/26/2016 10:28 AM, Igor Grinberg wrote: > Hi Fabio, > > On 05/23/2016 08:49 PM, Fabio Estevam wrote: >> On Sun, May 22, 2016 at 7:47 PM, <christopher.spinrath@rwth-aachen.de> wrote: >> >>> diff --git a/arch/arm/boot/dts/imx6q-utilite-pro.dts b/arch/arm/boot/dts/imx6q-utilite-pro.dts >>> new file mode 100644 >>> index 0000000..bcd8e0d >>> --- /dev/null >>> +++ b/arch/arm/boot/dts/imx6q-utilite-pro.dts >>> @@ -0,0 +1,128 @@ >>> +/* >>> + * Copyright 2016 Christopher Spinrath >>> + * Copyright 2013 CompuLab Ltd. >>> + * >>> + * Based on the GPLv2 licensed devicetree distributed with the vendor >>> + * kernel for the Utilite Pro: >>> + * Copyright 2013 CompuLab Ltd. >>> + * Author: Valentin Raevsky <valentin@compulab.co.il> >>> + * >>> + * The code contained herein is licensed under the GNU General Public >>> + * License. You may obtain a copy of the GNU General Public License >>> + * Version 2 or later at the following locations: >> >> Can you make this dual GPL/X11 license? >> >> For reference take a look at: >> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/imx6sl-warp.dts?id=refs/tags/v4.6 > > Please excuse me my ignorance, what is the rationale for this change? > Thanks for joining this discussion. I *guess* the rationale is to share the same device tree with projects that are incompatible with the GPL (e.g. *BSD). Even if there is no support for a particular device/board having all (or most) files dual licensed makes it easier to just pull them all in. Cheers, Christopher ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-05-26 14:26 ` Christopher Spinrath @ 2016-05-26 22:20 ` Fabio Estevam 2016-05-29 8:01 ` Igor Grinberg [not found] ` <c7a1b8de98814b95afc43cc6df3c92df@rwthex-w2-a.rwth-ad.de> 0 siblings, 2 replies; 18+ messages in thread From: Fabio Estevam @ 2016-05-26 22:20 UTC (permalink / raw) To: linux-arm-kernel On Thu, May 26, 2016 at 11:26 AM, Christopher Spinrath <christopher.spinrath@rwth-aachen.de> wrote: > Thanks for joining this discussion. I *guess* the rationale is to share > the same device tree with projects that are incompatible with the GPL > (e.g. *BSD). Even if there is no support for a particular device/board > having all (or most) files dual licensed makes it easier to just pull > them all in. Yes, that's correct. ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-05-26 22:20 ` Fabio Estevam @ 2016-05-29 8:01 ` Igor Grinberg [not found] ` <c7a1b8de98814b95afc43cc6df3c92df@rwthex-w2-a.rwth-ad.de> 1 sibling, 0 replies; 18+ messages in thread From: Igor Grinberg @ 2016-05-29 8:01 UTC (permalink / raw) To: linux-arm-kernel On 05/27/2016 01:20 AM, Fabio Estevam wrote: > On Thu, May 26, 2016 at 11:26 AM, Christopher Spinrath > <christopher.spinrath@rwth-aachen.de> wrote: > >> Thanks for joining this discussion. I *guess* the rationale is to share >> the same device tree with projects that are incompatible with the GPL >> (e.g. *BSD). Even if there is no support for a particular device/board >> having all (or most) files dual licensed makes it easier to just pull >> them all in. > > Yes, that's correct. > Thanks for the explanation. -- Regards, Igor. ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <c7a1b8de98814b95afc43cc6df3c92df@rwthex-w2-a.rwth-ad.de>]
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro [not found] ` <c7a1b8de98814b95afc43cc6df3c92df@rwthex-w2-a.rwth-ad.de> @ 2016-06-02 10:47 ` Christopher Spinrath 2016-06-05 16:25 ` Igor Grinberg [not found] ` <92298f2d0d69413abb9ba7a336f534ab@rwthex-w1-a.rwth-ad.de> 0 siblings, 2 replies; 18+ messages in thread From: Christopher Spinrath @ 2016-06-02 10:47 UTC (permalink / raw) To: linux-arm-kernel Hi Igor, On 05/29/2016 10:01 AM, Igor Grinberg wrote: > On 05/27/2016 01:20 AM, Fabio Estevam wrote: >> On Thu, May 26, 2016 at 11:26 AM, Christopher Spinrath >> <christopher.spinrath@rwth-aachen.de> wrote: >> >>> Thanks for joining this discussion. I *guess* the rationale is to share >>> the same device tree with projects that are incompatible with the GPL >>> (e.g. *BSD). Even if there is no support for a particular device/board >>> having all (or most) files dual licensed makes it easier to just pull >>> them all in. >> >> Yes, that's correct. >> > > Thanks for the explanation. > Have you/CompuLab made a decision? Do you/CompuLab approve the dual license? Thanks, Christopher ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-06-02 10:47 ` Christopher Spinrath @ 2016-06-05 16:25 ` Igor Grinberg [not found] ` <92298f2d0d69413abb9ba7a336f534ab@rwthex-w1-a.rwth-ad.de> 1 sibling, 0 replies; 18+ messages in thread From: Igor Grinberg @ 2016-06-05 16:25 UTC (permalink / raw) To: linux-arm-kernel Hi Christopher, Thanks for bringing this to my attention. On 06/02/2016 01:47 PM, Christopher Spinrath wrote: > Hi Igor, > > On 05/29/2016 10:01 AM, Igor Grinberg wrote: >> On 05/27/2016 01:20 AM, Fabio Estevam wrote: >>> On Thu, May 26, 2016 at 11:26 AM, Christopher Spinrath >>> <christopher.spinrath@rwth-aachen.de> wrote: >>> >>>> Thanks for joining this discussion. I *guess* the rationale is to share >>>> the same device tree with projects that are incompatible with the GPL >>>> (e.g. *BSD). Even if there is no support for a particular device/board >>>> having all (or most) files dual licensed makes it easier to just pull >>>> them all in. >>> >>> Yes, that's correct. >>> >> >> Thanks for the explanation. >> > > Have you/CompuLab made a decision? Do you/CompuLab approve the dual license? Yes, please use the dual license. You can count this answer official. -- Regards, Igor. ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <92298f2d0d69413abb9ba7a336f534ab@rwthex-w1-a.rwth-ad.de>]
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro [not found] ` <92298f2d0d69413abb9ba7a336f534ab@rwthex-w1-a.rwth-ad.de> @ 2016-06-05 17:36 ` Christopher Spinrath 2016-06-06 6:52 ` Igor Grinberg 0 siblings, 1 reply; 18+ messages in thread From: Christopher Spinrath @ 2016-06-05 17:36 UTC (permalink / raw) To: linux-arm-kernel Hi Igor, On 06/05/2016 06:25 PM, Igor Grinberg wrote: > Hi Christopher, > > Thanks for bringing this to my attention. > > On 06/02/2016 01:47 PM, Christopher Spinrath wrote: >> Hi Igor, >> >> On 05/29/2016 10:01 AM, Igor Grinberg wrote: >>> On 05/27/2016 01:20 AM, Fabio Estevam wrote: >>>> On Thu, May 26, 2016 at 11:26 AM, Christopher Spinrath >>>> <christopher.spinrath@rwth-aachen.de> wrote: >>>> >>>>> Thanks for joining this discussion. I *guess* the rationale is to share >>>>> the same device tree with projects that are incompatible with the GPL >>>>> (e.g. *BSD). Even if there is no support for a particular device/board >>>>> having all (or most) files dual licensed makes it easier to just pull >>>>> them all in. >>>> >>>> Yes, that's correct. >>>> >>> >>> Thanks for the explanation. >>> >> >> Have you/CompuLab made a decision? Do you/CompuLab approve the dual license? > > Yes, please use the dual license. > You can count this answer official. > Thank you very much! I will send v2 later today with the dual license (and also changing the license of the cm-fx6 file). I would be very nice, if you could provide your Acked-By (or whatever) for the license changes (I will keep you in cc). Cheers, Christopher ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-06-05 17:36 ` Christopher Spinrath @ 2016-06-06 6:52 ` Igor Grinberg 0 siblings, 0 replies; 18+ messages in thread From: Igor Grinberg @ 2016-06-06 6:52 UTC (permalink / raw) To: linux-arm-kernel On 06/05/2016 08:36 PM, Christopher Spinrath wrote: > Hi Igor, > > On 06/05/2016 06:25 PM, Igor Grinberg wrote: >> Hi Christopher, >> >> Thanks for bringing this to my attention. >> >> On 06/02/2016 01:47 PM, Christopher Spinrath wrote: >>> Hi Igor, >>> >>> On 05/29/2016 10:01 AM, Igor Grinberg wrote: >>>> On 05/27/2016 01:20 AM, Fabio Estevam wrote: >>>>> On Thu, May 26, 2016 at 11:26 AM, Christopher Spinrath >>>>> <christopher.spinrath@rwth-aachen.de> wrote: >>>>> >>>>>> Thanks for joining this discussion. I *guess* the rationale is to share >>>>>> the same device tree with projects that are incompatible with the GPL >>>>>> (e.g. *BSD). Even if there is no support for a particular device/board >>>>>> having all (or most) files dual licensed makes it easier to just pull >>>>>> them all in. >>>>> >>>>> Yes, that's correct. >>>>> >>>> >>>> Thanks for the explanation. >>>> >>> >>> Have you/CompuLab made a decision? Do you/CompuLab approve the dual license? >> >> Yes, please use the dual license. >> You can count this answer official. >> > Thank you very much! I will send v2 later today with the dual license > (and also changing the license of the cm-fx6 file). > > I would be very nice, if you could provide your Acked-By (or whatever) > for the license changes (I will keep you in cc). Sure! No problem! -- Regards, Igor. ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-05-22 22:47 ` [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro christopher.spinrath at rwth-aachen.de 2016-05-23 17:49 ` Fabio Estevam @ 2016-05-23 20:56 ` Stefan Wahren [not found] ` <20abc2f6769b4369ba87ec27274a090e@rwthex-s2-a.rwth-ad.de> [not found] ` <9b24c4b30f424407902589fcc4598ec5@rwthex-w2-a.rwth-ad.de> 3 siblings, 0 replies; 18+ messages in thread From: Stefan Wahren @ 2016-05-23 20:56 UTC (permalink / raw) To: linux-arm-kernel Hi Christopher, > christopher.spinrath at rwth-aachen.de hat am 23. Mai 2016 um 00:47 geschrieben: > > > From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> > > The CompuLab Utilite Pro is a miniature fanless desktop pc based on > the i.MX6 Quad powered cm-fx6 module. It features two serial ports, > USB OTG, 4x USB, analog audio and S/PDIF, 2x Gb Ethernet, HDMI and > DVI ports, an on-board 32GB SSD, a mmc slot, and on-board wifi/bt. > > Add initial support for it including USB, Ethernet (both ports), sata > and HDMI support. > > Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/imx6q-utilite-pro.dts | 128 > ++++++++++++++++++++++++++++++++ > 2 files changed, 129 insertions(+) > create mode 100644 arch/arm/boot/dts/imx6q-utilite-pro.dts > > ... > diff --git a/arch/arm/boot/dts/imx6q-utilite-pro.dts > b/arch/arm/boot/dts/imx6q-utilite-pro.dts > new file mode 100644 > index 0000000..bcd8e0d > --- /dev/null > +++ b/arch/arm/boot/dts/imx6q-utilite-pro.dts > @@ -0,0 +1,128 @@ > +/* > + * Copyright 2016 Christopher Spinrath > + * Copyright 2013 CompuLab Ltd. > + * > + * Based on the GPLv2 licensed devicetree distributed with the vendor > + * kernel for the Utilite Pro: > + * Copyright 2013 CompuLab Ltd. > + * Author: Valentin Raevsky <valentin@compulab.co.il> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > ... > + > + pinctrl_uart2: uart2grp { > + fsl,pins = < > + MX6QDL_PAD_GPIO_7__UART2_TX_DATA 0x1b0b1 > + MX6QDL_PAD_GPIO_8__UART2_RX_DATA 0x1b0b1 > + MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1 > + MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1 > + >; > + }; > + }; > +}; > + > +&pcie { > + pcie at 0,0 { > + reg = <0x000000 0 0 0 0>; > + #address-cells = <3>; > + #size-cells = <2>; > + > + /* non-removable i211 ethernet card */ > + eth1: intel,i211 at pcie0,0 { > + reg = <0x010000 0 0 0 0>; > + }; > + }; > +}; > + > +&uart2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart2>; > + fsl,uart-has-rtscts; this property is deprecated so please use the generic one: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=1006ed7e1b258dac3e85c9fafe9d38b6020c917f Stefan > + dma-names = "rx", "tx"; > + dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; > + status = "okay"; > +}; > -- > 2.8.2 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <20abc2f6769b4369ba87ec27274a090e@rwthex-s2-a.rwth-ad.de>]
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro [not found] ` <20abc2f6769b4369ba87ec27274a090e@rwthex-s2-a.rwth-ad.de> @ 2016-05-23 23:08 ` Christopher Spinrath 2016-05-23 23:20 ` Fabio Estevam [not found] ` <9b905766c6cc4680be4b33f79a179d5a@rwthex-w1-b.rwth-ad.de> 2016-05-23 23:13 ` Christopher Spinrath 1 sibling, 2 replies; 18+ messages in thread From: Christopher Spinrath @ 2016-05-23 23:08 UTC (permalink / raw) To: linux-arm-kernel Hi Fabio, On 05/23/2016 07:49 PM, Fabio Estevam wrote: > On Sun, May 22, 2016 at 7:47 PM, <christopher.spinrath@rwth-aachen.de> wrote: > >> diff --git a/arch/arm/boot/dts/imx6q-utilite-pro.dts b/arch/arm/boot/dts/imx6q-utilite-pro.dts >> new file mode 100644 >> index 0000000..bcd8e0d >> --- /dev/null >> +++ b/arch/arm/boot/dts/imx6q-utilite-pro.dts >> @@ -0,0 +1,128 @@ >> +/* >> + * Copyright 2016 Christopher Spinrath >> + * Copyright 2013 CompuLab Ltd. >> + * >> + * Based on the GPLv2 licensed devicetree distributed with the vendor >> + * kernel for the Utilite Pro: >> + * Copyright 2013 CompuLab Ltd. >> + * Author: Valentin Raevsky <valentin@compulab.co.il> >> + * >> + * The code contained herein is licensed under the GNU General Public >> + * License. You may obtain a copy of the GNU General Public License >> + * Version 2 or later at the following locations: > > Can you make this dual GPL/X11 license? > > For reference take a look at: > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/imx6sl-warp.dts?id=refs/tags/v4.6 > I would like to but I'm not sure if I'm allowed to. As I stated in the license header some nodes are copied (and cleaned up) from the vendor kernel/devicetree. They are licensed GPL-v2 only. So I don't know, can I add the X11 license? > >> + gpio-keys { >> + compatible = "gpio-keys"; >> + power { >> + label = "Power Button"; >> + gpios = <&gpio1 29 1>; > > Better to use a label like: > gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; > >> +&iomuxc { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_hog>; >> + >> + hog { >> + pinctrl_hog: hoggrp { >> + fsl,pins = < >> + /* power button */ >> + MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 > > Better to avoid 0x80000000. Replace it with the real iomux value > instead so that you don't need to rely on the bootloader > configuration. hmm, I don't know how to determine this value. The device documentation I have does not say anything about it and the vendor kernel uses 0x80000000... > >> + >> + imx6q-utilite-pro { >> + pinctrl_i2c1: i2c1grp { >> + fsl,pins = < >> + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 >> + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 >> + >; >> + }; > > You should better remove one level of indentation. Check this commit > for reference: > https://git.kernel.org/cgit/linux/kernel/git/shawnguo/linux.git/commit/arch/arm/boot/dts/imx6q-tbs2910.dts?h=for-next&id=aa7871b53bc3c36b4adefe67f728143e2deeec93 > OK, done (I also had to change this in the imx6q-cm-fx6.dts to make it work). >> +&uart2 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_uart2>; >> + fsl,uart-has-rtscts; >> + dma-names = "rx", "tx"; >> + dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; > > No need to add the dma nodes as they are already present in imx6qdl.dtsi. > Indeed, I removed them. Thanks for your review! Cheers, Christopher ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-05-23 23:08 ` Christopher Spinrath @ 2016-05-23 23:20 ` Fabio Estevam [not found] ` <9b905766c6cc4680be4b33f79a179d5a@rwthex-w1-b.rwth-ad.de> 1 sibling, 0 replies; 18+ messages in thread From: Fabio Estevam @ 2016-05-23 23:20 UTC (permalink / raw) To: linux-arm-kernel Hi Christopher, On Mon, May 23, 2016 at 8:08 PM, Christopher Spinrath <christopher.spinrath@rwth-aachen.de> wrote: > I would like to but I'm not sure if I'm allowed to. As I stated in the > license header some nodes are copied (and cleaned up) from the vendor > kernel/devicetree. They are licensed GPL-v2 only. So I don't know, can I > add the X11 license? Maybe you could contact the original author anc check? >> Better to avoid 0x80000000. Replace it with the real iomux value >> instead so that you don't need to rely on the bootloader >> configuration. > hmm, I don't know how to determine this value. The device documentation > I have does not say anything about it and the vendor kernel uses > 0x80000000... The default value of register IOMUXC_SW_PAD_CTL_PAD_ENET_TX_DATA1 is 0x1b0b0, so you can use this value. Another thing I forgot to comment: instead of putting this pin inside the hog group you could put it inside the gpio-keys node. ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <9b905766c6cc4680be4b33f79a179d5a@rwthex-w1-b.rwth-ad.de>]
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro [not found] ` <9b905766c6cc4680be4b33f79a179d5a@rwthex-w1-b.rwth-ad.de> @ 2016-05-25 14:05 ` Christopher Spinrath 2016-05-25 15:07 ` Fabio Estevam 2016-05-30 9:36 ` Holger Schurig 0 siblings, 2 replies; 18+ messages in thread From: Christopher Spinrath @ 2016-05-25 14:05 UTC (permalink / raw) To: linux-arm-kernel Hi Fabio, On 05/24/2016 01:20 AM, Fabio Estevam wrote: > Hi Christopher, > > On Mon, May 23, 2016 at 8:08 PM, Christopher Spinrath > <christopher.spinrath@rwth-aachen.de> wrote: > >> I would like to but I'm not sure if I'm allowed to. As I stated in the >> license header some nodes are copied (and cleaned up) from the vendor >> kernel/devicetree. They are licensed GPL-v2 only. So I don't know, can I >> add the X11 license? > > Maybe you could contact the original author anc check? > I have sent an email to the author and will wait about a week for a reply before I send v2. >>> Better to avoid 0x80000000. Replace it with the real iomux value >>> instead so that you don't need to rely on the bootloader >>> configuration. >> hmm, I don't know how to determine this value. The device documentation >> I have does not say anything about it and the vendor kernel uses >> 0x80000000... > > The default value of register IOMUXC_SW_PAD_CTL_PAD_ENET_TX_DATA1 is > 0x1b0b0, so you can use this value. > > Another thing I forgot to comment: instead of putting this pin inside > the hog group you could put it inside the gpio-keys node. > OK, done. Can I always use the default value in this case? If yes, can you point me to a proper documentation of these? Thanks, Christopher ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-05-25 14:05 ` Christopher Spinrath @ 2016-05-25 15:07 ` Fabio Estevam 2016-05-30 9:36 ` Holger Schurig 1 sibling, 0 replies; 18+ messages in thread From: Fabio Estevam @ 2016-05-25 15:07 UTC (permalink / raw) To: linux-arm-kernel On Wed, May 25, 2016 at 11:05 AM, Christopher Spinrath <christopher.spinrath@rwth-aachen.de> wrote: > OK, done. Can I always use the default value in this case? If yes, can > you point me to a proper documentation of these? You can look at "36.4.316 Pad Control Register (IOMUXC_SW_PAD_CTL_PAD_ENET_TX_DATA1)" in the mx6quad reference manual. For GPIO functionality the default power-on-reset value should work fine. You can confirm this by reading address 0x20E0500 in the bootloader: mw.l 0x20E0500 1 and then use this value on the dts. This way the kernel will always have a sane value instead of relying in the value passed from the bootloader. ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro 2016-05-25 14:05 ` Christopher Spinrath 2016-05-25 15:07 ` Fabio Estevam @ 2016-05-30 9:36 ` Holger Schurig 1 sibling, 0 replies; 18+ messages in thread From: Holger Schurig @ 2016-05-30 9:36 UTC (permalink / raw) To: linux-arm-kernel > OK, done. Can I always use the default value in this case? If yes, can > you point me to a proper documentation of these? Just google for "i.MX6Q Reference Manual", it's chapter 36 ("IOMUXC"), or to be more specific, it at 36.4.316. It's nice that Freescale/NXP is way better here than Marvell. You can download this stuff without any problem. When Marvell bought the PXA stuff from Intel and put everything under NDA / download after approvement, I was hugely p.... off. I never touched any Marvell chip after it :-) ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro [not found] ` <20abc2f6769b4369ba87ec27274a090e@rwthex-s2-a.rwth-ad.de> 2016-05-23 23:08 ` Christopher Spinrath @ 2016-05-23 23:13 ` Christopher Spinrath 1 sibling, 0 replies; 18+ messages in thread From: Christopher Spinrath @ 2016-05-23 23:13 UTC (permalink / raw) To: linux-arm-kernel Hi Fabio, sorry I forgot in my last reply to mention: On 05/23/2016 07:49 PM, Fabio Estevam wrote: -- snip -- > >> + gpio-keys { >> + compatible = "gpio-keys"; >> + power { >> + label = "Power Button"; >> + gpios = <&gpio1 29 1>; > > Better to use a label like: > gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; Will do. Thanks! Cheers, Christopher > >> +&iomuxc { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_hog>; >> + >> + hog { >> + pinctrl_hog: hoggrp { >> + fsl,pins = < >> + /* power button */ >> + MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 > > Better to avoid 0x80000000. Replace it with the real iomux value > instead so that you don't need to rely on the bootloader > configuration. > >> + >> + imx6q-utilite-pro { >> + pinctrl_i2c1: i2c1grp { >> + fsl,pins = < >> + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 >> + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 >> + >; >> + }; > > You should better remove one level of indentation. Check this commit > for reference: > https://git.kernel.org/cgit/linux/kernel/git/shawnguo/linux.git/commit/arch/arm/boot/dts/imx6q-tbs2910.dts?h=for-next&id=aa7871b53bc3c36b4adefe67f728143e2deeec93 > >> +&uart2 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_uart2>; >> + fsl,uart-has-rtscts; >> + dma-names = "rx", "tx"; >> + dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; > > No need to add the dma nodes as they are already present in imx6qdl.dtsi. > ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <9b24c4b30f424407902589fcc4598ec5@rwthex-w2-a.rwth-ad.de>]
* [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro [not found] ` <9b24c4b30f424407902589fcc4598ec5@rwthex-w2-a.rwth-ad.de> @ 2016-05-23 23:15 ` Christopher Spinrath 0 siblings, 0 replies; 18+ messages in thread From: Christopher Spinrath @ 2016-05-23 23:15 UTC (permalink / raw) To: linux-arm-kernel Hi Stefan, On 05/23/2016 10:56 PM, Stefan Wahren wrote: > Hi Christopher, > >> christopher.spinrath at rwth-aachen.de hat am 23. Mai 2016 um 00:47 geschrieben: >> >> >> From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> >> >> The CompuLab Utilite Pro is a miniature fanless desktop pc based on >> the i.MX6 Quad powered cm-fx6 module. It features two serial ports, >> USB OTG, 4x USB, analog audio and S/PDIF, 2x Gb Ethernet, HDMI and >> DVI ports, an on-board 32GB SSD, a mmc slot, and on-board wifi/bt. >> >> Add initial support for it including USB, Ethernet (both ports), sata >> and HDMI support. >> >> Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> >> --- >> arch/arm/boot/dts/Makefile | 1 + >> arch/arm/boot/dts/imx6q-utilite-pro.dts | 128 >> ++++++++++++++++++++++++++++++++ >> 2 files changed, 129 insertions(+) >> create mode 100644 arch/arm/boot/dts/imx6q-utilite-pro.dts >> >> ... >> diff --git a/arch/arm/boot/dts/imx6q-utilite-pro.dts >> b/arch/arm/boot/dts/imx6q-utilite-pro.dts >> new file mode 100644 >> index 0000000..bcd8e0d >> --- /dev/null >> +++ b/arch/arm/boot/dts/imx6q-utilite-pro.dts >> @@ -0,0 +1,128 @@ >> +/* >> + * Copyright 2016 Christopher Spinrath >> + * Copyright 2013 CompuLab Ltd. >> + * >> + * Based on the GPLv2 licensed devicetree distributed with the vendor >> + * kernel for the Utilite Pro: >> + * Copyright 2013 CompuLab Ltd. >> + * Author: Valentin Raevsky <valentin@compulab.co.il> >> + * >> + * The code contained herein is licensed under the GNU General Public >> + * License. You may obtain a copy of the GNU General Public License >> + * Version 2 or later at the following locations: >> + * >> + * http://www.opensource.org/licenses/gpl-license.html >> + * http://www.gnu.org/copyleft/gpl.html >> + */ >> + >> ... >> + >> + pinctrl_uart2: uart2grp { >> + fsl,pins = < >> + MX6QDL_PAD_GPIO_7__UART2_TX_DATA 0x1b0b1 >> + MX6QDL_PAD_GPIO_8__UART2_RX_DATA 0x1b0b1 >> + MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1 >> + MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1 >> + >; >> + }; >> + }; >> +}; >> + >> +&pcie { >> + pcie at 0,0 { >> + reg = <0x000000 0 0 0 0>; >> + #address-cells = <3>; >> + #size-cells = <2>; >> + >> + /* non-removable i211 ethernet card */ >> + eth1: intel,i211 at pcie0,0 { >> + reg = <0x010000 0 0 0 0>; >> + }; >> + }; >> +}; >> + >> +&uart2 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_uart2>; >> + fsl,uart-has-rtscts; > > this property is deprecated so please use the generic one: > > https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=1006ed7e1b258dac3e85c9fafe9d38b6020c917f > Thanks for pointing that out. I will switch to the generic property. Cheers, Christopher > Stefan > >> + dma-names = "rx", "tx"; >> + dmas = <&sdma 27 4 0>, <&sdma 28 4 0>; >> + status = "okay"; >> +}; >> -- >> 2.8.2 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel at lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2016-06-06 6:52 UTC | newest] Thread overview: 18+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <1463957258-4893-1-git-send-email-christopher.spinrath@rwth-aachen.de> 2016-05-22 22:47 ` [PATCH 2/2] ARM: dts: imx6q: add support for the Utilite Pro christopher.spinrath at rwth-aachen.de 2016-05-23 17:49 ` Fabio Estevam 2016-05-26 8:28 ` Igor Grinberg [not found] ` <a6cc6b85d2fa4994b3cb7e2b047f800d@rwthex-w2-b.rwth-ad.de> 2016-05-26 14:26 ` Christopher Spinrath 2016-05-26 22:20 ` Fabio Estevam 2016-05-29 8:01 ` Igor Grinberg [not found] ` <c7a1b8de98814b95afc43cc6df3c92df@rwthex-w2-a.rwth-ad.de> 2016-06-02 10:47 ` Christopher Spinrath 2016-06-05 16:25 ` Igor Grinberg [not found] ` <92298f2d0d69413abb9ba7a336f534ab@rwthex-w1-a.rwth-ad.de> 2016-06-05 17:36 ` Christopher Spinrath 2016-06-06 6:52 ` Igor Grinberg 2016-05-23 20:56 ` Stefan Wahren [not found] ` <20abc2f6769b4369ba87ec27274a090e@rwthex-s2-a.rwth-ad.de> 2016-05-23 23:08 ` Christopher Spinrath 2016-05-23 23:20 ` Fabio Estevam [not found] ` <9b905766c6cc4680be4b33f79a179d5a@rwthex-w1-b.rwth-ad.de> 2016-05-25 14:05 ` Christopher Spinrath 2016-05-25 15:07 ` Fabio Estevam 2016-05-30 9:36 ` Holger Schurig 2016-05-23 23:13 ` Christopher Spinrath [not found] ` <9b24c4b30f424407902589fcc4598ec5@rwthex-w2-a.rwth-ad.de> 2016-05-23 23:15 ` Christopher Spinrath
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).