From: Mika Laitio Date: Thu, 12 Feb 2009 01:44:06 +0000 (+0200) Subject: h63xx: nfs mount works, gpe image boots to ts config screen. X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=81889a4a25fbc820fc458bf94f4fbce47c83ce3b;p=linux-2.6-omap-h63xx.git h63xx: nfs mount works, gpe image boots to ts config screen. --- diff --git a/arch/arm/mach-omap1/board-h6300.c b/arch/arm/mach-omap1/board-h6300.c index c29090c3628..6bf80ccc50d 100644 --- a/arch/arm/mach-omap1/board-h6300.c +++ b/arch/arm/mach-omap1/board-h6300.c @@ -65,6 +65,8 @@ static struct omap_usb_config h6300_usb_config __initdata = { static int h6300_mmc_set_power(struct device *dev, int slot, int power_on, int vdd) { + //printk("h6300_mmc_set_power started\n"); + /* int err; u8 dat = 0; @@ -102,10 +104,12 @@ static struct omap_mmc_platform_data h6300_mmc1_data = { .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 + .gpio_wp = H6300_GPIO_MMC_WRITE_PROTECT, // input, write protect +/* .switch_pin = H6300_GPIO_MMC_CARD_DETECT, */ // input, card detect +/* .wires = 4, .name = "mmcblk", +*/ }, }; @@ -113,8 +117,21 @@ static struct omap_mmc_platform_data *h6300_mmc_data[OMAP15XX_NR_MMC]; static void __init h6300_mmc_init(void) { + int ret; + + printk("h6300_mmc_init() started\n"); + ret = gpio_request(H6300_GPIO_MMC_WRITE_PROTECT, "MMC WP"); + if (ret < 0) { + printk("Failed to get MMC WP gpio\n"); + gpio_free(H6300_GPIO_MMC_WRITE_PROTECT); + return; + } + gpio_direction_input(H6300_GPIO_MMC_WRITE_PROTECT); + printk("MMC WP gpio set input\n"); + h6300_mmc_data[0] = &h6300_mmc1_data; omap1_init_mmc(h6300_mmc_data, OMAP15XX_NR_MMC); + printk("h6300 mmc init done\n"); /* int ret; @@ -165,7 +182,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(); + h6300_mmc_init(); } static void __init h6300_map_io(void) diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 9d86b324988..b4c6b9778a1 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c @@ -63,6 +63,7 @@ /* bulk DMA seems to be behaving for both IN and OUT */ #ifdef CONFIG_MACH_OMAP_H6300 #undef USE_DMA +//#define USE_DMA #else #define USE_DMA #endif