Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 652bcd8f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap mmc: Remove broken MMC init code 



Most of the omap1 MMC boards got broken by an earlier patch
138ab9f8. If you look closely,
the MMC init funtions are pretty much just stubs.

Remove broken init code to make room for cleaner MMC init code.

Cc: Pierre Ossman <drzeus-mmc@drzeus.cx>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2619bc32

arch/arm/mach-omap1/board-h2-mmc.c

+0 −86
Original line number Original line Diff line number Diff line
@@ -15,91 +15,6 @@ 
#include <mach/mmc.h>

#include <mach/mmc.h>

#include <mach/gpio.h>

#include <mach/gpio.h>





#ifdef CONFIG_MMC_OMAP

static int slot_cover_open;

static struct device *mmc_device;



static int h2_mmc_set_power(struct device *dev, int slot, int power_on,

				int vdd)

{

#ifdef CONFIG_MMC_DEBUG

	dev_dbg(dev, "Set slot %d power: %s (vdd %d)\n", slot + 1,

		power_on ? "on" : "off", vdd);

#endif

	if (slot != 0) {

		dev_err(dev, "No such slot %d\n", slot + 1);

		return -ENODEV;

	}



	return 0;

}



static int h2_mmc_set_bus_mode(struct device *dev, int slot, int bus_mode)

{

#ifdef CONFIG_MMC_DEBUG

	dev_dbg(dev, "Set slot %d bus_mode %s\n", slot + 1,

		bus_mode == MMC_BUSMODE_OPENDRAIN ? "open-drain" : "push-pull");

#endif

	if (slot != 0) {

		dev_err(dev, "No such slot %d\n", slot + 1);

		return -ENODEV;

	}



	return 0;

}



static int h2_mmc_get_cover_state(struct device *dev, int slot)

{

	BUG_ON(slot != 0);



	return slot_cover_open;

}



void h2_mmc_slot_cover_handler(void *arg, int state)

{

	if (mmc_device == NULL)

		return;



	slot_cover_open = state;

	omap_mmc_notify_cover_event(mmc_device, 0, state);

}



static int h2_mmc_late_init(struct device *dev)

{

	int ret = 0;



	mmc_device = dev;



	return ret;

}



static void h2_mmc_cleanup(struct device *dev)

{

}



static struct omap_mmc_platform_data h2_mmc_data = {

	.nr_slots                       = 1,

	.switch_slot                    = NULL,

	.init                           = h2_mmc_late_init,

	.cleanup                        = h2_mmc_cleanup,

	.slots[0]       = {

		.set_power              = h2_mmc_set_power,

		.set_bus_mode           = h2_mmc_set_bus_mode,

		.get_ro                 = NULL,

		.get_cover_state        = h2_mmc_get_cover_state,

		.ocr_mask               = MMC_VDD_28_29 | MMC_VDD_30_31 |

					  MMC_VDD_32_33 | MMC_VDD_33_34,

		.name                   = "mmcblk",

	},

};



void __init h2_mmc_init(void)

{

	omap_set_mmc_info(1, &h2_mmc_data);

}



#else



void __init h2_mmc_init(void)

void __init h2_mmc_init(void)

{

{

}

}
@@ -107,4 +22,3 @@ void __init h2_mmc_init(void) 
void h2_mmc_slot_cover_handler(void *arg, int state)

void h2_mmc_slot_cover_handler(void *arg, int state)

{

{

}
 
}
 
#endif

arch/arm/mach-omap1/board-h2.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -378,15 +378,6 @@ static struct omap_usb_config h2_usb_config __initdata = { 
	.pins[1]	= 3,

	.pins[1]	= 3,

};

};





static struct omap_mmc_config h2_mmc_config __initdata = {

	.mmc[0] = {

		.enabled	= 1,

		.wire4		= 1,

	},

};



extern struct omap_mmc_platform_data h2_mmc_data;



static struct omap_uart_config h2_uart_config __initdata = {

static struct omap_uart_config h2_uart_config __initdata = {

	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),

	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),

};

};
@@ -397,7 +388,6 @@ static struct omap_lcd_config h2_lcd_config __initdata = { 




static struct omap_board_config_kernel h2_config[] __initdata = {

static struct omap_board_config_kernel h2_config[] __initdata = {

	{ OMAP_TAG_USB,		&h2_usb_config },

	{ OMAP_TAG_USB,		&h2_usb_config },

	{ OMAP_TAG_MMC,		&h2_mmc_config },

	{ OMAP_TAG_UART,	&h2_uart_config },

	{ OMAP_TAG_UART,	&h2_uart_config },

	{ OMAP_TAG_LCD,		&h2_lcd_config },

	{ OMAP_TAG_LCD,		&h2_lcd_config },

};

};

arch/arm/mach-omap1/board-h3-mmc.c

+0 −90
Original line number Original line Diff line number Diff line
@@ -15,95 +15,6 @@ 
#include <mach/mmc.h>

#include <mach/mmc.h>

#include <mach/gpio.h>

#include <mach/gpio.h>





#ifdef CONFIG_MMC_OMAP

static int slot_cover_open;

static struct device *mmc_device;



static int h3_mmc_set_power(struct device *dev, int slot, int power_on,

				int vdd)

{

#ifdef CONFIG_MMC_DEBUG

	dev_dbg(dev, "Set slot %d power: %s (vdd %d)\n", slot + 1,

		power_on ? "on" : "off", vdd);

#endif

	if (slot != 0) {

		dev_err(dev, "No such slot %d\n", slot + 1);

		return -ENODEV;

	}



	return 0;

}



static int h3_mmc_set_bus_mode(struct device *dev, int slot, int bus_mode)

{

	int ret = 0;



#ifdef CONFIG_MMC_DEBUG

	dev_dbg(dev, "Set slot %d bus_mode %s\n", slot + 1,

		bus_mode == MMC_BUSMODE_OPENDRAIN ? "open-drain" : "push-pull");

#endif

	if (slot != 0) {

		dev_err(dev, "No such slot %d\n", slot + 1);

		return -ENODEV;

	}



	/* Treated on upper level */



	return bus_mode;

}



static int h3_mmc_get_cover_state(struct device *dev, int slot)

{

	BUG_ON(slot != 0);



	return slot_cover_open;

}



void h3_mmc_slot_cover_handler(void *arg, int state)

{

	if (mmc_device == NULL)

		return;



	slot_cover_open = state;

	omap_mmc_notify_cover_event(mmc_device, 0, state);

}



static int h3_mmc_late_init(struct device *dev)

{

	int ret = 0;



	mmc_device = dev;



	return ret;

}



static void h3_mmc_cleanup(struct device *dev)

{

}



static struct omap_mmc_platform_data h3_mmc_data = {

	.nr_slots                       = 1,

	.switch_slot                    = NULL,

	.init                           = h3_mmc_late_init,

	.cleanup                        = h3_mmc_cleanup,

	.slots[0]       = {

		.set_power              = h3_mmc_set_power,

		.set_bus_mode           = h3_mmc_set_bus_mode,

		.get_ro                 = NULL,

		.get_cover_state        = h3_mmc_get_cover_state,

		.ocr_mask               = MMC_VDD_28_29 | MMC_VDD_30_31 |

					  MMC_VDD_32_33 | MMC_VDD_33_34,

		.name                   = "mmcblk",

	},

};



void __init h3_mmc_init(void)

{

	omap_set_mmc_info(1, &h3_mmc_data);

}



#else



void __init h3_mmc_init(void)

void __init h3_mmc_init(void)

{

{

}

}
@@ -111,4 +22,3 @@ void __init h3_mmc_init(void) 
void h3_mmc_slot_cover_handler(void *arg, int state)

void h3_mmc_slot_cover_handler(void *arg, int state)

{

{

}
 
}
 
#endif

arch/arm/mach-omap1/board-h3.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -447,15 +447,6 @@ static struct omap_usb_config h3_usb_config __initdata = { 
	.pins[1]	= 3,

	.pins[1]	= 3,

};

};





static struct omap_mmc_config h3_mmc_config __initdata = {

	.mmc[0] = {

		.enabled	= 1,

		.wire4		= 1,

       },

};



extern struct omap_mmc_platform_data h3_mmc_data;



static struct omap_uart_config h3_uart_config __initdata = {

static struct omap_uart_config h3_uart_config __initdata = {

	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),

	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),

};

};
@@ -466,7 +457,6 @@ static struct omap_lcd_config h3_lcd_config __initdata = { 




static struct omap_board_config_kernel h3_config[] __initdata = {

static struct omap_board_config_kernel h3_config[] __initdata = {

	{ OMAP_TAG_USB,		&h3_usb_config },

	{ OMAP_TAG_USB,		&h3_usb_config },

	{ OMAP_TAG_MMC,		&h3_mmc_config },

	{ OMAP_TAG_UART,	&h3_uart_config },

	{ OMAP_TAG_UART,	&h3_uart_config },

	{ OMAP_TAG_LCD,		&h3_lcd_config },

	{ OMAP_TAG_LCD,		&h3_lcd_config },

};

};

arch/arm/mach-omap1/board-palmte.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -316,7 +316,6 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery) 




static struct omap_board_config_kernel palmte_config[] __initdata = {

static struct omap_board_config_kernel palmte_config[] __initdata = {

	{ OMAP_TAG_USB,		&palmte_usb_config },

	{ OMAP_TAG_USB,		&palmte_usb_config },

	{ OMAP_TAG_MMC,		&palmte_mmc_config },

	{ OMAP_TAG_LCD,		&palmte_lcd_config },

	{ OMAP_TAG_LCD,		&palmte_lcd_config },

	{ OMAP_TAG_UART,	&palmte_uart_config },

	{ OMAP_TAG_UART,	&palmte_uart_config },

};

};