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

Commit 1414fbdc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-driversLCD' of git://github.com/at91linux/linux-at91 into next/drivers 

From Nicolas Ferre <nicolas.ferre@atmel.com>:

Some Atmel framebuffer driver enhancements with modification
of configuration data in ARM/AT91 and AVR32/AP7 trees.
A merge of these modifications seems easier through arm-soc
git tree nowadays.

* tag 'at91-driversLCD' of git://github.com/at91linux/linux-at91

:
  ARM: at91/avr32/atmel_lcdfb: add platform device-id table
  atmel_lcdfb: move lcdcon2 register access to compute_hozval
  ARM: at91/avr32/atmel_lcdfb: add bus-clock entry
  ARM: at91: fix LCD-wiring mode
  atmel_lcdfb: fix 16-bpp modes on older SOCs

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b7442b6c bbd44f6b

arch/arm/mach-at91/at91sam9261.c

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ static struct clk *periph_clocks[] __initdata = { 
};



static struct clk_lookup periph_clocks_lookups[] = {

	CLKDEV_CON_DEV_ID("hclk", "at91sam9261-lcdfb.0", &hck1),

	CLKDEV_CON_DEV_ID("hclk", "at91sam9g10-lcdfb.0", &hck1),

	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),

	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),

arch/arm/mach-at91/at91sam9261_devices.c

+5 −1
Original line number Diff line number Diff line
@@ -488,7 +488,6 @@ static struct resource lcdc_resources[] = { 
};



static struct platform_device at91_lcdc_device = {

	.name		= "atmel_lcdfb",

	.id		= 0,

	.dev		= {

				.dma_mask		= &lcdc_dmamask,
@@ -505,6 +504,11 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) 
		return;

	}



	if (cpu_is_at91sam9g10())

		at91_lcdc_device.name = "at91sam9g10-lcdfb";

	else

		at91_lcdc_device.name = "at91sam9261-lcdfb";



#if defined(CONFIG_FB_ATMEL_STN)

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

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

arch/arm/mach-at91/at91sam9263.c

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("pclk", "fff98000.ssc", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "fff9c000.ssc", &ssc1_clk),

	CLKDEV_CON_DEV_ID("hclk", "at91sam9263-lcdfb.0", &lcdc_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.0", &mmc0_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.1", &mmc1_clk),

	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),

arch/arm/mach-at91/at91sam9263_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ static struct resource lcdc_resources[] = { 
};



static struct platform_device at91_lcdc_device = {

	.name		= "atmel_lcdfb",

	.name		= "at91sam9263-lcdfb",

	.id		= 0,

	.dev		= {

				.dma_mask		= &lcdc_dmamask,

arch/arm/mach-at91/at91sam9g45.c

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_ID("hclk", &macb_clk),

	/* One additional fake clock for ohci */

	CLKDEV_CON_ID("ohci_clk", &uhphs_clk),

	CLKDEV_CON_DEV_ID("hclk", "at91sam9g45-lcdfb.0", &lcdc_clk),

	CLKDEV_CON_DEV_ID("hclk", "at91sam9g45es-lcdfb.0", &lcdc_clk),

	CLKDEV_CON_DEV_ID("ehci_clk", "atmel-ehci", &uhphs_clk),

	CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk),

	CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk),