1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-25 02:19:20 +02:00

jz4740: Use old mmc driver for now (the new one hasn't been commited yet)

This commit is contained in:
Lars-Peter Clausen 2009-11-21 15:31:36 +01:00
parent 145c533ec2
commit 7cb18ebd63
2 changed files with 5 additions and 3 deletions

View File

@ -28,7 +28,7 @@
#include <linux/spi/spi_gpio.h> #include <linux/spi/spi_gpio.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <linux/power/jz4740-battery.h> #include <linux/power/jz4740-battery.h>
#include <linux/mmc/jz4740_mmc.h> /*#include <linux/mmc/jz4740_mmc.h>*/
/* NAND */ /* NAND */
@ -327,11 +327,13 @@ static struct platform_device qi_lb60_gpio_keys = {
} }
}; };
/*
static struct jz4740_mmc_platform_data qi_lb60_mmc_pdata = { static struct jz4740_mmc_platform_data qi_lb60_mmc_pdata = {
.gpio_card_detect = JZ_GPIO_PORTD(0), .gpio_card_detect = JZ_GPIO_PORTD(0),
.gpio_read_only = JZ_GPIO_PORTD(16), .gpio_read_only = JZ_GPIO_PORTD(16),
.gpio_power = JZ_GPIO_PORTD(2), .gpio_power = JZ_GPIO_PORTD(2),
}; };
*/
static struct platform_device *jz_platform_devices[] __initdata = { static struct platform_device *jz_platform_devices[] __initdata = {
&jz4740_usb_ohci_device, &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_framebuffer_device.dev.platform_data = &qi_lb60_fb_pdata;
jz4740_nand_device.dev.platform_data = &qi_lb60_nand_pdata; jz4740_nand_device.dev.platform_data = &qi_lb60_nand_pdata;
jz4740_battery_device.dev.platform_data = &qi_lb60_battery_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, spi_register_board_info(qi_lb60_spi_board_info,
ARRAY_SIZE(qi_lb60_spi_board_info)); ARRAY_SIZE(qi_lb60_spi_board_info));

View File

@ -90,7 +90,7 @@ static struct resource jz4740_mmc_resources[] = {
static u64 jz4740_mmc_dmamask = ~(u32)0; static u64 jz4740_mmc_dmamask = ~(u32)0;
struct platform_device jz4740_mmc_device = { struct platform_device jz4740_mmc_device = {
.name = "jz4740-mmc", .name = "jz-mmc",
.id = 0, .id = 0,
.dev = { .dev = {
.dma_mask = &jz4740_mmc_dmamask, .dma_mask = &jz4740_mmc_dmamask,