Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx7: add Toradex Colibri iMX7D 1GB (eMMC) support

Add support for the Computer on Module Colibri iMX7D 1GB along
with the Colibri Evaluation Board device trees. Follow the usual
hierarchic include model, maintaining shared configuration in
imx7-colibri.dtsi and imx7-colibri-eval-v3.dtsi respectively.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Stefan Agner and committed by
Shawn Guo
f928a4a3 66d59b67

+108 -1
+1
arch/arm/boot/dts/Makefile
··· 520 520 imx6ull-14x14-evk.dtb 521 521 dtb-$(CONFIG_SOC_IMX7D) += \ 522 522 imx7d-cl-som-imx7.dtb \ 523 + imx7d-colibri-emmc-eval-v3.dtb \ 523 524 imx7d-colibri-eval-v3.dtb \ 524 525 imx7d-nitrogen7.dtb \ 525 526 imx7d-pico-pi.dtb \
+63 -1
arch/arm/boot/dts/imx7-colibri.dtsi
··· 121 121 fsl,use-minimum-ecc; 122 122 nand-on-flash-bbt; 123 123 nand-ecc-mode = "hw"; 124 - status = "okay"; 125 124 }; 126 125 127 126 &i2c1 { ··· 308 309 cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; 309 310 disable-wp; 310 311 vqmmc-supply = <&reg_LDO2>; 312 + }; 313 + 314 + &usdhc3 { 315 + pinctrl-names = "default", "state_100mhz", "state_200mhz"; 316 + pinctrl-0 = <&pinctrl_usdhc3>; 317 + pinctrl-1 = <&pinctrl_usdhc3_100mhz>; 318 + pinctrl-2 = <&pinctrl_usdhc3_200mhz>; 319 + assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>; 320 + assigned-clock-rates = <400000000>; 321 + bus-width = <8>; 322 + fsl,tuning-step = <2>; 323 + max-frequency = <100000000>; 324 + vmmc-supply = <&reg_module_3v3>; 325 + vqmmc-supply = <&reg_DCDC3>; 326 + non-removable; 311 327 }; 312 328 313 329 &iomuxc { ··· 609 595 MX7D_PAD_SD1_DATA1__SD1_DATA1 0x59 610 596 MX7D_PAD_SD1_DATA2__SD1_DATA2 0x59 611 597 MX7D_PAD_SD1_DATA3__SD1_DATA3 0x59 598 + >; 599 + }; 600 + 601 + pinctrl_usdhc3: usdhc3grp { 602 + fsl,pins = < 603 + MX7D_PAD_SD3_CMD__SD3_CMD 0x59 604 + MX7D_PAD_SD3_CLK__SD3_CLK 0x19 605 + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x59 606 + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x59 607 + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x59 608 + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x59 609 + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x59 610 + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x59 611 + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x59 612 + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x59 613 + MX7D_PAD_SD3_STROBE__SD3_STROBE 0x19 614 + >; 615 + }; 616 + 617 + pinctrl_usdhc3_100mhz: usdhc3grp_100mhz { 618 + fsl,pins = < 619 + MX7D_PAD_SD3_CMD__SD3_CMD 0x5a 620 + MX7D_PAD_SD3_CLK__SD3_CLK 0x1a 621 + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5a 622 + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5a 623 + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5a 624 + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5a 625 + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5a 626 + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5a 627 + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5a 628 + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5a 629 + MX7D_PAD_SD3_STROBE__SD3_STROBE 0x1a 630 + >; 631 + }; 632 + 633 + pinctrl_usdhc3_200mhz: usdhc3grp_200mhz { 634 + fsl,pins = < 635 + MX7D_PAD_SD3_CMD__SD3_CMD 0x5b 636 + MX7D_PAD_SD3_CLK__SD3_CLK 0x1b 637 + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5b 638 + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5b 639 + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5b 640 + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5b 641 + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5b 642 + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5b 643 + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5b 644 + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5b 645 + MX7D_PAD_SD3_STROBE__SD3_STROBE 0x1b 612 646 >; 613 647 }; 614 648
+19
arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts
··· 1 + // SPDX-License-Identifier: (GPL-2.0 OR MIT) 2 + /* 3 + * Copyright 2017 Toradex AG 4 + */ 5 + 6 + /dts-v1/; 7 + #include "imx7d-colibri-emmc.dtsi" 8 + #include "imx7-colibri-eval-v3.dtsi" 9 + 10 + / { 11 + model = "Toradex Colibri iMX7D 1GB (eMMC) on Colibri Evaluation Board V3"; 12 + compatible = "toradex,colibri-imx7d-emmc-eval-v3", 13 + "toradex,colibri-imx7d-emmc", "fsl,imx7d"; 14 + }; 15 + 16 + &usbotg2 { 17 + vbus-supply = <&reg_usbh_vbus>; 18 + status = "okay"; 19 + };
+21
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0 OR MIT) 2 + /* 3 + * Copyright 2017 Toradex AG 4 + */ 5 + 6 + #include "imx7d.dtsi" 7 + #include "imx7-colibri.dtsi" 8 + 9 + / { 10 + memory { 11 + reg = <0x80000000 0x40000000>; 12 + }; 13 + }; 14 + 15 + &usbotg2 { 16 + dr_mode = "host"; 17 + }; 18 + 19 + &usdhc3 { 20 + status = "okay"; 21 + };
+4
arch/arm/boot/dts/imx7d-colibri.dtsi
··· 49 49 }; 50 50 }; 51 51 52 + &gpmi { 53 + status = "okay"; 54 + }; 55 + 52 56 &usbotg2 { 53 57 dr_mode = "host"; 54 58 };