ep93xx video platform support
Subsystems (5)
PATCH v2 1/2 ep93xx video platform support
As pointed out by Daniele Venzano I missed a file in the previous patch set. I also messed up the order. The following series fixes these problems
---
Added platform and clock support for the ep93xx video driver
---
arch/arm/mach-ep93xx/clock.c +89 -1
@@ -37,7 +37,7 @@ struct clk {static unsigned long get_uart_rate (struct clk *clk);static int set_keytchclk_rate (struct clk *clk,unsigned long rate); - +static int set_div_rate (struct clk *clk,unsigned long rate);static struct clk clk_uart1 = { .sw_locked =1 ,
@@ -73,6 +73,13 @@ static struct clk clk_keypad = { .set_rate = set_keytchclk_rate, }; +static struct clk clk_video = { + .enable_reg =EP93XX_SYSCON_VIDCLKDIV , + .enable_mask =EP93XX_SYSCON_CLKDIV_ENABLE , + .sw_locked =1 , + .set_rate = set_div_rate, +}; +/* DMA Clocks */ static struct clk clk_m2p0 = { .enable_reg =EP93XX_SYSCON_PWRCNT ,
@@ -137,6 +144,7 @@ static struct clk_lookup clocks[] = {INIT_CK (NULL ,"pll2" , &clk_pll2),INIT_CK ("ep93xx-ohci" ,NULL , &clk_usb_host),INIT_CK ("ep93xx-keypad" ,NULL , &clk_keypad), +INIT_CK ("ep93xx-fb" ,NULL , &clk_video),INIT_CK (NULL ,"m2p0" , &clk_m2p0),INIT_CK (NULL ,"m2p1" , &clk_m2p1), INIT_CK(NULL, "m2p2", &clk_m2p2),
@@ -232,6 +240,86 @@ static int set_keytchclk_rate(struct clk *clk, unsigned long rate)return 0 ; } +static unsigned long calc_clk_div (unsigned long rate,int *psel,int *esel, +int *pdiv,int *div) +{ +unsigned long max_rate, best_rate =0 , + actual_rate =0 , mclk_rate =0 , rate_err =-1 ; +int i, found =0 , __div =0 , __pdiv =0 ; + +/* Don't exceed the maximum rate */ + max_rate =max (max (clk_pll1.rate /4 , clk_pll2.rate /4 ), + (unsigned long )EP93XX_EXT_CLK_RATE /4 ); + rate =min (rate, max_rate); + +/* +* Try the two pll's and the external clock +* Because the valid predividers are 2, 2.5 and 3, we multiply +* all the clocks by 2 to avoid floating point math. +* +* This is based on the algorithm in the ep93xx raster guide: +* http://be-a-maverick.com/en/pubs/appNote/AN269REV1.pdf +* +*/ +for (i =0 ; i <3 ; i++) { +if (i ==0 ) + mclk_rate =EP93XX_EXT_CLK_RATE *2 ; +else if (i ==1 ) + mclk_rate = clk_pll1.rate *2 ; +else if (i ==2 ) + mclk_rate = clk_pll2.rate *2 ; + +/* Try each predivider value */ +for (__pdiv =4 ; __pdiv <=6 ; __pdiv++) { + __div = mclk_rate / (rate * __pdiv); +if (__div <2 || __div >127 ) +continue ; + + actual_rate = mclk_rate / __pdiv * __div; + +if (!found ||abs (actual_rate - rate) < rate_err) { + *pdiv = __pdiv -3 ; + *div = __div; + *psel = (i ==2 ); + *esel = (i !=0 ); + best_rate = actual_rate; + rate_err = actual_rate - rate; + found =1 ; + } + } + } + +if (!found) +return 0 ; + +return best_rate; +} + +static int set_div_rate (struct clk *clk,unsigned long rate) +{ +unsigned long actual_rate; +int psel =0 , esel =0 , pdiv =0 , div =0 ; +u32 val; + + actual_rate =calc_clk_div (rate, &psel, &esel, &pdiv, &div); +if (actual_rate ==0 ) +return -EINVAL ; + clk->rate = actual_rate; + +/* Clear the esel, psel, pdiv and div bits */ + val =__raw_readl (clk->enable_reg); + val &= ~0x7fff ; + +/* Set the new esel, psel, pdiv and div bits for the new clock rate */ + val |= (esel ?EP93XX_SYSCON_CLKDIV_ESEL :0 ) | + (psel ?EP93XX_SYSCON_CLKDIV_PSEL :0 ) | + (pdiv <<EP93XX_SYSCON_CLKDIV_PDIV_SHIFT ) | div; +__raw_writel (0xaa ,EP93XX_SYSCON_SWLOCK ); +__raw_writel (val, clk->enable_reg); + +return 0 ; +} +int clk_set_rate (struct clk *clk,unsigned long rate) {if (clk->set_rate)
arch/arm/mach-ep93xx/core.c +30 -0
@@ -36,6 +36,7 @@#include <asm/hardware/vic.h> +#include <mach/fb.h> /************************************************************************* * Static I/O mappings that are needed for all EP93xx platforms
@@ -570,6 +571,35 @@ void __init ep93xx_register_i2c(struct i2c_board_info *devices, int num)platform_device_register (&ep93xx_i2c_device); } +/************************************************************************* +* EP93xx video peripheral handling +*************************************************************************/ +static struct ep93xxfb_mach_info ep93xxfb_data; + +static struct resource ep93xx_fb_resource[] = { + { + .start =EP93XX_RASTER_PHYS_BASE , + .end =EP93XX_RASTER_PHYS_BASE +0x800 -1 , + .flags =IORESOURCE_MEM , + }, +}; + +static struct platform_device ep93xx_fb_device = { + .name ="ep93xx-fb" , + .id =-1 , + .dev.platform_data = &ep93xxfb_data, + .dev.coherent_dma_mask =DMA_BIT_MASK (32 ), + .dev.dma_mask = &ep93xx_fb_device.dev.coherent_dma_mask, + .num_resources =ARRAY_SIZE (ep93xx_fb_resource), + .resource = ep93xx_fb_resource, +}; + +void __init ep93xx_register_fb (struct ep93xxfb_mach_info *data) +{ + ep93xxfb_data = *data; +platform_device_register (&ep93xx_fb_device); +} +extern void ep93xx_gpio_init (void );void __init ep93xx_init_devices (void )
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +6 -1
@@ -70,6 +70,7 @@#define EP93XX_USB_PHYS_BASE (EP93XX_AHB_PHYS_BASE + 0x00020000)#define EP93XX_USB_BASE EP93XX_AHB_IOMEM(0x00020000) +#define EP93XX_RASTER_PHYS_BASE (EP93XX_AHB_PHYS_BASE + 0x00030000)#define EP93XX_RASTER_BASE EP93XX_AHB_IOMEM(0x00030000)#define EP93XX_GRAPHICS_ACCEL_BASE EP93XX_AHB_IOMEM(0x00040000)
@@ -206,13 +207,17 @@#define EP93XX_SYSCON_DEVCFG_ADCPD (1<<2)#define EP93XX_SYSCON_DEVCFG_KEYS (1<<1)#define EP93XX_SYSCON_DEVCFG_SHENA (1<<0) +#define EP93XX_SYSCON_VIDCLKDIV EP93XX_SYSCON_REG(0x84) +#define EP93XX_SYSCON_CLKDIV_PSEL (1 << 13) +#define EP93XX_SYSCON_CLKDIV_ESEL (1 << 14) +#define EP93XX_SYSCON_CLKDIV_ENABLE (1 << 15) +#define EP93XX_SYSCON_CLKDIV_PDIV_SHIFT 8#define EP93XX_SYSCON_KEYTCHCLKDIV EP93XX_SYSCON_REG(0x90)#define EP93XX_SYSCON_KEYTCHCLKDIV_TSEN (1<<31)#define EP93XX_SYSCON_KEYTCHCLKDIV_ADIV (1<<16)#define EP93XX_SYSCON_KEYTCHCLKDIV_KEN (1<<15)#define EP93XX_SYSCON_KEYTCHCLKDIV_KDIV (1<<0)#define EP93XX_SYSCON_SWLOCK EP93XX_SYSCON_REG(0xc0) -#define EP93XX_WATCHDOG_BASE EP93XX_APB_IOMEM(0x00140000)
arch/arm/mach-ep93xx/include/mach/fb.h new file +55 -0
55 lines not on this page · raw message
arch/arm/mach-ep93xx/include/mach/platform.h +2 -1
@@ -5,6 +5,7 @@#ifndef __ASSEMBLY__struct i2c_board_info ; +struct ep93xxfb_mach_info ;struct ep93xx_eth_data {
@@ -32,7 +33,7 @@ static inline void ep93xx_devcfg_clear_bits(unsigned int bits)void ep93xx_register_eth (struct ep93xx_eth_data *data,int copy_addr);void ep93xx_register_i2c (struct i2c_board_info *devices,int num); - +void ep93xx_register_fb (struct ep93xxfb_mach_info *data);void ep93xx_init_devices (void );extern struct sys_timer ep93xx_timer;
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
Re: [PATCH v2 2/2] ep93xx video driver
EP93xx video driver support
---
drivers/video/Kconfig +11 -0
@@ -2114,6 +2114,17 @@ config FB_MB862XX_LIME ---help--- Framebuffer support for Fujitsu Lime GDC on host CPU bus. +config FB_EP93XX + tristate "EP93XX frame buffer support" + depends on FB && ARCH_EP93XX + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + ---help--- + Framebuffer driver for the Cirrus Logic EP93XX series of processors. + This driver is also available as a module. The module will be called + ep93xxfb. + config FB_PRE_INIT_FB bool "Don't reinitialize, use bootloader's GDC/Display configuration" depends on FB_MB862XX_LIME
drivers/video/Makefile +1 -0
@@ -126,6 +126,7 @@ obj-$(CONFIG_FB_OMAP) += omap/ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ +obj-$(CONFIG_FB_EP93XX) += ep93xx_fb.o # Platform or fallback drivers go here obj-$(CONFIG_FB_UVESA) += uvesafb.o
drivers/video/ep93xx_fb.c new file +646 -0
646 lines not on this page · raw message
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
Re: [PATCH v2 2/2] ep93xx video driver
Quoted 5 lines · Ryan Mallon
EP93xx video driver support
Signed-off-by Ryan Mallon <[email protected]>---
[snip]
Quoted 5 lines
drivers/video/ep93xx_fb.c new file +0
-0
[snip]
drivers/video/ep93xx_fb.c line 131
Quoted 10 lines
drivers/video/ep93xx_fb.c new file +10
-0+ +static inline unsigned int ep93xxfb_readl (struct ep93xx_fbi *fbi, +unsigned int off) +{ +return __raw_readl (fbi->mmio_base + off); +} + +static inline void ep93xxfb_writel (struct ep93xx_fbi *fbi,unsigned int val, +unsigned int off) +{
Please move the 'unsigned in val,' down with the 'unsigned int off'.
I know it's < 80 chars but it makes the inline function consistent with the others. And it's a bit clearer to read.
Quoted 17 lines
drivers/video/ep93xx_fb.c new file +17
-0+__raw_writel (val, fbi->mmio_base + off); +} + +/* +* Write to one of the locked raster registers. +*/ +static inline void ep93xxfb_out_locked (struct ep93xx_fbi *fbi, +unsigned int val,unsigned int reg) +{ +/* +* We don't need a lock or delay here since the raster register +* block will remain unlocked until the next access. +*/ +ep93xxfb_writel (fbi,0xaa ,EP93XXFB_SWLOCK ); +ep93xxfb_writel (fbi, val, reg); +} +
[snip]
Quoted 26 lines
drivers/video/ep93xx_fb.c new file +26
-0+static int __init ep93xxfb_alloc_videomem (struct fb_info *info) +{ +struct ep93xx_fbi *fbi = info->par; +char __iomem *virt_addr; +dma_addr_t phys_addr; +unsigned int fb_size; + + fb_size =ep93xxfb_calc_fbsize (fbi->mach_info); + virt_addr =dma_alloc_writecombine (info->dev, fb_size, + &phys_addr,GFP_KERNEL ); +if (!virt_addr) +return -ENOMEM ; + +/* +* There is a bug in the ep93xx framebuffer which causes problems +* if bit 27 of the physical address is set. +* See: http://marc.info/?l=linux-arm-kernel&m=110061245502000&w=2 +* There does not seem to be any offical errata for this, but I +* have confirmed the problem exists on my hardware (ep9315) at +* least. +*/ +if (check_screenpage_bug && phys_addr & (1 <<27 )) { +dev_err (info->dev,"ep93xx framebuffer bug. phys addr (0x%x) " +"has bit 27 set: cannot init framebuffer\n" , + phys_addr); +
drivers/video/ep93xx_fb.c line 474
Quoted 10 lines
drivers/video/ep93xx_fb.c new file +10
-0+dma_free_coherent (info->dev, fb_size, virt_addr, phys_addr); +return -ENOMEM ; + } + + info->fix.smem_start = phys_addr; + info->fix.smem_len = fb_size; + info->screen_base = virt_addr; + +return 0 ; +}
Were you able to test the SROMLL bit? If that "fixes" the bit 27 bug maybe this should be added to the comment. As far as I can tell, if the SROMLL bit is set it is impossbile to have an SDRAM physical address that would have bit 27 set. With it cleared there are a number of memory configurations that might have it set.
Regards,
Hartley
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
Re: [PATCH v2 2/2] ep93xx video driver
Quoted 37 lines · H Hartley Sweeten
Quoted 35 lines · Ryan Mallon
drivers/video/ep93xx_fb.c new file +35
-0+static int __init ep93xxfb_alloc_videomem (struct fb_info *info) +{ +struct ep93xx_fbi *fbi = info->par; +char __iomem *virt_addr; +dma_addr_t phys_addr; +unsigned int fb_size; + + fb_size =ep93xxfb_calc_fbsize (fbi->mach_info); + virt_addr =dma_alloc_writecombine (info->dev, fb_size, + &phys_addr,GFP_KERNEL ); +if (!virt_addr) +return -ENOMEM ; + +/* +* There is a bug in the ep93xx framebuffer which causes problems +* if bit 27 of the physical address is set. +* See: http://marc.info/?l=linux-arm-kernel&m=110061245502000&w=2 +* There does not seem to be any offical errata for this, but I +* have confirmed the problem exists on my hardware (ep9315) at +* least. +*/ +if (check_screenpage_bug && phys_addr & (1 <<27 )) { +dev_err (info->dev,"ep93xx framebuffer bug. phys addr (0x%x) " +"has bit 27 set: cannot init framebuffer\n" , + phys_addr); + +dma_free_coherent (info->dev, fb_size, virt_addr, phys_addr); +return -ENOMEM ; + } + + info->fix.smem_start = phys_addr; + info->fix.smem_len = fb_size; + info->screen_base = virt_addr; + +return 0 ;
Quoted 10 lines
Quoted 2 lines
+}
Were you able to test the SROMLL bit? If that "fixes" the bit 27 bug maybe this should be added to the comment. As far as I can tell, if the SROMLL bit is set it is impossbile to have an SDRAM physical address that would have bit 27 set. With it cleared there are a number of memory configurations that might have it set.
I tried the different memory layout you suggested, but I got a massive kernel panic in the memory manager near the end of the boot process. I haven't looked into it too much yet, one of my workmates seemed to think that the way our SDRAM is wired up means that we can only use the memory layout we have.
~Ryan
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
Re: [PATCH v2 2/2] ep93xx video driver
In reply to H Hartley SweetenUpdated version of the ep93xx video driver patch with fixes suggested by Hartley.
---
drivers/video/Kconfig +11 -0
@@ -2114,6 +2114,17 @@ config FB_MB862XX_LIME ---help--- Framebuffer support for Fujitsu Lime GDC on host CPU bus. +config FB_EP93XX + tristate "EP93XX frame buffer support" + depends on FB && ARCH_EP93XX + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + ---help--- + Framebuffer driver for the Cirrus Logic EP93XX series of processors. + This driver is also available as a module. The module will be called + ep93xxfb. + config FB_PRE_INIT_FB bool "Don't reinitialize, use bootloader's GDC/Display configuration" depends on FB_MB862XX_LIME
drivers/video/Makefile +1 -0
@@ -126,6 +126,7 @@ obj-$(CONFIG_FB_OMAP) += omap/ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ +obj-$(CONFIG_FB_EP93XX) += ep93xx_fb.o # Platform or fallback drivers go here obj-$(CONFIG_FB_UVESA) += uvesafb.o
drivers/video/ep93xx_fb.c new file +646 -0
646 lines not on this page · raw message
-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
Updated version of the ep93xx video driver platform support patch with fixes suggested by Hartley.
---
arch/arm/mach-ep93xx/clock.c +87 -1
@@ -37,7 +37,7 @@ struct clk {static unsigned long get_uart_rate (struct clk *clk);static int set_keytchclk_rate (struct clk *clk,unsigned long rate); - +static int set_div_rate (struct clk *clk,unsigned long rate);static struct clk clk_uart1 = { .sw_locked =1 ,
@@ -73,6 +73,13 @@ static struct clk clk_keypad = { .set_rate = set_keytchclk_rate, }; +static struct clk clk_video = { + .sw_locked =1 , + .enable_reg =EP93XX_SYSCON_VIDCLKDIV , + .enable_mask =EP93XX_SYSCON_CLKDIV_ENABLE , + .set_rate = set_div_rate, +}; +/* DMA Clocks */ static struct clk clk_m2p0 = { .enable_reg =EP93XX_SYSCON_PWRCNT ,
@@ -137,6 +144,7 @@ static struct clk_lookup clocks[] = {INIT_CK (NULL ,"pll2" , &clk_pll2),INIT_CK ("ep93xx-ohci" ,NULL , &clk_usb_host),INIT_CK ("ep93xx-keypad" ,NULL , &clk_keypad), +INIT_CK ("ep93xx-fb" ,NULL , &clk_video),INIT_CK (NULL ,"m2p0" , &clk_m2p0),INIT_CK (NULL ,"m2p1" , &clk_m2p1), INIT_CK(NULL, "m2p2", &clk_m2p2),
@@ -232,6 +240,84 @@ static int set_keytchclk_rate(struct clk *clk, unsigned long rate)return 0 ; } +static unsigned long calc_clk_div (unsigned long rate,int *psel,int *esel, +int *pdiv,int *div) +{ +unsigned long max_rate, best_rate =0 , + actual_rate =0 , mclk_rate =0 , rate_err =-1 ; +int i, found =0 , __div =0 , __pdiv =0 ; + +/* Don't exceed the maximum rate */ + max_rate =max (max (clk_pll1.rate /4 , clk_pll2.rate /4 ), + (unsigned long )EP93XX_EXT_CLK_RATE /4 ); + rate =min (rate, max_rate); + +/* +* Try the two pll's and the external clock +* Because the valid predividers are 2, 2.5 and 3, we multiply +* all the clocks by 2 to avoid floating point math. +* +* This is based on the algorithm in the ep93xx raster guide: +* http://be-a-maverick.com/en/pubs/appNote/AN269REV1.pdf +* +*/ +for (i =0 ; i <3 ; i++) { +if (i ==0 ) + mclk_rate =EP93XX_EXT_CLK_RATE *2 ; +else if (i ==1 ) + mclk_rate = clk_pll1.rate *2 ; +else if (i ==2 ) + mclk_rate = clk_pll2.rate *2 ; + +/* Try each predivider value */ +for (__pdiv =4 ; __pdiv <=6 ; __pdiv++) { + __div = mclk_rate / (rate * __pdiv); +if (__div <2 || __div >127 ) +continue ; + + actual_rate = mclk_rate / __pdiv * __div; + +if (!found ||abs (actual_rate - rate) < rate_err) { + *pdiv = __pdiv -3 ; + *div = __div; + *psel = (i ==2 ); + *esel = (i !=0 ); + best_rate = actual_rate; + rate_err = actual_rate - rate; + found =1 ; + } + } + } + +if (!found) +return 0 ; + +return best_rate; +} + +static int set_div_rate (struct clk *clk,unsigned long rate) +{ +unsigned long actual_rate; +int psel =0 , esel =0 , pdiv =0 , div =0 ; +u32 val; + + actual_rate =calc_clk_div (rate, &psel, &esel, &pdiv, &div); +if (actual_rate ==0 ) +return -EINVAL ; + clk->rate = actual_rate; + +/* Clear the esel, psel, pdiv and div bits */ + val =__raw_readl (clk->enable_reg); + val &= ~0x7fff ; + +/* Set the new esel, psel, pdiv and div bits for the new clock rate */ + val |= (esel ?EP93XX_SYSCON_CLKDIV_ESEL :0 ) | + (psel ?EP93XX_SYSCON_CLKDIV_PSEL :0 ) | + (pdiv <<EP93XX_SYSCON_CLKDIV_PDIV_SHIFT ) | div; +ep93xx_syscon_swlocked_write (val, clk->enable_reg); +return 0 ; +} +int clk_set_rate (struct clk *clk,unsigned long rate) {if (clk->set_rate)
arch/arm/mach-ep93xx/core.c +32 -1
@@ -29,6 +29,7 @@#include <linux/i2c-gpio.h> #include <mach/hardware.h> +#include <mach/fb.h> #include <asm/mach/map.h> #include <asm/mach/time.h>
@@ -36,7 +37,6 @@#include <asm/hardware/vic.h> -/************************************************************************* * Static I/O mappings that are needed for all EP93xx platforms *************************************************************************/
@@ -570,6 +570,37 @@ void __init ep93xx_register_i2c(struct i2c_board_info *devices, int num)platform_device_register (&ep93xx_i2c_device); } +/************************************************************************* +* EP93xx video peripheral handling +*************************************************************************/ +static struct ep93xxfb_mach_info ep93xxfb_data; + +static struct resource ep93xx_fb_resource[] = { + { + .start =EP93XX_RASTER_PHYS_BASE , + .end =EP93XX_RASTER_PHYS_BASE +0x800 -1 , + .flags =IORESOURCE_MEM , + }, +}; + +static struct platform_device ep93xx_fb_device = { + .name ="ep93xx-fb" , + .id =-1 , + .dev = { + .platform_data = &ep93xxfb_data, + .coherent_dma_mask =DMA_BIT_MASK (32 ), + .dma_mask = &ep93xx_fb_device.dev.coherent_dma_mask, + }, + .num_resources =ARRAY_SIZE (ep93xx_fb_resource), + .resource = ep93xx_fb_resource, +}; + +void __init ep93xx_register_fb (struct ep93xxfb_mach_info *data) +{ + ep93xxfb_data = *data; +platform_device_register (&ep93xx_fb_device); +} +extern void ep93xx_gpio_init (void );void __init ep93xx_init_devices (void )
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +6 -0
@@ -70,6 +70,7 @@#define EP93XX_USB_PHYS_BASE (EP93XX_AHB_PHYS_BASE + 0x00020000)#define EP93XX_USB_BASE EP93XX_AHB_IOMEM(0x00020000) +#define EP93XX_RASTER_PHYS_BASE (EP93XX_AHB_PHYS_BASE + 0x00030000)#define EP93XX_RASTER_BASE EP93XX_AHB_IOMEM(0x00030000)#define EP93XX_GRAPHICS_ACCEL_BASE EP93XX_AHB_IOMEM(0x00040000)
@@ -206,6 +207,11 @@#define EP93XX_SYSCON_DEVCFG_ADCPD (1<<2)#define EP93XX_SYSCON_DEVCFG_KEYS (1<<1)#define EP93XX_SYSCON_DEVCFG_SHENA (1<<0) +#define EP93XX_SYSCON_VIDCLKDIV EP93XX_SYSCON_REG(0x84) +#define EP93XX_SYSCON_CLKDIV_PSEL (1<<13) +#define EP93XX_SYSCON_CLKDIV_ESEL (1<<14) +#define EP93XX_SYSCON_CLKDIV_ENABLE (1<<15) +#define EP93XX_SYSCON_CLKDIV_PDIV_SHIFT 8#define EP93XX_SYSCON_KEYTCHCLKDIV EP93XX_SYSCON_REG(0x90)#define EP93XX_SYSCON_KEYTCHCLKDIV_TSEN (1<<31)#define EP93XX_SYSCON_KEYTCHCLKDIV_ADIV (1<<16)
arch/arm/mach-ep93xx/include/mach/fb.h new file +55 -0
55 lines not on this page · raw message
arch/arm/mach-ep93xx/include/mach/platform.h +2 -0
@@ -5,6 +5,7 @@#ifndef __ASSEMBLY__struct i2c_board_info ; +struct ep93xxfb_mach_info ;struct ep93xx_eth_data {
@@ -32,6 +33,7 @@ static inline void ep93xx_devcfg_clear_bits(unsigned int bits)void ep93xx_register_eth (struct ep93xx_eth_data *data,int copy_addr);void ep93xx_register_i2c (struct i2c_board_info *devices,int num); +void ep93xx_register_fb (struct ep93xxfb_mach_info *data);void ep93xx_init_devices (void );extern struct sys_timer ep93xx_timer;
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
H Hartley Sweeten
Acked-byQuoted 4 lines · Ryan Mallon
Updated version of the ep93xx video driver platform support patch with fixes suggested by Hartley.
Signed-off-by Ryan Mallon <[email protected]>
A couple more formatting issue comments below.
Quoted 16 lines
---
arch/arm/mach-ep93xx/clock.c +1
-1@@ -37,7 +37,7 @@ struct clk {static unsigned long get_uart_rate (struct clk *clk);static int set_keytchclk_rate (struct clk *clk,unsigned long rate); - +static int set_div_rate (struct clk *clk,unsigned long rate);static struct clk clk_uart1 = { .sw_locked =1 ,
arch/arm/mach-ep93xx/clock.c static struct clk clk_keypad = { · line 76
Quoted 4 lines
arch/arm/mach-ep93xx/clock.c +1
-0@@ -73,6 +73,13 @@ static struct clk clk_keypad = { .set_rate = set_keytchclk_rate, }; +static struct clk clk_video = {
Unnecessary blank line.
Quoted 31 lines
arch/arm/mach-ep93xx/clock.c +17
-0+ .sw_locked = 1, + .enable_reg = EP93XX_SYSCON_VIDCLKDIV, + .enable_mask = EP93XX_SYSCON_CLKDIV_ENABLE, + .set_rate = set_div_rate, +}; +/* DMA Clocks */ static struct clk clk_m2p0 = { .enable_reg =EP93XX_SYSCON_PWRCNT ,@@ -137,6 +144,7 @@ static struct clk_lookup clocks[] = {INIT_CK (NULL ,"pll2" , &clk_pll2),INIT_CK ("ep93xx-ohci" ,NULL , &clk_usb_host),INIT_CK ("ep93xx-keypad" ,NULL , &clk_keypad), +INIT_CK ("ep93xx-fb" ,NULL , &clk_video),INIT_CK (NULL ,"m2p0" , &clk_m2p0),INIT_CK (NULL ,"m2p1" , &clk_m2p1), INIT_CK(NULL, "m2p2", &clk_m2p2),@@ -232,6 +240,84 @@ static int set_keytchclk_rate(struct clk *clk, unsigned long rate)return 0 ; } +static unsigned long calc_clk_div (unsigned long rate,int *psel,int *esel, +int *pdiv,int *div) +{ +unsigned long max_rate, best_rate =0 , + actual_rate =0 , mclk_rate =0 , rate_err =-1 ; +int i, found =0 , __div =0 , __pdiv =0 ; + +/* Don't exceed the maximum rate */ + max_rate =max (max (clk_pll1.rate /4 , clk_pll2.rate /4 ), + (unsigned long )EP93XX_EXT_CLK_RATE /4 );
arch/arm/mach-ep93xx/clock.c static int set_keytchclk_rate(struct clk *clk, unsigned long rate) · line 262
Quoted 10 lines
arch/arm/mach-ep93xx/clock.c +10
-0+ rate =min (rate, max_rate); + +/* +* Try the two pll's and the external clock +* Because the valid predividers are 2, 2.5 and 3, we multiply +* all the clocks by 2 to avoid floating point math. +* +* This is based on the algorithm in the ep93xx raster guide: +* http://be-a-maverick.com/en/pubs/appNote/AN269REV1.pdf +*
Unnecessary extra '*'.
Quoted 218 lines
arch/arm/mach-ep93xx/clock.c +58
-0+*/ +for (i =0 ; i <3 ; i++) { +if (i ==0 ) + mclk_rate =EP93XX_EXT_CLK_RATE *2 ; +else if (i ==1 ) + mclk_rate = clk_pll1.rate *2 ; +else if (i ==2 ) + mclk_rate = clk_pll2.rate *2 ; + +/* Try each predivider value */ +for (__pdiv =4 ; __pdiv <=6 ; __pdiv++) { + __div = mclk_rate / (rate * __pdiv); +if (__div <2 || __div >127 ) +continue ; + + actual_rate = mclk_rate / __pdiv * __div; + +if (!found ||abs (actual_rate - rate) < rate_err) { + *pdiv = __pdiv -3 ; + *div = __div; + *psel = (i ==2 ); + *esel = (i !=0 ); + best_rate = actual_rate; + rate_err = actual_rate - rate; + found =1 ; + } + } + } + +if (!found) +return 0 ; + +return best_rate; +} + +static int set_div_rate (struct clk *clk,unsigned long rate) +{ +unsigned long actual_rate; +int psel =0 , esel =0 , pdiv =0 , div =0 ; +u32 val; + + actual_rate =calc_clk_div (rate, &psel, &esel, &pdiv, &div); +if (actual_rate ==0 ) +return -EINVAL ; + clk->rate = actual_rate; + +/* Clear the esel, psel, pdiv and div bits */ + val =__raw_readl (clk->enable_reg); + val &= ~0x7fff ; + +/* Set the new esel, psel, pdiv and div bits for the new clock rate */ + val |= (esel ?EP93XX_SYSCON_CLKDIV_ESEL :0 ) | + (psel ?EP93XX_SYSCON_CLKDIV_PSEL :0 ) | + (pdiv <<EP93XX_SYSCON_CLKDIV_PDIV_SHIFT ) | div; +ep93xx_syscon_swlocked_write (val, clk->enable_reg); +return 0 ; +} +int clk_set_rate (struct clk *clk,unsigned long rate) {if (clk->set_rate)arch/arm/mach-ep93xx/core.c +32
-1@@ -29,6 +29,7 @@#include <linux/i2c-gpio.h> #include <mach/hardware.h> +#include <mach/fb.h> #include <asm/mach/map.h> #include <asm/mach/time.h> @@ -36,7 +37,6 @@#include <asm/hardware/vic.h> -/************************************************************************* * Static I/O mappings that are needed for all EP93xx platforms *************************************************************************/ @@ -570,6 +570,37 @@ void __init ep93xx_register_i2c(struct i2c_board_info *devices, int num)platform_device_register (&ep93xx_i2c_device); } +/************************************************************************* +* EP93xx video peripheral handling +*************************************************************************/ +static struct ep93xxfb_mach_info ep93xxfb_data; + +static struct resource ep93xx_fb_resource[] = { + { + .start =EP93XX_RASTER_PHYS_BASE , + .end =EP93XX_RASTER_PHYS_BASE +0x800 -1 , + .flags =IORESOURCE_MEM , + }, +}; + +static struct platform_device ep93xx_fb_device = { + .name ="ep93xx-fb" , + .id =-1 , + .dev = { + .platform_data = &ep93xxfb_data, + .coherent_dma_mask =DMA_BIT_MASK (32 ), + .dma_mask = &ep93xx_fb_device.dev.coherent_dma_mask, + }, + .num_resources =ARRAY_SIZE (ep93xx_fb_resource), + .resource = ep93xx_fb_resource, +}; + +void __init ep93xx_register_fb (struct ep93xxfb_mach_info *data) +{ + ep93xxfb_data = *data; +platform_device_register (&ep93xx_fb_device); +} +extern void ep93xx_gpio_init (void );void __init ep93xx_init_devices (void )arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +6
-0@@ -70,6 +70,7 @@#define EP93XX_USB_PHYS_BASE (EP93XX_AHB_PHYS_BASE + 0x00020000)#define EP93XX_USB_BASE EP93XX_AHB_IOMEM(0x00020000) +#define EP93XX_RASTER_PHYS_BASE (EP93XX_AHB_PHYS_BASE + 0x00030000)#define EP93XX_RASTER_BASE EP93XX_AHB_IOMEM(0x00030000)#define EP93XX_GRAPHICS_ACCEL_BASE EP93XX_AHB_IOMEM(0x00040000)@@ -206,6 +207,11 @@#define EP93XX_SYSCON_DEVCFG_ADCPD (1<<2)#define EP93XX_SYSCON_DEVCFG_KEYS (1<<1)#define EP93XX_SYSCON_DEVCFG_SHENA (1<<0) +#define EP93XX_SYSCON_VIDCLKDIV EP93XX_SYSCON_REG(0x84) +#define EP93XX_SYSCON_CLKDIV_PSEL (1<<13) +#define EP93XX_SYSCON_CLKDIV_ESEL (1<<14) +#define EP93XX_SYSCON_CLKDIV_ENABLE (1<<15) +#define EP93XX_SYSCON_CLKDIV_PDIV_SHIFT 8#define EP93XX_SYSCON_KEYTCHCLKDIV EP93XX_SYSCON_REG(0x90)#define EP93XX_SYSCON_KEYTCHCLKDIV_TSEN (1<<31)#define EP93XX_SYSCON_KEYTCHCLKDIV_ADIV (1<<16)arch/arm/mach-ep93xx/include/mach/fb.h new file +55
-0@@ -0,0 +1,55 @@ +/* +* arch/arm/mach-ep93xx/include/mach/fb.h +*/ + +#ifndef __ASM_ARCH_EP93XXFB_H +#define __ASM_ARCH_EP93XXFB_H + +struct fb_videomode ; +struct fb_info ; + +#define EP93XXFB_USE_MODEDB 0 + +/* VideoAttributes flags */ +#define EP93XXFB_STATE_MACHINE_ENABLE (1 << 0) +#define EP93XXFB_PIXEL_CLOCK_ENABLE (1 << 1) +#define EP93XXFB_VSYNC_ENABLE (1 << 2) +#define EP93XXFB_PIXEL_DATA_ENABLE (1 << 3) +#define EP93XXFB_COMPOSITE_SYNC (1 << 4) +#define EP93XXFB_SYNC_VERT_HIGH (1 << 5) +#define EP93XXFB_SYNC_HORIZ_HIGH (1 << 6) +#define EP93XXFB_SYNC_BLANK_HIGH (1 << 7) +#define EP93XXFB_PCLK_FALLING (1 << 8) +#define EP93XXFB_ENABLE_AC (1 << 9) +#define EP93XXFB_ENABLE_LCD (1 << 10) +#define EP93XXFB_ENABLE_CCIR (1 << 12) +#define EP93XXFB_USE_PARALLEL_INTERFACE (1 << 13) +#define EP93XXFB_ENABLE_INTERRUPT (1 << 14) +#define EP93XXFB_USB_INTERLACE (1 << 16) +#define EP93XXFB_USE_EQUALIZATION (1 << 17) +#define EP93XXFB_USE_DOUBLE_HORZ (1 << 18) +#define EP93XXFB_USE_DOUBLE_VERT (1 << 19) +#define EP93XXFB_USE_BLANK_PIXEL (1 << 20) +#define EP93XXFB_USE_SDCSN0 (0 << 21) +#define EP93XXFB_USE_SDCSN1 (1 << 21) +#define EP93XXFB_USE_SDCSN2 (2 << 21) +#define EP93XXFB_USE_SDCSN3 (3 << 21) + +#define EP93XXFB_ENABLE (EP93XXFB_STATE_MACHINE_ENABLE | \ + EP93XXFB_PIXEL_CLOCK_ENABLE | \ + EP93XXFB_VSYNC_ENABLE | \ + EP93XXFB_PIXEL_DATA_ENABLE) + +struct ep93xxfb_mach_info { +unsigned int num_modes; +const struct fb_videomode *modes; +const struct fb_videomode *default_mode; +int bpp; +unsigned int flags; + +int (*setup)(struct fb_info *info); +void (*teardown)(struct fb_info *info); +void (*blank)(int blank_mode,struct fb_info *info); +}; + +#endif /* __ASM_ARCH_EP93XXFB_H */ arch/arm/mach-ep93xx/include/mach/platform.h +1
-0@@ -5,6 +5,7 @@#ifndef __ASSEMBLY__struct i2c_board_info ; +struct ep93xxfb_mach_info ;struct ep93xx_eth_data {
arch/arm/mach-ep93xx/include/mach/platform.h static inline void ep93xx_devcfg_clear_bits(unsigned int bits) · line 39
Quoted 7 lines
arch/arm/mach-ep93xx/include/mach/platform.h +1
-0@@ -32,6 +33,7 @@ static inline void ep93xx_devcfg_clear_bits(unsigned int bits)void ep93xx_register_eth (struct ep93xx_eth_data *data,int copy_addr);void ep93xx_register_i2c (struct i2c_board_info *devices,int num); +void ep93xx_register_fb (struct ep93xxfb_mach_info *data);void ep93xx_init_devices (void );extern struct sys_timer ep93xx_timer;
Looks good other than that.
I'm not sure which tag is appropriate for this patch. So here's both.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
Quoted 17 lines · H Hartley Sweeten
Quoted 5 lines · Ryan Mallon
Updated version of the ep93xx video driver platform support patch with fixes suggested by Hartley.
Signed-off-by Ryan Mallon <[email protected]>A couple more formatting issue comments below.
Quoted 6 lines
static struct clk
clk_uart1= {arch/arm/mach-ep93xx/clock.c +0
-0.sw_locked = 1,@@ -73,6 +73,13 @@ static struct clk clk_keypad = { .set_rate = set_keytchclk_rate, };
Quoted 5 lines
Review static struct clk clk_keypad = { · line 77
Quoted 2 lines
(quoted diff) +1
-0+static struct clk clk_video = {Unnecessary blank line.
I like having blank lines between structures :-). I can remove it if you want.
Quoted 16 lines
Quoted 16 lines
arch/arm/mach-ep93xx/clock.c +15
-0+static unsigned long calc_clk_div (unsigned long rate,int *psel,int *esel, +int *pdiv,int *div) +{ +unsigned long max_rate, best_rate =0 , + actual_rate =0 , mclk_rate =0 , rate_err =-1 ; +int i, found =0 , __div =0 , __pdiv =0 ; + +/* Don't exceed the maximum rate */ + max_rate =max (max (clk_pll1.rate /4 , clk_pll2.rate /4 ), + (unsigned long )EP93XX_EXT_CLK_RATE /4 ); + rate =min (rate, max_rate); + +/* +* Try the two pll's and the external clock +* Because the valid predividers are 2, 2.5 and 3, we multiply
Quoted 9 lines
arch/arm/mach-ep93xx/clock.c static int set_keytchclk_rate(struct clk *clk, unsigned long rate) · line 262
Quoted 6 lines
arch/arm/mach-ep93xx/clock.c +5
-0+* all the clocks by 2 to avoid floating point math. +* +* This is based on the algorithm in the ep93xx raster guide: +* http://be-a-maverick.com/en/pubs/appNote/AN269REV1.pdf +* Unnecessary extra '*'.
Again, I think this is okay, it spaces the comment out a bit and makes it more readable (IMHO).
Quoted 6 lines
Looks good other than that.
I'm not sure which tag is appropriate for this patch. So here's both.
Signed-off-by H Hartley Sweeten <[email protected]>
Sorry, your signed-off-by should have been there from the start.
Quoted 2 lines
I'm not sure if you can have both a signed-off-by and acked-by tag on the same patch. Russell?
I'm also putting together a short document on how to use the driver since Daniele was having trouble getting it going. I would like to wait until he has it fully working before this gets applied since that gives us a third independent person who can confirm it all works.
Russell, will this eventually be okay to go through the ARM patch system, or does it need to go via the framebuffer people?
~Ryan
Signature · 16 lines
Bluewater Systems Ltd - ARM Technology Solution Centre
Ryan Mallon Unit 5, Amuri Park
Phone: +64 3 3779127 404 Barbadoes St
Fax: +64 3 3779135 PO Box 13 889
Email: [email protected] Christchurch, 8013
Web: http://www.bluewatersys.com New Zealand
Freecall Australia 1800 148 751 USA 1800 261 2934
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/ChallengeQuoted 15 lines · Ryan Mallon
Quoted 15 lines
Quoted 5 lines
Updated version of the ep93xx video driver platform support patch with fixes suggested by Hartley.
Signed-off-by Ryan Mallon <[email protected]>A couple more formatting issue comments below.
Quoted 6 lines
static struct clk
clk_uart1= {arch/arm/mach-ep93xx/clock.c +0
-0.sw_locked = 1,@@ -73,6 +73,13 @@ static struct clk clk_keypad = { .set_rate = set_keytchclk_rate, };
Quoted 7 lines
Quoted 5 lines
Review static struct clk clk_keypad = { · line 77
Quoted 2 lines
(quoted diff) +1
-0+static struct clk clk_video = {Unnecessary blank line.
I like having blank lines between structures :-). I can remove it if you want.
Only because all the other clk's don't have a blank line separating them.
Quoted 25 lines
Quoted 16 lines
Quoted 16 lines
arch/arm/mach-ep93xx/clock.c +15
-0+static unsigned long calc_clk_div (unsigned long rate,int *psel,int *esel, +int *pdiv,int *div) +{ +unsigned long max_rate, best_rate =0 , + actual_rate =0 , mclk_rate =0 , rate_err =-1 ; +int i, found =0 , __div =0 , __pdiv =0 ; + +/* Don't exceed the maximum rate */ + max_rate =max (max (clk_pll1.rate /4 , clk_pll2.rate /4 ), + (unsigned long )EP93XX_EXT_CLK_RATE /4 ); + rate =min (rate, max_rate); + +/* +* Try the two pll's and the external clock +* Because the valid predividers are 2, 2.5 and 3, we multiply Quoted 9 lines
arch/arm/mach-ep93xx/clock.c static int set_keytchclk_rate(struct clk *clk, unsigned long rate) · line 262
Quoted 6 lines
arch/arm/mach-ep93xx/clock.c +5
-0+* all the clocks by 2 to avoid floating point math. +* +* This is based on the algorithm in the ep93xx raster guide: +* http://be-a-maverick.com/en/pubs/appNote/AN269REV1.pdf +* Unnecessary extra '*'.
Quoted 2 lines
Again, I think this is okay, it spaces the comment out a bit and makes it more readable (IMHO).
That's fine.
Quoted 11 lines
Quoted 6 lines
Looks good other than that.
I'm not sure which tag is appropriate for this patch. So here's both.
Signed-off-by H Hartley Sweeten <[email protected]>Sorry, your signed-off-by should have been there from the start.
Quoted 2 lines
I'm not sure if you can have both a signed-off-by and acked-by tag on the same patch. Russell?
I guess it should be a Signed-off-by, you will need an ack from someone else (Russell?).
Quoted 4 lines
I'm also putting together a short document on how to use the driver since Daniele was having trouble getting it going. I would like to wait until he has it fully working before this gets applied since that gives us a third independent person who can confirm it all works.
I was going to suggest that. Or you could submit a patch for the snappercl15 showing an example usage.
Quoted 2 lines
Russell, will this eventually be okay to go through the ARM patch system, or does it need to go via the framebuffer people?
I think Russell could ok this part of the support. The actual driver will probably need to go via the framebuffer people.
I'm reviewing the driver right now. You should have my Signed-off-by later today.
Regards,
Hartley
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
Quoted 6 lines · H Hartley Sweeten
Quoted 2 lines · Ryan Mallon
Russell, will this eventually be okay to go through the ARM patch system, or does it need to go via the framebuffer people?
I think Russell could ok this part of the support. The actual driver will probably need to go via the framebuffer people.
I think it depends on whether there's any response from framebuffer folk. I've heard many stories of people submitting patches to the framebuffer list and nothing happening. Safest thing is probably to CC Andrew Morton as a just-in-case measure.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
Quoted 4 lines · H Hartley Sweeten
I'm not sure which tag is appropriate for this patch. So here's both.
Signed-off-by H Hartley Sweeten <[email protected]>
If you're directly involved in the patch delivery path, then the sign-off is what's required. In other words, you take someone elses patch, decide you're happy with it and want to pass it along yourself.
If you've just reviewed it and are happy with it, then it's the acked-by which is needed. Or use one of the more specific Reviewed-by, Tested-by etc (whatever seems most appropriate for the amount of review or checking you've done.)
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
H Hartley Sweeten
Acked-byQuoted 6 lines · Russell King
Quoted 4 lines · H Hartley Sweeten
I'm not sure which tag is appropriate for this patch. So here's both.
Signed-off-by H Hartley Sweeten <[email protected]>
Quoted 8 lines
If you're directly involved in the patch delivery path, then the sign-off is what's required. In other words, you take someone elses patch, decide you're happy with it and want to pass it along yourself.
If you've just reviewed it and are happy with it, then it's the acked-by which is needed. Or use one of the more specific Reviewed-by, Tested-by etc (whatever seems most appropriate for the amount of review or checking you've done.)
Thanks Russell.
Based on that information, my tag for this part of the patch should be:
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge
Re: [PATCH v2 3/2] ep93xx video driver documentation
In reply to Ryan MallonDocumentation for the ep93xx LCD controller
---
Documentation/fb/ep93xx_fb.txt new file +105 -0
@@ -0,0 +1,105 @@ +================================ +Driver for EP93xx LCD controller +================================ + +The EP93xx LCD controller can drive both standard desktop monitors and +embedded LCD displays. If you have a standard desktop monitor then you +can use the standard Linux video mode database. In your board file: + + static struct ep93xxfb_mach_info some_board_fb_info = { + .num_modes = EP93XXFB_USE_MODEDB, + .bpp = 16, + }; + +If you have an embedded LCD display then you need to define a video +mode for it as follows: + + static struct fb_videomode some_board_video_modes[] = { + { + .name = "some_lcd_name", + /* Pixel clock, porches, etc */ + }, + }; + + static struct ep93xxfb_mach_info some_board_fb_info = { + .num_modes = ARRAY_SIZE(some_board_video_modes), + .modes = some_board_video_modes, + .default_mode = &some_board_video_modes[0], + .bpp = 16, + }; + +The framebuffer device can be registered by adding the following to +your board initialisation function: + + ep93xx_register_fb(&some_board_fb_info); + +===================== +Video Attribute Flags +===================== + +The ep93xxfb_mach_info structure has a flags field which can be used +to configure the controller. The video attributes flags are fully +documented in section 7 of the EP93xx users' guide. The following +flags are available: + +EP93XXFB_PCLK_FALLING Clock data on the falling edge of the + pixel clock. The default is to clock + data on the rising edge. + +EP93XXFB_SYNC_BLANK_HIGH Blank signal is active high. By + default the blank signal is active low. + +EP93XXFB_SYNC_HORIZ_HIGH Horizontal sync is active high. By + default the horizontal sync is active low. + +EP93XXFB_SYNC_VERT_HIGH Vertical sync is active high. By + default the vertical sync is active high. + +The physical address of the framebuffer can be controlled using the +following flags: + +EP93XXFB_USE_SDCSN0 Use SDCSn[0] for the framebuffer. This + is the default setting. + +EP93XXFB_USE_SDCSN1 Use SDCSn[1] for the framebuffer. + +EP93XXFB_USE_SDCSN2 Use SDCSn[2] for the framebuffer. + +EP93XXFB_USE_SDCSN3 Use SDCSn[3] for the framebuffer. + +====================== +Setting the video mode +====================== + +The video mode is set using the following syntax: + + video=XRESxYRES[-BPP][@REFRESH] + +If the EP93xx video driver is built-in then the video mode is set on +the Linux kernel command line, for example: + + video=800x600-16@60 + +If the EP93xx video driver is built as a module then the video mode is +set when the module is installed: + + modprobe ep93xx_fb video=320x240 + +============== +Screenpage bug +============== + +At least on the EP9315 there is a silicon bug which causes bit 27 of +the VIDSCRNPAGE (framebuffer physical offset) to be tied low. There is +an unofficial errata for this bug at: + http://marc.info/?l=linux-arm-kernel&m=110061245502000&w=2 + +By default the EP93xx framebuffer driver checks if the allocated physical +address has bit 27 set. If it does, then the memory is freed and an +error is returned. The check can be disabled by adding the following +option when loading the driver: + + ep93xx_fb.check_screenpage_bug=0 + +In some cases it may be possible to reconfigure your SDRAM layout to +avoid this bug. See section 13 of the EP93xx users' guide for details.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge