The mvsata_ide driver was due for DM conversion by v2019.07. As that
has long passed, remove the driver and disable it in the boards which
had enabled it.
Signed-off-by: Tom Rini
---
Makefile | 10 -
arch/arm/mach-kirkwood/include/mach/config.h | 2 -
configs/dns325_defconfig | 1 -
configs/dreamplug_defconfig | 1 -
configs/ds109_defconfig | 1 -
configs/edminiv2_defconfig | 1 -
configs/goflexhome_defconfig | 1 -
configs/guruplug_defconfig | 1 -
configs/ib62x0_defconfig | 1 -
configs/nas220_defconfig | 1 -
configs/nsa310s_defconfig| 1 -
drivers/ata/Kconfig | 6 -
drivers/ata/Makefile | 1 -
drivers/ata/mvsata_ide.c | 199 ---
include/configs/dns325.h | 8 -
include/configs/dreamplug.h | 7 -
include/configs/ds109.h | 7 -
include/configs/edminiv2.h | 3 -
include/configs/goflexhome.h | 7 -
include/configs/guruplug.h | 7 -
include/configs/ib62x0.h | 3 -
include/configs/nas220.h | 8 -
include/configs/nsa310s.h| 2 -
include/configs/sheevaplug.h | 3 -
scripts/config_whitelist.txt | 2 -
25 files changed, 284 deletions(-)
delete mode 100644 drivers/ata/mvsata_ide.c
diff --git a/Makefile b/Makefile
index ebbedb1fb1af..9d6ac5e16fe5 100644
--- a/Makefile
+++ b/Makefile
@@ -1064,16 +1064,6 @@ ifneq
($(CONFIG_DM_USB)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy)
@echo >&2 ""
endif
endif
-ifeq ($(CONFIG_MVSATA_IDE),y)
- @echo >&2 "= WARNING =="
- @echo >&2 "This board does use CONFIG_MVSATA_IDE which is not"
- @echo >&2 "ported to driver-model (DM) yet. Please update the storage"
- @echo >&2 "controller driver to use CONFIG_AHCI before the v2019.07"
- @echo >&2 "release."
- @echo >&2 "Failure to update by the deadline may result in board
removal."
- @echo >&2 "See doc/driver-model/migration.rst for more info."
- @echo >&2 ""
-endif
ifeq ($(CONFIG_LIBATA),y)
ifneq ($(CONFIG_AHCI),y)
@echo >&2 "= WARNING =="
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h
b/arch/arm/mach-kirkwood/include/mach/config.h
index 3bd032e08790..ef68fc86b22e 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -74,8 +74,6 @@
*/
#ifdef CONFIG_IDE
#define __io
-#define CONFIG_IDE_PREINIT
-#define CONFIG_MVSATA_IDE_USE_PORT1
/* Needs byte-swapping for ATA data register */
#define CONFIG_IDE_SWAP_IO
/* Data, registers and alternate blocks are at the same offset */
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index a5fe9cd33160..493c802d5208 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -36,7 +36,6 @@ CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_NETCONSOLE=y
CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
CONFIG_BLK=y
# CONFIG_MMC is not set
CONFIG_MTD=y
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 2c27726fcde4..b4dedc9e59b1 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -34,7 +34,6 @@ CONFIG_ENV_SPI_MAX_HZ=5000
CONFIG_ENV_ADDR=0x10
CONFIG_NETCONSOLE=y
CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
CONFIG_BLK=y
# CONFIG_MMC is not set
CONFIG_MTD=y
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index e412e3f5937c..77c094b76637 100644
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -30,7 +30,6 @@ CONFIG_ENV_SPI_MAX_HZ=5000
CONFIG_ENV_ADDR=0x3D
CONFIG_NETCONSOLE=y
CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
CONFIG_BLK=y
CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MVTWSI=y
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 916775e9ed17..0aacb35e44c4 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ENV_ADDR=0xFFF84000
CONFIG_NETCONSOLE=y
-CONFIG_MVSATA_IDE=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index b271822dcbfd..6e3e6325e921 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -37,7 +37,6 @@ CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_NETCONSOLE=y
CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
CONFIG_BLK=y
# CONFIG_MMC is not set
CONFIG_MTD=y
diff --git a/configs/guruplug_defconfig
