| Message ID | 20210819140345.357167-1-marcel@ziswiler.com |
|---|---|
| Headers | show |
| Series | ARM: prepare and add colibri imx6ull 1gb (emmc) support | expand |
On Thu, 2021-08-19 at 16:03 +0200, Marcel Ziswiler wrote: > From: Max Krummenacher <max.krummenacher@toradex.com> > > Add devices trees for a Colibri iMX6ULL 1GB which has a eMMC instead of > the raw NAND used on other SKUs. > > Related-to: ELB-4056, ELB-4058 > Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > --- > > arch/arm/boot/dts/Makefile | 1 + > .../boot/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 ++ > .../dts/imx6ull-colibri-emmc-nonwifi.dtsi | 185 ++++++++++++++++++ > arch/arm/boot/dts/imx6ull-colibri.dtsi | 30 ++- > 4 files changed, 232 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts > create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi > > ... > > diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi > index 0cdbf7b6e7285..f432fc0a6a530 100644 > --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi > +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: (GPL-2.0 OR MIT) > /* > - * Copyright 2018 Toradex AG > + * Copyright 2018-2021 Toradex AG > */ > > #include "imx6ull.dtsi" > @@ -345,6 +345,19 @@ MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0xb0b0 /* SODIMM 63 */ > >; > }; > > + /* > + * With an eMMC instead of a raw NAND device the following pins > + * are available at SODIMM pins > + */ > + pinctrl_gpmi_gpio: gpmi-gpio-grp { > + fsl,pins = < > + MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x10b0 /* SODIMM 140 */ > + MX6UL_PAD_NAND_CE0_B__GPIO4_IO13 0x10b0 /* SODIMM 144 */ > + MX6UL_PAD_NAND_CLE__GPIO4_IO15 0x10b0 /* SODIMM 146 */ > + MX6UL_PAD_NAND_READY_B__GPIO4_IO12 0x10b0 /* SODIMM 142 */ > + >; > + }; > + Just noticed that I somehow messed up the indentation above with one spurious tab too much. Will correct that in a v2. Sorry about that. > pinctrl_gpmi_nand: gpmi-nand-grp { > fsl,pins = < > MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9 > @@ -533,6 +546,21 @@ MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x10 > >; > }; > > + pinctrl_usdhc2emmc: usdhc2emmcgrp { > + fsl,pins = < > + MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x17059 > + MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 > + MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 > + MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 > + MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 > + MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 > + MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 > + MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 > + MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 > + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 > + >; > + }; > + Ditto above. > pinctrl_wdog: wdog-grp { > fsl,pins = < > MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0 Cheers Marcel
From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Clean-up imx_v6_v7_defconfig and then add support for the new Colibri iMX6ULL 1GB (eMMC) which builds on the success of the existing Colibri iMX6ULL SKUs using raw NAND but replaces this by more RAM (1 GB) and an eMMC (4 GB). Marcel Ziswiler (6): ARM: imx_v6_v7_defconfig: enable mtd physmap ARM: imx_v6_v7_defconfig: enable fb ARM: imx_v6_v7_defconfig: change snd soc tlv320aic3x to i2c variant ARM: imx_v6_v7_defconfig: rebuild default configuration ARM: imx_v6_v7_defconfig: build imx sdma driver as module ARM: imx_v6_v7_defconfig: enable bpf syscall and cgroup bpf Max Krummenacher (1): ARM: dts: colibri-imx6ull-emmc: add device trees arch/arm/boot/dts/Makefile | 1 + .../boot/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 ++ .../dts/imx6ull-colibri-emmc-nonwifi.dtsi | 185 ++++++++++++++++++ arch/arm/boot/dts/imx6ull-colibri.dtsi | 30 ++- arch/arm/configs/imx_v6_v7_defconfig | 46 ++--- 5 files changed, 249 insertions(+), 30 deletions(-) create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi