Generalise the change in commit 3936514b82e8 ("dm: sunxi: Move Linksprite_pcDuino3 to use DM for MMC, SATA") so it applies to all A20 boards: use the driver model for MMC and SATA, in preparation for CONFIG_BLK defaulting to y.

Tested on Linksprite_pcDuino3_Nano.

Signed-off-by: Adam Sampson ats@offog.org Acked-by: Maxime Ripard maxime.ripard@bootlin.com --- Changes for v2: - at Maxime's suggestion, enabled by default at the Kconfig level for all A20 boards (which means the one board Simon updated previously doesn't need to specify them any more) Changes for v3: - only select DM_MMC if MMC is enabled, for boards without MMC

arch/arm/mach-sunxi/Kconfig | 2 ++ configs/Linksprite_pcDuino3_defconfig | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index a3f7723028..8f70c6750e 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -174,6 +174,8 @@ config MACH_SUN7I select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI + select DM_MMC if MMC + select DM_SCSI if SCSI select DRAM_SUN4I select PHY_SUN4I_USB select SUNXI_GEN_SUN4I diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index d7e9c26cbf..f987cef711 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -13,10 +13,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SCSI_AHCI=y -CONFIG_DM_MMC=y CONFIG_ETH_DESIGNWARE=y CONFIG_SUN7I_GMAC=y CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_USB_EHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y