From 7cb18ebd63d945c4b434f5218f5b82c3047acf72 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 21 Nov 2009 15:31:36 +0100 Subject: [PATCH] jz4740: Use old mmc driver for now (the new one hasn't been commited yet) --- .../xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c | 6 ++++-- .../linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c index db9332fee..f0278ae17 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c @@ -28,7 +28,7 @@ #include #include #include -#include +/*#include */ /* NAND */ @@ -327,11 +327,13 @@ static struct platform_device qi_lb60_gpio_keys = { } }; +/* static struct jz4740_mmc_platform_data qi_lb60_mmc_pdata = { .gpio_card_detect = JZ_GPIO_PORTD(0), .gpio_read_only = JZ_GPIO_PORTD(16), .gpio_power = JZ_GPIO_PORTD(2), }; +*/ static struct platform_device *jz_platform_devices[] __initdata = { &jz4740_usb_ohci_device, @@ -363,7 +365,7 @@ static int __init qi_lb60_init_platform_devices(void) jz4740_framebuffer_device.dev.platform_data = &qi_lb60_fb_pdata; jz4740_nand_device.dev.platform_data = &qi_lb60_nand_pdata; jz4740_battery_device.dev.platform_data = &qi_lb60_battery_pdata; - jz4740_mmc_device.dev.platform_data = &qi_lb60_mmc_pdata; +/* jz4740_mmc_device.dev.platform_data = &qi_lb60_mmc_pdata;*/ spi_register_board_info(qi_lb60_spi_board_info, ARRAY_SIZE(qi_lb60_spi_board_info)); diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c index 05ee4c309..ff7a26886 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c @@ -90,7 +90,7 @@ static struct resource jz4740_mmc_resources[] = { static u64 jz4740_mmc_dmamask = ~(u32)0; struct platform_device jz4740_mmc_device = { - .name = "jz4740-mmc", + .name = "jz-mmc", .id = 0, .dev = { .dma_mask = &jz4740_mmc_dmamask,