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

Commit f591eb1e authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: Wire up SD controller on DB/PB1200 boards. 



Add au1xmmc platform data for PB1200/DB1200 boards and wire up the 2 SD
controllers for them.

Signed-off-by: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent fa36b043

arch/mips/alchemy/common/platform.c

+74 −24
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <linux/init.h>



#include <asm/mach-au1x00/au1xxx.h>

#include <asm/mach-au1x00/au1xxx_dbdma.h>

#include <asm/mach-au1x00/au1100_mmc.h>



#define PORT(_base, _irq)				\

	{						\
@@ -163,24 +165,6 @@ static struct resource au1xxx_usb_gdt_resources[] = { 
	},

};



static struct resource au1xxx_mmc_resources[] = {

	[0] = {

		.start          = SD0_PHYS_ADDR,

		.end            = SD0_PHYS_ADDR + 0x7ffff,

		.flags          = IORESOURCE_MEM,

	},

	[1] = {

		.start		= SD1_PHYS_ADDR,

		.end 		= SD1_PHYS_ADDR + 0x7ffff,

		.flags		= IORESOURCE_MEM,

	},

	[2] = {

		.start          = AU1200_SD_INT,

		.end            = AU1200_SD_INT,

		.flags          = IORESOURCE_IRQ,

	}

};



static u64 udc_dmamask = DMA_32BIT_MASK;



static struct platform_device au1xxx_usb_gdt_device = {
@@ -249,16 +233,79 @@ static struct platform_device au1200_lcd_device = { 


static u64 au1xxx_mmc_dmamask =  DMA_32BIT_MASK;



static struct platform_device au1xxx_mmc_device = {

extern struct au1xmmc_platform_data au1xmmc_platdata[2];



static struct resource au1200_mmc0_resources[] = {

	[0] = {

		.start          = SD0_PHYS_ADDR,

		.end            = SD0_PHYS_ADDR + 0x7ffff,

		.flags          = IORESOURCE_MEM,

	},

	[1] = {

		.start		= AU1200_SD_INT,

		.end		= AU1200_SD_INT,

		.flags		= IORESOURCE_IRQ,

	},

	[2] = {

		.start		= DSCR_CMD0_SDMS_TX0,

		.end		= DSCR_CMD0_SDMS_TX0,

		.flags		= IORESOURCE_DMA,

	},

	[3] = {

		.start          = DSCR_CMD0_SDMS_RX0,

		.end		= DSCR_CMD0_SDMS_RX0,

		.flags          = IORESOURCE_DMA,

	}

};



static struct platform_device au1200_mmc0_device = {

	.name = "au1xxx-mmc",

	.id = 0,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.coherent_dma_mask	= DMA_32BIT_MASK,

		.platform_data		= &au1xmmc_platdata[0],

	},

	.num_resources	= ARRAY_SIZE(au1200_mmc0_resources),

	.resource	= au1200_mmc0_resources,

};



#ifndef CONFIG_MIPS_DB1200

static struct resource au1200_mmc1_resources[] = {

	[0] = {

		.start          = SD1_PHYS_ADDR,

		.end            = SD1_PHYS_ADDR + 0x7ffff,

		.flags          = IORESOURCE_MEM,

	},

	[1] = {

		.start		= AU1200_SD_INT,

		.end		= AU1200_SD_INT,

		.flags		= IORESOURCE_IRQ,

	},

	[2] = {

		.start		= DSCR_CMD0_SDMS_TX1,

		.end		= DSCR_CMD0_SDMS_TX1,

		.flags		= IORESOURCE_DMA,

	},

	[3] = {

		.start          = DSCR_CMD0_SDMS_RX1,

		.end		= DSCR_CMD0_SDMS_RX1,

		.flags          = IORESOURCE_DMA,

	}

};



static struct platform_device au1200_mmc1_device = {

	.name = "au1xxx-mmc",

	.id = 1,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.coherent_dma_mask	= DMA_32BIT_MASK,

		.platform_data		= &au1xmmc_platdata[1],

	},

	.num_resources  = ARRAY_SIZE(au1xxx_mmc_resources),

	.resource       = au1xxx_mmc_resources,

	.num_resources	= ARRAY_SIZE(au1200_mmc1_resources),

	.resource	= au1200_mmc1_resources,

};

#endif /* #ifndef CONFIG_MIPS_DB1200 */

#endif /* #ifdef CONFIG_SOC_AU1200 */



static struct platform_device au1x00_pcmcia_device = {
@@ -296,7 +343,10 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = { 
	&au1xxx_usb_gdt_device,

	&au1xxx_usb_otg_device,

	&au1200_lcd_device,

	&au1xxx_mmc_device,

	&au1200_mmc0_device,

#ifndef CONFIG_MIPS_DB1200

	&au1200_mmc1_device,

#endif

#endif

#ifdef SMBUS_PSC_BASE

	&pbdb_smbus_device,

arch/mips/alchemy/pb1200/platform.c

+81 −0
Original line number Diff line number Diff line
@@ -20,9 +20,90 @@ 


#include <linux/dma-mapping.h>

#include <linux/init.h>

#include <linux/leds.h>

#include <linux/platform_device.h>



#include <asm/mach-au1x00/au1xxx.h>

#include <asm/mach-au1x00/au1100_mmc.h>



static int mmc_activity;



static void pb1200mmc0_set_power(void *mmc_host, int state)

{

	if (state)

		bcsr->board |= BCSR_BOARD_SD0PWR;

	else

		bcsr->board &= ~BCSR_BOARD_SD0PWR;



	au_sync_delay(1);

}



static int pb1200mmc0_card_readonly(void *mmc_host)

{

	return (bcsr->status & BCSR_STATUS_SD0WP) ? 1 : 0;

}



static int pb1200mmc0_card_inserted(void *mmc_host)

{

	return (bcsr->sig_status & BCSR_INT_SD0INSERT) ? 1 : 0;

}



static void pb1200_mmcled_set(struct led_classdev *led,

			enum led_brightness brightness)

{

	if (brightness != LED_OFF) {

		if (++mmc_activity == 1)

			bcsr->disk_leds &= ~(1 << 8);

	} else {

		if (--mmc_activity == 0)

			bcsr->disk_leds |= (1 << 8);

	}

}



static struct led_classdev pb1200mmc_led = {

	.brightness_set	= pb1200_mmcled_set,

};



#ifndef CONFIG_MIPS_DB1200

static void pb1200mmc1_set_power(void *mmc_host, int state)

{

	if (state)

		bcsr->board |= BCSR_BOARD_SD1PWR;

	else

		bcsr->board &= ~BCSR_BOARD_SD1PWR;



	au_sync_delay(1);

}



static int pb1200mmc1_card_readonly(void *mmc_host)

{

	return (bcsr->status & BCSR_STATUS_SD1WP) ? 1 : 0;

}



static int pb1200mmc1_card_inserted(void *mmc_host)

{

	return (bcsr->sig_status & BCSR_INT_SD1INSERT) ? 1 : 0;

}

#endif



const struct au1xmmc_platform_data au1xmmc_platdata[2] = {

	[0] = {

		.set_power	= pb1200mmc0_set_power,

		.card_inserted	= pb1200mmc0_card_inserted,

		.card_readonly	= pb1200mmc0_card_readonly,

		.cd_setup	= NULL,		/* use poll-timer in driver */

		.led		= &pb1200mmc_led,

	},

#ifndef CONFIG_MIPS_DB1200

	[1] = {

		.set_power	= pb1200mmc1_set_power,

		.card_inserted	= pb1200mmc1_card_inserted,

		.card_readonly	= pb1200mmc1_card_readonly,

		.cd_setup	= NULL,		/* use poll-timer in driver */

		.led		= &pb1200mmc_led,

	},

#endif

};



static struct resource ide_resources[] = {

	[0] = {