diff options
author | Tom Rini <trini@konsulko.com> | 2017-03-19 14:49:26 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-03-19 15:13:38 -0400 |
commit | 02ccab1908c405fe1449457d4a0d343784a30acb (patch) | |
tree | 3a5d41abff96a3af22587ace67713d5c0165b097 /arch/arm/dts/imx6qdl-icore-rqs.dtsi | |
parent | f40574e2d78c96a3818c4fa2379382d924866a6e (diff) | |
parent | d883fcc6bbb2fcc3df90857fee99c2f543a0289c (diff) | |
download | u-boot-02ccab1908c405fe1449457d4a0d343784a30acb.zip u-boot-02ccab1908c405fe1449457d4a0d343784a30acb.tar.gz u-boot-02ccab1908c405fe1449457d4a0d343784a30acb.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/bk4r1_defconfig
configs/colibri_vf_defconfig
configs/pcm052_defconfig
include/configs/colibri_vf.h
include/configs/pcm052.h
Diffstat (limited to 'arch/arm/dts/imx6qdl-icore-rqs.dtsi')
-rw-r--r-- | arch/arm/dts/imx6qdl-icore-rqs.dtsi | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/dts/imx6qdl-icore-rqs.dtsi index 750229b..8b9d5b4 100644 --- a/arch/arm/dts/imx6qdl-icore-rqs.dtsi +++ b/arch/arm/dts/imx6qdl-icore-rqs.dtsi @@ -107,6 +107,13 @@ status = "okay"; }; +&usdhc4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc4>; + no-1-8-v; + status = "okay"; +}; + &iomuxc { pinctrl_enet: enetgrp { fsl,pins = < @@ -167,4 +174,19 @@ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17070 >; }; + + pinctrl_usdhc4: usdhc4grp { + fsl,pins = < + MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17070 + MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10070 + MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17070 + MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17070 + MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17070 + MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17070 + MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17070 + MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17070 + MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17070 + MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17070 + >; + }; }; |