From: Mika Laitio Date: Wed, 11 Feb 2009 17:05:59 +0000 (+0200) Subject: h63xx: very initial mmc support. X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ca50f1a98281f2831d32c57dc126b1c35cfbac01;p=linux-2.6-omap-h63xx.git h63xx: very initial mmc support. --- diff --git a/arch/arm/mach-omap1/board-h6300.c b/arch/arm/mach-omap1/board-h6300.c index 04faa97e1a6..c29090c3628 100644 --- a/arch/arm/mach-omap1/board-h6300.c +++ b/arch/arm/mach-omap1/board-h6300.c @@ -29,6 +29,7 @@ #include #include #include +#include static struct platform_device h6300_lcd_device = { .name = "lcd_h6300", @@ -54,6 +55,91 @@ static struct omap_usb_config h6300_usb_config __initdata = { .pins[0] = 0, }; +#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) + +//#define H6300_GPIO_MMC_POWER 13 +#define H6300_GPIO_MMC_WRITE_PROTECT 13 +#define H6300_GPIO_MMC_CARD_DETECT 15 + + +static int h6300_mmc_set_power(struct device *dev, int slot, int power_on, + int vdd) +{ +/* + int err; + u8 dat = 0; + + err = sx1_i2c_read_byte(SOFIA_I2C_ADDR, SOFIA_POWER1_REG, &dat); + if (err < 0) + return err; + + if (power_on) + dat |= SOFIA_MMC_POWER; + else + dat &= ~SOFIA_MMC_POWER; + + return sx1_i2c_write_byte(SOFIA_I2C_ADDR, SOFIA_POWER1_REG, dat); +*/ +/* + if (power_on) + gpio_set_value(H6300_GPIO_MMC_POWER, 1); + else + gpio_set_value(H6300_GPIO_MMC_POWER, 0); +*/ + return 0; +} + +/* +static int h6300_mmc_get_cover_state(struct device *dev, int slot) +{ + return gpio_get_value(H6300_GPIO_MMC_CARD_DETECT); +} +*/ + +static struct omap_mmc_platform_data h6300_mmc1_data = { + .nr_slots = 1, +/* .dma_mask = 0xffffffff, */ + .slots[0] = { + .set_power = h6300_mmc_set_power, +/* .get_cover_state = h6300_mmc_get_cover_state, */ + .gpio_wp = H6300_GPIO_MMC_WRITE_PROTECT, // input, write protect + .switch_pin = H6300_GPIO_MMC_CARD_DETECT, // input, card detect + .wires = 4, + .name = "mmcblk", + }, +}; + +static struct omap_mmc_platform_data *h6300_mmc_data[OMAP15XX_NR_MMC]; + +static void __init h6300_mmc_init(void) +{ + h6300_mmc_data[0] = &h6300_mmc1_data; + omap1_init_mmc(h6300_mmc_data, OMAP15XX_NR_MMC); +/* + int ret; + + ret = gpio_request(H6300_GPIO_MMC_POWER, "MMC power"); + if (ret < 0) + return; + gpio_direction_output(H6300_GPIO_MMC_POWER, 0); + mmc_data[0] = &h6300_mmc1_data; + omap1_init_mmc(mmc_data, OMAP15XX_NR_MMC); + + ret = gpio_request(NOKIA770_GPIO_MMC_SWITCH, "MMC cover"); + if (ret < 0) { + gpio_free(NOKIA770_GPIO_MMC_POWER); + return; + } + gpio_direction_input(NOKIA770_GPIO_MMC_SWITCH); +*/ +} + +#else +static inline void h6300_mmc_init(void) +{ +} +#endif + static struct omap_board_config_kernel h6300_config[] = { { OMAP_TAG_LCD, &h6300_lcd_config }, { OMAP_TAG_UART, &h6300_uart_config }, @@ -79,6 +165,7 @@ static void __init h6300_init(void) omap_board_config_size = ARRAY_SIZE(h6300_config); omap_serial_init(); omap_register_i2c_bus(1, 100, NULL, 0); + //h6300_mmc_init(); } static void __init h6300_map_io(void)