diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-09-18 15:23:01 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-19 09:55:42 +0200 |
| commit | 5f99a8d403052aa42a311390bea1b9de49a74185 (patch) | |
| tree | 1ef4b1f6b3d9e8f923f23fe215952436c00dbdf0 /arch | |
| parent | 502d54dc2536a203c1bd57e5dcbc0f144b954588 (diff) | |
| download | barebox-5f99a8d403052aa42a311390bea1b9de49a74185.tar.gz barebox-5f99a8d403052aa42a311390bea1b9de49a74185.tar.xz | |
dts: VFxxx: Add aliases for ESDHC controllers
Add aliases for ESDHC controllers in order to make their naming across
Vybrid and i.MX.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/zii-vf610-dev/board.c | 5 | ||||
| -rw-r--r-- | arch/arm/dts/vf610-twr.dts | 1 | ||||
| -rw-r--r-- | arch/arm/dts/vf610-zii-dev.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/dts/vf610.dtsi | 12 |
4 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm/boards/zii-vf610-dev/board.c b/arch/arm/boards/zii-vf610-dev/board.c index 91c653804e..42b5c59dfb 100644 --- a/arch/arm/boards/zii-vf610-dev/board.c +++ b/arch/arm/boards/zii-vf610-dev/board.c @@ -174,8 +174,9 @@ static int zii_vf610_spu3_register_bbu(void) if (!of_machine_is_compatible("zii,vf610spu3-a")) return 0; - ret = vf610_bbu_internal_mmc_register_handler("eMMC", "/dev/disk0", - BBU_HANDLER_FLAG_DEFAULT); + ret = vf610_bbu_internal_mmcboot_register_handler("eMMC", + "/dev/mmc0", + BBU_HANDLER_FLAG_DEFAULT); if (ret) { pr_err("Failed to register eMMC BBU handler\n"); return ret; diff --git a/arch/arm/dts/vf610-twr.dts b/arch/arm/dts/vf610-twr.dts index 2456ade5f5..ac2774979e 100644 --- a/arch/arm/dts/vf610-twr.dts +++ b/arch/arm/dts/vf610-twr.dts @@ -8,6 +8,7 @@ */ #include <arm/vf610-twr.dts> +#include "vf610.dtsi" #include "vf610-ddrmc.dtsi" &usbdev0 { diff --git a/arch/arm/dts/vf610-zii-dev.dtsi b/arch/arm/dts/vf610-zii-dev.dtsi index dc16280bc3..b6db262027 100644 --- a/arch/arm/dts/vf610-zii-dev.dtsi +++ b/arch/arm/dts/vf610-zii-dev.dtsi @@ -42,6 +42,7 @@ n * copy, modify, merge, publish, distribute, sublicense, and/or * OTHER DEALINGS IN THE SOFTWARE. */ +#include "vf610.dtsi" #include "vf610-ddrmc.dtsi" / { diff --git a/arch/arm/dts/vf610.dtsi b/arch/arm/dts/vf610.dtsi new file mode 100644 index 0000000000..3060031b8a --- /dev/null +++ b/arch/arm/dts/vf610.dtsi @@ -0,0 +1,12 @@ +/* + * Two aliases missing in upstream DT needed to make VFxxx's SD/MMC + * device naming scheme consistent with the rest of i.MX (which the + * following aliases from upstream. + */ + +/ { + aliases { + mmc0 = &esdhc0; + mmc1 = &esdhc1; + }; +}; |