From 6d8c9e8567eff4f5be860bc5f0e48a03e368c653 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Fri, 17 Mar 2017 17:17:59 +0800 Subject: [PATCH] MLK-14445-9 mx7ulp_evk: Add eMMC reworked board support Add build configuration and DTS file to enable eMMC for eMMC reworked EVK board. Because the eMMC DTS file has QSPI node disabled, so we change to use non-DM QSPI driver. Signed-off-by: Ye Li (cherry picked from commit 9ae0e03eb829f694d26caec22f91d1f0fdba980d) (cherry picked from commit 29a10734150e91d3b5596f11a7533cb52dc5a4d2) --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx7ulp-evk-emmc.dts | 18 ++++++++++ configs/mx7ulp_evk_emmc_defconfig | 56 +++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx7ulp-evk-emmc.dts create mode 100644 configs/mx7ulp_evk_emmc_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 67526572bf..96f00f7cf5 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -577,7 +577,8 @@ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \ imx7s-warp.dtb dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb \ - imx7ulp-evk-qspi.dtb + imx7ulp-evk-emmc.dtb \ + imx7ulp-evk-qspi.dtb dtb-$(CONFIG_ARCH_IMX8) += fsl-imx8qxp-mek.dtb \ fsl-imx8qm-mek.dtb \ diff --git a/arch/arm/dts/imx7ulp-evk-emmc.dts b/arch/arm/dts/imx7ulp-evk-emmc.dts new file mode 100644 index 0000000000..e58616e71b --- /dev/null +++ b/arch/arm/dts/imx7ulp-evk-emmc.dts @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2016 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "imx7ulp-evk.dts" + +&usdhc0 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_usdhc0_8bit>; + pinctrl-1 = <&pinctrl_usdhc0_8bit>; + non-removable; + bus-width = <8>; + status = "okay"; +}; diff --git a/configs/mx7ulp_evk_emmc_defconfig b/configs/mx7ulp_evk_emmc_defconfig new file mode 100644 index 0000000000..14504e4888 --- /dev/null +++ b/configs/mx7ulp_evk_emmc_defconfig @@ -0,0 +1,56 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX7ULP=y +CONFIG_SYS_TEXT_BASE=0x67800000 +CONFIG_TARGET_MX7ULP_EVK=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" +CONFIG_BOUNCE_BUFFER=y +CONFIG_BOARD_LATE_INIT=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_FAT=y +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-emmc" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM=y +CONFIG_DM_GPIO=y +CONFIG_IMX_RGPIO2P=y +# CONFIG_MXC_GPIO is not set +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y +CONFIG_SYS_I2C_IMX_LPI2C=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX7ULP=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y +CONFIG_FSL_LPUART=y +CONFIG_CMD_SF=y +CONFIG_FSL_QSPI=y +CONFIG_SPI=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SF_DEFAULT_BUS=0 +CONFIG_SF_DEFAULT_CS=0 +CONFIG_SF_DEFAULT_SPEED=40000000 +CONFIG_SF_DEFAULT_MODE=0 +CONFIG_ULP_WATCHDOG=y +CONFIG_CMD_USB=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_STORAGE=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_VIDEO=y -- 2.17.1