diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-05-07 15:50:03 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-01-27 20:36:36 +0200 |
| commit | 3aed7ebf55f649829a1dee2f6009f90d48cf8c95 (patch) | |
| tree | e05dc61a2aef8c70bb33ee77da4e9608da236be5 /arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | |
| parent | a3cb524c20fa4feb98c85d743e49344d11c9d180 (diff) | |
ARM: dts (ds): imx7: merge changes from toradex_4.9-2.3.x-imx-next
Merge changes from Toradex Linux 4.9 BSP.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
(cherry picked from commit e79a2c56ad4d547a45c726195b9024b189657128)
Conflicts:
arch/arm/boot/dts/imx7-colibri.dtsi
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
arch/arm/boot/dts/imx7d.dtsi
arch/arm/boot/dts/imx7s.dtsi
I reverted imx7d.dtsi and imx7s.dtsi completely this time. Then
I copied the parts over from imx7d to imx7s like we had it on the BSP
before to guarantee the same functionality on iMX7s as we already had.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Conflicts:
arch/arm/boot/dts/imx7-colibri.dtsi
arch/arm/boot/dts/imx7d.dtsi
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-colibri-emmc.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi index 898f4b8d7421..35bedec5b001 100644 --- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi @@ -7,7 +7,15 @@ #include "imx7-colibri.dtsi" / { - memory@80000000 { + aliases { + /* the following, together with kernel patches, forces a fixed assignment + between device id and usdhc controller */ + /* i.e. the eMMC on usdhc3 will be /dev/mmcblk0 */ + mmc0 = &usdhc3; /* eMMC */ + mmc1 = &usdhc1; /* MMC 4bit slot */ + }; + + memory { device_type = "memory"; reg = <0x80000000 0x40000000>; }; |