imx: ventana: enable dm support for MMC and SATA

Enable driver model support for MMC and SATA.

Note that DM_MMC requires aliases for your mmc devices so
they are added to the dts. Linux does not support enumerating mmc
devices by alias so these are not present in the Linux dts.

Note that we still need board_mmc_init() and board_mmc_getcd() for
not DM SPL to support MMC.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

diff --git a/arch/arm/dts/imx6qdl-gw52xx.dtsi b/arch/arm/dts/imx6qdl-gw52xx.dtsi
index de54b7c2174b0879b80fd1b242c15de5faa55122..6eedf8d40d87185f89338798d1062947edc25aa2 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/dts/imx6qdl-gw52xx.dtsi
@@ -13,6 +13,7 @@
                led0 = &led0;
                led1 = &led1;
                led2 = &led2;
+               mmc0 = &usdhc3;
                nand = &gpmi;
                ssi0 = &ssi1;
                usb0 = &usbh1;

diff --git a/arch/arm/dts/imx6qdl-gw53xx.dtsi b/arch/arm/dts/imx6qdl-gw53xx.dtsi
index 64bb88dc745a060b01ede8a988abeeefabd582cf..9deec7e352d5a7d3941ee039e599bee4dcc30f20 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/dts/imx6qdl-gw53xx.dtsi
@@ -13,6 +13,7 @@
                led0 = &led0;
                led1 = &led1;
                led2 = &led2;
+               mmc0 = &usdhc3;
                nand = &gpmi;
                ssi0 = &ssi1;
                usb0 = &usbh1;

diff --git a/arch/arm/dts/imx6qdl-gw54xx.dtsi b/arch/arm/dts/imx6qdl-gw54xx.dtsi
index 56d090ec0f67ba0de9988cd591d16953f83e31fa..a30ba4848e04548b726d93716df80fa1467f5ee7 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/dts/imx6qdl-gw54xx.dtsi
@@ -14,6 +14,7 @@
                led0 = &led0;
                led1 = &led1;
                led2 = &led2;
+               mmc0 = &usdhc3;
                nand = &gpmi;
                ssi0 = &ssi1;
                usb0 = &usbh1;

diff --git a/arch/arm/dts/imx6qdl-gw560x.dtsi b/arch/arm/dts/imx6qdl-gw560x.dtsi
index d5468fb26066ec86f937119ab325c06b29b06328..0786b0d5463a78ad19cfc80f540bc46490458294 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw560x.dtsi
+++ b/arch/arm/dts/imx6qdl-gw560x.dtsi
@@ -55,6 +55,8 @@
                led0 = &led0;
                led1 = &led1;
                led2 = &led2;
+               mmc0 = &usdhc2;
+               mmc1 = &usdhc3;
                ssi0 = &ssi1;
                usb0 = &usbh1;
                usb1 = &usbotg;

diff --git a/arch/arm/dts/imx6qdl-gw5904.dtsi b/arch/arm/dts/imx6qdl-gw5904.dtsi
index 52b255b726e58688f2bc5a55f9a5845354ef7613..5b7bd5693286a1defbdc82db1a352d6858272bc4 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw5904.dtsi
+++ b/arch/arm/dts/imx6qdl-gw5904.dtsi
@@ -55,6 +55,7 @@
                led0 = &led0;
                led1 = &led1;
                led2 = &led2;
+               mmc0 = &usdhc3;
                usb0 = &usbh1;
                usb1 = &usbotg;
        };

diff --git a/arch/arm/dts/imx6qdl-gw5910.dtsi b/arch/arm/dts/imx6qdl-gw5910.dtsi
index 56d0c4ff6c8592eebbdc30f0755c34f7f856b2e6..248e077a56edf362d5da5ee15c0cde5360ab5d51 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw5910.dtsi
+++ b/arch/arm/dts/imx6qdl-gw5910.dtsi
@@ -13,6 +13,7 @@
                led0 = &led0;
                led1 = &led1;
                led2 = &led2;
+               mmc0 = &usdhc3;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw5912.dtsi b/arch/arm/dts/imx6qdl-gw5912.dtsi
index 797f160249f787d02f0295820846dafbc4df5261..7593872c07e8612f43249be0ee50d7274378b21f 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw5912.dtsi
+++ b/arch/arm/dts/imx6qdl-gw5912.dtsi
@@ -13,6 +13,7 @@
                led0 = &led0;
                led1 = &led1;
                led2 = &led2;
+               mmc0 = &usdhc3;
                nand = &gpmi;
                usb0 = &usbh1;
                usb1 = &usbotg;

diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 50bb202a723cfed561676449ba0f8280a40fbfdb..7be4555d4bad5c9e5007b706bf585d2f7f8fa2ca 100644 (file)
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -28,7 +28,6 @@
 #include <hwconfig.h>
 #include <i2c.h>
 #include <fdt_support.h>
-#include <fsl_esdhc_imx.h>
 #include <jffs2/load_kernel.h>
 #include <linux/ctype.h>
 #include <miiphy.h>
@@ -650,10 +649,6 @@ int board_init(void)
        setup_ventana_i2c(1);
        setup_ventana_i2c(2);
 
-#ifdef CONFIG_SATA
-       setup_sata();
-#endif
-
        setup_iomux_gpio(board_type, &ventana_info);
 
        return 0;

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index 696f49ca8ae706f20b292c30cadd58aaba33b421..d383a85f8bf908a31f6419c63364667e33c0cf80 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL=y
 CONFIG_ENV_OFFSET_REDUND=0xD1400
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx"
+CONFIG_AHCI=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
@@ -79,6 +80,7 @@ CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
+CONFIG_DM_MMC=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y

diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 0e697017b1f48f4e647b9637c75022902c4e3705..b6ef9e6f8a706a040fe94ed8636ccc8affdbf80a 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL=y
 CONFIG_ENV_OFFSET_REDUND=0xD1400
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx"
+CONFIG_AHCI=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
@@ -79,6 +80,7 @@ CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
+CONFIG_DM_MMC=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y

diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 9b204c726377d47446fa2beaeae12ca0a17d5295..533d31af9fcdada0975ad14d0a6e041414db6109 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL=y
 CONFIG_ENV_OFFSET_REDUND=0x1080000
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx"
+CONFIG_AHCI=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
@@ -81,6 +82,7 @@ CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
+CONFIG_DM_MMC=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y