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

Commit d0a2b7af authored by Haavard Skinnemoen's avatar Haavard Skinnemoen
Browse files

[AVR32] Implement platform hooks for atmel_lcdfb driver 



This modifies and extends the existing lcdc platform code to support
the new atmel_lcdfb driver. The ATSTK1000 board code is set up to use
the on-board Samsung LTV350QV LCD panel.

Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
parent 78c129b9

arch/avr32/boards/atstk1000/atstk1000.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/*

 * ATSTK1000 setup code: Daughterboard interface

 *

 * Copyright (C) 2007 Atmel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#ifndef __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H

#define __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H



extern struct atmel_lcdfb_info atstk1000_lcdc_data;



#endif /* __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H */

arch/avr32/boards/atstk1000/atstk1002.c

+5 −5
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/types.h>

#include <linux/spi/spi.h>



#include <video/atmel_lcdc.h>



#include <asm/io.h>

#include <asm/setup.h>

#include <asm/arch/at32ap7000.h>
@@ -23,6 +25,7 @@ 
#include <asm/arch/init.h>

#include <asm/arch/portmux.h>



#include "atstk1000.h"



#define	SW2_DEFAULT		/* MMCI and UART_A available */
@@ -31,9 +34,7 @@ struct eth_addr { 
};



static struct eth_addr __initdata hw_addr[2];



static struct eth_platform_data __initdata eth_data[2];

static struct lcdc_platform_data atstk1000_fb0_data;



static struct spi_board_info spi0_board_info[] __initdata = {

	{
@@ -148,9 +149,8 @@ static int __init atstk1002_init(void) 
	set_hw_addr(at32_add_device_eth(0, &eth_data[0]));



	at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));

	atstk1000_fb0_data.fbmem_start = fbmem_start;

	atstk1000_fb0_data.fbmem_size = fbmem_size;

	at32_add_device_lcdc(0, &atstk1000_fb0_data);

	at32_add_device_lcdc(0, &atstk1000_lcdc_data,

			     fbmem_start, fbmem_size);



	return 0;

}

arch/avr32/boards/atstk1000/setup.c

+44 −1
Original line number Diff line number Diff line
@@ -8,13 +8,56 @@ 
 * published by the Free Software Foundation.

 */

#include <linux/bootmem.h>

#include <linux/fb.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/linkage.h>



#include <asm/setup.h>

#include <video/atmel_lcdc.h>



#include <asm/setup.h>

#include <asm/arch/board.h>



#include "atstk1000.h"



/* Initialized by bootloader-specific startup code. */

struct tag *bootloader_tags __initdata;



static struct fb_videomode __initdata ltv350qv_modes[] = {

	{

		.name		= "320x240 @ 75",

		.refresh	= 75,

		.xres		= 320,		.yres		= 240,

		.pixclock	= KHZ2PICOS(6891),



		.left_margin	= 17,		.right_margin	= 33,

		.upper_margin	= 10,		.lower_margin	= 10,

		.hsync_len	= 16,		.vsync_len	= 1,



		.sync		= 0,

		.vmode		= FB_VMODE_NONINTERLACED,

	},

};



static struct fb_monspecs __initdata atstk1000_default_monspecs = {

	.manufacturer		= "SNG",

	.monitor		= "LTV350QV",

	.modedb			= ltv350qv_modes,

	.modedb_len		= ARRAY_SIZE(ltv350qv_modes),

	.hfmin			= 14820,

	.hfmax			= 22230,

	.vfmin			= 60,

	.vfmax			= 90,

	.dclkmax		= 30000000,

};



struct atmel_lcdfb_info __initdata atstk1000_lcdc_data = {

	.default_bpp		= 24,

	.default_dmacon		= ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,

	.default_lcdcon2	= (ATMEL_LCDC_DISTYPE_TFT

				   | ATMEL_LCDC_INVCLK

				   | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE

				   | ATMEL_LCDC_MEMOR_BIG),

	.default_monspecs	= &atstk1000_default_monspecs,

	.guard_time		= 2,

};

arch/avr32/mach-at32ap/at32ap7000.c

+60 −17
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * published by the Free Software Foundation.

 */

#include <linux/clk.h>

#include <linux/fb.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/spi/spi.h>
@@ -17,6 +18,8 @@ 
#include <asm/arch/portmux.h>

#include <asm/arch/sm.h>



#include <video/atmel_lcdc.h>



#include "clock.h"

#include "hmatrix.h"

#include "pio.h"
@@ -881,20 +884,26 @@ at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n) 
/* --------------------------------------------------------------------

 *  LCDC

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

static struct lcdc_platform_data lcdc0_data;

static struct resource lcdc0_resource[] = {

static struct atmel_lcdfb_info atmel_lcdfb0_data;

static struct resource atmel_lcdfb0_resource[] = {

	{

		.start		= 0xff000000,

		.end		= 0xff000fff,

		.flags		= IORESOURCE_MEM,

	},

	IRQ(1),

	{

		/* Placeholder for pre-allocated fb memory */

		.start		= 0x00000000,

		.end		= 0x00000000,

		.flags		= 0,

	},

};

DEFINE_DEV_DATA(lcdc, 0);

DEV_CLK(hclk, lcdc0, hsb, 7);

static struct clk lcdc0_pixclk = {

	.name		= "pixclk",

	.dev		= &lcdc0_device.dev,

DEFINE_DEV_DATA(atmel_lcdfb, 0);

DEV_CLK(hck1, atmel_lcdfb0, hsb, 7);

static struct clk atmel_lcdfb0_pixclk = {

	.name		= "lcdc_clk",

	.dev		= &atmel_lcdfb0_device.dev,

	.mode		= genclk_mode,

	.get_rate	= genclk_get_rate,

	.set_rate	= genclk_set_rate,
@@ -903,13 +912,34 @@ static struct clk lcdc0_pixclk = { 
};



struct platform_device *__init

at32_add_device_lcdc(unsigned int id, struct lcdc_platform_data *data)

at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,

		     unsigned long fbmem_start, unsigned long fbmem_len)

{

	struct platform_device *pdev;

	struct atmel_lcdfb_info *info;

	struct fb_monspecs *monspecs;

	struct fb_videomode *modedb;

	unsigned int modedb_size;



	/*

	 * Do a deep copy of the fb data, monspecs and modedb. Make

	 * sure all allocations are done before setting up the

	 * portmux.

	 */

	monspecs = kmemdup(data->default_monspecs,

			   sizeof(struct fb_monspecs), GFP_KERNEL);

	if (!monspecs)

		return NULL;



	modedb_size = sizeof(struct fb_videomode) * monspecs->modedb_len;

	modedb = kmemdup(monspecs->modedb, modedb_size, GFP_KERNEL);

	if (!modedb)

		goto err_dup_modedb;

	monspecs->modedb = modedb;



	switch (id) {

	case 0:

		pdev = &lcdc0_device;

		pdev = &atmel_lcdfb0_device;

		select_peripheral(PC(19), PERIPH_A, 0);	/* CC	  */

		select_peripheral(PC(20), PERIPH_A, 0);	/* HSYNC  */

		select_peripheral(PC(21), PERIPH_A, 0);	/* PCLK	  */
@@ -942,19 +972,32 @@ at32_add_device_lcdc(unsigned int id, struct lcdc_platform_data *data) 
		select_peripheral(PD(16), PERIPH_A, 0);	/* DATA22 */

		select_peripheral(PD(17), PERIPH_A, 0);	/* DATA23 */



		clk_set_parent(&lcdc0_pixclk, &pll0);

		clk_set_rate(&lcdc0_pixclk, clk_get_rate(&pll0));

		clk_set_parent(&atmel_lcdfb0_pixclk, &pll0);

		clk_set_rate(&atmel_lcdfb0_pixclk, clk_get_rate(&pll0));

		break;



	default:

		return NULL;

		goto err_invalid_id;

	}



	if (fbmem_len) {

		pdev->resource[2].start = fbmem_start;

		pdev->resource[2].end = fbmem_start + fbmem_len - 1;

		pdev->resource[2].flags = IORESOURCE_MEM;

	}



	memcpy(pdev->dev.platform_data, data,

	       sizeof(struct lcdc_platform_data));

	info = pdev->dev.platform_data;

	memcpy(info, data, sizeof(struct atmel_lcdfb_info));

	info->default_monspecs = monspecs;



	platform_device_register(pdev);

	return pdev;



err_invalid_id:

	kfree(modedb);

err_dup_modedb:

	kfree(monspecs);

	return NULL;

}



/* --------------------------------------------------------------------
@@ -1037,8 +1080,8 @@ struct clk *at32_clock_list[] = { 
	&macb1_pclk,

	&atmel_spi0_spi_clk,

	&atmel_spi1_spi_clk,

	&lcdc0_hclk,

	&lcdc0_pixclk,

	&atmel_lcdfb0_hck1,

	&atmel_lcdfb0_pixclk,

	&gclk0,

	&gclk1,

	&gclk2,
@@ -1077,7 +1120,7 @@ void __init at32_clock_init(void) 
	genclk_init_parent(&gclk2);

	genclk_init_parent(&gclk3);

	genclk_init_parent(&gclk4);

	genclk_init_parent(&lcdc0_pixclk);

	genclk_init_parent(&atmel_lcdfb0_pixclk);



	/*

	 * Turn on all clocks that have at least one user already, and

include/asm-avr32/arch-at32ap/board.h

+3 −5
Original line number Diff line number Diff line
@@ -30,11 +30,9 @@ struct spi_board_info; 
struct platform_device *

at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n);



struct lcdc_platform_data {

	unsigned long fbmem_start;

	unsigned long fbmem_size;

};

struct atmel_lcdfb_info;

struct platform_device *

at32_add_device_lcdc(unsigned int id, struct lcdc_platform_data *data);

at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,

		     unsigned long fbmem_start, unsigned long fbmem_len);



#endif /* __ASM_ARCH_BOARD_H */