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

Commit 7776a94c authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 4352/1: AT91: Platform data for LCD and AC97. 



Define resources, platform_device and device registration functions for
the LCD and AC97 controllers on the AT91SAM9263.
Also update the AT91SAM9261 to use the common atmel_lcdfb driver.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@rfo.atmel.com>
Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e8788bab

arch/arm/mach-at91/at91sam9261_devices.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -430,9 +430,9 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) 
 *  LCD Controller

 *  LCD Controller

 * -------------------------------------------------------------------- */

 * -------------------------------------------------------------------- */





#if defined(CONFIG_FB_AT91) || defined(CONFIG_FB_AT91_MODULE)

#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)

static u64 lcdc_dmamask = 0xffffffffUL;

static u64 lcdc_dmamask = 0xffffffffUL;

static struct at91fb_info lcdc_data;

static struct atmel_lcdfb_info lcdc_data;





static struct resource lcdc_resources[] = {

static struct resource lcdc_resources[] = {

	[0] = {

	[0] = {
@@ -455,7 +455,7 @@ static struct resource lcdc_resources[] = { 
};

};





static struct platform_device at91_lcdc_device = {

static struct platform_device at91_lcdc_device = {

	.name		= "at91-fb",

	.name		= "atmel_lcdfb",

	.id		= 0,

	.id		= 0,

	.dev		= {

	.dev		= {

				.dma_mask		= &lcdc_dmamask,

				.dma_mask		= &lcdc_dmamask,
@@ -466,7 +466,7 @@ static struct platform_device at91_lcdc_device = { 
	.num_resources	= ARRAY_SIZE(lcdc_resources),

	.num_resources	= ARRAY_SIZE(lcdc_resources),

};

};





void __init at91_add_device_lcdc(struct at91fb_info *data)

void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)

{

{

	if (!data) {

	if (!data) {

		return;

		return;
@@ -499,7 +499,7 @@ void __init at91_add_device_lcdc(struct at91fb_info *data) 
	platform_device_register(&at91_lcdc_device);

	platform_device_register(&at91_lcdc_device);

}

}

#else

#else

void __init at91_add_device_lcdc(struct at91fb_info *data) {}

void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}

#endif

#endif

arch/arm/mach-at91/at91sam9263_devices.c

+124 −0
Original line number Original line Diff line number Diff line
@@ -572,6 +572,130 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) 
#endif

#endif









/* --------------------------------------------------------------------

 *  AC97

 * -------------------------------------------------------------------- */



#if defined(CONFIG_SND_AT91_AC97) || defined(CONFIG_SND_AT91_AC97_MODULE)

static u64 ac97_dmamask = 0xffffffffUL;

static struct atmel_ac97_data ac97_data;



static struct resource ac97_resources[] = {

	[0] = {

		.start	= AT91SAM9263_BASE_AC97C,

		.end	= AT91SAM9263_BASE_AC97C + SZ_16K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= AT91SAM9263_ID_AC97C,

		.end	= AT91SAM9263_ID_AC97C,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device at91sam9263_ac97_device = {

	.name		= "ac97c",

	.id		= 1,

	.dev		= {

				.dma_mask		= &ac97_dmamask,

				.coherent_dma_mask	= 0xffffffff,

				.platform_data		= &ac97_data,

	},

	.resource	= ac97_resources,

	.num_resources	= ARRAY_SIZE(ac97_resources),

};



void __init at91_add_device_ac97(struct atmel_ac97_data *data)

{

	if (!data)

		return;



	at91_set_A_periph(AT91_PIN_PB0, 0);	/* AC97FS */

	at91_set_A_periph(AT91_PIN_PB1, 0);	/* AC97CK */

	at91_set_A_periph(AT91_PIN_PB2, 0);	/* AC97TX */

	at91_set_A_periph(AT91_PIN_PB3, 0);	/* AC97RX */



	/* reset */

	if (data->reset_pin)

		at91_set_gpio_output(data->reset_pin, 0);



	ac97_data = *ek_data;

	platform_device_register(&at91sam9263_ac97_device);

}

#else

void __init at91_add_device_ac97(struct atmel_ac97_data *data) {}

#endif





/* --------------------------------------------------------------------

 *  LCD Controller

 * -------------------------------------------------------------------- */



#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)

static u64 lcdc_dmamask = 0xffffffffUL;

static struct atmel_lcdfb_info lcdc_data;



static struct resource lcdc_resources[] = {

	[0] = {

		.start	= AT91SAM9263_LCDC_BASE,

		.end	= AT91SAM9263_LCDC_BASE + SZ_4K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= AT91SAM9263_ID_LCDC,

		.end	= AT91SAM9263_ID_LCDC,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device at91_lcdc_device = {

	.name		= "atmel_lcdfb",

	.id		= 0,

	.dev		= {

				.dma_mask		= &lcdc_dmamask,

				.coherent_dma_mask	= 0xffffffff,

				.platform_data		= &lcdc_data,

	},

	.resource	= lcdc_resources,

	.num_resources	= ARRAY_SIZE(lcdc_resources),

};



void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)

{

	if (!data)

		return;



	at91_set_A_periph(AT91_PIN_PC1, 0);	/* LCDHSYNC */

	at91_set_A_periph(AT91_PIN_PC2, 0);	/* LCDDOTCK */

	at91_set_A_periph(AT91_PIN_PC3, 0);	/* LCDDEN */

	at91_set_B_periph(AT91_PIN_PB9, 0);	/* LCDCC */

	at91_set_A_periph(AT91_PIN_PC6, 0);	/* LCDD2 */

	at91_set_A_periph(AT91_PIN_PC7, 0);	/* LCDD3 */

	at91_set_A_periph(AT91_PIN_PC8, 0);	/* LCDD4 */

	at91_set_A_periph(AT91_PIN_PC9, 0);	/* LCDD5 */

	at91_set_A_periph(AT91_PIN_PC10, 0);	/* LCDD6 */

	at91_set_A_periph(AT91_PIN_PC11, 0);	/* LCDD7 */

	at91_set_A_periph(AT91_PIN_PC14, 0);	/* LCDD10 */

	at91_set_A_periph(AT91_PIN_PC15, 0);	/* LCDD11 */

	at91_set_A_periph(AT91_PIN_PC16, 0);	/* LCDD12 */

	at91_set_B_periph(AT91_PIN_PC12, 0);	/* LCDD13 */

	at91_set_A_periph(AT91_PIN_PC18, 0);	/* LCDD14 */

	at91_set_A_periph(AT91_PIN_PC19, 0);	/* LCDD15 */

	at91_set_A_periph(AT91_PIN_PC22, 0);	/* LCDD18 */

	at91_set_A_periph(AT91_PIN_PC23, 0);	/* LCDD19 */

	at91_set_A_periph(AT91_PIN_PC24, 0);	/* LCDD20 */

	at91_set_B_periph(AT91_PIN_PC17, 0);	/* LCDD21 */

	at91_set_A_periph(AT91_PIN_PC26, 0);	/* LCDD22 */

	at91_set_A_periph(AT91_PIN_PC27, 0);	/* LCDD23 */



	lcdc_data = *data;

	platform_device_register(&at91_lcdc_device);

}

#else

void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}

#endif





/* --------------------------------------------------------------------

/* --------------------------------------------------------------------

 *  LEDs

 *  LEDs

 * -------------------------------------------------------------------- */

 * -------------------------------------------------------------------- */

include/asm-arm/arch-at91/board.h

+11 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ struct at91_mmc_data { 
};

};

extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data);

extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data);





 /* Ethernet */

 /* Ethernet (EMAC & MACB) */

struct at91_eth_data {

struct at91_eth_data {

	u8		phy_irq_pin;	/* PHY IRQ */

	u8		phy_irq_pin;	/* PHY IRQ */

	u8		is_rmii;	/* using RMII interface? */

	u8		is_rmii;	/* using RMII interface? */
@@ -114,6 +114,16 @@ struct atmel_uart_data { 
};

};

extern void __init at91_add_device_serial(void);

extern void __init at91_add_device_serial(void);





 /* LCD Controller */

struct atmel_lcdfb_info;

extern void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data);



 /* AC97 */

struct atmel_ac97_data {

	u8		reset_pin;	/* reset */

}

extern void __init at91_add_device_ac97(struct atmel_ac97_data *data);



 /* LEDs */

 /* LEDs */

extern u8 at91_leds_cpu;

extern u8 at91_leds_cpu;

extern u8 at91_leds_timer;

extern u8 at91_leds_timer;