diff mbox

[3/7] ARM: ux500: Remove ATAG support for SDI (MMC)

Message ID 1383732348-18576-4-git-send-email-lee.jones@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Lee Jones Nov. 6, 2013, 10:05 a.m. UTC 
This hasn't been used since we moved over to a Device Tree only platform.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/Makefile           |   3 +-
 arch/arm/mach-ux500/board-mop500-sdi.c | 166 ---------------------------------
 arch/arm/mach-ux500/board-mop500.h     |   4 -
 3 files changed, 1 insertion(+), 172 deletions(-)
 delete mode 100644 arch/arm/mach-ux500/board-mop500-sdi.c

Comments

Ulf Hansson Nov. 7, 2013, 11:40 a.m. UTC | #1 
On 6 November 2013 11:05, Lee Jones <lee.jones@linaro.org> wrote:
> This hasn't been used since we moved over to a Device Tree only platform.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  arch/arm/mach-ux500/Makefile           |   3 +-
>  arch/arm/mach-ux500/board-mop500-sdi.c | 166 ---------------------------------
>  arch/arm/mach-ux500/board-mop500.h     |   4 -
>  3 files changed, 1 insertion(+), 172 deletions(-)
>  delete mode 100644 arch/arm/mach-ux500/board-mop500-sdi.c
>
> diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
> index 66f351f..e34c010 100644
> --- a/arch/arm/mach-ux500/Makefile
> +++ b/arch/arm/mach-ux500/Makefile
> @@ -5,8 +5,7 @@
>  obj-y                          := cpu.o devices.o id.o timer.o pm.o
>  obj-$(CONFIG_CACHE_L2X0)       += cache-l2x0.o
>  obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o
> -obj-$(CONFIG_MACH_MOP500)      += board-mop500-sdi.o \
> -                               board-mop500-regulators.o \
> +obj-$(CONFIG_MACH_MOP500)      += board-mop500-regulators.o \
>                                 board-mop500-pins.o \
>                                 board-mop500-audio.o
>  obj-$(CONFIG_SMP)              += platsmp.o headsmp.o
> diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
> deleted file mode 100644
> index fcbf3a1..0000000
> --- a/arch/arm/mach-ux500/board-mop500-sdi.c
> +++ /dev/null
> @@ -1,166 +0,0 @@
> -/*
> - * Copyright (C) ST-Ericsson SA 2010
> - *
> - * Author: Hanumath Prasad <hanumath.prasad@stericsson.com>
> - * License terms: GNU General Public License (GPL) version 2
> - */
> -
> -#include <linux/kernel.h>
> -#include <linux/gpio.h>
> -#include <linux/amba/bus.h>
> -#include <linux/amba/mmci.h>
> -#include <linux/mmc/host.h>
> -#include <linux/platform_device.h>
> -#include <linux/platform_data/dma-ste-dma40.h>
> -
> -#include <asm/mach-types.h>
> -
> -#include "db8500-regs.h"
> -#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)
> - */
> -
> -#ifdef CONFIG_STE_DMA40
> -struct stedma40_chan_cfg mop500_sdi0_dma_cfg_rx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_DEV_TO_MEM,
> -       .dev_type = DB8500_DMA_DEV29_SD_MM0,
> -};
> -
> -static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_MEM_TO_DEV,
> -       .dev_type = DB8500_DMA_DEV29_SD_MM0,
> -};
> -#endif
> -
> -struct mmci_platform_data mop500_sdi0_data = {
> -       .f_max          = 100000000,
> -       .capabilities   = MMC_CAP_4_BIT_DATA |
> -                               MMC_CAP_SD_HIGHSPEED |
> -                               MMC_CAP_MMC_HIGHSPEED |
> -                               MMC_CAP_ERASE |
> -                               MMC_CAP_UHS_SDR12 |
> -                               MMC_CAP_UHS_SDR25,

I guess all the above caps is having binders in DT then?

> -       .gpio_wp        = -1,
> -       .sigdir         = MCI_ST_FBCLKEN |
> -                               MCI_ST_CMDDIREN |
> -                               MCI_ST_DATA0DIREN |
> -                               MCI_ST_DATA2DIREN,
> -#ifdef CONFIG_STE_DMA40
> -       .dma_filter     = stedma40_filter,
> -       .dma_rx_param   = &mop500_sdi0_dma_cfg_rx,
> -       .dma_tx_param   = &mop500_sdi0_dma_cfg_tx,
> -#endif
> -};
> -
> -/*
> - * SDI1 (SDIO WLAN)
> - */
> -#ifdef CONFIG_STE_DMA40
> -static struct stedma40_chan_cfg sdi1_dma_cfg_rx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_DEV_TO_MEM,
> -       .dev_type = DB8500_DMA_DEV32_SD_MM1,
> -};
> -
> -static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_MEM_TO_DEV,
> -       .dev_type = DB8500_DMA_DEV32_SD_MM1,
> -};
> -#endif
> -
> -struct mmci_platform_data mop500_sdi1_data = {
> -       .ocr_mask       = MMC_VDD_29_30,
> -       .f_max          = 100000000,
> -       .capabilities   = MMC_CAP_4_BIT_DATA |
> -                               MMC_CAP_NONREMOVABLE,
> -       .gpio_cd        = -1,
> -       .gpio_wp        = -1,
> -#ifdef CONFIG_STE_DMA40
> -       .dma_filter     = stedma40_filter,
> -       .dma_rx_param   = &sdi1_dma_cfg_rx,
> -       .dma_tx_param   = &sdi1_dma_cfg_tx,
> -#endif
> -};
> -
> -/*
> - * SDI 2 (POP eMMC, not on DB8500ed)
> - */
> -
> -#ifdef CONFIG_STE_DMA40
> -struct stedma40_chan_cfg mop500_sdi2_dma_cfg_rx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_DEV_TO_MEM,
> -       .dev_type =  DB8500_DMA_DEV28_SD_MM2,
> -};
> -
> -static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_MEM_TO_DEV,
> -       .dev_type = DB8500_DMA_DEV28_SD_MM2,
> -};
> -#endif
> -
> -struct mmci_platform_data mop500_sdi2_data = {
> -       .ocr_mask       = MMC_VDD_165_195,
> -       .f_max          = 100000000,
> -       .capabilities   = MMC_CAP_4_BIT_DATA |
> -                               MMC_CAP_8_BIT_DATA |
> -                               MMC_CAP_NONREMOVABLE |
> -                               MMC_CAP_MMC_HIGHSPEED |
> -                               MMC_CAP_ERASE |
> -                               MMC_CAP_CMD23,

Dito

> -       .gpio_cd        = -1,
> -       .gpio_wp        = -1,
> -#ifdef CONFIG_STE_DMA40
> -       .dma_filter     = stedma40_filter,
> -       .dma_rx_param   = &mop500_sdi2_dma_cfg_rx,
> -       .dma_tx_param   = &mop500_sdi2_dma_cfg_tx,
> -#endif
> -};
> -
> -/*
> - * SDI 4 (on-board eMMC)
> - */
> -
> -#ifdef CONFIG_STE_DMA40
> -struct stedma40_chan_cfg mop500_sdi4_dma_cfg_rx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_DEV_TO_MEM,
> -       .dev_type =  DB8500_DMA_DEV42_SD_MM4,
> -};
> -
> -static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_MEM_TO_DEV,
> -       .dev_type = DB8500_DMA_DEV42_SD_MM4,
> -};
> -#endif
> -
> -struct mmci_platform_data mop500_sdi4_data = {
> -       .f_max          = 100000000,
> -       .capabilities   = MMC_CAP_4_BIT_DATA |
> -                               MMC_CAP_8_BIT_DATA |
> -                               MMC_CAP_NONREMOVABLE |
> -                               MMC_CAP_MMC_HIGHSPEED |
> -                               MMC_CAP_ERASE |
> -                               MMC_CAP_CMD23,

Dito

> -       .gpio_cd        = -1,
> -       .gpio_wp        = -1,
> -#ifdef CONFIG_STE_DMA40
> -       .dma_filter     = stedma40_filter,
> -       .dma_rx_param   = &mop500_sdi4_dma_cfg_rx,
> -       .dma_tx_param   = &mop500_sdi4_dma_cfg_tx,
> -#endif
> -};
> diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
> index d48e866..78861f6 100644
> --- a/arch/arm/mach-ux500/board-mop500.h
> +++ b/arch/arm/mach-ux500/board-mop500.h
> @@ -79,10 +79,6 @@
>  #define SNOWBALL_EN_3V3_ETH_GPIO       MOP500_AB8500_PIN_GPIO(26)      /* GPIO26 */
>
>  struct device;
> -extern struct mmci_platform_data mop500_sdi0_data;
> -extern struct mmci_platform_data mop500_sdi1_data;
> -extern struct mmci_platform_data mop500_sdi2_data;
> -extern struct mmci_platform_data mop500_sdi4_data;
>  extern struct msp_i2s_platform_data msp0_platform_data;
>  extern struct msp_i2s_platform_data msp1_platform_data;
>  extern struct msp_i2s_platform_data msp2_platform_data;
> --
> 1.8.1.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Kind regards
Ulf Hansson
Russell King - ARM Linux Nov. 7, 2013, 11:46 a.m. UTC | #2 
On Wed, Nov 06, 2013 at 10:05:44AM +0000, Lee Jones wrote:
> This hasn't been used since we moved over to a Device Tree only platform.

The patch summary line is slightly off.  There's nothing here to do with
ATAGs.
Lee Jones Nov. 7, 2013, 11:54 a.m. UTC | #3 
On Thu, 07 Nov 2013, Russell King - ARM Linux wrote:

> On Wed, Nov 06, 2013 at 10:05:44AM +0000, Lee Jones wrote:
> > This hasn't been used since we moved over to a Device Tree only platform.
> 
> The patch summary line is slightly off.  There's nothing here to do with
> ATAGs.

Oh I see. Yes you're right, it was just what Arnd, myself and a few
others called non-DT 'cos it was easier.

Linus are you happy to fixup the subject lines of these two commits or
would you like me to re-submit?
Lee Jones Nov. 7, 2013, 12:07 p.m. UTC | #4 
> > -struct mmci_platform_data mop500_sdi0_data = {
> > -       .f_max          = 100000000,
> > -       .capabilities   = MMC_CAP_4_BIT_DATA |
> > -                               MMC_CAP_SD_HIGHSPEED |
> > -                               MMC_CAP_MMC_HIGHSPEED |
> > -                               MMC_CAP_ERASE |
> > -                               MMC_CAP_UHS_SDR12 |
> > -                               MMC_CAP_UHS_SDR25,
> 
> I guess all the above caps is having binders in DT then?

They're not there yet, no. But this stuff is not used anymore in
Mainline hence the patch. I attempted to supply bindings for them, but
they were rejected. Would you like to have a stab at that?

We are suffering with some MMC issues presently on Snowball, this
could well be the cause.

> Dito
> Dito

Likewise.

NB: When you post review comments, try not to forget to <snip> all
unrelated cruft. Scrolling down for pages to find them is not optimal.
Linus Walleij Nov. 8, 2013, 9:06 a.m. UTC | #5 
On Thu, Nov 7, 2013 at 1:07 PM, Lee Jones <lee.jones@linaro.org> wrote:

>> > -struct mmci_platform_data mop500_sdi0_data = {
>> > -       .f_max          = 100000000,
>> > -       .capabilities   = MMC_CAP_4_BIT_DATA |
>> > -                               MMC_CAP_SD_HIGHSPEED |
>> > -                               MMC_CAP_MMC_HIGHSPEED |
>> > -                               MMC_CAP_ERASE |
>> > -                               MMC_CAP_UHS_SDR12 |
>> > -                               MMC_CAP_UHS_SDR25,
>>
>> I guess all the above caps is having binders in DT then?
>
> They're not there yet, no. But this stuff is not used anymore in
> Mainline hence the patch. I attempted to supply bindings for them, but
> they were rejected. Would you like to have a stab at that?

Yeah but we basically regressed the ux500 with the patch now
queued for v3.13:
commit 49c129519a7a8840767321c38d2eaf84a263529b
"ARM: ux500: Stop passing MMC's platform data for Device Tree boots"

Which deleted the passing of this non-yet-DT:ed platform
data.

Since it's a regression we need to do a fixup patch for the
v3.13 series adding it back.

Since this patch probably needs to be rewritten on top of
that I don't merge this patch as of now.

Yours,
Linus Walleij
Lee Jones Nov. 8, 2013, 9:26 a.m. UTC | #6 
On Fri, 08 Nov 2013, Linus Walleij wrote:

> On Thu, Nov 7, 2013 at 1:07 PM, Lee Jones <lee.jones@linaro.org> wrote:
> 
> >> > -struct mmci_platform_data mop500_sdi0_data = {
> >> > -       .f_max          = 100000000,
> >> > -       .capabilities   = MMC_CAP_4_BIT_DATA |
> >> > -                               MMC_CAP_SD_HIGHSPEED |
> >> > -                               MMC_CAP_MMC_HIGHSPEED |
> >> > -                               MMC_CAP_ERASE |
> >> > -                               MMC_CAP_UHS_SDR12 |
> >> > -                               MMC_CAP_UHS_SDR25,
> >>
> >> I guess all the above caps is having binders in DT then?
> >
> > They're not there yet, no. But this stuff is not used anymore in
> > Mainline hence the patch. I attempted to supply bindings for them, but
> > they were rejected. Would you like to have a stab at that?
> 
> Yeah but we basically regressed the ux500 with the patch now
> queued for v3.13:
> commit 49c129519a7a8840767321c38d2eaf84a263529b
> "ARM: ux500: Stop passing MMC's platform data for Device Tree boots"
> 
> Which deleted the passing of this non-yet-DT:ed platform
> data.
> 
> Since it's a regression we need to do a fixup patch for the
> v3.13 series adding it back.

Okay, do you want me to do that?

> Since this patch probably needs to be rewritten on top of
> that I don't merge this patch as of now.

Sure.
Linus Walleij Nov. 8, 2013, 9:45 a.m. UTC | #7 
On Fri, Nov 8, 2013 at 10:26 AM, Lee Jones <lee.jones@linaro.org> wrote:
> On Fri, 08 Nov 2013, Linus Walleij wrote:
>> On Thu, Nov 7, 2013 at 1:07 PM, Lee Jones <lee.jones@linaro.org> wrote:

>> Since it's a regression we need to do a fixup patch for the
>> v3.13 series adding it back.
>
> Okay, do you want me to do that?

Sure, thanks! :-)

Yours,
Linus Walleij
diff mbox

Patch

diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 66f351f..e34c010 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -5,8 +5,7 @@ 
 obj-y				:= cpu.o devices.o id.o timer.o pm.o
 obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o
 obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o
-obj-$(CONFIG_MACH_MOP500)	+= board-mop500-sdi.o \
-				board-mop500-regulators.o \
+obj-$(CONFIG_MACH_MOP500)	+= board-mop500-regulators.o \
 				board-mop500-pins.o \
 				board-mop500-audio.o
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
deleted file mode 100644
index fcbf3a1..0000000
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ /dev/null
@@ -1,166 +0,0 @@ 
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Hanumath Prasad <hanumath.prasad@stericsson.com>
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#include <linux/kernel.h>
-#include <linux/gpio.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/mmci.h>
-#include <linux/mmc/host.h>
-#include <linux/platform_device.h>
-#include <linux/platform_data/dma-ste-dma40.h>
-
-#include <asm/mach-types.h>
-
-#include "db8500-regs.h"
-#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)
- */
-
-#ifdef CONFIG_STE_DMA40
-struct stedma40_chan_cfg mop500_sdi0_dma_cfg_rx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_DEV_TO_MEM,
-	.dev_type = DB8500_DMA_DEV29_SD_MM0,
-};
-
-static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_MEM_TO_DEV,
-	.dev_type = DB8500_DMA_DEV29_SD_MM0,
-};
-#endif
-
-struct mmci_platform_data mop500_sdi0_data = {
-	.f_max		= 100000000,
-	.capabilities	= MMC_CAP_4_BIT_DATA |
-				MMC_CAP_SD_HIGHSPEED |
-				MMC_CAP_MMC_HIGHSPEED |
-				MMC_CAP_ERASE |
-				MMC_CAP_UHS_SDR12 |
-				MMC_CAP_UHS_SDR25,
-	.gpio_wp	= -1,
-	.sigdir		= MCI_ST_FBCLKEN |
-				MCI_ST_CMDDIREN |
-				MCI_ST_DATA0DIREN |
-				MCI_ST_DATA2DIREN,
-#ifdef CONFIG_STE_DMA40
-	.dma_filter	= stedma40_filter,
-	.dma_rx_param	= &mop500_sdi0_dma_cfg_rx,
-	.dma_tx_param	= &mop500_sdi0_dma_cfg_tx,
-#endif
-};
-
-/*
- * SDI1 (SDIO WLAN)
- */
-#ifdef CONFIG_STE_DMA40
-static struct stedma40_chan_cfg sdi1_dma_cfg_rx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_DEV_TO_MEM,
-	.dev_type = DB8500_DMA_DEV32_SD_MM1,
-};
-
-static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_MEM_TO_DEV,
-	.dev_type = DB8500_DMA_DEV32_SD_MM1,
-};
-#endif
-
-struct mmci_platform_data mop500_sdi1_data = {
-	.ocr_mask	= MMC_VDD_29_30,
-	.f_max		= 100000000,
-	.capabilities	= MMC_CAP_4_BIT_DATA |
-				MMC_CAP_NONREMOVABLE,
-	.gpio_cd	= -1,
-	.gpio_wp	= -1,
-#ifdef CONFIG_STE_DMA40
-	.dma_filter	= stedma40_filter,
-	.dma_rx_param	= &sdi1_dma_cfg_rx,
-	.dma_tx_param	= &sdi1_dma_cfg_tx,
-#endif
-};
-
-/*
- * SDI 2 (POP eMMC, not on DB8500ed)
- */
-
-#ifdef CONFIG_STE_DMA40
-struct stedma40_chan_cfg mop500_sdi2_dma_cfg_rx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_DEV_TO_MEM,
-	.dev_type =  DB8500_DMA_DEV28_SD_MM2,
-};
-
-static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_MEM_TO_DEV,
-	.dev_type = DB8500_DMA_DEV28_SD_MM2,
-};
-#endif
-
-struct mmci_platform_data mop500_sdi2_data = {
-	.ocr_mask	= MMC_VDD_165_195,
-	.f_max		= 100000000,
-	.capabilities	= MMC_CAP_4_BIT_DATA |
-				MMC_CAP_8_BIT_DATA |
-				MMC_CAP_NONREMOVABLE |
-				MMC_CAP_MMC_HIGHSPEED |
-				MMC_CAP_ERASE |
-				MMC_CAP_CMD23,
-	.gpio_cd	= -1,
-	.gpio_wp	= -1,
-#ifdef CONFIG_STE_DMA40
-	.dma_filter	= stedma40_filter,
-	.dma_rx_param	= &mop500_sdi2_dma_cfg_rx,
-	.dma_tx_param	= &mop500_sdi2_dma_cfg_tx,
-#endif
-};
-
-/*
- * SDI 4 (on-board eMMC)
- */
-
-#ifdef CONFIG_STE_DMA40
-struct stedma40_chan_cfg mop500_sdi4_dma_cfg_rx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_DEV_TO_MEM,
-	.dev_type =  DB8500_DMA_DEV42_SD_MM4,
-};
-
-static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_MEM_TO_DEV,
-	.dev_type = DB8500_DMA_DEV42_SD_MM4,
-};
-#endif
-
-struct mmci_platform_data mop500_sdi4_data = {
-	.f_max		= 100000000,
-	.capabilities	= MMC_CAP_4_BIT_DATA |
-				MMC_CAP_8_BIT_DATA |
-				MMC_CAP_NONREMOVABLE |
-				MMC_CAP_MMC_HIGHSPEED |
-				MMC_CAP_ERASE |
-				MMC_CAP_CMD23,
-	.gpio_cd	= -1,
-	.gpio_wp	= -1,
-#ifdef CONFIG_STE_DMA40
-	.dma_filter	= stedma40_filter,
-	.dma_rx_param	= &mop500_sdi4_dma_cfg_rx,
-	.dma_tx_param	= &mop500_sdi4_dma_cfg_tx,
-#endif
-};
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index d48e866..78861f6 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -79,10 +79,6 @@ 
 #define SNOWBALL_EN_3V3_ETH_GPIO	MOP500_AB8500_PIN_GPIO(26)	/* GPIO26 */
 
 struct device;
-extern struct mmci_platform_data mop500_sdi0_data;
-extern struct mmci_platform_data mop500_sdi1_data;
-extern struct mmci_platform_data mop500_sdi2_data;
-extern struct mmci_platform_data mop500_sdi4_data;
 extern struct msp_i2s_platform_data msp0_platform_data;
 extern struct msp_i2s_platform_data msp1_platform_data;
 extern struct msp_i2s_platform_data msp2_platform_data;