| Message ID | 20200204111151.3426090-1-oleksandr.suvorov@toradex.com |
|---|---|
| Headers | show |
| Series | Add Aster carrier board support for Colibri iMX7 CoM | expand |
On Tue, Feb 04, 2020 at 01:11:46PM +0200, Oleksandr Suvorov wrote: > Make sure that the priority of the RTCs is defined. > > Signed-off-by: Stefan Agner <stefan.agner@toradex.com> > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> Applied, thanks.
On Tue, Feb 04, 2020 at 01:11:47PM +0200, Oleksandr Suvorov wrote: > USB_C_DET pin shouldn't be in ethernet group. > > Creating a separate group allows one to use this pin > as an USB ID pin. > > Fixes: b326629f25b7 ("ARM: dts: imx7: add Toradex Colibri iMX7S/iMX7D suppor") > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> Applied, thanks.
On Tue, Feb 04, 2020 at 01:11:48PM +0200, Oleksandr Suvorov wrote: > Replace boiler plate licenses texts with the SPDX license identifiers in > Colibri iMX7 DTS files. > > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> > --- > > arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 40 ++------------------- > arch/arm/boot/dts/imx7-colibri.dtsi | 40 ++------------------- > arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 40 ++------------------- > arch/arm/boot/dts/imx7s-colibri-eval-v3.dts | 40 ++------------------- > 4 files changed, 8 insertions(+), 152 deletions(-) > > diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi > index 9e9e85c10acb..287d88e3deb8 100644 > --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi > +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi > @@ -1,43 +1,7 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR X11) DT maintainer prefers to MIT over X11. Shawn > /* > - * Copyright 2016 Toradex AG > + * Copyright 2016-2020 Toradex AG > * > - * 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. > - * > - * 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 "AS IS", 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. > */ > > / { > diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi > index f18a7c9e1303..7b4e81412381 100644 > --- a/arch/arm/boot/dts/imx7-colibri.dtsi > +++ b/arch/arm/boot/dts/imx7-colibri.dtsi > @@ -1,43 +1,7 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* > - * Copyright 2016 Toradex AG > + * Copyright 2016-20 Toradex AG > * > - * 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. > - * > - * 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 "AS IS", 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. > */ > > / { > diff --git a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts > index 136e11ab4893..1808759e718b 100644 > --- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts > +++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts > @@ -1,43 +1,7 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* > - * Copyright 2016 Toradex AG > + * Copyright 2016-2020 Toradex AG > * > - * 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. > - * > - * 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 "AS IS", 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. > */ > > /dts-v1/; > diff --git a/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts > index bd2a49c1ade6..b0ad98c119d4 100644 > --- a/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts > +++ b/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts > @@ -1,43 +1,7 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* > - * Copyright 2016 Toradex AG > + * Copyright 2016-2020 Toradex AG > * > - * 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. > - * > - * 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 "AS IS", 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. > */ > > /dts-v1/; > -- > 2.24.1 >
On Tue, Feb 04, 2020 at 01:11:51PM +0200, Oleksandr Suvorov wrote: > Add support for the Toradex Aster carrier board. > > Follow the usual hierarchic include model, maintaining shared > configuration imx7-colibri-aster.dtsi. > > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> > --- > > arch/arm/boot/dts/Makefile | 3 + > arch/arm/boot/dts/imx7-colibri-aster.dtsi | 191 ++++++++++++++++++ > arch/arm/boot/dts/imx7-colibri.dtsi | 2 - > arch/arm/boot/dts/imx7d-colibri-aster.dts | 20 ++ > .../arm/boot/dts/imx7d-colibri-emmc-aster.dts | 20 ++ > arch/arm/boot/dts/imx7s-colibri-aster.dts | 15 ++ > 6 files changed, 249 insertions(+), 2 deletions(-) > create mode 100644 arch/arm/boot/dts/imx7-colibri-aster.dtsi > create mode 100644 arch/arm/boot/dts/imx7d-colibri-aster.dts > create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts > create mode 100644 arch/arm/boot/dts/imx7s-colibri-aster.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index e006fef77499..6165d5d3a008 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -610,6 +610,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ > imx6ulz-14x14-evk.dtb > dtb-$(CONFIG_SOC_IMX7D) += \ > imx7d-cl-som-imx7.dtb \ > + imx7d-colibri-aster.dtb \ > + imx7d-colibri-emmc-aster.dtb \ > imx7d-colibri-emmc-eval-v3.dtb \ > imx7d-colibri-eval-v3.dtb \ > imx7d-mba7.dtb \ > @@ -623,6 +625,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ > imx7d-sdb-sht11.dtb \ > imx7d-zii-rmu2.dtb \ > imx7d-zii-rpu2.dtb \ > + imx7s-colibri-aster.dtb \ > imx7s-colibri-eval-v3.dtb \ > imx7s-mba7.dtb \ > imx7s-warp.dtb > diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi > new file mode 100644 > index 000000000000..776dacdbbe30 > --- /dev/null > +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi > @@ -0,0 +1,191 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR X11) MIT > +/* > + * Copyright 2017-2020 Toradex AG > + * > + */ > + > + > +#include <dt-bindings/input/input.h> > +#include <dt-bindings/pwm/pwm.h> > + > +/ { > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + gpio-keys { > + compatible = "gpio-keys"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_gpiokeys>; > + > + power { > + label = "Wake-Up"; > + gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; > + linux,code = <KEY_WAKEUP>; > + debounce-interval = <10>; > + wakeup-source; > + }; > + }; > + > + panel: panel { > + compatible = "edt,et057090dhu"; > + backlight = <&bl>; > + power-supply = <®_3v3>; > + > + port { > + panel_in: endpoint { > + remote-endpoint = <&lcdif_out>; > + }; > + }; > + }; > + > + reg_3v3: regulator-3v3 { > + compatible = "regulator-fixed"; > + regulator-name = "3.3V"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + reg_5v0: regulator-5v0 { > + compatible = "regulator-fixed"; > + regulator-name = "5V"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + }; > + > + reg_usbh_vbus: regulator-usbh-vbus { > + compatible = "regulator-fixed"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usbh_reg>; > + regulator-name = "VCC_USB[1-4]"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + gpio = <&gpio4 7 GPIO_ACTIVE_LOW>; > + vin-supply = <®_5v0>; > + }; > +}; > + > +&bl { > + brightness-levels = <0 4 8 16 32 64 128 255>; > + default-brightness-level = <6>; > + power-supply = <®_3v3>; > + Drop this newline. > + status = "okay"; > +}; > + > +&adc1 { Sort nodes alphabetically. > + status = "okay"; > +}; > + > +/* > + * ADC2 is not available on the Aster board and > + * conflicts with AD7879 resistive touchscreen. > + */ > +&adc2 { > + status = "disabled"; > +}; > + > +&ecspi3 { > + cs-gpios = < > + &gpio4 11 GPIO_ACTIVE_HIGH > + &gpio4 23 GPIO_ACTIVE_HIGH > + >; > + status = "okay"; > + > + spidev0: spidev@0 { > + compatible = "toradex,evalspi"; Undocumented compatible? > + reg = <0>; > + spi-max-frequency = <23000000>; > + }; > + > + spidev1: spidev@1 { > + compatible = "toradex,evalspi"; > + reg = <1>; > + spi-max-frequency = <23000000>; > + }; > +}; > + > +&fec1 { > + status = "okay"; > +}; > + > +&i2c4 { > + status = "okay"; > + > + /* Microchip/Atmel maxtouch controller */ > + touchscreen@4a { > + compatible = "atmel,maxtouch"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_gpiotouch>; > + reg = <0x4a>; > + interrupt-parent = <&gpio2>; > + interrupts = <15 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 */ > + reset-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */ > + status = "okay"; We use okay status to flip disabled device. It's not really necessary here, right? > + }; > + > + /* M41T0M6 real time clock on carrier board */ > + rtc: m41t0m6@68 { > + compatible = "st,m41t0"; > + reg = <0x68>; > + }; > +}; > + > +&lcdif { > + status = "okay"; > + > + port { > + lcdif_out: endpoint { > + remote-endpoint = <&panel_in>; > + }; > + }; > +}; > + > +&pwm1 { > + status = "okay"; > +}; > + > +&pwm2 { > + status = "okay"; > +}; > + > +&pwm3 { > + status = "okay"; > +}; > + > +&pwm4 { > + status = "okay"; > +}; > + > +&uart1 { > + status = "okay"; > +}; > + > +&uart2 { > + status = "okay"; > +}; > + > +&uart3 { > + status = "okay"; > +}; > + > +&usbotg1 { > + status = "okay"; > +}; > + > +&usdhc1 { > + keep-power-in-suspend; > + no-1-8-v; > + wakeup-source; > + vmmc-supply = <®_3v3>; > + status = "okay"; > +}; > + > +&iomuxc { > + pinctrl_gpiotouch: touchgpios { > + fsl,pins = < > + MX7D_PAD_EPDC_DATA15__GPIO2_IO15 0x74 > + MX7D_PAD_EPDC_BDR0__GPIO2_IO28 0x14 > + >; > + }; > +}; > diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi > index 7b4e81412381..fc075f2465eb 100644 > --- a/arch/arm/boot/dts/imx7-colibri.dtsi > +++ b/arch/arm/boot/dts/imx7-colibri.dtsi > @@ -321,7 +321,6 @@ MX7D_PAD_LCD_RESET__GPIO3_IO4 0x14 /* SODIMM 93 */ > MX7D_PAD_EPDC_DATA13__GPIO2_IO13 0x14 /* SODIMM 95 */ > MX7D_PAD_ENET1_RGMII_TXC__GPIO7_IO11 0x14 /* SODIMM 99 */ > MX7D_PAD_EPDC_DATA10__GPIO2_IO10 0x74 /* SODIMM 105 */ > - MX7D_PAD_EPDC_DATA15__GPIO2_IO15 0x74 /* SODIMM 107 */ > MX7D_PAD_EPDC_DATA00__GPIO2_IO0 0x14 /* SODIMM 111 */ > MX7D_PAD_EPDC_DATA01__GPIO2_IO1 0x14 /* SODIMM 113 */ > MX7D_PAD_EPDC_DATA02__GPIO2_IO2 0x14 /* SODIMM 115 */ > @@ -338,7 +337,6 @@ MX7D_PAD_SAI1_RX_BCLK__GPIO6_IO17 0x14 /* SODIMM 24 */ > MX7D_PAD_SD2_DATA2__GPIO5_IO16 0x14 /* SODIMM 100 */ > MX7D_PAD_SD2_DATA3__GPIO5_IO17 0x14 /* SODIMM 102 */ > MX7D_PAD_EPDC_GDSP__GPIO2_IO27 0x14 /* SODIMM 104 */ > - MX7D_PAD_EPDC_BDR0__GPIO2_IO28 0x74 /* SODIMM 106 */ > MX7D_PAD_EPDC_BDR1__GPIO2_IO29 0x14 /* SODIMM 110 */ > MX7D_PAD_EPDC_PWR_COM__GPIO2_IO30 0x14 /* SODIMM 112 */ > MX7D_PAD_EPDC_SDCLK__GPIO2_IO16 0x14 /* SODIMM 114 */ > diff --git a/arch/arm/boot/dts/imx7d-colibri-aster.dts b/arch/arm/boot/dts/imx7d-colibri-aster.dts > new file mode 100644 > index 000000000000..1e84e47a00fc > --- /dev/null > +++ b/arch/arm/boot/dts/imx7d-colibri-aster.dts > @@ -0,0 +1,20 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR X11) > +/* > + * Copyright 2017-2020 Toradex AG > + * > + */ > + > +/dts-v1/; > +#include "imx7d-colibri.dtsi" > +#include "imx7-colibri-aster.dtsi" > + > +/ { > + model = "Toradex Colibri iMX7D on Colibri Aster Board"; > + compatible = "toradex,colibri-imx7d-aster", "toradex,colibri-imx7d", Any new compatible needs to be documented. Shawn > + "fsl,imx7d"; > +}; > + > +&usbotg2 { > + vbus-supply = <®_usbh_vbus>; > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts > new file mode 100644 > index 000000000000..9caaac6ecf5c > --- /dev/null > +++ b/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts > @@ -0,0 +1,20 @@ > +// SPDX-License-Identifier: GPL-2.0 OR X11 > +/* > + * Copyright 2017-2020 Toradex AG > + * > + */ > + > +/dts-v1/; > +#include "imx7d-colibri-emmc.dtsi" > +#include "imx7-colibri-aster.dtsi" > + > +/ { > + model = "Toradex Colibri iMX7D 1GB (eMMC) on Colibri Aster Board"; > + compatible = "toradex,colibri-imx7d-emmc-aster", > + "toradex,colibri-imx7d-emmc", "fsl,imx7d"; > +}; > + > +&usbotg2 { > + vbus-supply = <®_usbh_vbus>; > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/imx7s-colibri-aster.dts b/arch/arm/boot/dts/imx7s-colibri-aster.dts > new file mode 100644 > index 000000000000..6fb981f3f801 > --- /dev/null > +++ b/arch/arm/boot/dts/imx7s-colibri-aster.dts > @@ -0,0 +1,15 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR X11) > +/* > + * Copyright 2017-2020 Toradex AG > + * > + */ > + > +/dts-v1/; > +#include "imx7s-colibri.dtsi" > +#include "imx7-colibri-aster.dtsi" > + > +/ { > + model = "Toradex Colibri iMX7S on Colibri Aster Board"; > + compatible = "toradex,colibri-imx7s-aster", "toradex,colibri-imx7s", > + "fsl,imx7s"; > +}; > -- > 2.24.1 >
Hello Shawn, Thanks for your extremely helpful review. I'll fix all the issues you noted in the next patchset version. On Fri, Feb 14, 2020 at 10:44 AM Shawn Guo <shawnguo@kernel.org> wrote: > > On Tue, Feb 04, 2020 at 01:11:51PM +0200, Oleksandr Suvorov wrote: > > Add support for the Toradex Aster carrier board. > > > > Follow the usual hierarchic include model, maintaining shared > > configuration imx7-colibri-aster.dtsi. > > > > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> > > --- > > > > arch/arm/boot/dts/Makefile | 3 + > > arch/arm/boot/dts/imx7-colibri-aster.dtsi | 191 ++++++++++++++++++ > > arch/arm/boot/dts/imx7-colibri.dtsi | 2 - > > arch/arm/boot/dts/imx7d-colibri-aster.dts | 20 ++ > > .../arm/boot/dts/imx7d-colibri-emmc-aster.dts | 20 ++ > > arch/arm/boot/dts/imx7s-colibri-aster.dts | 15 ++ > > 6 files changed, 249 insertions(+), 2 deletions(-) > > create mode 100644 arch/arm/boot/dts/imx7-colibri-aster.dtsi > > create mode 100644 arch/arm/boot/dts/imx7d-colibri-aster.dts > > create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts > > create mode 100644 arch/arm/boot/dts/imx7s-colibri-aster.dts > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > index e006fef77499..6165d5d3a008 100644 > > --- a/arch/arm/boot/dts/Makefile > > +++ b/arch/arm/boot/dts/Makefile > > @@ -610,6 +610,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ > > imx6ulz-14x14-evk.dtb > > dtb-$(CONFIG_SOC_IMX7D) += \ > > imx7d-cl-som-imx7.dtb \ > > + imx7d-colibri-aster.dtb \ > > + imx7d-colibri-emmc-aster.dtb \ > > imx7d-colibri-emmc-eval-v3.dtb \ > > imx7d-colibri-eval-v3.dtb \ > > imx7d-mba7.dtb \ > > @@ -623,6 +625,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ > > imx7d-sdb-sht11.dtb \ > > imx7d-zii-rmu2.dtb \ > > imx7d-zii-rpu2.dtb \ > > + imx7s-colibri-aster.dtb \ > > imx7s-colibri-eval-v3.dtb \ > > imx7s-mba7.dtb \ > > imx7s-warp.dtb > > diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi > > new file mode 100644 > > index 000000000000..776dacdbbe30 > > --- /dev/null > > +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi > > @@ -0,0 +1,191 @@ > > +// SPDX-License-Identifier: (GPL-2.0 OR X11) > > MIT > > > +/* > > + * Copyright 2017-2020 Toradex AG > > + * > > + */ > > + > > + > > +#include <dt-bindings/input/input.h> > > +#include <dt-bindings/pwm/pwm.h> > > + > > +/ { > > + chosen { > > + stdout-path = "serial0:115200n8"; > > + }; > > + > > + gpio-keys { > > + compatible = "gpio-keys"; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&pinctrl_gpiokeys>; > > + > > + power { > > + label = "Wake-Up"; > > + gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; > > + linux,code = <KEY_WAKEUP>; > > + debounce-interval = <10>; > > + wakeup-source; > > + }; > > + }; > > + > > + panel: panel { > > + compatible = "edt,et057090dhu"; > > + backlight = <&bl>; > > + power-supply = <®_3v3>; > > + > > + port { > > + panel_in: endpoint { > > + remote-endpoint = <&lcdif_out>; > > + }; > > + }; > > + }; > > + > > + reg_3v3: regulator-3v3 { > > + compatible = "regulator-fixed"; > > + regulator-name = "3.3V"; > > + regulator-min-microvolt = <3300000>; > > + regulator-max-microvolt = <3300000>; > > + }; > > + > > + reg_5v0: regulator-5v0 { > > + compatible = "regulator-fixed"; > > + regulator-name = "5V"; > > + regulator-min-microvolt = <5000000>; > > + regulator-max-microvolt = <5000000>; > > + }; > > + > > + reg_usbh_vbus: regulator-usbh-vbus { > > + compatible = "regulator-fixed"; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&pinctrl_usbh_reg>; > > + regulator-name = "VCC_USB[1-4]"; > > + regulator-min-microvolt = <5000000>; > > + regulator-max-microvolt = <5000000>; > > + gpio = <&gpio4 7 GPIO_ACTIVE_LOW>; > > + vin-supply = <®_5v0>; > > + }; > > +}; > > + > > +&bl { > > + brightness-levels = <0 4 8 16 32 64 128 255>; > > + default-brightness-level = <6>; > > + power-supply = <®_3v3>; > > + > > Drop this newline. > > > + status = "okay"; > > +}; > > + > > +&adc1 { > > Sort nodes alphabetically. > > > + status = "okay"; > > +}; > > + > > +/* > > + * ADC2 is not available on the Aster board and > > + * conflicts with AD7879 resistive touchscreen. > > + */ > > +&adc2 { > > + status = "disabled"; > > +}; > > + > > +&ecspi3 { > > + cs-gpios = < > > + &gpio4 11 GPIO_ACTIVE_HIGH > > + &gpio4 23 GPIO_ACTIVE_HIGH > > + >; > > + status = "okay"; > > + > > + spidev0: spidev@0 { > > + compatible = "toradex,evalspi"; > > Undocumented compatible? > > > + reg = <0>; > > + spi-max-frequency = <23000000>; > > + }; > > + > > + spidev1: spidev@1 { > > + compatible = "toradex,evalspi"; > > + reg = <1>; > > + spi-max-frequency = <23000000>; > > + }; > > +}; > > + > > +&fec1 { > > + status = "okay"; > > +}; > > + > > +&i2c4 { > > + status = "okay"; > > + > > + /* Microchip/Atmel maxtouch controller */ > > + touchscreen@4a { > > + compatible = "atmel,maxtouch"; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&pinctrl_gpiotouch>; > > + reg = <0x4a>; > > + interrupt-parent = <&gpio2>; > > + interrupts = <15 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 */ > > + reset-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */ > > + status = "okay"; > > We use okay status to flip disabled device. It's not really necessary > here, right? > > > + }; > > + > > + /* M41T0M6 real time clock on carrier board */ > > + rtc: m41t0m6@68 { > > + compatible = "st,m41t0"; > > + reg = <0x68>; > > + }; > > +}; > > + > > +&lcdif { > > + status = "okay"; > > + > > + port { > > + lcdif_out: endpoint { > > + remote-endpoint = <&panel_in>; > > + }; > > + }; > > +}; > > + > > +&pwm1 { > > + status = "okay"; > > +}; > > + > > +&pwm2 { > > + status = "okay"; > > +}; > > + > > +&pwm3 { > > + status = "okay"; > > +}; > > + > > +&pwm4 { > > + status = "okay"; > > +}; > > + > > +&uart1 { > > + status = "okay"; > > +}; > > + > > +&uart2 { > > + status = "okay"; > > +}; > > + > > +&uart3 { > > + status = "okay"; > > +}; > > + > > +&usbotg1 { > > + status = "okay"; > > +}; > > + > > +&usdhc1 { > > + keep-power-in-suspend; > > + no-1-8-v; > > + wakeup-source; > > + vmmc-supply = <®_3v3>; > > + status = "okay"; > > +}; > > + > > +&iomuxc { > > + pinctrl_gpiotouch: touchgpios { > > + fsl,pins = < > > + MX7D_PAD_EPDC_DATA15__GPIO2_IO15 0x74 > > + MX7D_PAD_EPDC_BDR0__GPIO2_IO28 0x14 > > + >; > > + }; > > +}; > > diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi > > index 7b4e81412381..fc075f2465eb 100644 > > --- a/arch/arm/boot/dts/imx7-colibri.dtsi > > +++ b/arch/arm/boot/dts/imx7-colibri.dtsi > > @@ -321,7 +321,6 @@ MX7D_PAD_LCD_RESET__GPIO3_IO4 0x14 /* SODIMM 93 */ > > MX7D_PAD_EPDC_DATA13__GPIO2_IO13 0x14 /* SODIMM 95 */ > > MX7D_PAD_ENET1_RGMII_TXC__GPIO7_IO11 0x14 /* SODIMM 99 */ > > MX7D_PAD_EPDC_DATA10__GPIO2_IO10 0x74 /* SODIMM 105 */ > > - MX7D_PAD_EPDC_DATA15__GPIO2_IO15 0x74 /* SODIMM 107 */ > > MX7D_PAD_EPDC_DATA00__GPIO2_IO0 0x14 /* SODIMM 111 */ > > MX7D_PAD_EPDC_DATA01__GPIO2_IO1 0x14 /* SODIMM 113 */ > > MX7D_PAD_EPDC_DATA02__GPIO2_IO2 0x14 /* SODIMM 115 */ > > @@ -338,7 +337,6 @@ MX7D_PAD_SAI1_RX_BCLK__GPIO6_IO17 0x14 /* SODIMM 24 */ > > MX7D_PAD_SD2_DATA2__GPIO5_IO16 0x14 /* SODIMM 100 */ > > MX7D_PAD_SD2_DATA3__GPIO5_IO17 0x14 /* SODIMM 102 */ > > MX7D_PAD_EPDC_GDSP__GPIO2_IO27 0x14 /* SODIMM 104 */ > > - MX7D_PAD_EPDC_BDR0__GPIO2_IO28 0x74 /* SODIMM 106 */ > > MX7D_PAD_EPDC_BDR1__GPIO2_IO29 0x14 /* SODIMM 110 */ > > MX7D_PAD_EPDC_PWR_COM__GPIO2_IO30 0x14 /* SODIMM 112 */ > > MX7D_PAD_EPDC_SDCLK__GPIO2_IO16 0x14 /* SODIMM 114 */ > > diff --git a/arch/arm/boot/dts/imx7d-colibri-aster.dts b/arch/arm/boot/dts/imx7d-colibri-aster.dts > > new file mode 100644 > > index 000000000000..1e84e47a00fc > > --- /dev/null > > +++ b/arch/arm/boot/dts/imx7d-colibri-aster.dts > > @@ -0,0 +1,20 @@ > > +// SPDX-License-Identifier: (GPL-2.0 OR X11) > > +/* > > + * Copyright 2017-2020 Toradex AG > > + * > > + */ > > + > > +/dts-v1/; > > +#include "imx7d-colibri.dtsi" > > +#include "imx7-colibri-aster.dtsi" > > + > > +/ { > > + model = "Toradex Colibri iMX7D on Colibri Aster Board"; > > + compatible = "toradex,colibri-imx7d-aster", "toradex,colibri-imx7d", > > Any new compatible needs to be documented. > > Shawn > > > + "fsl,imx7d"; > > +}; > > + > > +&usbotg2 { > > + vbus-supply = <®_usbh_vbus>; > > + status = "okay"; > > +}; > > diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts > > new file mode 100644 > > index 000000000000..9caaac6ecf5c > > --- /dev/null > > +++ b/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts > > @@ -0,0 +1,20 @@ > > +// SPDX-License-Identifier: GPL-2.0 OR X11 > > +/* > > + * Copyright 2017-2020 Toradex AG > > + * > > + */ > > + > > +/dts-v1/; > > +#include "imx7d-colibri-emmc.dtsi" > > +#include "imx7-colibri-aster.dtsi" > > + > > +/ { > > + model = "Toradex Colibri iMX7D 1GB (eMMC) on Colibri Aster Board"; > > + compatible = "toradex,colibri-imx7d-emmc-aster", > > + "toradex,colibri-imx7d-emmc", "fsl,imx7d"; > > +}; > > + > > +&usbotg2 { > > + vbus-supply = <®_usbh_vbus>; > > + status = "okay"; > > +}; > > diff --git a/arch/arm/boot/dts/imx7s-colibri-aster.dts b/arch/arm/boot/dts/imx7s-colibri-aster.dts > > new file mode 100644 > > index 000000000000..6fb981f3f801 > > --- /dev/null > > +++ b/arch/arm/boot/dts/imx7s-colibri-aster.dts > > @@ -0,0 +1,15 @@ > > +// SPDX-License-Identifier: (GPL-2.0 OR X11) > > +/* > > + * Copyright 2017-2020 Toradex AG > > + * > > + */ > > + > > +/dts-v1/; > > +#include "imx7s-colibri.dtsi" > > +#include "imx7-colibri-aster.dtsi" > > + > > +/ { > > + model = "Toradex Colibri iMX7S on Colibri Aster Board"; > > + compatible = "toradex,colibri-imx7s-aster", "toradex,colibri-imx7s", > > + "fsl,imx7s"; > > +}; > > -- > > 2.24.1 > >