diff options
| author | Ye Li <ye.li@nxp.com> | 2018-09-26 01:59:41 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-09-29 00:35:24 -0700 |
| commit | b089275ffbd9f403d161653bebc7838d126e9f3b (patch) | |
| tree | 87a34da517004db4cf2c888484cd9b9f6ec3f72d | |
| parent | 57549a0423dc9c0bf4972453d6209aaf82a69c43 (diff) | |
MLK-19726-1 Revert "MLK-18568 imx8: disable the DM devices removing"
This reverts commit af92ba299b2b87cde02bbd4f534f1a30b45552cd.
Disable the CONFIG_DM_DEVICE_REMOVE will cause device_remove function
do nothing. But it is needed by some drivers like usb, mmc, sf. When
running "usb start" then "usb stop", it does not stop the usb, and cause
problem to next "usb start".
(cherry picked from commit b78c0eab73d19e945c6c98ea50c3e975f20ca249)
24 files changed, 0 insertions, 24 deletions
diff --git a/configs/imx8dx_ddr3_arm2_defconfig b/configs/imx8dx_ddr3_arm2_defconfig index edbf377b33..b6f3c31cb4 100644 --- a/configs/imx8dx_ddr3_arm2_defconfig +++ b/configs/imx8dx_ddr3_arm2_defconfig @@ -93,7 +93,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig index c3af6770ef..729468b63f 100644 --- a/configs/imx8qm_ddr4_arm2_defconfig +++ b/configs/imx8qm_ddr4_arm2_defconfig @@ -81,7 +81,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_ddr4_arm2_spl_defconfig b/configs/imx8qm_ddr4_arm2_spl_defconfig index 55ca947cc2..d08c375755 100644 --- a/configs/imx8qm_ddr4_arm2_spl_defconfig +++ b/configs/imx8qm_ddr4_arm2_spl_defconfig @@ -89,7 +89,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_lpddr4_arm2_android_defconfig b/configs/imx8qm_lpddr4_arm2_android_defconfig index c28e46b53d..c351d038eb 100644 --- a/configs/imx8qm_lpddr4_arm2_android_defconfig +++ b/configs/imx8qm_lpddr4_arm2_android_defconfig @@ -83,7 +83,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig index 97f42d0de4..f690be596f 100644 --- a/configs/imx8qm_lpddr4_arm2_defconfig +++ b/configs/imx8qm_lpddr4_arm2_defconfig @@ -81,7 +81,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig index fba8942e29..c30ba29ef5 100644 --- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig @@ -82,7 +82,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_lpddr4_arm2_spl_defconfig b/configs/imx8qm_lpddr4_arm2_spl_defconfig index 2904b84970..57aa28dc38 100644 --- a/configs/imx8qm_lpddr4_arm2_spl_defconfig +++ b/configs/imx8qm_lpddr4_arm2_spl_defconfig @@ -89,7 +89,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig index f7cad9ddb5..d383177ff6 100644 --- a/configs/imx8qm_mek_android_defconfig +++ b/configs/imx8qm_mek_android_defconfig @@ -84,7 +84,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_LZ4=y CONFIG_SMC_FUSE=y diff --git a/configs/imx8qm_mek_androidauto_defconfig b/configs/imx8qm_mek_androidauto_defconfig index 6ef5502ec5..bcf2568cf2 100644 --- a/configs/imx8qm_mek_androidauto_defconfig +++ b/configs/imx8qm_mek_androidauto_defconfig @@ -102,7 +102,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_LZ4=y CONFIG_SMC_FUSE=y diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig index 707c52f38d..e163100091 100644 --- a/configs/imx8qm_mek_androidauto_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto_trusty_defconfig @@ -103,7 +103,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_LZ4=y CONFIG_SMC_FUSE=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 8ee97f6594..98bc128a86 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -94,7 +94,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig index 5bc524a607..55596b27c1 100644 --- a/configs/imx8qm_mek_fspi_defconfig +++ b/configs/imx8qm_mek_fspi_defconfig @@ -95,7 +95,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_ddr3_arm2_defconfig b/configs/imx8qxp_ddr3_arm2_defconfig index 32ea29501e..cf58702156 100644 --- a/configs/imx8qxp_ddr3_arm2_defconfig +++ b/configs/imx8qxp_ddr3_arm2_defconfig @@ -81,7 +81,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_lpddr4_arm2_android_defconfig b/configs/imx8qxp_lpddr4_arm2_android_defconfig index 019c513bcf..b4f1e0546f 100644 --- a/configs/imx8qxp_lpddr4_arm2_android_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_android_defconfig @@ -83,7 +83,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_lpddr4_arm2_defconfig b/configs/imx8qxp_lpddr4_arm2_defconfig index 480f9e4d6a..0ff3c54d88 100644 --- a/configs/imx8qxp_lpddr4_arm2_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_defconfig @@ -81,7 +81,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig index c81d1c72a6..c7f5eba28f 100644 --- a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig @@ -81,7 +81,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_lpddr4_arm2_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_nand_defconfig index 96b5928882..a0d40b2930 100644 --- a/configs/imx8qxp_lpddr4_arm2_nand_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_nand_defconfig @@ -78,7 +78,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_NAND=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig index 6c02e421d2..05089b01f9 100644 --- a/configs/imx8qxp_mek_android_defconfig +++ b/configs/imx8qxp_mek_android_defconfig @@ -84,7 +84,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_LZ4=y CONFIG_SMC_FUSE=y diff --git a/configs/imx8qxp_mek_androidauto_defconfig b/configs/imx8qxp_mek_androidauto_defconfig index eb2af4cd49..3ffc998dbf 100644 --- a/configs/imx8qxp_mek_androidauto_defconfig +++ b/configs/imx8qxp_mek_androidauto_defconfig @@ -104,7 +104,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_LZ4=y CONFIG_SMC_FUSE=y diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig index 1fdf74e283..2a7de30550 100644 --- a/configs/imx8qxp_mek_androidauto_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig @@ -105,7 +105,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_LZ4=y CONFIG_SMC_FUSE=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index d001041835..2821782e97 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -95,7 +95,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_mek_fspi_defconfig b/configs/imx8qxp_mek_fspi_defconfig index b2a75c29fd..15f0680490 100644 --- a/configs/imx8qxp_mek_fspi_defconfig +++ b/configs/imx8qxp_mek_fspi_defconfig @@ -96,7 +96,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_mek_spl_defconfig b/configs/imx8qxp_mek_spl_defconfig index 30dec46934..54f9bb9a7d 100644 --- a/configs/imx8qxp_mek_spl_defconfig +++ b/configs/imx8qxp_mek_spl_defconfig @@ -102,7 +102,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_mek_spl_fspi_defconfig b/configs/imx8qxp_mek_spl_fspi_defconfig index 3c4511a746..f48f568ac6 100644 --- a/configs/imx8qxp_mek_spl_fspi_defconfig +++ b/configs/imx8qxp_mek_spl_fspi_defconfig @@ -106,7 +106,6 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_SPL_FLASH=y -CONFIG_DM_DEVICE_REMOVE=n CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y |