ARM: ux500: remove support for early silicon revisions

[deliverable/linux.git] / arch / arm / mach-ux500 / board-mop500-sdi.c

diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index cf93dca97b9a688d24be908e58e32af951626496..23be34b3bb6e8a9f2e41547c2d18b724c1a17609 100644 (file)
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -21,6 +21,12 @@
 #include "board-mop500.h"
 #include "ste-dma40-db8500.h"
 
+/*
+ * v2 has a new version of this block that need to be forced, the number found
+ * in hardware is incorrect
+ */
+#define U8500_SDI_V2_PERIPHID 0x10480180
+
 /*
  * SDI 0 (MicroSD slot)
  */
@@ -117,10 +123,7 @@ static void sdi0_configure(void)
        gpio_direction_output(sdi0_en, 1);
 
        /* Add the device, force v2 to subrevision 1 */
-       if (cpu_is_u8500v2())
-               db8500_add_sdi0(&mop500_sdi0_data, 0x10480180);
-       else
-               db8500_add_sdi0(&mop500_sdi0_data, 0);
+       db8500_add_sdi0(&mop500_sdi0_data, U8500_SDI_V2_PERIPHID);
 }
 
 void mop500_sdi_tc35892_init(void)
@@ -194,7 +197,8 @@ static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {
 static struct mmci_platform_data mop500_sdi2_data = {
        .ocr_mask       = MMC_VDD_165_195,
        .f_max          = 50000000,
-       .capabilities   = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
+       .capabilities   = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |
+                         MMC_CAP_MMC_HIGHSPEED,
        .gpio_cd        = -1,
        .gpio_wp        = -1,
 #ifdef CONFIG_STE_DMA40
@@ -244,20 +248,10 @@ static struct mmci_platform_data mop500_sdi4_data = {
 
 void __init mop500_sdi_init(void)
 {
-       u32 periphid = 0;
-
-       /* v2 has a new version of this block that need to be forced */
-       if (cpu_is_u8500v2())
-               periphid = 0x10480180;
-       /* PoP:ed eMMC on top of DB8500 v1.0 has problems with high speed */
-       if (!cpu_is_u8500v10())
-               mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;
-
-       db8500_add_sdi2(&mop500_sdi2_data, periphid);
-
+       /* PoP:ed eMMC */
+       db8500_add_sdi2(&mop500_sdi2_data, U8500_SDI_V2_PERIPHID);
        /* On-board eMMC */
-       db8500_add_sdi4(&mop500_sdi4_data, periphid);
-
+       db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
        /*
         * On boards with the TC35892 GPIO expander, sdi0 will finally
         * be added when the TC35892 initializes and calls
@@ -267,13 +261,9 @@ void __init mop500_sdi_init(void)
 
 void __init snowball_sdi_init(void)
 {
-       u32 periphid = 0x10480180;
-
-       mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;
-
        /* On-board eMMC */
-       db8500_add_sdi4(&mop500_sdi4_data, periphid);
-
+       db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
+       /* External Micro SD slot */
        mop500_sdi0_data.gpio_cd = SNOWBALL_SDMMC_CD_GPIO;
        mop500_sdi0_data.cd_invert = true;
        sdi0_en = SNOWBALL_SDMMC_EN_GPIO;
@@ -283,19 +273,15 @@ void __init snowball_sdi_init(void)
 
 void __init hrefv60_sdi_init(void)
 {
-       u32 periphid = 0x10480180;
-
-       mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;
-
-       db8500_add_sdi2(&mop500_sdi2_data, periphid);
-
+       /* PoP:ed eMMC */
+       db8500_add_sdi2(&mop500_sdi2_data, U8500_SDI_V2_PERIPHID);
        /* On-board eMMC */
-       db8500_add_sdi4(&mop500_sdi4_data, periphid);
-
+       db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
+       /* External Micro SD slot */
        mop500_sdi0_data.gpio_cd = HREFV60_SDMMC_CD_GPIO;
        sdi0_en = HREFV60_SDMMC_EN_GPIO;
        sdi0_vsel = HREFV60_SDMMC_1V8_3V_GPIO;
        sdi0_configure();
-
-       db8500_add_sdi1(&mop500_sdi1_data, periphid);
+       /* WLAN SDIO channel */
+       db8500_add_sdi1(&mop500_sdi1_data, U8500_SDI_V2_PERIPHID);
 }