[RFC 2.6.26-rc3 0/10] am200epd, pxafb, metronomefb changes v4

[RFC 2.6.26-rc3 0/10] am200epd, pxafb, metronomefb changes v4

[Jaya Kumar]

Hi Eric, arm and fbdev friends,

This is version 4 of this RFC and contains the following updates:
- split pxafb patch 1 into separate parts as suggested.
- add patch for ifdef in pxafb
- improve failout handling in metronomefb

Thanks to Krzysztof, Eric and Lothar for feedback.

This RFC consists of patches intended to improve the condition of the
am200epd devkit support. The am200epd devkit contains a gumstix (pxa255) and
a carrier board (am200epd or Lyre), and a metronome display controller.
Previously, there was a drivers/video/am200epd driver that manipulated pxa
LCDC registers and GPSR/GPLR registers directly. That was clearly wrong and
broken so I have removed it and written a new mach-pxa am200epd support
driver.This driver interfaces with pxafb through a set of callbacks to
share/unshare pxafb's framebuffer and achieves the same functionality without
manipulating any pxa registers directly. The patches are split as follows:

pxafb: fix ifdef for command line option handling
pxafb: cleanup and fix order of failure handling
pxafb: fix __devinit/exit annotations
pxafb: add exit and remove handlers
pxafb: add shared framebuffer interface
gumstix: conversion to MFP support and add bluetooth support
am200epd: move am200epd to mach-pxa
am200epd: convert to shared fb and use gpio api
metronomefb: convert printk to dev_dbg/err messages
metronomefb: changes to use separate framebuffer

I would be grateful for any feedback and advice.

Thanks,
jaya


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 01/10] pxafb: fix ifdef for command line option handling

[Jaya Kumar]

This bug was found and fixed by Lothar Wassmann.

Previously, the use of ifndef CONFIG_MODULES made it such that pxafb command
line option parsing was dependent on whether the kernel was built with module
support. The ifndef should be MODULE so that parsing is dependent only on
whether the driver is built-in or not.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 drivers/video/pxafb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 274bc93..dd013f3 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1586,7 +1586,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
 
 static char g_options[256] __devinitdata = "";
 
-#ifndef CONFIG_MODULES
+#ifndef MODULE
 static int __devinit pxafb_setup_options(void)
 {
 	char *options = NULL;
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 02/10] pxafb: cleanup and fix order of failure handling

[Jaya Kumar]

This issue was found by Krzysztof Helt and Eric Miao.

pxafb had issues in the order with which it cleaned up if errors occurred
during a probe. This patch reorders the failure handling sequence and also
frees the cmap and clk.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 drivers/video/pxafb.c |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index dd013f3..037881a 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1683,14 +1683,14 @@ static int __init pxafb_probe(struct platform_device *dev)
 	if (r == NULL) {
 		dev_err(&dev->dev, "no I/O memory resource defined\n");
 		ret = -ENODEV;
-		goto failed;
+		goto failed_fbi;
 	}
 
 	r = request_mem_region(r->start, r->end - r->start + 1, dev->name);
 	if (r == NULL) {
 		dev_err(&dev->dev, "failed to request I/O memory\n");
 		ret = -EBUSY;
-		goto failed;
+		goto failed_fbi;
 	}
 
 	fbi->mmio_base = ioremap(r->start, r->end - r->start + 1);
@@ -1733,8 +1733,17 @@ static int __init pxafb_probe(struct platform_device *dev)
 	 * This makes sure that our colour bitfield
 	 * descriptors are correctly initialised.
 	 */
-	pxafb_check_var(&fbi->fb.var, &fbi->fb);
-	pxafb_set_par(&fbi->fb);
+	ret = pxafb_check_var(&fbi->fb.var, &fbi->fb);
+	if (ret) {
+		dev_err(&dev->dev, "failed to get suitable mode\n");
+		goto failed_free_irq;
+	}
+
+	ret = pxafb_set_par(&fbi->fb);
+	if (ret) {
+		dev_err(&dev->dev, "Failed to set parameters\n");
+		goto failed_free_irq;
+	}
 
 	platform_set_drvdata(dev, fbi);
 
@@ -1742,7 +1751,7 @@ static int __init pxafb_probe(struct platform_device *dev)
 	if (ret < 0) {
 		dev_err(&dev->dev,
 			"Failed to register framebuffer device: %d\n", ret);
-		goto failed_free_irq;
+		goto failed_free_cmap;
 	}
 
 #ifdef CONFIG_CPU_FREQ
@@ -1761,18 +1770,23 @@ static int __init pxafb_probe(struct platform_device *dev)
 
 	return 0;
 
+failed_free_cmap:
+	if (fbi->fb.cmap.len)
+		fb_dealloc_cmap(&fbi->fb.cmap);
 failed_free_irq:
 	free_irq(irq, fbi);
-failed_free_res:
-	release_mem_region(r->start, r->end - r->start + 1);
-failed_free_io:
-	iounmap(fbi->mmio_base);
 failed_free_mem:
 	dma_free_writecombine(&dev->dev, fbi->map_size,
 			fbi->map_cpu, fbi->map_dma);
-failed:
+failed_free_io:
+	iounmap(fbi->mmio_base);
+failed_free_res:
+	release_mem_region(r->start, r->end - r->start + 1);
+failed_fbi:
+	clk_put(fbi->clk);
 	platform_set_drvdata(dev, NULL);
 	kfree(fbi);
+failed:
 	return ret;
 }
 
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 03/10] pxafb: fix __devinit/exit annotations

[Jaya Kumar]

This patch fixes pxafb's init/exit annotations. It uses __devinit/exit for
probe functions and __init for init functions. g_options is left as
__devinitdata since it is used by both.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 drivers/video/pxafb.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 037881a..b891aac 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1246,7 +1246,7 @@ static int pxafb_resume(struct platform_device *dev)
  *      cache.  Once this area is remapped, all virtual memory
  *      access to the video memory should occur at the new region.
  */
-static int __init pxafb_map_video_memory(struct pxafb_info *fbi)
+static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi)
 {
 	/*
 	 * We reserve one page for the palette, plus the size
@@ -1346,7 +1346,7 @@ decode_mode:
 	pxafb_decode_mode_info(fbi, inf->modes, inf->num_modes);
 }
 
-static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev)
+static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
 {
 	struct pxafb_info *fbi;
 	void *addr;
@@ -1408,7 +1408,7 @@ static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev)
 }
 
 #ifdef CONFIG_FB_PXA_PARAMETERS
-static int __init parse_opt_mode(struct device *dev, const char *this_opt)
+static int __devinit parse_opt_mode(struct device *dev, const char *this_opt)
 {
 	struct pxafb_mach_info *inf = dev->platform_data;
 
@@ -1467,7 +1467,7 @@ done:
 	return 0;
 }
 
-static int __init parse_opt(struct device *dev, char *this_opt)
+static int __devinit parse_opt(struct device *dev, char *this_opt)
 {
 	struct pxafb_mach_info *inf = dev->platform_data;
 	struct pxafb_mode_info *mode = &inf->modes[0];
@@ -1565,7 +1565,7 @@ static int __init parse_opt(struct device *dev, char *this_opt)
 	return 0;
 }
 
-static int __init pxafb_parse_options(struct device *dev, char *options)
+static int __devinit pxafb_parse_options(struct device *dev, char *options)
 {
 	char *this_opt;
 	int ret;
@@ -1587,7 +1587,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
 static char g_options[256] __devinitdata = "";
 
 #ifndef MODULE
-static int __devinit pxafb_setup_options(void)
+static int __init pxafb_setup_options(void)
 {
 	char *options = NULL;
 
@@ -1611,7 +1611,7 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)");
 #define pxafb_setup_options()		(0)
 #endif
 
-static int __init pxafb_probe(struct platform_device *dev)
+static int __devinit pxafb_probe(struct platform_device *dev)
 {
 	struct pxafb_info *fbi;
 	struct pxafb_mach_info *inf;
@@ -1799,7 +1799,7 @@ static struct platform_driver pxafb_driver = {
 	},
 };
 
-static int __devinit pxafb_init(void)
+static int __init pxafb_init(void)
 {
 	if (pxafb_setup_options())
 		return -EINVAL;
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 04/10] pxafb: add exit and remove handlers

[Jaya Kumar]

This patch adds exit and remove handlers to pxafb so that it can be loaded
and unloaded as a module.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 drivers/video/pxafb.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index b891aac..89f1b48 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1790,11 +1790,49 @@ failed:
 	return ret;
 }
 
+static int __devexit pxafb_remove(struct platform_device *dev)
+{
+	struct pxafb_info *fbi = platform_get_drvdata(dev);
+	struct resource *r;
+	int irq;
+	struct fb_info *info;
+
+	if (!fbi)
+		return 0;
+
+	info = &fbi->fb;
+
+	unregister_framebuffer(info);
+
+	pxafb_disable_controller(fbi);
+
+	if (fbi->fb.cmap.len)
+		fb_dealloc_cmap(&fbi->fb.cmap);
+
+	irq = platform_get_irq(dev, 0);
+	free_irq(irq, fbi);
+
+	dma_free_writecombine(&dev->dev, fbi->map_size,
+					fbi->map_cpu, fbi->map_dma);
+
+	iounmap(fbi->mmio_base);
+
+	r = platform_get_resource(dev, IORESOURCE_MEM, 0);
+	release_mem_region(r->start, r->end - r->start + 1);
+
+	clk_put(fbi->clk);
+	kfree(fbi);
+
+	return 0;
+}
+
 static struct platform_driver pxafb_driver = {
 	.probe		= pxafb_probe,
+	.remove 	= pxafb_remove,
 	.suspend	= pxafb_suspend,
 	.resume		= pxafb_resume,
 	.driver		= {
+		.owner	= THIS_MODULE,
 		.name	= "pxa2xx-fb",
 	},
 };
@@ -1807,7 +1845,13 @@ static int __init pxafb_init(void)
 	return platform_driver_register(&pxafb_driver);
 }
 
+static void __exit pxafb_exit(void)
+{
+	platform_driver_unregister(&pxafb_driver);
+}
+
 module_init(pxafb_init);
+module_exit(pxafb_exit);
 
 MODULE_DESCRIPTION("loadable framebuffer driver for PXA");
 MODULE_LICENSE("GPL");
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 05/10] pxafb: add shared framebuffer interface

[Jaya Kumar]

These changes are to make it possible for a secondary driver to share the
pxafb framebuffer. The changes include:
- adding clkdev entry in pxafb_mach_info so that a driver can pass in the
  correct struct device owner for the LCDCLK.
- adding custom_xfer_div entry so that a driver can have custom sized
  transfers. For example, the metronome controller uses 16 bit AMLCD
  transfers but actually has 3 bit pixels in 8 bit containers.
- adding extra_video_mem entry so that a driver can tell pxafb of its
  additional needs.
- adding share_video_mem/unshare_video_mem callbacks to notify the secondary
  driver of the framebuffer address, to allow refcounting, and to cleanup on
  completion.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 arch/arm/mach-pxa/devices.c      |    2 +
 drivers/video/pxafb.c            |   48 ++++++++++++++++++++++++++++++++-----
 include/asm-arm/arch-pxa/pxafb.h |    9 +++++++
 3 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index d6c05b6..b72b73a 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -130,6 +130,8 @@ struct platform_device pxa_device_fb = {
 
 void __init set_pxa_fb_info(struct pxafb_mach_info *info)
 {
+	if (!info->clkdev)
+		info->clkdev = &pxa_device_fb.dev;
 	pxa_register_device(&pxa_device_fb, info);
 }
 
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 89f1b48..434587f 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -57,6 +57,8 @@
  */
 #define DEBUG_VAR 1
 
+static struct platform_driver pxafb_driver;
+
 #include "pxafb.h"
 
 /* Bits which should not be set in machine configuration structures */
@@ -775,10 +777,15 @@ int pxafb_smart_flush(struct fb_info *info)
 static void setup_parallel_timing(struct pxafb_info *fbi,
 				  struct fb_var_screeninfo *var)
 {
+	struct pxafb_mach_info *inf = fbi->dev->platform_data;
 	unsigned int lines_per_panel, pcd = get_pcd(fbi, var->pixclock);
+	unsigned int pix_per_line = var->xres;
+
+	if (inf->custom_xfer_div)
+		pix_per_line /= inf->custom_xfer_div;
 
 	fbi->reg_lccr1 =
-		LCCR1_DisWdth(var->xres) +
+		LCCR1_DisWdth(pix_per_line) +
 		LCCR1_HorSnchWdth(var->hsync_len) +
 		LCCR1_BegLnDel(var->left_margin) +
 		LCCR1_EndLnDel(var->right_margin);
@@ -819,6 +826,7 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var,
 {
 	u_long flags;
 	size_t nbytes;
+	struct pxafb_mach_info *inf = fbi->dev->platform_data;
 
 #if DEBUG_VAR
 	if (!(fbi->lccr0 & LCCR0_LCDT)) {
@@ -878,6 +886,8 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var,
 	fbi->reg_lccr3 |= pxafb_bpp_to_lccr3(var);
 
 	nbytes = var->yres * fbi->fb.fix.line_length;
+	if (inf->custom_xfer_div)
+		nbytes /= inf->custom_xfer_div;
 
 	if ((fbi->lccr0 & LCCR0_SDS) == LCCR0_Dual) {
 		nbytes = nbytes / 2;
@@ -1246,21 +1256,25 @@ static int pxafb_resume(struct platform_device *dev)
  *      cache.  Once this area is remapped, all virtual memory
  *      access to the video memory should occur at the new region.
  */
-static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi)
+static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi,
+					 struct pxafb_mach_info *inf)
 {
+	int ret;
 	/*
 	 * We reserve one page for the palette, plus the size
 	 * of the framebuffer.
 	 */
 	fbi->video_offset = PAGE_ALIGN(sizeof(struct pxafb_dma_buff));
-	fbi->map_size = PAGE_ALIGN(fbi->fb.fix.smem_len + fbi->video_offset);
+	fbi->map_size = PAGE_ALIGN(fbi->fb.fix.smem_len + fbi->video_offset +
+					inf->extra_video_mem);
 	fbi->map_cpu = dma_alloc_writecombine(fbi->dev, fbi->map_size,
 					      &fbi->map_dma, GFP_KERNEL);
 
 	if (fbi->map_cpu) {
 		/* prevent initial garbage on screen */
 		memset(fbi->map_cpu, 0, fbi->map_size);
-		fbi->fb.screen_base = fbi->map_cpu + fbi->video_offset;
+		fbi->fb.screen_base = (char __force __iomem *) fbi->map_cpu
+					+ fbi->video_offset;
 		fbi->screen_dma = fbi->map_dma + fbi->video_offset;
 
 		/*
@@ -1280,6 +1294,13 @@ static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi)
 		fbi->smart_cmds = (uint16_t *) fbi->dma_buff->cmd_buff;
 		fbi->n_smart_cmds = 0;
 #endif
+		if (inf->share_video_mem) {
+			ret = inf->share_video_mem(fbi->fb.screen_base,
+				fbi->screen_dma, pxafb_driver.driver.owner,
+				inf->extra_data);
+			if (ret)
+				return ret;
+		}
 	}
 
 	return fbi->map_cpu ? 0 : -ENOMEM;
@@ -1290,6 +1311,7 @@ static void pxafb_decode_mode_info(struct pxafb_info *fbi,
 				   unsigned int num_modes)
 {
 	unsigned int i, smemlen;
+	struct pxafb_mach_info *inf = fbi->dev->platform_data;
 
 	pxafb_setmode(&fbi->fb.var, &modes[0]);
 
@@ -1297,6 +1319,8 @@ static void pxafb_decode_mode_info(struct pxafb_info *fbi,
 		smemlen = modes[i].xres * modes[i].yres * modes[i].bpp / 8;
 		if (smemlen > fbi->fb.fix.smem_len)
 			fbi->fb.fix.smem_len = smemlen;
+		if (inf->custom_xfer_div)
+			fbi->fb.fix.smem_len /= inf->custom_xfer_div;
 	}
 }
 
@@ -1360,7 +1384,7 @@ static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
 	memset(fbi, 0, sizeof(struct pxafb_info));
 	fbi->dev = dev;
 
-	fbi->clk = clk_get(dev, "LCDCLK");
+	fbi->clk = clk_get(inf->clkdev, "LCDCLK");
 	if (IS_ERR(fbi->clk)) {
 		kfree(fbi);
 		return NULL;
@@ -1701,8 +1725,12 @@ static int __devinit pxafb_probe(struct platform_device *dev)
 	}
 
 	/* Initialize video memory */
-	ret = pxafb_map_video_memory(fbi);
-	if (ret) {
+	ret = pxafb_map_video_memory(fbi, inf);
+	if (ret == -ENODEV) {
+		dev_err(&dev->dev, "Failed device binding: %d\n", ret);
+		ret = -ENODEV;
+		goto failed_free_mem;
+	} else if (ret) {
 		dev_err(&dev->dev, "Failed to allocate video RAM: %d\n", ret);
 		ret = -ENOMEM;
 		goto failed_free_io;
@@ -1776,6 +1804,8 @@ failed_free_cmap:
 failed_free_irq:
 	free_irq(irq, fbi);
 failed_free_mem:
+	if (inf->unshare_video_mem)
+		inf->unshare_video_mem(inf->extra_data);
 	dma_free_writecombine(&dev->dev, fbi->map_size,
 			fbi->map_cpu, fbi->map_dma);
 failed_free_io:
@@ -1796,6 +1826,7 @@ static int __devexit pxafb_remove(struct platform_device *dev)
 	struct resource *r;
 	int irq;
 	struct fb_info *info;
+	struct pxafb_mach_info *inf;
 
 	if (!fbi)
 		return 0;
@@ -1812,6 +1843,9 @@ static int __devexit pxafb_remove(struct platform_device *dev)
 	irq = platform_get_irq(dev, 0);
 	free_irq(irq, fbi);
 
+	inf = dev->dev.platform_data;
+	if (inf->unshare_video_mem)
+		inf->unshare_video_mem(inf->extra_data);
 	dma_free_writecombine(&dev->dev, fbi->map_size,
 					fbi->map_cpu, fbi->map_dma);
 
diff --git a/include/asm-arm/arch-pxa/pxafb.h b/include/asm-arm/arch-pxa/pxafb.h
index bbd2239..2c1409c 100644
--- a/include/asm-arm/arch-pxa/pxafb.h
+++ b/include/asm-arm/arch-pxa/pxafb.h
@@ -138,9 +138,18 @@ struct pxafb_mach_info {
 	 * All other bits in LCCR4 should be left alone.
 	 */
 	u_int		lccr4;
+	unsigned int	custom_xfer_div; /* divides the pixel transfer */
+	/* size of extra mem needed for secondary driver */
+	unsigned int	extra_video_mem;
+	void		*extra_data; /* extra data for secondary */
 	void (*pxafb_backlight_power)(int);
 	void (*pxafb_lcd_power)(int, struct fb_var_screeninfo *);
 	void (*smart_update)(struct fb_info *);
+	/* share_video_mem allows client drivers to get our framebuffer */
+	int (*share_video_mem)(char __iomem *, dma_addr_t, struct module *,
+				void *);
+	void (*unshare_video_mem)(void *);
+	struct device *clkdev;
 };
 void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info);
 void set_pxa_fb_parent(struct device *parent_dev);
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Jaya Kumar]

This patch converts gumstix over to the MFP configuration system and adds
bluetooth support. Added a CLK_32K clock to enable bluetooth.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 arch/arm/mach-pxa/gumstix.c           |   79 ++++++++++++++++++++++++++-------
 arch/arm/mach-pxa/pxa25x.c            |   31 +++++++++++++
 include/asm-arm/arch-pxa/mfp-pxa25x.h |    1 +
 3 files changed, 95 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index bdf2397..3e0a962 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -20,8 +20,12 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
+#include <linux/delay.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/gpio.h>
+#include <linux/err.h>
+#include <linux/clk.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -40,7 +44,7 @@
 
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
+#include <asm/arch/mfp-pxa25x.h>
 
 #include "generic.h"
 
@@ -85,21 +89,8 @@ static struct platform_device *devices[] __initdata = {
 };
 
 #ifdef CONFIG_MMC_PXA
-static struct pxamci_platform_data gumstix_mci_platform_data;
-
-static int gumstix_mci_init(struct device *dev, irq_handler_t detect_int,
-				void *data)
-{
-	pxa_gpio_mode(GPIO6_MMCCLK_MD);
-	pxa_gpio_mode(GPIO53_MMCCLK_MD);
-	pxa_gpio_mode(GPIO8_MMCCS0_MD);
-
-	return 0;
-}
-
 static struct pxamci_platform_data gumstix_mci_platform_data = {
 	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,
-	.init		= gumstix_mci_init,
 };
 
 static void __init gumstix_mmc_init(void)
@@ -109,7 +100,7 @@ static void __init gumstix_mmc_init(void)
 #else
 static void __init gumstix_mmc_init(void)
 {
-	printk(KERN_INFO "Gumstix mmc disabled\n");
+	pr_debug("Gumstix mmc disabled\n");
 }
 #endif
 
@@ -126,12 +117,68 @@ static void __init gumstix_udc_init(void)
 #else
 static void gumstix_udc_init(void)
 {
-	printk(KERN_INFO "Gumstix udc is disabled\n");
+	pr_debug("Gumstix udc is disabled\n");
+}
+#endif
+
+#ifdef CONFIG_BT
+static void __init gumstix_bluetooth_init(void)
+{
+	int err;
+	struct clk *clk32k;
+
+	clk32k = clk_get(NULL, "CLK_32K");
+	if (IS_ERR(clk32k)) {
+		pr_err("gumstix: failed to find 32kHz clock\n");
+		return;
+	}
+	clk_enable(clk32k);
+
+	err = gpio_direction_output(GPIO_GUMSTIX_BTRESET, 1);
+	if (err) {
+		pr_err("gumstix: can't reset bluetooth\n");
+		return;
+	}
+	gpio_set_value(GPIO_GUMSTIX_BTRESET, 0);
+	udelay(100);
+	gpio_set_value(GPIO_GUMSTIX_BTRESET, 1);
+}
+#else
+static void gumstix_bluetooth_init(void)
+{
+	pr_debug("Gumstix Bluetooth is disabled\n");
 }
 #endif
 
+static unsigned long gumstix_pin_config[] __initdata = {
+#ifdef CONFIG_BT
+	GPIO12_32KHz,
+	/* BTUART */
+	GPIO42_HWUART_RXD,
+	GPIO43_HWUART_TXD,
+	GPIO44_HWUART_CTS,
+	GPIO45_HWUART_RTSL,
+#endif
+#ifdef CONFIG_MMC_PXA
+	/* MMC */
+	GPIO6_MMC_CLK,
+	GPIO53_MMC_CLK,
+	GPIO8_MMC_CS0,
+#endif
+	/* these are used by AM200EPD */
+	GPIO51_GPIO,
+	GPIO49_GPIO,
+	GPIO48_GPIO,
+	GPIO32_GPIO,
+	GPIO17_GPIO,
+	GPIO16_GPIO,
+};
+
 static void __init gumstix_init(void)
 {
+	pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config));
+
+	gumstix_bluetooth_init();
 	gumstix_udc_init();
 	gumstix_mmc_init();
 	(void) platform_add_devices(devices, ARRAY_SIZE(devices));
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index e5b417d..1ffe773 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -22,6 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/suspend.h>
 #include <linux/sysdev.h>
+#include <linux/delay.h>
 
 #include <asm/hardware.h>
 #include <asm/arch/irqs.h>
@@ -108,6 +109,30 @@ static const struct clkops clk_pxa25x_lcd_ops = {
 	.getrate	= clk_pxa25x_lcd_getrate,
 };
 
+static void clk_32k_enable(struct clk *clk)
+{
+	int timeout = 500;
+
+	OSCC |= OSCC_OON;
+	do {
+		if (OSCC & OSCC_OOK)
+			break;
+		udelay(1);
+	} while (--timeout);
+	if (!timeout)
+		pr_err("Failed to start 32kHz clock\n");
+}
+
+static void clk_32k_disable(struct clk *clk)
+{
+	OSCC &= ~OSCC_OON;
+}
+
+static const struct clkops clk_32k_ops = {
+	.enable		= clk_32k_enable,
+	.disable	= clk_32k_disable,
+};
+
 /*
  * 3.6864MHz -> OST, GPIO, SSP, PWM, PLLs (95.842MHz, 147.456MHz)
  * 95.842MHz -> MMC 19.169MHz, I2C 31.949MHz, FICP 47.923MHz, USB 47.923MHz
@@ -118,6 +143,12 @@ static struct clk pxa25x_hwuart_clk =
 ;
 
 static struct clk pxa25x_clks[] = {
+	{
+		.name           = "CLK_32K",
+		.ops            = &clk_32k_ops,
+		.rate           = 32000,
+		.delay          = 70,
+	},
 	INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev),
 	INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev),
 	INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev),
diff --git a/include/asm-arm/arch-pxa/mfp-pxa25x.h b/include/asm-arm/arch-pxa/mfp-pxa25x.h
index 0499323..6c82a74 100644
--- a/include/asm-arm/arch-pxa/mfp-pxa25x.h
+++ b/include/asm-arm/arch-pxa/mfp-pxa25x.h
@@ -79,6 +79,7 @@
 #define GPIO43_HWUART_TXD	MFP_CFG_OUT(GPIO43, AF3, DRIVE_HIGH)
 #define GPIO44_HWUART_CTS	MFP_CFG_IN(GPIO44, AF3)
 #define GPIO45_HWUART_RTS	MFP_CFG_OUT(GPIO45, AF3, DRIVE_HIGH)
+#define GPIO45_HWUART_RTSL	MFP_CFG_OUT(GPIO45, AF3, DRIVE_LOW)
 #define GPIO48_HWUART_TXD	MFP_CFG_OUT(GPIO48, AF1, DRIVE_HIGH)
 #define GPIO49_HWUART_RXD	MFP_CFG_IN(GPIO49, AF1)
 #define GPIO50_HWUART_CTS	MFP_CFG_IN(GPIO50, AF1)
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 07/10] am200epd: move am200epd to mach-pxa

[Jaya Kumar]

The am200epd driver was designed with bad assumptions. It manipulated
GPSR/GPLR registers directly. It relied on direct access to the pxa LCDC
registers which have since conflicted with commit
ce4fb7b892a6d6c6a0f87366b26fd834d2923dd7 . This patch moves it into
mach-pxa in preparation for an overhaul. This is done as a move rather
than a removal in order to facilitate code review.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 arch/arm/mach-pxa/Kconfig    |   17 +++
 arch/arm/mach-pxa/Makefile   |    1 +
 arch/arm/mach-pxa/am200epd.c |  295 ++++++++++++++++++++++++++++++++++++++++++
 drivers/video/Kconfig        |   13 --
 drivers/video/Makefile       |    1 -
 drivers/video/am200epd.c     |  295 ------------------------------------------
 6 files changed, 313 insertions(+), 309 deletions(-)
 create mode 100644 arch/arm/mach-pxa/am200epd.c
 delete mode 100644 drivers/video/am200epd.c

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 5da7a68..1bcff21 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -179,6 +179,23 @@ endchoice
 
 endif
 
+if MACH_GUMSTIX_F
+
+choice
+	prompt "Select base board for Gumstix board"
+
+config MACH_AM200EPD
+	tristate "Enable AM200EPD board support"
+	select FB_METRONOME
+	select FB_SYS_FILLRECT
+	select FB_SYS_COPYAREA
+	select FB_SYS_IMAGEBLIT
+	select FB_SYS_FOPS
+	select FB_DEFERRED_IO
+
+endchoice
+
+endif
 
 if MACH_TRIZEPS4
 
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 0e6d05b..c72db62 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_CPU_PXA320)	+= pxa320.o
 
 # Specific board support
 obj-$(CONFIG_ARCH_GUMSTIX)	+= gumstix.o
+obj-$(CONFIG_MACH_AM200EPD)	+= am200epd.o
 obj-$(CONFIG_ARCH_LUBBOCK)	+= lubbock.o
 obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
 obj-$(CONFIG_MACH_MAINSTONE)	+= mainstone.o
diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c
new file mode 100644
index 0000000..51e26c1
--- /dev/null
+++ b/arch/arm/mach-pxa/am200epd.c
@@ -0,0 +1,295 @@
+/*
+ * linux/drivers/video/am200epd.c -- Platform device for AM200 EPD kit
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This work was made possible by help and equipment support from E-Ink
+ * Corporation. http://support.eink.com/community
+ *
+ * This driver is written to be used with the Metronome display controller.
+ * on the AM200 EPD prototype kit/development kit with an E-Ink 800x600
+ * Vizplex EPD on a Gumstix board using the Lyre interface board.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/uaccess.h>
+#include <linux/irq.h>
+
+#include <video/metronomefb.h>
+
+#include <asm/arch/pxa-regs.h>
+
+/* register offsets for gpio control */
+#define LED_GPIO_PIN 51
+#define STDBY_GPIO_PIN 48
+#define RST_GPIO_PIN 49
+#define RDY_GPIO_PIN 32
+#define ERR_GPIO_PIN 17
+#define PCBPWR_GPIO_PIN 16
+
+#define AF_SEL_GPIO_N 0x3
+#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
+#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
+#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
+#define GPDR1_OFFSET(pin) (pin - 32)
+#define GPCR1_OFFSET(pin) (pin - 32)
+#define GPSR1_OFFSET(pin) (pin - 32)
+#define GPCR0_OFFSET(pin) (pin)
+#define GPSR0_OFFSET(pin) (pin)
+
+static void am200_set_gpio_output(int pin, int val)
+{
+	u8 index;
+
+	index = pin >> 4;
+
+	switch (index) {
+	case 1:
+		if (val)
+			GPSR0 |= (1 << GPSR0_OFFSET(pin));
+		else
+			GPCR0 |= (1 << GPCR0_OFFSET(pin));
+		break;
+	case 2:
+		break;
+	case 3:
+		if (val)
+			GPSR1 |= (1 << GPSR1_OFFSET(pin));
+		else
+			GPCR1 |= (1 << GPCR1_OFFSET(pin));
+		break;
+	default:
+		printk(KERN_ERR "unimplemented\n");
+	}
+}
+
+static void __devinit am200_init_gpio_pin(int pin, int dir)
+{
+	u8 index;
+	/* dir 0 is output, 1 is input
+	- do 2 things here:
+	- set gpio alternate function to standard gpio
+	- set gpio direction to input or output  */
+
+	index = pin >> 4;
+	switch (index) {
+	case 1:
+		GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
+
+		if (dir)
+			GPDR0 &= ~(1 << pin);
+		else
+			GPDR0 |= (1 << pin);
+		break;
+	case 2:
+		GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
+
+		if (dir)
+			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
+		else
+			GPDR1 |= (1 << GPDR1_OFFSET(pin));
+		break;
+	case 3:
+		GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
+
+		if (dir)
+			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
+		else
+			GPDR1 |= (1 << GPDR1_OFFSET(pin));
+		break;
+	default:
+		printk(KERN_ERR "unimplemented\n");
+	}
+}
+
+static void am200_init_gpio_regs(struct metronomefb_par *par)
+{
+	am200_init_gpio_pin(LED_GPIO_PIN, 0);
+	am200_set_gpio_output(LED_GPIO_PIN, 0);
+
+	am200_init_gpio_pin(STDBY_GPIO_PIN, 0);
+	am200_set_gpio_output(STDBY_GPIO_PIN, 0);
+
+	am200_init_gpio_pin(RST_GPIO_PIN, 0);
+	am200_set_gpio_output(RST_GPIO_PIN, 0);
+
+	am200_init_gpio_pin(RDY_GPIO_PIN, 1);
+
+	am200_init_gpio_pin(ERR_GPIO_PIN, 1);
+
+	am200_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
+	am200_set_gpio_output(PCBPWR_GPIO_PIN, 0);
+}
+
+static void am200_disable_lcd_controller(struct metronomefb_par *par)
+{
+	LCSR = 0xffffffff;	/* Clear LCD Status Register */
+	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
+
+	/* we reset and just wait for things to settle */
+	msleep(200);
+}
+
+static void am200_enable_lcd_controller(struct metronomefb_par *par)
+{
+	LCSR = 0xffffffff;
+	FDADR0 = par->metromem_desc_dma;
+	LCCR0 |= LCCR0_ENB;
+}
+
+static void am200_init_lcdc_regs(struct metronomefb_par *par)
+{
+	/* here we do:
+	- disable the lcd controller
+	- setup lcd control registers
+	- setup dma descriptor
+	- reenable lcd controller
+	*/
+
+	/* disable the lcd controller */
+	am200_disable_lcd_controller(par);
+
+	/* setup lcd control registers */
+	LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
+		| LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
+
+	LCCR1 = (par->info->var.xres/2 - 1) /* pixels per line */
+		| (27 << 10) /* hsync pulse width - 1 */
+		| (33 << 16) /* eol pixel count */
+		| (33 << 24); /* bol pixel count */
+
+	LCCR2 = (par->info->var.yres - 1) /* lines per panel */
+		| (24 << 10) /* vsync pulse width - 1 */
+		| (2 << 16) /* eof pixel count */
+		| (0 << 24); /* bof pixel count */
+
+	LCCR3 = 2 /* pixel clock divisor */
+		| (24 << 8) /* AC Bias pin freq */
+		| LCCR3_16BPP /* BPP */
+		| LCCR3_PCP;  /* PCP falling edge */
+
+}
+
+static void am200_post_dma_setup(struct metronomefb_par *par)
+{
+	par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
+	par->metromem_desc->mFSADR0 = par->metromem_dma;
+	par->metromem_desc->mFIDR0 = 0;
+	par->metromem_desc->mLDCMD0 = par->info->var.xres
+					* par->info->var.yres;
+	am200_enable_lcd_controller(par);
+}
+
+static void am200_free_irq(struct fb_info *info)
+{
+	free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
+}
+
+static irqreturn_t am200_handle_irq(int irq, void *dev_id)
+{
+	struct fb_info *info = dev_id;
+	struct metronomefb_par *par = info->par;
+
+	wake_up_interruptible(&par->waitq);
+	return IRQ_HANDLED;
+}
+
+static int am200_setup_irq(struct fb_info *info)
+{
+	int retval;
+
+	retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
+				IRQF_DISABLED, "AM200", info);
+	if (retval) {
+		printk(KERN_ERR "am200epd: request_irq failed: %d\n", retval);
+		return retval;
+	}
+
+	return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
+}
+
+static void am200_set_rst(struct metronomefb_par *par, int state)
+{
+	am200_set_gpio_output(RST_GPIO_PIN, state);
+}
+
+static void am200_set_stdby(struct metronomefb_par *par, int state)
+{
+	am200_set_gpio_output(STDBY_GPIO_PIN, state);
+}
+
+static int am200_wait_event(struct metronomefb_par *par)
+{
+	return wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+}
+
+static int am200_wait_event_intr(struct metronomefb_par *par)
+{
+	return wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+}
+
+static struct metronome_board am200_board = {
+	.owner			= THIS_MODULE,
+	.free_irq		= am200_free_irq,
+	.setup_irq		= am200_setup_irq,
+	.init_gpio_regs		= am200_init_gpio_regs,
+	.init_lcdc_regs		= am200_init_lcdc_regs,
+	.post_dma_setup		= am200_post_dma_setup,
+	.set_rst		= am200_set_rst,
+	.set_stdby		= am200_set_stdby,
+	.met_wait_event		= am200_wait_event,
+	.met_wait_event_intr	= am200_wait_event_intr,
+};
+
+static struct platform_device *am200_device;
+
+static int __init am200_init(void)
+{
+	int ret;
+
+	/* request our platform independent driver */
+	request_module("metronomefb");
+
+	am200_device = platform_device_alloc("metronomefb", -1);
+	if (!am200_device)
+		return -ENOMEM;
+
+	platform_device_add_data(am200_device, &am200_board,
+					sizeof(am200_board));
+
+	/* this _add binds metronomefb to am200. metronomefb refcounts am200 */
+	ret = platform_device_add(am200_device);
+
+	if (ret)
+		platform_device_put(am200_device);
+
+	return ret;
+}
+
+static void __exit am200_exit(void)
+{
+	platform_device_unregister(am200_device);
+}
+
+module_init(am200_init);
+module_exit(am200_exit);
+
+MODULE_DESCRIPTION("board driver for am200 metronome epd kit");
+MODULE_AUTHOR("Jaya Kumar");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 002b61b..2bbd328 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1937,19 +1937,6 @@ config FB_XILINX
 	  framebuffer. ML300 carries a 640*480 LCD display on the board,
 	  ML403 uses a standard DB15 VGA connector.
 
-config FB_AM200EPD
-       tristate "AM-200 E-Ink EPD devkit support"
-       depends on FB && ARCH_PXA && MMU
-       select FB_SYS_FILLRECT
-       select FB_SYS_COPYAREA
-       select FB_SYS_IMAGEBLIT
-       select FB_SYS_FOPS
-       select FB_DEFERRED_IO
-       select FB_METRONOME
-       help
-         This enables support for the Metronome display controller used on
-         the E-Ink AM-200 EPD devkit.
-
 config FB_VIRTUAL
 	tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
 	depends on FB
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 04bca35..80d5842 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -29,7 +29,6 @@ obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o
 
 # Hardware specific drivers go first
 obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
-obj-$(CONFIG_FB_AM200EPD)         += am200epd.o
 obj-$(CONFIG_FB_ARC)              += arcfb.o
 obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
 obj-$(CONFIG_FB_CYBER2000)        += cyber2000fb.o
diff --git a/drivers/video/am200epd.c b/drivers/video/am200epd.c
deleted file mode 100644
index 51e26c1..0000000
--- a/drivers/video/am200epd.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * linux/drivers/video/am200epd.c -- Platform device for AM200 EPD kit
- *
- * Copyright (C) 2008, Jaya Kumar
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file COPYING in the main directory of this archive for
- * more details.
- *
- * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
- *
- * This work was made possible by help and equipment support from E-Ink
- * Corporation. http://support.eink.com/community
- *
- * This driver is written to be used with the Metronome display controller.
- * on the AM200 EPD prototype kit/development kit with an E-Ink 800x600
- * Vizplex EPD on a Gumstix board using the Lyre interface board.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/list.h>
-#include <linux/uaccess.h>
-#include <linux/irq.h>
-
-#include <video/metronomefb.h>
-
-#include <asm/arch/pxa-regs.h>
-
-/* register offsets for gpio control */
-#define LED_GPIO_PIN 51
-#define STDBY_GPIO_PIN 48
-#define RST_GPIO_PIN 49
-#define RDY_GPIO_PIN 32
-#define ERR_GPIO_PIN 17
-#define PCBPWR_GPIO_PIN 16
-
-#define AF_SEL_GPIO_N 0x3
-#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
-#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
-#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
-#define GPDR1_OFFSET(pin) (pin - 32)
-#define GPCR1_OFFSET(pin) (pin - 32)
-#define GPSR1_OFFSET(pin) (pin - 32)
-#define GPCR0_OFFSET(pin) (pin)
-#define GPSR0_OFFSET(pin) (pin)
-
-static void am200_set_gpio_output(int pin, int val)
-{
-	u8 index;
-
-	index = pin >> 4;
-
-	switch (index) {
-	case 1:
-		if (val)
-			GPSR0 |= (1 << GPSR0_OFFSET(pin));
-		else
-			GPCR0 |= (1 << GPCR0_OFFSET(pin));
-		break;
-	case 2:
-		break;
-	case 3:
-		if (val)
-			GPSR1 |= (1 << GPSR1_OFFSET(pin));
-		else
-			GPCR1 |= (1 << GPCR1_OFFSET(pin));
-		break;
-	default:
-		printk(KERN_ERR "unimplemented\n");
-	}
-}
-
-static void __devinit am200_init_gpio_pin(int pin, int dir)
-{
-	u8 index;
-	/* dir 0 is output, 1 is input
-	- do 2 things here:
-	- set gpio alternate function to standard gpio
-	- set gpio direction to input or output  */
-
-	index = pin >> 4;
-	switch (index) {
-	case 1:
-		GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
-
-		if (dir)
-			GPDR0 &= ~(1 << pin);
-		else
-			GPDR0 |= (1 << pin);
-		break;
-	case 2:
-		GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
-
-		if (dir)
-			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
-		else
-			GPDR1 |= (1 << GPDR1_OFFSET(pin));
-		break;
-	case 3:
-		GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
-
-		if (dir)
-			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
-		else
-			GPDR1 |= (1 << GPDR1_OFFSET(pin));
-		break;
-	default:
-		printk(KERN_ERR "unimplemented\n");
-	}
-}
-
-static void am200_init_gpio_regs(struct metronomefb_par *par)
-{
-	am200_init_gpio_pin(LED_GPIO_PIN, 0);
-	am200_set_gpio_output(LED_GPIO_PIN, 0);
-
-	am200_init_gpio_pin(STDBY_GPIO_PIN, 0);
-	am200_set_gpio_output(STDBY_GPIO_PIN, 0);
-
-	am200_init_gpio_pin(RST_GPIO_PIN, 0);
-	am200_set_gpio_output(RST_GPIO_PIN, 0);
-
-	am200_init_gpio_pin(RDY_GPIO_PIN, 1);
-
-	am200_init_gpio_pin(ERR_GPIO_PIN, 1);
-
-	am200_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
-	am200_set_gpio_output(PCBPWR_GPIO_PIN, 0);
-}
-
-static void am200_disable_lcd_controller(struct metronomefb_par *par)
-{
-	LCSR = 0xffffffff;	/* Clear LCD Status Register */
-	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
-
-	/* we reset and just wait for things to settle */
-	msleep(200);
-}
-
-static void am200_enable_lcd_controller(struct metronomefb_par *par)
-{
-	LCSR = 0xffffffff;
-	FDADR0 = par->metromem_desc_dma;
-	LCCR0 |= LCCR0_ENB;
-}
-
-static void am200_init_lcdc_regs(struct metronomefb_par *par)
-{
-	/* here we do:
-	- disable the lcd controller
-	- setup lcd control registers
-	- setup dma descriptor
-	- reenable lcd controller
-	*/
-
-	/* disable the lcd controller */
-	am200_disable_lcd_controller(par);
-
-	/* setup lcd control registers */
-	LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
-		| LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
-
-	LCCR1 = (par->info->var.xres/2 - 1) /* pixels per line */
-		| (27 << 10) /* hsync pulse width - 1 */
-		| (33 << 16) /* eol pixel count */
-		| (33 << 24); /* bol pixel count */
-
-	LCCR2 = (par->info->var.yres - 1) /* lines per panel */
-		| (24 << 10) /* vsync pulse width - 1 */
-		| (2 << 16) /* eof pixel count */
-		| (0 << 24); /* bof pixel count */
-
-	LCCR3 = 2 /* pixel clock divisor */
-		| (24 << 8) /* AC Bias pin freq */
-		| LCCR3_16BPP /* BPP */
-		| LCCR3_PCP;  /* PCP falling edge */
-
-}
-
-static void am200_post_dma_setup(struct metronomefb_par *par)
-{
-	par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
-	par->metromem_desc->mFSADR0 = par->metromem_dma;
-	par->metromem_desc->mFIDR0 = 0;
-	par->metromem_desc->mLDCMD0 = par->info->var.xres
-					* par->info->var.yres;
-	am200_enable_lcd_controller(par);
-}
-
-static void am200_free_irq(struct fb_info *info)
-{
-	free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
-}
-
-static irqreturn_t am200_handle_irq(int irq, void *dev_id)
-{
-	struct fb_info *info = dev_id;
-	struct metronomefb_par *par = info->par;
-
-	wake_up_interruptible(&par->waitq);
-	return IRQ_HANDLED;
-}
-
-static int am200_setup_irq(struct fb_info *info)
-{
-	int retval;
-
-	retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
-				IRQF_DISABLED, "AM200", info);
-	if (retval) {
-		printk(KERN_ERR "am200epd: request_irq failed: %d\n", retval);
-		return retval;
-	}
-
-	return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
-}
-
-static void am200_set_rst(struct metronomefb_par *par, int state)
-{
-	am200_set_gpio_output(RST_GPIO_PIN, state);
-}
-
-static void am200_set_stdby(struct metronomefb_par *par, int state)
-{
-	am200_set_gpio_output(STDBY_GPIO_PIN, state);
-}
-
-static int am200_wait_event(struct metronomefb_par *par)
-{
-	return wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
-}
-
-static int am200_wait_event_intr(struct metronomefb_par *par)
-{
-	return wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
-}
-
-static struct metronome_board am200_board = {
-	.owner			= THIS_MODULE,
-	.free_irq		= am200_free_irq,
-	.setup_irq		= am200_setup_irq,
-	.init_gpio_regs		= am200_init_gpio_regs,
-	.init_lcdc_regs		= am200_init_lcdc_regs,
-	.post_dma_setup		= am200_post_dma_setup,
-	.set_rst		= am200_set_rst,
-	.set_stdby		= am200_set_stdby,
-	.met_wait_event		= am200_wait_event,
-	.met_wait_event_intr	= am200_wait_event_intr,
-};
-
-static struct platform_device *am200_device;
-
-static int __init am200_init(void)
-{
-	int ret;
-
-	/* request our platform independent driver */
-	request_module("metronomefb");
-
-	am200_device = platform_device_alloc("metronomefb", -1);
-	if (!am200_device)
-		return -ENOMEM;
-
-	platform_device_add_data(am200_device, &am200_board,
-					sizeof(am200_board));
-
-	/* this _add binds metronomefb to am200. metronomefb refcounts am200 */
-	ret = platform_device_add(am200_device);
-
-	if (ret)
-		platform_device_put(am200_device);
-
-	return ret;
-}
-
-static void __exit am200_exit(void)
-{
-	platform_device_unregister(am200_device);
-}
-
-module_init(am200_init);
-module_exit(am200_exit);
-
-MODULE_DESCRIPTION("board driver for am200 metronome epd kit");
-MODULE_AUTHOR("Jaya Kumar");
-MODULE_LICENSE("GPL");
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 08/10] am200epd: convert to shared fb and use gpio api

[Jaya Kumar]

This patch converts am200epd to use pxafb's fb and to stop performing
direct access to LCDC registers. It now uses the generic GPIO api.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 arch/arm/mach-pxa/am200epd.c |  342 ++++++++++++++++++++++++------------------
 arch/arm/mach-pxa/devices.c  |    1 +
 2 files changed, 198 insertions(+), 145 deletions(-)

diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c
index 51e26c1..67bed6c 100644
--- a/arch/arm/mach-pxa/am200epd.c
+++ b/arch/arm/mach-pxa/am200epd.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/video/am200epd.c -- Platform device for AM200 EPD kit
+ * am200epd.c -- Platform device for AM200 EPD kit
  *
  * Copyright (C) 2008, Jaya Kumar
  *
@@ -18,6 +18,8 @@
  *
  */
 
+#define DEBUG 1
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -27,13 +29,72 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/list.h>
-#include <linux/uaccess.h>
 #include <linux/irq.h>
+#include <linux/gpio.h>
+
+#include <asm/arch/pxafb.h>
 
 #include <video/metronomefb.h>
 
-#include <asm/arch/pxa-regs.h>
+#include "generic.h"
+#include "devices.h"
+
+static unsigned int panel_type = 6;
+static struct platform_device *am200_device;
+static struct metronome_board am200_board;
+
+static struct pxafb_mode_info am200_fb_mode_9inch7 = {
+	.pixclock	= 40000,
+	.xres		= 1200,
+	.yres		= 842,
+	.bpp		= 16,
+	.hsync_len	= 2,
+	.left_margin	= 2,
+	.right_margin	= 2,
+	.vsync_len	= 1,
+	.upper_margin	= 2,
+	.lower_margin	= 25,
+	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct pxafb_mode_info am200_fb_mode_8inch = {
+	.pixclock	= 40000,
+	.xres		= 1088,
+	.yres		= 791,
+	.bpp		= 16,
+	.hsync_len	= 28,
+	.left_margin	= 8,
+	.right_margin	= 30,
+	.vsync_len	= 8,
+	.upper_margin	= 10,
+	.lower_margin	= 8,
+	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct pxafb_mode_info am200_fb_mode_6inch = {
+	.pixclock	= 40189,
+	.xres		= 832,
+	.yres		= 622,
+	.bpp		= 16,
+	.hsync_len	= 28,
+	.left_margin	= 34,
+	.right_margin	= 34,
+	.vsync_len	= 25,
+	.upper_margin	= 0,
+	.lower_margin	= 2,
+	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct pxafb_mach_info am200_fb_info = {
+	.modes		= &am200_fb_mode_6inch,
+	.num_modes	= 1,
+	.lccr0		= LCCR0_Pas | LCCR0_Sngl | LCCR0_Color,
+	.lccr3		= 0,
+	.lcd_conn	= LCD_TYPE_COLOR_TFT | LCD_PCLK_EDGE_FALL |
+			  LCD_AC_BIAS_FREQ(24),
+	.clkdev		= &pxa_device_fb.dev,
+	.custom_xfer_div = 2,
+};
 
 /* register offsets for gpio control */
 #define LED_GPIO_PIN 51
@@ -42,163 +103,144 @@
 #define RDY_GPIO_PIN 32
 #define ERR_GPIO_PIN 17
 #define PCBPWR_GPIO_PIN 16
+static int gpios[] = { LED_GPIO_PIN , STDBY_GPIO_PIN , RST_GPIO_PIN,
+			RDY_GPIO_PIN, ERR_GPIO_PIN, PCBPWR_GPIO_PIN };
+static char *gpio_names[] = { "LED" , "STDBY" , "RST", "RDY", "ERR", "PCBPWR" };
 
-#define AF_SEL_GPIO_N 0x3
-#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
-#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
-#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
-#define GPDR1_OFFSET(pin) (pin - 32)
-#define GPCR1_OFFSET(pin) (pin - 32)
-#define GPSR1_OFFSET(pin) (pin - 32)
-#define GPCR0_OFFSET(pin) (pin)
-#define GPSR0_OFFSET(pin) (pin)
-
-static void am200_set_gpio_output(int pin, int val)
+static int am200_init_gpio_regs(struct metronomefb_par *par)
 {
-	u8 index;
+	int i;
+	int err;
+
+	for (i = 0; i < ARRAY_SIZE(gpios); i++) {
+		err = gpio_request(gpios[i], gpio_names[i]);
+		if (err) {
+			dev_err(&am200_device->dev, "failed requesting "
+				"gpio %s, err=%d\n", gpio_names[i], err);
+			goto err_req_gpio;
+		}
+	}
 
-	index = pin >> 4;
+	gpio_direction_output(LED_GPIO_PIN, 0);
+	gpio_direction_output(STDBY_GPIO_PIN, 0);
+	gpio_direction_output(RST_GPIO_PIN, 0);
 
-	switch (index) {
-	case 1:
-		if (val)
-			GPSR0 |= (1 << GPSR0_OFFSET(pin));
-		else
-			GPCR0 |= (1 << GPCR0_OFFSET(pin));
-		break;
-	case 2:
-		break;
-	case 3:
-		if (val)
-			GPSR1 |= (1 << GPSR1_OFFSET(pin));
-		else
-			GPCR1 |= (1 << GPCR1_OFFSET(pin));
-		break;
-	default:
-		printk(KERN_ERR "unimplemented\n");
-	}
+	gpio_direction_input(RDY_GPIO_PIN);
+	gpio_direction_input(ERR_GPIO_PIN);
+
+	gpio_direction_output(PCBPWR_GPIO_PIN, 0);
+
+	return 0;
+
+err_req_gpio:
+	while (i > 0)
+		gpio_free(gpios[i--]);
+
+	return err;
 }
 
-static void __devinit am200_init_gpio_pin(int pin, int dir)
+static void am200_cleanup(struct metronomefb_par *par)
 {
-	u8 index;
-	/* dir 0 is output, 1 is input
-	- do 2 things here:
-	- set gpio alternate function to standard gpio
-	- set gpio direction to input or output  */
-
-	index = pin >> 4;
-	switch (index) {
-	case 1:
-		GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
-
-		if (dir)
-			GPDR0 &= ~(1 << pin);
-		else
-			GPDR0 |= (1 << pin);
-		break;
-	case 2:
-		GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
+	int i;
 
-		if (dir)
-			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
-		else
-			GPDR1 |= (1 << GPDR1_OFFSET(pin));
-		break;
-	case 3:
-		GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
+	free_irq(IRQ_GPIO(RDY_GPIO_PIN), par->info);
 
-		if (dir)
-			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
-		else
-			GPDR1 |= (1 << GPDR1_OFFSET(pin));
-		break;
-	default:
-		printk(KERN_ERR "unimplemented\n");
-	}
+	for (i = 0; i < ARRAY_SIZE(gpios); i++)
+		gpio_free(gpios[i]);
 }
 
-static void am200_init_gpio_regs(struct metronomefb_par *par)
+static struct platform_device *am200_pxa_device_fb;
+
+static int am200_pxa_register_device(struct platform_device *dev,
+					struct pxafb_mach_info *data)
 {
-	am200_init_gpio_pin(LED_GPIO_PIN, 0);
-	am200_set_gpio_output(LED_GPIO_PIN, 0);
+	int ret;
 
-	am200_init_gpio_pin(STDBY_GPIO_PIN, 0);
-	am200_set_gpio_output(STDBY_GPIO_PIN, 0);
+	am200_pxa_device_fb = platform_device_alloc("pxa2xx-fb", -1);
+	if (!am200_pxa_device_fb)
+		return -ENOMEM;
 
-	am200_init_gpio_pin(RST_GPIO_PIN, 0);
-	am200_set_gpio_output(RST_GPIO_PIN, 0);
+	platform_device_add_data(am200_pxa_device_fb, data, sizeof(*data));
 
-	am200_init_gpio_pin(RDY_GPIO_PIN, 1);
+	platform_device_add_resources(am200_pxa_device_fb,
+					pxa_device_fb.resource,
+					pxa_device_fb.num_resources);
 
-	am200_init_gpio_pin(ERR_GPIO_PIN, 1);
+	am200_pxa_device_fb->dev.dma_mask = pxa_device_fb.dev.dma_mask;
+	am200_pxa_device_fb->dev.coherent_dma_mask =
+					pxa_device_fb.dev.coherent_dma_mask;
 
-	am200_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
-	am200_set_gpio_output(PCBPWR_GPIO_PIN, 0);
-}
+	ret = platform_device_add(am200_pxa_device_fb);
 
-static void am200_disable_lcd_controller(struct metronomefb_par *par)
-{
-	LCSR = 0xffffffff;	/* Clear LCD Status Register */
-	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
+	if (ret) {
+		dev_err(&am200_device->dev, "failed adding pxafb %d\n", ret);
+		platform_device_put(am200_pxa_device_fb);
+	}
 
-	/* we reset and just wait for things to settle */
-	msleep(200);
+	return ret;
 }
 
-static void am200_enable_lcd_controller(struct metronomefb_par *par)
+static int am200_share_video_mem(char __iomem *video_mem, dma_addr_t dma,
+					struct module *fbmaster, void *data)
 {
-	LCSR = 0xffffffff;
-	FDADR0 = par->metromem_desc_dma;
-	LCCR0 |= LCCR0_ENB;
+	struct metronomefb_par *par = data;
+
+	/* try to refcount the caller since we are the consumer after this */
+	if (!try_module_get(fbmaster))
+		return -ENODEV;
+
+	dev_dbg(&am200_device->dev, "mod_get %p\n", fbmaster);
+	am200_board.fbmaster = fbmaster;
+	par->metromem = (unsigned char __force *)video_mem;
+	par->metromem_dma = dma;
+
+	return 0;
 }
 
-static void am200_init_lcdc_regs(struct metronomefb_par *par)
+static void am200_unshare_video_mem(void *data)
 {
-	/* here we do:
-	- disable the lcd controller
-	- setup lcd control registers
-	- setup dma descriptor
-	- reenable lcd controller
-	*/
-
-	/* disable the lcd controller */
-	am200_disable_lcd_controller(par);
-
-	/* setup lcd control registers */
-	LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
-		| LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
-
-	LCCR1 = (par->info->var.xres/2 - 1) /* pixels per line */
-		| (27 << 10) /* hsync pulse width - 1 */
-		| (33 << 16) /* eol pixel count */
-		| (33 << 24); /* bol pixel count */
-
-	LCCR2 = (par->info->var.yres - 1) /* lines per panel */
-		| (24 << 10) /* vsync pulse width - 1 */
-		| (2 << 16) /* eof pixel count */
-		| (0 << 24); /* bof pixel count */
-
-	LCCR3 = 2 /* pixel clock divisor */
-		| (24 << 8) /* AC Bias pin freq */
-		| LCCR3_16BPP /* BPP */
-		| LCCR3_PCP;  /* PCP falling edge */
+	struct metronomefb_par *par = data;
 
+	dev_dbg(&am200_device->dev, "ENTER %s\n", __func__);
+	par->metromem = NULL;
+	par->metromem_dma = 0;
+	dev_dbg(&am200_device->dev, "mod_put %p\n", am200_board.fbmaster);
+	module_put(am200_board.fbmaster);
 }
 
-static void am200_post_dma_setup(struct metronomefb_par *par)
+static int am200_setup_fb(struct metronomefb_par *par)
 {
-	par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
-	par->metromem_desc->mFSADR0 = par->metromem_dma;
-	par->metromem_desc->mFIDR0 = 0;
-	par->metromem_desc->mLDCMD0 = par->info->var.xres
-					* par->info->var.yres;
-	am200_enable_lcd_controller(par);
+	int ret;
+
+	am200_fb_info.extra_video_mem = par->extra_size;
+	am200_fb_info.extra_data = (void *) par;
+	am200_fb_info.share_video_mem = am200_share_video_mem;
+	am200_fb_info.unshare_video_mem = am200_unshare_video_mem;
+
+	switch (panel_type) {
+	case 6:
+		am200_fb_info.modes = &am200_fb_mode_6inch;
+		break;
+	case 8:
+		am200_fb_info.modes = &am200_fb_mode_8inch;
+		break;
+	case 97:
+		am200_fb_info.modes = &am200_fb_mode_9inch7;
+		break;
+	default:
+		dev_err(&am200_device->dev, "invalid panel_type selection,"
+						" setting to 6\n");
+		am200_fb_info.modes = &am200_fb_mode_6inch;
+		break;
+	}
+
+	ret = am200_pxa_register_device(&pxa_device_fb, &am200_fb_info);
+	return ret;
 }
 
-static void am200_free_irq(struct fb_info *info)
+static int am200_get_panel_type(void)
 {
-	free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
+	return panel_type;
 }
 
 static irqreturn_t am200_handle_irq(int irq, void *dev_id)
@@ -212,53 +254,59 @@ static irqreturn_t am200_handle_irq(int irq, void *dev_id)
 
 static int am200_setup_irq(struct fb_info *info)
 {
-	int retval;
+	int ret;
 
-	retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
+	ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
 				IRQF_DISABLED, "AM200", info);
-	if (retval) {
-		printk(KERN_ERR "am200epd: request_irq failed: %d\n", retval);
-		return retval;
+	if (ret) {
+		dev_err(&am200_device->dev, "request_irq failed: %d\n", ret);
+		return ret;
 	}
 
-	return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
+	ret = set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
+	if (ret)
+		dev_err(&am200_device->dev, "set_irq_type failed: %d\n", ret);
+
+	return ret;
 }
 
 static void am200_set_rst(struct metronomefb_par *par, int state)
 {
-	am200_set_gpio_output(RST_GPIO_PIN, state);
+	gpio_set_value(RST_GPIO_PIN, state);
 }
 
 static void am200_set_stdby(struct metronomefb_par *par, int state)
 {
-	am200_set_gpio_output(STDBY_GPIO_PIN, state);
+	gpio_set_value(STDBY_GPIO_PIN, state);
 }
 
 static int am200_wait_event(struct metronomefb_par *par)
 {
-	return wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+	return wait_event_timeout(par->waitq, gpio_get_value(RDY_GPIO_PIN), HZ);
 }
 
 static int am200_wait_event_intr(struct metronomefb_par *par)
 {
-	return wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+	int ret;
+
+	ret = wait_event_interruptible_timeout(par->waitq,
+					gpio_get_value(RDY_GPIO_PIN), HZ);
+	return ret;
 }
 
 static struct metronome_board am200_board = {
 	.owner			= THIS_MODULE,
-	.free_irq		= am200_free_irq,
 	.setup_irq		= am200_setup_irq,
-	.init_gpio_regs		= am200_init_gpio_regs,
-	.init_lcdc_regs		= am200_init_lcdc_regs,
-	.post_dma_setup		= am200_post_dma_setup,
+	.setup_io		= am200_init_gpio_regs,
+	.setup_fb		= am200_setup_fb,
 	.set_rst		= am200_set_rst,
 	.set_stdby		= am200_set_stdby,
 	.met_wait_event		= am200_wait_event,
 	.met_wait_event_intr	= am200_wait_event_intr,
+	.get_panel_type		= am200_get_panel_type,
+	.cleanup		= am200_cleanup,
 };
 
-static struct platform_device *am200_device;
-
 static int __init am200_init(void)
 {
 	int ret;
@@ -284,9 +332,13 @@ static int __init am200_init(void)
 
 static void __exit am200_exit(void)
 {
+	platform_device_unregister(am200_pxa_device_fb);
 	platform_device_unregister(am200_device);
 }
 
+module_param(panel_type, uint, 0);
+MODULE_PARM_DESC(panel_type, "Select the panel type: 6, 8, 97");
+
 module_init(am200_init);
 module_exit(am200_exit);
 
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index b72b73a..fe0eb07 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -127,6 +127,7 @@ struct platform_device pxa_device_fb = {
 	.num_resources	= ARRAY_SIZE(pxafb_resources),
 	.resource	= pxafb_resources,
 };
+EXPORT_SYMBOL_GPL(pxa_device_fb);
 
 void __init set_pxa_fb_info(struct pxafb_mach_info *info)
 {
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 09/10] metronomefb: convert printk to dev_dbg/err messages

[Jaya Kumar]

This patch converts the printk messages in metronomefb to dev_dbg/err type
messages.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 drivers/video/metronomefb.c |   49 +++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
index cc4c038..8ccd113 100644
--- a/drivers/video/metronomefb.c
+++ b/drivers/video/metronomefb.c
@@ -18,6 +18,8 @@
  * is provided as am200epd.c
  *
  */
+#define DEBUG 1
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -40,15 +42,6 @@
 
 #include <asm/unaligned.h>
 
-
-#define DEBUG 1
-#ifdef DEBUG
-#define DPRINTK(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)
-#else
-#define DPRINTK(f, a...)
-#endif
-
-
 /* Display specific information */
 #define DPY_W 832
 #define DPY_H 622
@@ -135,8 +128,8 @@ static u16 calc_img_cksum(u16 *start, int length)
 
 /* here we decode the incoming waveform file and populate metromem */
 #define EXP_WFORM_SIZE 47001
-static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
-				u8 *frame_count)
+static int __devinit load_waveform(u8 *mem, size_t size, int m, int t,
+				struct metronomefb_par *par)
 {
 	int tta;
 	int wmta;
@@ -148,9 +141,11 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
 	int wfm_idx, owfm_idx;
 	int mem_idx = 0;
 	struct waveform_hdr *wfm_hdr;
+	u8 *metromem = par->metromem_wfm;
+	struct device *dev = par->info->dev;
 
 	if (size != EXP_WFORM_SIZE) {
-		printk(KERN_ERR "Error: unexpected size %d != %d\n", size,
+		dev_err(dev, "Error: unexpected size %d != %d\n", size,
 					EXP_WFORM_SIZE);
 		return -EINVAL;
 	}
@@ -158,16 +153,16 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
 	wfm_hdr = (struct waveform_hdr *) mem;
 
 	if (wfm_hdr->fvsn != 1) {
-		printk(KERN_ERR "Error: bad fvsn %x\n", wfm_hdr->fvsn);
+		dev_err(dev, "Error: bad fvsn %x\n", wfm_hdr->fvsn);
 		return -EINVAL;
 	}
 	if (wfm_hdr->luts != 0) {
-		printk(KERN_ERR "Error: bad luts %x\n", wfm_hdr->luts);
+		dev_err(dev, "Error: bad luts %x\n", wfm_hdr->luts);
 		return -EINVAL;
 	}
 	cksum = calc_cksum(32, 47, mem);
 	if (cksum != wfm_hdr->wfm_cs) {
-		printk(KERN_ERR "Error: bad cksum %x != %x\n", cksum,
+		dev_err(dev, "Error: bad cksum %x != %x\n", cksum,
 					wfm_hdr->wfm_cs);
 		return -EINVAL;
 	}
@@ -175,7 +170,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
 	wfm_hdr->trc += 1;
 	for (i = 0; i < 5; i++) {
 		if (*(wfm_hdr->stuff2a + i) != 0) {
-			printk(KERN_ERR "Error: unexpected value in padding\n");
+			dev_err(dev, "Error: unexpected value in padding\n");
 			return -EINVAL;
 		}
 	}
@@ -200,7 +195,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
 		return -EINVAL;
 	cksum = calc_cksum(sizeof(*wfm_hdr), cksum_idx, mem);
 	if (cksum != mem[cksum_idx]) {
-		printk(KERN_ERR "Error: bad temperature range table cksum"
+		dev_err(dev, "Error: bad temperature range table cksum"
 				" %x != %x\n", cksum, mem[cksum_idx]);
 		return -EINVAL;
 	}
@@ -212,7 +207,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
 		return -EINVAL;
 	cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
 	if (cksum != mem[cksum_idx]) {
-		printk(KERN_ERR "Error: bad mode table address cksum"
+		dev_err(dev, "Error: bad mode table address cksum"
 				" %x != %x\n", cksum, mem[cksum_idx]);
 		return -EINVAL;
 	}
@@ -224,7 +219,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
 		return -EINVAL;
 	cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
 	if (cksum != mem[cksum_idx]) {
-		printk(KERN_ERR "Error: bad temperature table address cksum"
+		dev_err(dev, "Error: bad temperature table address cksum"
 			" %x != %x\n", cksum, mem[cksum_idx]);
 		return -EINVAL;
 	}
@@ -259,11 +254,11 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
 		return -EINVAL;
 	cksum = calc_cksum(owfm_idx, cksum_idx, mem);
 	if (cksum != mem[cksum_idx]) {
-		printk(KERN_ERR "Error: bad waveform data cksum"
+		dev_err(dev, "Error: bad waveform data cksum"
 				" %x != %x\n", cksum, mem[cksum_idx]);
 		return -EINVAL;
 	}
-	*frame_count = (mem_idx/64);
+	par->frame_count = (mem_idx/64);
 
 	return 0;
 }
@@ -662,15 +657,15 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 		b) process waveform and decode into metromem */
 	retval = request_firmware(&fw_entry, "metronome.wbf", &dev->dev);
 	if (retval < 0) {
-		printk(KERN_ERR "metronomefb: couldn't get waveform\n");
+		dev_err(&dev->dev, "Failed to get waveform\n");
 		goto err_dma_free;
 	}
 
-	retval = load_waveform((u8 *) fw_entry->data, fw_entry->size,
-				par->metromem_wfm, 3, 31, &par->frame_count);
+	retval = load_waveform((u8 *) fw_entry->data, fw_entry->size, 3, 31,
+				par);
 	release_firmware(fw_entry);
 	if (retval < 0) {
-		printk(KERN_ERR "metronomefb: couldn't process waveform\n");
+		dev_err(&dev->dev, "Failed processing waveform\n");
 		goto err_dma_free;
 	}
 
@@ -688,7 +683,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 
 	retval = fb_alloc_cmap(&info->cmap, 8, 0);
 	if (retval < 0) {
-		printk(KERN_ERR "Failed to allocate colormap\n");
+		dev_err(&dev->dev, "Failed to allocate colormap\n");
 		goto err_fb_rel;
 	}
 
@@ -704,7 +699,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 
 	platform_set_drvdata(dev, info);
 
-	printk(KERN_INFO
+	dev_dbg(&dev->dev,
 		"fb%d: Metronome frame buffer device, using %dK of video"
 		" memory\n", info->node, videomemorysize >> 10);
 
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[RFC 2.6.26-rc3 10/10] metronomefb: changes to use separate framebuffer

[Jaya Kumar]

These changes are used in order to support the use of a separate
framebuffer provided by the platform device driver. Other changes
are cleanup to error handling and order of release.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
---
 drivers/video/metronomefb.c |  225 +++++++++++++++++++++++++------------------
 include/video/metronomefb.h |   22 ++---
 2 files changed, 138 insertions(+), 109 deletions(-)

diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
index 8ccd113..471b0c1 100644
--- a/drivers/video/metronomefb.c
+++ b/drivers/video/metronomefb.c
@@ -46,16 +46,59 @@
 #define DPY_W 832
 #define DPY_H 622
 
+static int user_wfm_size;
+
 /* frame differs from image. frame includes non-visible pixels */
 struct epd_frame {
 	int fw; /* frame width */
 	int fh; /* frame height */
+	u16 config[4];
+	int wfm_size;
 };
 
 static struct epd_frame epd_frame_table[] = {
 	{
-	.fw = 832,
-	.fh = 622
+		.fw = 832,
+		.fh = 622,
+		.config = {
+			15 /* sdlew */
+			| 2 << 8 /* sdosz */
+			| 0 << 11 /* sdor */
+			| 0 << 12 /* sdces */
+			| 0 << 15, /* sdcer */
+			42 /* gdspl */
+			| 1 << 8 /* gdr1 */
+			| 1 << 9 /* sdshr */
+			| 0 << 15, /* gdspp */
+			18 /* gdspw */
+			| 0 << 15, /* dispc */
+			599 /* vdlc */
+			| 0 << 11 /* dsi */
+			| 0 << 12, /* dsic */
+		},
+		.wfm_size = 47001,
+	},
+	{
+		.fw = 1088,
+		.fh = 791,
+		.config = {
+			0x0104,
+			0x031f,
+			0x0088,
+			0x02ff,
+		},
+		.wfm_size = 46770,
+	},
+	{
+		.fw = 1200,
+		.fh = 842,
+		.config = {
+			0x0101,
+			0x030e,
+			0x0012,
+			0x0280,
+		},
+		.wfm_size = 46770,
 	},
 };
 
@@ -127,7 +170,6 @@ static u16 calc_img_cksum(u16 *start, int length)
 }
 
 /* here we decode the incoming waveform file and populate metromem */
-#define EXP_WFORM_SIZE 47001
 static int __devinit load_waveform(u8 *mem, size_t size, int m, int t,
 				struct metronomefb_par *par)
 {
@@ -144,9 +186,12 @@ static int __devinit load_waveform(u8 *mem, size_t size, int m, int t,
 	u8 *metromem = par->metromem_wfm;
 	struct device *dev = par->info->dev;
 
-	if (size != EXP_WFORM_SIZE) {
+	if (user_wfm_size)
+		epd_frame_table[par->dt].wfm_size = user_wfm_size;
+
+	if (size != epd_frame_table[par->dt].wfm_size) {
 		dev_err(dev, "Error: unexpected size %d != %d\n", size,
-					EXP_WFORM_SIZE);
+					epd_frame_table[par->dt].wfm_size);
 		return -EINVAL;
 	}
 
@@ -330,44 +375,17 @@ static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)
 
 static int __devinit metronome_config_cmd(struct metronomefb_par *par)
 {
-	int i;
-	u16 cs;
-
 	/* setup config command
 	we can't immediately set the opcode since the controller
-	will try parse the command before we've set it all up
-	so we just set cs here and set the opcode at the end */
-
-	cs = 0xCC10;
-
-	/* set the 12 args ( 8 bytes ) for config. see spec for meanings */
-	i = 0;
-	par->metromem_cmd->args[i] = 	15 /* sdlew */
-					| 2 << 8 /* sdosz */
-					| 0 << 11 /* sdor */
-					| 0 << 12 /* sdces */
-					| 0 << 15; /* sdcer */
-	cs += par->metromem_cmd->args[i++];
-
-	par->metromem_cmd->args[i] = 	42 /* gdspl */
-					| 1 << 8 /* gdr1 */
-					| 1 << 9 /* sdshr */
-					| 0 << 15; /* gdspp */
-	cs += par->metromem_cmd->args[i++];
-
-	par->metromem_cmd->args[i] = 	18 /* gdspw */
-					| 0 << 15; /* dispc */
-	cs += par->metromem_cmd->args[i++];
-
-	par->metromem_cmd->args[i] = 	599 /* vdlc */
-					| 0 << 11 /* dsi */
-					| 0 << 12; /* dsic */
-	cs += par->metromem_cmd->args[i++];
+	will try parse the command before we've set it all up */
 
+	memcpy(par->metromem_cmd->args, epd_frame_table[par->dt].config,
+		sizeof(epd_frame_table[par->dt].config));
 	/* the rest are 0 */
-	memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+	memset((u8 *) (par->metromem_cmd->args + 4), 0, (32-4)*2);
 
-	par->metromem_cmd->csum = cs;
+	par->metromem_cmd->csum = 0xCC10;
+	par->metromem_cmd->csum += calc_img_cksum(par->metromem_cmd->args, 4);
 	par->metromem_cmd->opcode = 0xCC10; /* config cmd */
 
 	return par->board->met_wait_event(par);
@@ -403,12 +421,9 @@ static int __devinit metronome_init_regs(struct metronomefb_par *par)
 {
 	int res;
 
-	par->board->init_gpio_regs(par);
-
-	par->board->init_lcdc_regs(par);
-
-	/* now that lcd is setup, setup dma descriptor */
-	par->board->post_dma_setup(par);
+	res = par->board->setup_io(par);
+	if (res)
+		return res;
 
 	res = metronome_powerup_cmd(par);
 	if (res)
@@ -425,16 +440,16 @@ static int __devinit metronome_init_regs(struct metronomefb_par *par)
 
 static void metronomefb_dpy_update(struct metronomefb_par *par)
 {
+	int fbsize;
 	u16 cksum;
 	unsigned char *buf = (unsigned char __force *)par->info->screen_base;
 
+	fbsize = par->info->fix.smem_len;
 	/* copy from vm to metromem */
-	memcpy(par->metromem_img, buf, DPY_W*DPY_H);
+	memcpy(par->metromem_img, buf, fbsize);
 
-	cksum = calc_img_cksum((u16 *) par->metromem_img,
-				(epd_frame_table[0].fw * DPY_H)/2);
-	*((u16 *)(par->metromem_img) +
-			(epd_frame_table[0].fw * DPY_H)/2) = cksum;
+	cksum = calc_img_cksum((u16 *) par->metromem_img, fbsize/2);
+	*((u16 *)(par->metromem_img) + fbsize/2) = cksum;
 	metronome_display_cmd(par);
 }
 
@@ -569,8 +584,11 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 	unsigned char *videomemory;
 	struct metronomefb_par *par;
 	const struct firmware *fw_entry;
-	int cmd_size, wfm_size, img_size, padding_size, totalsize;
+	int cmd_size, wfm_size, padding_size;
 	int i;
+	int panel_type;
+	int fw, fh;
+	int epd_dt_index;
 
 	/* pick up board specific routines */
 	board = dev->dev.platform_data;
@@ -581,39 +599,65 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 	if (!try_module_get(board->owner))
 		return -ENODEV;
 
+	info = framebuffer_alloc(sizeof(struct metronomefb_par), &dev->dev);
+	if (!info)
+		goto err;
+
 	/* we have two blocks of memory.
 	info->screen_base which is vm, and is the fb used by apps.
 	par->metromem which is physically contiguous memory and
 	contains the display controller commands, waveform,
 	processed image data and padding. this is the data pulled
-	by the device's LCD controller and pushed to Metronome */
-
-	videomemorysize = (DPY_W*DPY_H);
+	by the device's LCD controller and pushed to Metronome.
+	the metromem memory is allocated by the board driver and
+	is provided to us */
+
+	panel_type = board->get_panel_type();
+	switch (panel_type) {
+	case 6:
+		epd_dt_index = 0;
+		break;
+	case 8:
+		epd_dt_index = 1;
+		break;
+	case 97:
+		epd_dt_index = 2;
+		break;
+	default:
+		dev_err(&dev->dev, "Unexpected panel type. Defaulting to 6\n");
+		epd_dt_index = 0;
+		break;
+	}
+	fw = epd_frame_table[epd_dt_index].fw;
+	fh = epd_frame_table[epd_dt_index].fh;
+	videomemorysize = fw * fh;
 	videomemory = vmalloc(videomemorysize);
 	if (!videomemory)
-		return -ENOMEM;
+		goto err_fb_rel;
 
 	memset(videomemory, 0, videomemorysize);
 
-	info = framebuffer_alloc(sizeof(struct metronomefb_par), &dev->dev);
-	if (!info)
-		goto err_vfree;
-
 	info->screen_base = (char __force __iomem *)videomemory;
 	info->fbops = &metronomefb_ops;
 
+	metronomefb_fix.line_length = fw;
+	metronomefb_var.xres = fw;
+	metronomefb_var.yres = fh;
+	metronomefb_var.xres_virtual = fw;
+	metronomefb_var.yres_virtual = fh;
 	info->var = metronomefb_var;
 	info->fix = metronomefb_fix;
 	info->fix.smem_len = videomemorysize;
 	par = info->par;
 	par->info = info;
 	par->board = board;
+	par->dt = epd_dt_index;
 	init_waitqueue_head(&par->waitq);
 
 	/* this table caches per page csum values. */
 	par->csum_table = vmalloc(videomemorysize/PAGE_SIZE);
 	if (!par->csum_table)
-		goto err_csum_table;
+		goto err_vfree;
 
 	/* the metromem buffer is divided as follows:
 	command | CRC | padding
@@ -623,34 +667,26 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 	eg: IW=832 IH=622 WS=128
 	*/
 
-	cmd_size = 1 * epd_frame_table[0].fw;
-	wfm_size = ((16*1024 + 2 + epd_frame_table[0].fw - 1)
-			/ epd_frame_table[0].fw) * epd_frame_table[0].fw;
-	img_size = epd_frame_table[0].fh * epd_frame_table[0].fw;
-	padding_size = 4 * epd_frame_table[0].fw;
-	totalsize = cmd_size + wfm_size + img_size + padding_size;
-	par->metromemsize = PAGE_ALIGN(totalsize + 256);
-	DPRINTK("desired memory size = %d\n", par->metromemsize);
-	dev->dev.coherent_dma_mask = 0xffffffffull;
-	par->metromem = dma_alloc_writecombine(&dev->dev, par->metromemsize,
-						&par->metromem_dma, GFP_KERNEL);
+	cmd_size = 1 * fw;
+	wfm_size = ((16*1024 + 2 + fw - 1) / fw) * fw;
+	padding_size = 4 * fw;
+	par->extra_size = cmd_size + wfm_size + padding_size;
+	retval = par->board->setup_fb(par);
+	if (retval) {
+		dev_err(&dev->dev, "Failed to setup fb\n");
+		goto err_csum_table;
+	}
+	/* after this point we should have a framebuffer */
 	if (!par->metromem) {
-		printk(KERN_ERR
-			"metronomefb: unable to allocate dma buffer\n");
-		goto err_vfree;
+		retval = -EINVAL;
+		goto err_csum_table;
 	}
 
 	info->fix.smem_start = par->metromem_dma;
 	par->metromem_cmd = (struct metromem_cmd *) par->metromem;
 	par->metromem_wfm = par->metromem + cmd_size;
 	par->metromem_img = par->metromem + cmd_size + wfm_size;
-	par->metromem_img_csum = (u16 *) (par->metromem_img +
-					(epd_frame_table[0].fw * DPY_H));
-	DPRINTK("img offset=0x%x\n", cmd_size + wfm_size);
-	par->metromem_desc = (struct metromem_desc *) (par->metromem + cmd_size
-					+ wfm_size + img_size + padding_size);
-	par->metromem_desc_dma = par->metromem_dma + cmd_size + wfm_size
-				 + img_size + padding_size;
+	par->metromem_img_csum = (u16 *) (par->metromem_img + (fw * fh));
 
 	/* load the waveform in. assume mode 3, temp 31 for now
 		a) request the waveform file from userspace
@@ -658,7 +694,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 	retval = request_firmware(&fw_entry, "metronome.wbf", &dev->dev);
 	if (retval < 0) {
 		dev_err(&dev->dev, "Failed to get waveform\n");
-		goto err_dma_free;
+		goto err_csum_table;
 	}
 
 	retval = load_waveform((u8 *) fw_entry->data, fw_entry->size, 3, 31,
@@ -666,11 +702,11 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 	release_firmware(fw_entry);
 	if (retval < 0) {
 		dev_err(&dev->dev, "Failed processing waveform\n");
-		goto err_dma_free;
+		goto err_csum_table;
 	}
 
 	if (board->setup_irq(info))
-		goto err_dma_free;
+		goto err_csum_table;
 
 	retval = metronome_init_regs(par);
 	if (retval < 0)
@@ -684,7 +720,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 	retval = fb_alloc_cmap(&info->cmap, 8, 0);
 	if (retval < 0) {
 		dev_err(&dev->dev, "Failed to allocate colormap\n");
-		goto err_fb_rel;
+		goto err_free_irq;
 	}
 
 	/* set cmap */
@@ -707,17 +743,15 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 
 err_cmap:
 	fb_dealloc_cmap(&info->cmap);
-err_fb_rel:
-	framebuffer_release(info);
 err_free_irq:
-	board->free_irq(info);
-err_dma_free:
-	dma_free_writecombine(&dev->dev, par->metromemsize, par->metromem,
-				par->metromem_dma);
+	board->cleanup(par);
 err_csum_table:
 	vfree(par->csum_table);
 err_vfree:
 	vfree(videomemory);
+err_fb_rel:
+	framebuffer_release(info);
+err:
 	module_put(board->owner);
 	return retval;
 }
@@ -728,15 +762,15 @@ static int __devexit metronomefb_remove(struct platform_device *dev)
 
 	if (info) {
 		struct metronomefb_par *par = info->par;
+
+		unregister_framebuffer(info);
 		fb_deferred_io_cleanup(info);
-		dma_free_writecombine(&dev->dev, par->metromemsize,
-					par->metromem, par->metromem_dma);
 		fb_dealloc_cmap(&info->cmap);
+		par->board->cleanup(par);
 		vfree(par->csum_table);
-		unregister_framebuffer(info);
 		vfree((void __force *)info->screen_base);
-		par->board->free_irq(info);
 		module_put(par->board->owner);
+		dev_dbg(&dev->dev, "calling release\n");
 		framebuffer_release(info);
 	}
 	return 0;
@@ -761,6 +795,9 @@ static void __exit metronomefb_exit(void)
 	platform_driver_unregister(&metronomefb_driver);
 }
 
+module_param(user_wfm_size, uint, 0);
+MODULE_PARM_DESC(user_wfm_size, "Set custom waveform size");
+
 module_init(metronomefb_init);
 module_exit(metronomefb_exit);
 
diff --git a/include/video/metronomefb.h b/include/video/metronomefb.h
index dab04b4..79444cd 100644
--- a/include/video/metronomefb.h
+++ b/include/video/metronomefb.h
@@ -12,14 +12,6 @@
 #ifndef _LINUX_METRONOMEFB_H_
 #define _LINUX_METRONOMEFB_H_
 
-/* address and control descriptors used by metronome controller */
-struct metromem_desc {
-	u32 mFDADR0;
-	u32 mFSADR0;
-	u32 mFIDR0;
-	u32 mLDCMD0;
-};
-
 /* command structure used by metronome controller */
 struct metromem_cmd {
 	u16 opcode;
@@ -30,33 +22,33 @@ struct metromem_cmd {
 /* struct used by metronome. board specific stuff comes from *board */
 struct metronomefb_par {
 	unsigned char *metromem;
-	struct metromem_desc *metromem_desc;
 	struct metromem_cmd *metromem_cmd;
 	unsigned char *metromem_wfm;
 	unsigned char *metromem_img;
 	u16 *metromem_img_csum;
 	u16 *csum_table;
-	int metromemsize;
 	dma_addr_t metromem_dma;
-	dma_addr_t metromem_desc_dma;
 	struct fb_info *info;
 	struct metronome_board *board;
 	wait_queue_head_t waitq;
 	u8 frame_count;
+	int extra_size;
+	int dt;
 };
 
 /* board specific routines */
 struct metronome_board {
 	struct module *owner;
-	void (*free_irq)(struct fb_info *);
-	void (*init_gpio_regs)(struct metronomefb_par *);
-	void (*init_lcdc_regs)(struct metronomefb_par *);
-	void (*post_dma_setup)(struct metronomefb_par *);
+	struct module *fbmaster;
 	void (*set_rst)(struct metronomefb_par *, int);
 	void (*set_stdby)(struct metronomefb_par *, int);
+	void (*cleanup)(struct metronomefb_par *);
 	int (*met_wait_event)(struct metronomefb_par *);
 	int (*met_wait_event_intr)(struct metronomefb_par *);
 	int (*setup_irq)(struct fb_info *);
+	int (*setup_fb)(struct metronomefb_par *);
+	int (*setup_io)(struct metronomefb_par *);
+	int (*get_panel_type)(void);
 };
 
 #endif
-- 
1.5.3.6


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 02/10] pxafb: cleanup and fix order of failure handling

[Krzysztof Helt]

On Thu, 12 Jun 2008 12:59:13 -0400
Jaya Kumar <jayakumar.lkml@gmail.com> wrote:

> This issue was found by Krzysztof Helt and Eric Miao.
> 
> pxafb had issues in the order with which it cleaned up if errors occurred
> during a probe. This patch reorders the failure handling sequence and also
> frees the cmap and clk.
> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
> ---

Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>

----------------------------------------------------------------------
Internetowy planer podrozy - sprawdz!
kliknij >>> http://link.interia.pl/f1e3a


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [Linux-fbdev-devel] [RFC 2.6.26-rc3 03/10] pxafb: fix __devinit/exit annotations

[Krzysztof Helt]

On Thu, 12 Jun 2008 12:59:14 -0400
Jaya Kumar <jayakumar.lkml@gmail.com> wrote:

> This patch fixes pxafb's init/exit annotations. It uses __devinit/exit for
> probe functions and __init for init functions. g_options is left as
> __devinitdata since it is used by both.
> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
> ---

Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>


----------------------------------------------------------------------
Sprawdz, czy jestes lepszy, niz Leo!
kliknij >>> http://link.interia.pl/f1e2f


-------------------------------------------------------------------
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

Re: [Linux-fbdev-devel] [RFC 2.6.26-rc3 04/10] pxafb: add exit and remove handlers

[Krzysztof Helt]

On Thu, 12 Jun 2008 12:59:15 -0400
Jaya Kumar <jayakumar.lkml@gmail.com> wrote:

> This patch adds exit and remove handlers to pxafb so that it can be loaded
> and unloaded as a module.
> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
> ---

Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>

----------------------------------------------------------------------
Szukasz tanich wycieczek? Sprawdz!
kliknij >>> http://link.interia.pl/f1e33


-------------------------------------------------------------------
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

Re: [RFC 2.6.26-rc3 01/10] pxafb: fix ifdef for command line option handling

[Eric Miao]

Krzysztof Helt wrote:
> On Thu, 12 Jun 2008 12:59:12 -0400
> Jaya Kumar <jayakumar.lkml@gmail.com> wrote:
> 
>> This bug was found and fixed by Lothar Wassmann.
>>
>> Previously, the use of ifndef CONFIG_MODULES made it such that pxafb command
>> line option parsing was dependent on whether the kernel was built with module
>> support. The ifndef should be MODULE so that parsing is dependent only on
>> whether the driver is built-in or not.
>>
>> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
>> ---
>>  drivers/video/pxafb.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
>> index 274bc93..dd013f3 100644
>> --- a/drivers/video/pxafb.c
>> +++ b/drivers/video/pxafb.c
>> @@ -1586,7 +1586,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
>>  
>>  static char g_options[256] __devinitdata = "";
>>  
>> -#ifndef CONFIG_MODULES
>> +#ifndef MODULE
>>  static int __devinit pxafb_setup_options(void)
>>  {
>>  	char *options = NULL;
>> -- 
> 
> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
> 
> Eric,
> Can you review and ack at least few first patches from this set?
> Jaya redoes this set for the third or fourth time and every time he
> redoes it I have to review the whole set again. If you can ack few
> first patches, he can upload them into RMK's patch system and
> redoes only a part of the set next time. Thank you in advance.
> 

Acked-by: Eric Miao <eric.miao@marvell.com>

> Krzysztof
> 
> 
> ----------------------------------------------------------------------
> Jeste¶ Polakiem i mieszkasz za granica? Sprawdz!
> kliknij >>> http://link.interia.pl/f1e38
> 
> 
> 
> 
> ------------------------------------------------------------------------
> 
> -------------------------------------------------------------------
> 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


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Linux-fbdev-devel mailing list
Linux-fbdev-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel

Re: [RFC 2.6.26-rc3 02/10] pxafb: cleanup and fix order of failure handling

[Eric Miao]

Krzysztof Helt wrote:
> On Thu, 12 Jun 2008 12:59:13 -0400
> Jaya Kumar <jayakumar.lkml@gmail.com> wrote:
> 
>> This issue was found by Krzysztof Helt and Eric Miao.
>>
>> pxafb had issues in the order with which it cleaned up if errors occurred
>> during a probe. This patch reorders the failure handling sequence and also
>> frees the cmap and clk.
>>
>> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
>> ---
> 
> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>

Acked-by: Eric Miao <eric.miao@marvell.com>

> 
> ----------------------------------------------------------------------
> Internetowy planer podrozy - sprawdz!
> kliknij >>> http://link.interia.pl/f1e3a
> 
> 
> -------------------------------------------------------------------
> 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


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 03/10] pxafb: fix __devinit/exit annotations

[Eric Miao]

Krzysztof Helt wrote:
> On Thu, 12 Jun 2008 12:59:14 -0400
> Jaya Kumar <jayakumar.lkml@gmail.com> wrote:
> 
>> This patch fixes pxafb's init/exit annotations. It uses __devinit/exit for
>> probe functions and __init for init functions. g_options is left as
>> __devinitdata since it is used by both.
>>
>> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
>> ---
> 
> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
> 

Acked-by: Eric Miao <eric.miao@marvell.com>

> 
> ----------------------------------------------------------------------
> Sprawdz, czy jestes lepszy, niz Leo!
> kliknij >>> http://link.interia.pl/f1e2f
> 
> 
> -------------------------------------------------------------------
> 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


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 04/10] pxafb: add exit and remove handlers

[Eric Miao]

Jaya Kumar wrote:
> This patch adds exit and remove handlers to pxafb so that it can be loaded
> and unloaded as a module.
> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>

Acked-by: Eric Miao <eric.miao@marvell.com>

> ---
>  drivers/video/pxafb.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 44 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
> index b891aac..89f1b48 100644
> --- a/drivers/video/pxafb.c
> +++ b/drivers/video/pxafb.c
> @@ -1790,11 +1790,49 @@ failed:
>  	return ret;
>  }
>  
> +static int __devexit pxafb_remove(struct platform_device *dev)
> +{
> +	struct pxafb_info *fbi = platform_get_drvdata(dev);
> +	struct resource *r;
> +	int irq;
> +	struct fb_info *info;
> +
> +	if (!fbi)
> +		return 0;
> +
> +	info = &fbi->fb;
> +
> +	unregister_framebuffer(info);
> +
> +	pxafb_disable_controller(fbi);
> +
> +	if (fbi->fb.cmap.len)
> +		fb_dealloc_cmap(&fbi->fb.cmap);
> +
> +	irq = platform_get_irq(dev, 0);
> +	free_irq(irq, fbi);
> +
> +	dma_free_writecombine(&dev->dev, fbi->map_size,
> +					fbi->map_cpu, fbi->map_dma);
> +
> +	iounmap(fbi->mmio_base);
> +
> +	r = platform_get_resource(dev, IORESOURCE_MEM, 0);
> +	release_mem_region(r->start, r->end - r->start + 1);
> +
> +	clk_put(fbi->clk);
> +	kfree(fbi);
> +
> +	return 0;
> +}
> +
>  static struct platform_driver pxafb_driver = {
>  	.probe		= pxafb_probe,
> +	.remove 	= pxafb_remove,
>  	.suspend	= pxafb_suspend,
>  	.resume		= pxafb_resume,
>  	.driver		= {
> +		.owner	= THIS_MODULE,
>  		.name	= "pxa2xx-fb",
>  	},
>  };
> @@ -1807,7 +1845,13 @@ static int __init pxafb_init(void)
>  	return platform_driver_register(&pxafb_driver);
>  }
>  
> +static void __exit pxafb_exit(void)
> +{
> +	platform_driver_unregister(&pxafb_driver);
> +}
> +
>  module_init(pxafb_init);
> +module_exit(pxafb_exit);
>  
>  MODULE_DESCRIPTION("loadable framebuffer driver for PXA");
>  MODULE_LICENSE("GPL");


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Eric Miao]

Jaya Kumar wrote:
> This patch converts gumstix over to the MFP configuration system and adds
> bluetooth support. Added a CLK_32K clock to enable bluetooth.
> 

Overall looks ok to me, some concerns about the 32K timer, see my
comments below.

> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
> ---
>  arch/arm/mach-pxa/gumstix.c           |   79 ++++++++++++++++++++++++++-------
>  arch/arm/mach-pxa/pxa25x.c            |   31 +++++++++++++
>  include/asm-arm/arch-pxa/mfp-pxa25x.h |    1 +
>  3 files changed, 95 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
> index bdf2397..3e0a962 100644
> --- a/arch/arm/mach-pxa/gumstix.c
> +++ b/arch/arm/mach-pxa/gumstix.c
> @@ -20,8 +20,12 @@
>  #include <linux/init.h>
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
> +#include <linux/delay.h>
>  #include <linux/mtd/mtd.h>
>  #include <linux/mtd/partitions.h>
> +#include <linux/gpio.h>
> +#include <linux/err.h>
> +#include <linux/clk.h>
>  
>  #include <asm/setup.h>
>  #include <asm/memory.h>
> @@ -40,7 +44,7 @@
>  
>  #include <asm/arch/pxa-regs.h>
>  #include <asm/arch/pxa2xx-regs.h>
> -#include <asm/arch/pxa2xx-gpio.h>
> +#include <asm/arch/mfp-pxa25x.h>
>  
>  #include "generic.h"
>  
> @@ -85,21 +89,8 @@ static struct platform_device *devices[] __initdata = {
>  };
>  
>  #ifdef CONFIG_MMC_PXA

I'd suggest we use

#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)

so that even when PXA MMCI is built as a module, the platform data
is still available for later bind. Same below to the BT.

> -static struct pxamci_platform_data gumstix_mci_platform_data;
> -
> -static int gumstix_mci_init(struct device *dev, irq_handler_t detect_int,
> -				void *data)
> -{
> -	pxa_gpio_mode(GPIO6_MMCCLK_MD);
> -	pxa_gpio_mode(GPIO53_MMCCLK_MD);
> -	pxa_gpio_mode(GPIO8_MMCCS0_MD);
> -
> -	return 0;
> -}
> -
>  static struct pxamci_platform_data gumstix_mci_platform_data = {
>  	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,
> -	.init		= gumstix_mci_init,
>  };
>  
>  static void __init gumstix_mmc_init(void)
> @@ -109,7 +100,7 @@ static void __init gumstix_mmc_init(void)
>  #else
>  static void __init gumstix_mmc_init(void)
>  {
> -	printk(KERN_INFO "Gumstix mmc disabled\n");
> +	pr_debug("Gumstix mmc disabled\n");
>  }
>  #endif
>  
> @@ -126,12 +117,68 @@ static void __init gumstix_udc_init(void)
>  #else
>  static void gumstix_udc_init(void)
>  {
> -	printk(KERN_INFO "Gumstix udc is disabled\n");
> +	pr_debug("Gumstix udc is disabled\n");
> +}
> +#endif
> +
> +#ifdef CONFIG_BT
> +static void __init gumstix_bluetooth_init(void)
> +{
> +	int err;
> +	struct clk *clk32k;
> +
> +	clk32k = clk_get(NULL, "CLK_32K");
> +	if (IS_ERR(clk32k)) {
> +		pr_err("gumstix: failed to find 32kHz clock\n");
> +		return;
> +	}
> +	clk_enable(clk32k);

The 32KHz oscillator should be on by default, so I'm thinking of:

1. remove this clock source

or

2. enable/disable the clk by enable/disable the pin configuration
(i.e. switch between GPIO12_32KHz and GPIO12_GPIO)

> +
> +	err = gpio_direction_output(GPIO_GUMSTIX_BTRESET, 1);
> +	if (err) {
> +		pr_err("gumstix: can't reset bluetooth\n");
> +		return;
> +	}
> +	gpio_set_value(GPIO_GUMSTIX_BTRESET, 0);
> +	udelay(100);
> +	gpio_set_value(GPIO_GUMSTIX_BTRESET, 1);
> +}
> +#else
> +static void gumstix_bluetooth_init(void)
> +{
> +	pr_debug("Gumstix Bluetooth is disabled\n");
>  }
>  #endif
>  
> +static unsigned long gumstix_pin_config[] __initdata = {
> +#ifdef CONFIG_BT
> +	GPIO12_32KHz,
> +	/* BTUART */
> +	GPIO42_HWUART_RXD,
> +	GPIO43_HWUART_TXD,
> +	GPIO44_HWUART_CTS,
> +	GPIO45_HWUART_RTSL,
> +#endif
> +#ifdef CONFIG_MMC_PXA
> +	/* MMC */
> +	GPIO6_MMC_CLK,
> +	GPIO53_MMC_CLK,
> +	GPIO8_MMC_CS0,
> +#endif
> +	/* these are used by AM200EPD */
> +	GPIO51_GPIO,
> +	GPIO49_GPIO,
> +	GPIO48_GPIO,
> +	GPIO32_GPIO,
> +	GPIO17_GPIO,
> +	GPIO16_GPIO,
> +};
> +
>  static void __init gumstix_init(void)
>  {
> +	pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config));
> +
> +	gumstix_bluetooth_init();
>  	gumstix_udc_init();
>  	gumstix_mmc_init();
>  	(void) platform_add_devices(devices, ARRAY_SIZE(devices));
> diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
> index e5b417d..1ffe773 100644
> --- a/arch/arm/mach-pxa/pxa25x.c
> +++ b/arch/arm/mach-pxa/pxa25x.c
> @@ -22,6 +22,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/suspend.h>
>  #include <linux/sysdev.h>
> +#include <linux/delay.h>
>  
>  #include <asm/hardware.h>
>  #include <asm/arch/irqs.h>
> @@ -108,6 +109,30 @@ static const struct clkops clk_pxa25x_lcd_ops = {
>  	.getrate	= clk_pxa25x_lcd_getrate,
>  };
>  
> +static void clk_32k_enable(struct clk *clk)
> +{
> +	int timeout = 500;
> +
> +	OSCC |= OSCC_OON;
> +	do {
> +		if (OSCC & OSCC_OOK)
> +			break;
> +		udelay(1);
> +	} while (--timeout);
> +	if (!timeout)
> +		pr_err("Failed to start 32kHz clock\n");
> +}

As said, the 32K timer should really be started on the very begining,
I'd prefer a some kind of warning here if OSCC_OOK isn't set.

> +
> +static void clk_32k_disable(struct clk *clk)
> +{
> +	OSCC &= ~OSCC_OON;
> +}
> +

The 32K timer cannot be disabled once started, until a power-on or
hardware reset occurs.

> +static const struct clkops clk_32k_ops = {
> +	.enable		= clk_32k_enable,
> +	.disable	= clk_32k_disable,
> +};
> +
>  /*
>   * 3.6864MHz -> OST, GPIO, SSP, PWM, PLLs (95.842MHz, 147.456MHz)
>   * 95.842MHz -> MMC 19.169MHz, I2C 31.949MHz, FICP 47.923MHz, USB 47.923MHz
> @@ -118,6 +143,12 @@ static struct clk pxa25x_hwuart_clk =
>  ;
>  
>  static struct clk pxa25x_clks[] = {
> +	{
> +		.name           = "CLK_32K",
> +		.ops            = &clk_32k_ops,
> +		.rate           = 32000,
> +		.delay          = 70,
> +	},
>  	INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev),
>  	INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev),
>  	INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev),
> diff --git a/include/asm-arm/arch-pxa/mfp-pxa25x.h b/include/asm-arm/arch-pxa/mfp-pxa25x.h
> index 0499323..6c82a74 100644
> --- a/include/asm-arm/arch-pxa/mfp-pxa25x.h
> +++ b/include/asm-arm/arch-pxa/mfp-pxa25x.h
> @@ -79,6 +79,7 @@
>  #define GPIO43_HWUART_TXD	MFP_CFG_OUT(GPIO43, AF3, DRIVE_HIGH)
>  #define GPIO44_HWUART_CTS	MFP_CFG_IN(GPIO44, AF3)
>  #define GPIO45_HWUART_RTS	MFP_CFG_OUT(GPIO45, AF3, DRIVE_HIGH)
> +#define GPIO45_HWUART_RTSL	MFP_CFG_OUT(GPIO45, AF3, DRIVE_LOW)

Is this board specific or globally applicable? ISTR, RTS is low active,
so a HIGH in low power mode would be more appropriate that the remote
DCE will hold its data to send.

>  #define GPIO48_HWUART_TXD	MFP_CFG_OUT(GPIO48, AF1, DRIVE_HIGH)
>  #define GPIO49_HWUART_RXD	MFP_CFG_IN(GPIO49, AF1)
>  #define GPIO50_HWUART_CTS	MFP_CFG_IN(GPIO50, AF1)


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 07/10] am200epd: move am200epd to mach-pxa

[Eric Miao]

Jaya Kumar wrote:
> The am200epd driver was designed with bad assumptions. It manipulated
> GPSR/GPLR registers directly. It relied on direct access to the pxa LCDC
> registers which have since conflicted with commit
> ce4fb7b892a6d6c6a0f87366b26fd834d2923dd7 . This patch moves it into
> mach-pxa in preparation for an overhaul. This is done as a move rather
> than a removal in order to facilitate code review.

You may generate the patch with "-M" option, so that git can recognize
the file rename/move change.

Also, I think it would be better to merge this commit with your
following [patch 08] am200epd: conver to share fb and use gpio api,
that will be helpful for code review, and "-M" option should be
smart enough to make the change clear.

> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
> ---
>  arch/arm/mach-pxa/Kconfig    |   17 +++
>  arch/arm/mach-pxa/Makefile   |    1 +
>  arch/arm/mach-pxa/am200epd.c |  295 ++++++++++++++++++++++++++++++++++++++++++
>  drivers/video/Kconfig        |   13 --
>  drivers/video/Makefile       |    1 -
>  drivers/video/am200epd.c     |  295 ------------------------------------------
>  6 files changed, 313 insertions(+), 309 deletions(-)
>  create mode 100644 arch/arm/mach-pxa/am200epd.c
>  delete mode 100644 drivers/video/am200epd.c
> 
> diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
> index 5da7a68..1bcff21 100644
> --- a/arch/arm/mach-pxa/Kconfig
> +++ b/arch/arm/mach-pxa/Kconfig
> @@ -179,6 +179,23 @@ endchoice
>  
>  endif
>  
> +if MACH_GUMSTIX_F
> +
> +choice
> +	prompt "Select base board for Gumstix board"
> +
> +config MACH_AM200EPD
> +	tristate "Enable AM200EPD board support"
> +	select FB_METRONOME
> +	select FB_SYS_FILLRECT
> +	select FB_SYS_COPYAREA
> +	select FB_SYS_IMAGEBLIT
> +	select FB_SYS_FOPS
> +	select FB_DEFERRED_IO
> +
> +endchoice
> +
> +endif
>  
>  if MACH_TRIZEPS4
>  
> diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
> index 0e6d05b..c72db62 100644
> --- a/arch/arm/mach-pxa/Makefile
> +++ b/arch/arm/mach-pxa/Makefile
> @@ -20,6 +20,7 @@ obj-$(CONFIG_CPU_PXA320)	+= pxa320.o
>  
>  # Specific board support
>  obj-$(CONFIG_ARCH_GUMSTIX)	+= gumstix.o
> +obj-$(CONFIG_MACH_AM200EPD)	+= am200epd.o
>  obj-$(CONFIG_ARCH_LUBBOCK)	+= lubbock.o
>  obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
>  obj-$(CONFIG_MACH_MAINSTONE)	+= mainstone.o
> diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c
> new file mode 100644
> index 0000000..51e26c1
> --- /dev/null
> +++ b/arch/arm/mach-pxa/am200epd.c
> @@ -0,0 +1,295 @@
> +/*
> + * linux/drivers/video/am200epd.c -- Platform device for AM200 EPD kit
> + *
> + * Copyright (C) 2008, Jaya Kumar
> + *
> + * This file is subject to the terms and conditions of the GNU General Public
> + * License. See the file COPYING in the main directory of this archive for
> + * more details.
> + *
> + * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
> + *
> + * This work was made possible by help and equipment support from E-Ink
> + * Corporation. http://support.eink.com/community
> + *
> + * This driver is written to be used with the Metronome display controller.
> + * on the AM200 EPD prototype kit/development kit with an E-Ink 800x600
> + * Vizplex EPD on a Gumstix board using the Lyre interface board.
> + *
> + */
> +
> +#include <linux/module.h>
> +#include <linux/kernel.h>
> +#include <linux/errno.h>
> +#include <linux/string.h>
> +#include <linux/delay.h>
> +#include <linux/interrupt.h>
> +#include <linux/fb.h>
> +#include <linux/init.h>
> +#include <linux/platform_device.h>
> +#include <linux/list.h>
> +#include <linux/uaccess.h>
> +#include <linux/irq.h>
> +
> +#include <video/metronomefb.h>
> +
> +#include <asm/arch/pxa-regs.h>
> +
> +/* register offsets for gpio control */
> +#define LED_GPIO_PIN 51
> +#define STDBY_GPIO_PIN 48
> +#define RST_GPIO_PIN 49
> +#define RDY_GPIO_PIN 32
> +#define ERR_GPIO_PIN 17
> +#define PCBPWR_GPIO_PIN 16
> +
> +#define AF_SEL_GPIO_N 0x3
> +#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
> +#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
> +#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
> +#define GPDR1_OFFSET(pin) (pin - 32)
> +#define GPCR1_OFFSET(pin) (pin - 32)
> +#define GPSR1_OFFSET(pin) (pin - 32)
> +#define GPCR0_OFFSET(pin) (pin)
> +#define GPSR0_OFFSET(pin) (pin)
> +
> +static void am200_set_gpio_output(int pin, int val)
> +{
> +	u8 index;
> +
> +	index = pin >> 4;
> +
> +	switch (index) {
> +	case 1:
> +		if (val)
> +			GPSR0 |= (1 << GPSR0_OFFSET(pin));
> +		else
> +			GPCR0 |= (1 << GPCR0_OFFSET(pin));
> +		break;
> +	case 2:
> +		break;
> +	case 3:
> +		if (val)
> +			GPSR1 |= (1 << GPSR1_OFFSET(pin));
> +		else
> +			GPCR1 |= (1 << GPCR1_OFFSET(pin));
> +		break;
> +	default:
> +		printk(KERN_ERR "unimplemented\n");
> +	}
> +}
> +
> +static void __devinit am200_init_gpio_pin(int pin, int dir)
> +{
> +	u8 index;
> +	/* dir 0 is output, 1 is input
> +	- do 2 things here:
> +	- set gpio alternate function to standard gpio
> +	- set gpio direction to input or output  */
> +
> +	index = pin >> 4;
> +	switch (index) {
> +	case 1:
> +		GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
> +
> +		if (dir)
> +			GPDR0 &= ~(1 << pin);
> +		else
> +			GPDR0 |= (1 << pin);
> +		break;
> +	case 2:
> +		GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
> +
> +		if (dir)
> +			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
> +		else
> +			GPDR1 |= (1 << GPDR1_OFFSET(pin));
> +		break;
> +	case 3:
> +		GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
> +
> +		if (dir)
> +			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
> +		else
> +			GPDR1 |= (1 << GPDR1_OFFSET(pin));
> +		break;
> +	default:
> +		printk(KERN_ERR "unimplemented\n");
> +	}
> +}
> +
> +static void am200_init_gpio_regs(struct metronomefb_par *par)
> +{
> +	am200_init_gpio_pin(LED_GPIO_PIN, 0);
> +	am200_set_gpio_output(LED_GPIO_PIN, 0);
> +
> +	am200_init_gpio_pin(STDBY_GPIO_PIN, 0);
> +	am200_set_gpio_output(STDBY_GPIO_PIN, 0);
> +
> +	am200_init_gpio_pin(RST_GPIO_PIN, 0);
> +	am200_set_gpio_output(RST_GPIO_PIN, 0);
> +
> +	am200_init_gpio_pin(RDY_GPIO_PIN, 1);
> +
> +	am200_init_gpio_pin(ERR_GPIO_PIN, 1);
> +
> +	am200_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
> +	am200_set_gpio_output(PCBPWR_GPIO_PIN, 0);
> +}
> +
> +static void am200_disable_lcd_controller(struct metronomefb_par *par)
> +{
> +	LCSR = 0xffffffff;	/* Clear LCD Status Register */
> +	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
> +
> +	/* we reset and just wait for things to settle */
> +	msleep(200);
> +}
> +
> +static void am200_enable_lcd_controller(struct metronomefb_par *par)
> +{
> +	LCSR = 0xffffffff;
> +	FDADR0 = par->metromem_desc_dma;
> +	LCCR0 |= LCCR0_ENB;
> +}
> +
> +static void am200_init_lcdc_regs(struct metronomefb_par *par)
> +{
> +	/* here we do:
> +	- disable the lcd controller
> +	- setup lcd control registers
> +	- setup dma descriptor
> +	- reenable lcd controller
> +	*/
> +
> +	/* disable the lcd controller */
> +	am200_disable_lcd_controller(par);
> +
> +	/* setup lcd control registers */
> +	LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
> +		| LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
> +
> +	LCCR1 = (par->info->var.xres/2 - 1) /* pixels per line */
> +		| (27 << 10) /* hsync pulse width - 1 */
> +		| (33 << 16) /* eol pixel count */
> +		| (33 << 24); /* bol pixel count */
> +
> +	LCCR2 = (par->info->var.yres - 1) /* lines per panel */
> +		| (24 << 10) /* vsync pulse width - 1 */
> +		| (2 << 16) /* eof pixel count */
> +		| (0 << 24); /* bof pixel count */
> +
> +	LCCR3 = 2 /* pixel clock divisor */
> +		| (24 << 8) /* AC Bias pin freq */
> +		| LCCR3_16BPP /* BPP */
> +		| LCCR3_PCP;  /* PCP falling edge */
> +
> +}
> +
> +static void am200_post_dma_setup(struct metronomefb_par *par)
> +{
> +	par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
> +	par->metromem_desc->mFSADR0 = par->metromem_dma;
> +	par->metromem_desc->mFIDR0 = 0;
> +	par->metromem_desc->mLDCMD0 = par->info->var.xres
> +					* par->info->var.yres;
> +	am200_enable_lcd_controller(par);
> +}
> +
> +static void am200_free_irq(struct fb_info *info)
> +{
> +	free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
> +}
> +
> +static irqreturn_t am200_handle_irq(int irq, void *dev_id)
> +{
> +	struct fb_info *info = dev_id;
> +	struct metronomefb_par *par = info->par;
> +
> +	wake_up_interruptible(&par->waitq);
> +	return IRQ_HANDLED;
> +}
> +
> +static int am200_setup_irq(struct fb_info *info)
> +{
> +	int retval;
> +
> +	retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
> +				IRQF_DISABLED, "AM200", info);
> +	if (retval) {
> +		printk(KERN_ERR "am200epd: request_irq failed: %d\n", retval);
> +		return retval;
> +	}
> +
> +	return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
> +}
> +
> +static void am200_set_rst(struct metronomefb_par *par, int state)
> +{
> +	am200_set_gpio_output(RST_GPIO_PIN, state);
> +}
> +
> +static void am200_set_stdby(struct metronomefb_par *par, int state)
> +{
> +	am200_set_gpio_output(STDBY_GPIO_PIN, state);
> +}
> +
> +static int am200_wait_event(struct metronomefb_par *par)
> +{
> +	return wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
> +}
> +
> +static int am200_wait_event_intr(struct metronomefb_par *par)
> +{
> +	return wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
> +}
> +
> +static struct metronome_board am200_board = {
> +	.owner			= THIS_MODULE,
> +	.free_irq		= am200_free_irq,
> +	.setup_irq		= am200_setup_irq,
> +	.init_gpio_regs		= am200_init_gpio_regs,
> +	.init_lcdc_regs		= am200_init_lcdc_regs,
> +	.post_dma_setup		= am200_post_dma_setup,
> +	.set_rst		= am200_set_rst,
> +	.set_stdby		= am200_set_stdby,
> +	.met_wait_event		= am200_wait_event,
> +	.met_wait_event_intr	= am200_wait_event_intr,
> +};
> +
> +static struct platform_device *am200_device;
> +
> +static int __init am200_init(void)
> +{
> +	int ret;
> +
> +	/* request our platform independent driver */
> +	request_module("metronomefb");
> +
> +	am200_device = platform_device_alloc("metronomefb", -1);
> +	if (!am200_device)
> +		return -ENOMEM;
> +
> +	platform_device_add_data(am200_device, &am200_board,
> +					sizeof(am200_board));
> +
> +	/* this _add binds metronomefb to am200. metronomefb refcounts am200 */
> +	ret = platform_device_add(am200_device);
> +
> +	if (ret)
> +		platform_device_put(am200_device);
> +
> +	return ret;
> +}
> +
> +static void __exit am200_exit(void)
> +{
> +	platform_device_unregister(am200_device);
> +}
> +
> +module_init(am200_init);
> +module_exit(am200_exit);
> +
> +MODULE_DESCRIPTION("board driver for am200 metronome epd kit");
> +MODULE_AUTHOR("Jaya Kumar");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index 002b61b..2bbd328 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -1937,19 +1937,6 @@ config FB_XILINX
>  	  framebuffer. ML300 carries a 640*480 LCD display on the board,
>  	  ML403 uses a standard DB15 VGA connector.
>  
> -config FB_AM200EPD
> -       tristate "AM-200 E-Ink EPD devkit support"
> -       depends on FB && ARCH_PXA && MMU
> -       select FB_SYS_FILLRECT
> -       select FB_SYS_COPYAREA
> -       select FB_SYS_IMAGEBLIT
> -       select FB_SYS_FOPS
> -       select FB_DEFERRED_IO
> -       select FB_METRONOME
> -       help
> -         This enables support for the Metronome display controller used on
> -         the E-Ink AM-200 EPD devkit.
> -
>  config FB_VIRTUAL
>  	tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
>  	depends on FB
> diff --git a/drivers/video/Makefile b/drivers/video/Makefile
> index 04bca35..80d5842 100644
> --- a/drivers/video/Makefile
> +++ b/drivers/video/Makefile
> @@ -29,7 +29,6 @@ obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o
>  
>  # Hardware specific drivers go first
>  obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
> -obj-$(CONFIG_FB_AM200EPD)         += am200epd.o
>  obj-$(CONFIG_FB_ARC)              += arcfb.o
>  obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
>  obj-$(CONFIG_FB_CYBER2000)        += cyber2000fb.o
> diff --git a/drivers/video/am200epd.c b/drivers/video/am200epd.c
> deleted file mode 100644
> index 51e26c1..0000000
> --- a/drivers/video/am200epd.c
> +++ /dev/null
> @@ -1,295 +0,0 @@
> -/*
> - * linux/drivers/video/am200epd.c -- Platform device for AM200 EPD kit
> - *
> - * Copyright (C) 2008, Jaya Kumar
> - *
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License. See the file COPYING in the main directory of this archive for
> - * more details.
> - *
> - * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
> - *
> - * This work was made possible by help and equipment support from E-Ink
> - * Corporation. http://support.eink.com/community
> - *
> - * This driver is written to be used with the Metronome display controller.
> - * on the AM200 EPD prototype kit/development kit with an E-Ink 800x600
> - * Vizplex EPD on a Gumstix board using the Lyre interface board.
> - *
> - */
> -
> -#include <linux/module.h>
> -#include <linux/kernel.h>
> -#include <linux/errno.h>
> -#include <linux/string.h>
> -#include <linux/delay.h>
> -#include <linux/interrupt.h>
> -#include <linux/fb.h>
> -#include <linux/init.h>
> -#include <linux/platform_device.h>
> -#include <linux/list.h>
> -#include <linux/uaccess.h>
> -#include <linux/irq.h>
> -
> -#include <video/metronomefb.h>
> -
> -#include <asm/arch/pxa-regs.h>
> -
> -/* register offsets for gpio control */
> -#define LED_GPIO_PIN 51
> -#define STDBY_GPIO_PIN 48
> -#define RST_GPIO_PIN 49
> -#define RDY_GPIO_PIN 32
> -#define ERR_GPIO_PIN 17
> -#define PCBPWR_GPIO_PIN 16
> -
> -#define AF_SEL_GPIO_N 0x3
> -#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
> -#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
> -#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
> -#define GPDR1_OFFSET(pin) (pin - 32)
> -#define GPCR1_OFFSET(pin) (pin - 32)
> -#define GPSR1_OFFSET(pin) (pin - 32)
> -#define GPCR0_OFFSET(pin) (pin)
> -#define GPSR0_OFFSET(pin) (pin)
> -
> -static void am200_set_gpio_output(int pin, int val)
> -{
> -	u8 index;
> -
> -	index = pin >> 4;
> -
> -	switch (index) {
> -	case 1:
> -		if (val)
> -			GPSR0 |= (1 << GPSR0_OFFSET(pin));
> -		else
> -			GPCR0 |= (1 << GPCR0_OFFSET(pin));
> -		break;
> -	case 2:
> -		break;
> -	case 3:
> -		if (val)
> -			GPSR1 |= (1 << GPSR1_OFFSET(pin));
> -		else
> -			GPCR1 |= (1 << GPCR1_OFFSET(pin));
> -		break;
> -	default:
> -		printk(KERN_ERR "unimplemented\n");
> -	}
> -}
> -
> -static void __devinit am200_init_gpio_pin(int pin, int dir)
> -{
> -	u8 index;
> -	/* dir 0 is output, 1 is input
> -	- do 2 things here:
> -	- set gpio alternate function to standard gpio
> -	- set gpio direction to input or output  */
> -
> -	index = pin >> 4;
> -	switch (index) {
> -	case 1:
> -		GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
> -
> -		if (dir)
> -			GPDR0 &= ~(1 << pin);
> -		else
> -			GPDR0 |= (1 << pin);
> -		break;
> -	case 2:
> -		GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
> -
> -		if (dir)
> -			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
> -		else
> -			GPDR1 |= (1 << GPDR1_OFFSET(pin));
> -		break;
> -	case 3:
> -		GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
> -
> -		if (dir)
> -			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
> -		else
> -			GPDR1 |= (1 << GPDR1_OFFSET(pin));
> -		break;
> -	default:
> -		printk(KERN_ERR "unimplemented\n");
> -	}
> -}
> -
> -static void am200_init_gpio_regs(struct metronomefb_par *par)
> -{
> -	am200_init_gpio_pin(LED_GPIO_PIN, 0);
> -	am200_set_gpio_output(LED_GPIO_PIN, 0);
> -
> -	am200_init_gpio_pin(STDBY_GPIO_PIN, 0);
> -	am200_set_gpio_output(STDBY_GPIO_PIN, 0);
> -
> -	am200_init_gpio_pin(RST_GPIO_PIN, 0);
> -	am200_set_gpio_output(RST_GPIO_PIN, 0);
> -
> -	am200_init_gpio_pin(RDY_GPIO_PIN, 1);
> -
> -	am200_init_gpio_pin(ERR_GPIO_PIN, 1);
> -
> -	am200_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
> -	am200_set_gpio_output(PCBPWR_GPIO_PIN, 0);
> -}
> -
> -static void am200_disable_lcd_controller(struct metronomefb_par *par)
> -{
> -	LCSR = 0xffffffff;	/* Clear LCD Status Register */
> -	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
> -
> -	/* we reset and just wait for things to settle */
> -	msleep(200);
> -}
> -
> -static void am200_enable_lcd_controller(struct metronomefb_par *par)
> -{
> -	LCSR = 0xffffffff;
> -	FDADR0 = par->metromem_desc_dma;
> -	LCCR0 |= LCCR0_ENB;
> -}
> -
> -static void am200_init_lcdc_regs(struct metronomefb_par *par)
> -{
> -	/* here we do:
> -	- disable the lcd controller
> -	- setup lcd control registers
> -	- setup dma descriptor
> -	- reenable lcd controller
> -	*/
> -
> -	/* disable the lcd controller */
> -	am200_disable_lcd_controller(par);
> -
> -	/* setup lcd control registers */
> -	LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
> -		| LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
> -
> -	LCCR1 = (par->info->var.xres/2 - 1) /* pixels per line */
> -		| (27 << 10) /* hsync pulse width - 1 */
> -		| (33 << 16) /* eol pixel count */
> -		| (33 << 24); /* bol pixel count */
> -
> -	LCCR2 = (par->info->var.yres - 1) /* lines per panel */
> -		| (24 << 10) /* vsync pulse width - 1 */
> -		| (2 << 16) /* eof pixel count */
> -		| (0 << 24); /* bof pixel count */
> -
> -	LCCR3 = 2 /* pixel clock divisor */
> -		| (24 << 8) /* AC Bias pin freq */
> -		| LCCR3_16BPP /* BPP */
> -		| LCCR3_PCP;  /* PCP falling edge */
> -
> -}
> -
> -static void am200_post_dma_setup(struct metronomefb_par *par)
> -{
> -	par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
> -	par->metromem_desc->mFSADR0 = par->metromem_dma;
> -	par->metromem_desc->mFIDR0 = 0;
> -	par->metromem_desc->mLDCMD0 = par->info->var.xres
> -					* par->info->var.yres;
> -	am200_enable_lcd_controller(par);
> -}
> -
> -static void am200_free_irq(struct fb_info *info)
> -{
> -	free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
> -}
> -
> -static irqreturn_t am200_handle_irq(int irq, void *dev_id)
> -{
> -	struct fb_info *info = dev_id;
> -	struct metronomefb_par *par = info->par;
> -
> -	wake_up_interruptible(&par->waitq);
> -	return IRQ_HANDLED;
> -}
> -
> -static int am200_setup_irq(struct fb_info *info)
> -{
> -	int retval;
> -
> -	retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
> -				IRQF_DISABLED, "AM200", info);
> -	if (retval) {
> -		printk(KERN_ERR "am200epd: request_irq failed: %d\n", retval);
> -		return retval;
> -	}
> -
> -	return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
> -}
> -
> -static void am200_set_rst(struct metronomefb_par *par, int state)
> -{
> -	am200_set_gpio_output(RST_GPIO_PIN, state);
> -}
> -
> -static void am200_set_stdby(struct metronomefb_par *par, int state)
> -{
> -	am200_set_gpio_output(STDBY_GPIO_PIN, state);
> -}
> -
> -static int am200_wait_event(struct metronomefb_par *par)
> -{
> -	return wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
> -}
> -
> -static int am200_wait_event_intr(struct metronomefb_par *par)
> -{
> -	return wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
> -}
> -
> -static struct metronome_board am200_board = {
> -	.owner			= THIS_MODULE,
> -	.free_irq		= am200_free_irq,
> -	.setup_irq		= am200_setup_irq,
> -	.init_gpio_regs		= am200_init_gpio_regs,
> -	.init_lcdc_regs		= am200_init_lcdc_regs,
> -	.post_dma_setup		= am200_post_dma_setup,
> -	.set_rst		= am200_set_rst,
> -	.set_stdby		= am200_set_stdby,
> -	.met_wait_event		= am200_wait_event,
> -	.met_wait_event_intr	= am200_wait_event_intr,
> -};
> -
> -static struct platform_device *am200_device;
> -
> -static int __init am200_init(void)
> -{
> -	int ret;
> -
> -	/* request our platform independent driver */
> -	request_module("metronomefb");
> -
> -	am200_device = platform_device_alloc("metronomefb", -1);
> -	if (!am200_device)
> -		return -ENOMEM;
> -
> -	platform_device_add_data(am200_device, &am200_board,
> -					sizeof(am200_board));
> -
> -	/* this _add binds metronomefb to am200. metronomefb refcounts am200 */
> -	ret = platform_device_add(am200_device);
> -
> -	if (ret)
> -		platform_device_put(am200_device);
> -
> -	return ret;
> -}
> -
> -static void __exit am200_exit(void)
> -{
> -	platform_device_unregister(am200_device);
> -}
> -
> -module_init(am200_init);
> -module_exit(am200_exit);
> -
> -MODULE_DESCRIPTION("board driver for am200 metronome epd kit");
> -MODULE_AUTHOR("Jaya Kumar");
> -MODULE_LICENSE("GPL");


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 08/10] am200epd: convert to shared fb and use gpio api

[Eric Miao]

Jaya Kumar wrote:
> This patch converts am200epd to use pxafb's fb and to stop performing
> direct access to LCDC registers. It now uses the generic GPIO api.
> 

Mmm..., this patch makes the code much cleaner now, see my comments below.

> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
> ---
>  arch/arm/mach-pxa/am200epd.c |  342 ++++++++++++++++++++++++------------------
>  arch/arm/mach-pxa/devices.c  |    1 +
>  2 files changed, 198 insertions(+), 145 deletions(-)
> 
> diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c
> index 51e26c1..67bed6c 100644
> --- a/arch/arm/mach-pxa/am200epd.c
> +++ b/arch/arm/mach-pxa/am200epd.c
> @@ -1,5 +1,5 @@
>  /*
> - * linux/drivers/video/am200epd.c -- Platform device for AM200 EPD kit
> + * am200epd.c -- Platform device for AM200 EPD kit
>   *
>   * Copyright (C) 2008, Jaya Kumar
>   *
> @@ -18,6 +18,8 @@
>   *
>   */
>  
> +#define DEBUG 1
> +
>  #include <linux/module.h>
>  #include <linux/kernel.h>
>  #include <linux/errno.h>
> @@ -27,13 +29,72 @@
>  #include <linux/fb.h>
>  #include <linux/init.h>
>  #include <linux/platform_device.h>
> -#include <linux/list.h>
> -#include <linux/uaccess.h>
>  #include <linux/irq.h>
> +#include <linux/gpio.h>
> +
> +#include <asm/arch/pxafb.h>
>  
>  #include <video/metronomefb.h>
>  
> -#include <asm/arch/pxa-regs.h>
> +#include "generic.h"
> +#include "devices.h"
> +
> +static unsigned int panel_type = 6;
> +static struct platform_device *am200_device;
> +static struct metronome_board am200_board;
> +
> +static struct pxafb_mode_info am200_fb_mode_9inch7 = {
> +	.pixclock	= 40000,
> +	.xres		= 1200,
> +	.yres		= 842,
> +	.bpp		= 16,
> +	.hsync_len	= 2,
> +	.left_margin	= 2,
> +	.right_margin	= 2,
> +	.vsync_len	= 1,
> +	.upper_margin	= 2,
> +	.lower_margin	= 25,
> +	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
> +};
> +
> +static struct pxafb_mode_info am200_fb_mode_8inch = {
> +	.pixclock	= 40000,
> +	.xres		= 1088,
> +	.yres		= 791,
> +	.bpp		= 16,
> +	.hsync_len	= 28,
> +	.left_margin	= 8,
> +	.right_margin	= 30,
> +	.vsync_len	= 8,
> +	.upper_margin	= 10,
> +	.lower_margin	= 8,
> +	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
> +};
> +
> +static struct pxafb_mode_info am200_fb_mode_6inch = {
> +	.pixclock	= 40189,
> +	.xres		= 832,
> +	.yres		= 622,
> +	.bpp		= 16,
> +	.hsync_len	= 28,
> +	.left_margin	= 34,
> +	.right_margin	= 34,
> +	.vsync_len	= 25,
> +	.upper_margin	= 0,
> +	.lower_margin	= 2,
> +	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
> +};
> +
> +static struct pxafb_mach_info am200_fb_info = {
> +	.modes		= &am200_fb_mode_6inch,
> +	.num_modes	= 1,
> +	.lccr0		= LCCR0_Pas | LCCR0_Sngl | LCCR0_Color,
> +	.lccr3		= 0,
> +	.lcd_conn	= LCD_TYPE_COLOR_TFT | LCD_PCLK_EDGE_FALL |
> +			  LCD_AC_BIAS_FREQ(24),

You don't need to specify both lccrX and lcd_conn, the pxafb.c should
be smart enough to guess a correct LCCRx setting based on lcd_conn.

> +	.clkdev		= &pxa_device_fb.dev,
> +	.custom_xfer_div = 2,
> +};
>  
>  /* register offsets for gpio control */
>  #define LED_GPIO_PIN 51
> @@ -42,163 +103,144 @@
>  #define RDY_GPIO_PIN 32
>  #define ERR_GPIO_PIN 17
>  #define PCBPWR_GPIO_PIN 16
> +static int gpios[] = { LED_GPIO_PIN , STDBY_GPIO_PIN , RST_GPIO_PIN,
> +			RDY_GPIO_PIN, ERR_GPIO_PIN, PCBPWR_GPIO_PIN };
> +static char *gpio_names[] = { "LED" , "STDBY" , "RST", "RDY", "ERR", "PCBPWR" };
>  
> -#define AF_SEL_GPIO_N 0x3
> -#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
> -#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
> -#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
> -#define GPDR1_OFFSET(pin) (pin - 32)
> -#define GPCR1_OFFSET(pin) (pin - 32)
> -#define GPSR1_OFFSET(pin) (pin - 32)
> -#define GPCR0_OFFSET(pin) (pin)
> -#define GPSR0_OFFSET(pin) (pin)
> -
> -static void am200_set_gpio_output(int pin, int val)
> +static int am200_init_gpio_regs(struct metronomefb_par *par)
>  {
> -	u8 index;
> +	int i;
> +	int err;
> +
> +	for (i = 0; i < ARRAY_SIZE(gpios); i++) {
> +		err = gpio_request(gpios[i], gpio_names[i]);
> +		if (err) {
> +			dev_err(&am200_device->dev, "failed requesting "
> +				"gpio %s, err=%d\n", gpio_names[i], err);
> +			goto err_req_gpio;
> +		}
> +	}
>  
> -	index = pin >> 4;
> +	gpio_direction_output(LED_GPIO_PIN, 0);
> +	gpio_direction_output(STDBY_GPIO_PIN, 0);
> +	gpio_direction_output(RST_GPIO_PIN, 0);
>  
> -	switch (index) {
> -	case 1:
> -		if (val)
> -			GPSR0 |= (1 << GPSR0_OFFSET(pin));
> -		else
> -			GPCR0 |= (1 << GPCR0_OFFSET(pin));
> -		break;
> -	case 2:
> -		break;
> -	case 3:
> -		if (val)
> -			GPSR1 |= (1 << GPSR1_OFFSET(pin));
> -		else
> -			GPCR1 |= (1 << GPCR1_OFFSET(pin));
> -		break;
> -	default:
> -		printk(KERN_ERR "unimplemented\n");
> -	}
> +	gpio_direction_input(RDY_GPIO_PIN);
> +	gpio_direction_input(ERR_GPIO_PIN);
> +
> +	gpio_direction_output(PCBPWR_GPIO_PIN, 0);
> +
> +	return 0;
> +
> +err_req_gpio:
> +	while (i > 0)
> +		gpio_free(gpios[i--]);
> +
> +	return err;
>  }
>  
> -static void __devinit am200_init_gpio_pin(int pin, int dir)
> +static void am200_cleanup(struct metronomefb_par *par)
>  {
> -	u8 index;
> -	/* dir 0 is output, 1 is input
> -	- do 2 things here:
> -	- set gpio alternate function to standard gpio
> -	- set gpio direction to input or output  */
> -
> -	index = pin >> 4;
> -	switch (index) {
> -	case 1:
> -		GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
> -
> -		if (dir)
> -			GPDR0 &= ~(1 << pin);
> -		else
> -			GPDR0 |= (1 << pin);
> -		break;
> -	case 2:
> -		GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
> +	int i;
>  
> -		if (dir)
> -			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
> -		else
> -			GPDR1 |= (1 << GPDR1_OFFSET(pin));
> -		break;
> -	case 3:
> -		GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
> +	free_irq(IRQ_GPIO(RDY_GPIO_PIN), par->info);
>  
> -		if (dir)
> -			GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
> -		else
> -			GPDR1 |= (1 << GPDR1_OFFSET(pin));
> -		break;
> -	default:
> -		printk(KERN_ERR "unimplemented\n");
> -	}
> +	for (i = 0; i < ARRAY_SIZE(gpios); i++)
> +		gpio_free(gpios[i]);
>  }
>  
> -static void am200_init_gpio_regs(struct metronomefb_par *par)
> +static struct platform_device *am200_pxa_device_fb;
> +
> +static int am200_pxa_register_device(struct platform_device *dev,
> +					struct pxafb_mach_info *data)
>  {
> -	am200_init_gpio_pin(LED_GPIO_PIN, 0);
> -	am200_set_gpio_output(LED_GPIO_PIN, 0);
> +	int ret;
>  
> -	am200_init_gpio_pin(STDBY_GPIO_PIN, 0);
> -	am200_set_gpio_output(STDBY_GPIO_PIN, 0);
> +	am200_pxa_device_fb = platform_device_alloc("pxa2xx-fb", -1);
> +	if (!am200_pxa_device_fb)
> +		return -ENOMEM;
>  
> -	am200_init_gpio_pin(RST_GPIO_PIN, 0);
> -	am200_set_gpio_output(RST_GPIO_PIN, 0);
> +	platform_device_add_data(am200_pxa_device_fb, data, sizeof(*data));
>  
> -	am200_init_gpio_pin(RDY_GPIO_PIN, 1);
> +	platform_device_add_resources(am200_pxa_device_fb,
> +					pxa_device_fb.resource,
> +					pxa_device_fb.num_resources);
>  
> -	am200_init_gpio_pin(ERR_GPIO_PIN, 1);
> +	am200_pxa_device_fb->dev.dma_mask = pxa_device_fb.dev.dma_mask;
> +	am200_pxa_device_fb->dev.coherent_dma_mask =
> +					pxa_device_fb.dev.coherent_dma_mask;
>  
> -	am200_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
> -	am200_set_gpio_output(PCBPWR_GPIO_PIN, 0);
> -}
> +	ret = platform_device_add(am200_pxa_device_fb);
>  
> -static void am200_disable_lcd_controller(struct metronomefb_par *par)
> -{
> -	LCSR = 0xffffffff;	/* Clear LCD Status Register */
> -	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
> +	if (ret) {
> +		dev_err(&am200_device->dev, "failed adding pxafb %d\n", ret);
> +		platform_device_put(am200_pxa_device_fb);
> +	}
>  
> -	/* we reset and just wait for things to settle */
> -	msleep(200);
> +	return ret;
>  }

Can set_pxa_fb_info() be used here instead of re-allocating a new
platform_device with almost same setting as pxa_device_fb?

>  
> -static void am200_enable_lcd_controller(struct metronomefb_par *par)
> +static int am200_share_video_mem(char __iomem *video_mem, dma_addr_t dma,
> +					struct module *fbmaster, void *data)
>  {
> -	LCSR = 0xffffffff;
> -	FDADR0 = par->metromem_desc_dma;
> -	LCCR0 |= LCCR0_ENB;
> +	struct metronomefb_par *par = data;
> +
> +	/* try to refcount the caller since we are the consumer after this */
> +	if (!try_module_get(fbmaster))
> +		return -ENODEV;
> +
> +	dev_dbg(&am200_device->dev, "mod_get %p\n", fbmaster);
> +	am200_board.fbmaster = fbmaster;
> +	par->metromem = (unsigned char __force *)video_mem;
> +	par->metromem_dma = dma;
> +
> +	return 0;
>  }
>  
> -static void am200_init_lcdc_regs(struct metronomefb_par *par)
> +static void am200_unshare_video_mem(void *data)
>  {
> -	/* here we do:
> -	- disable the lcd controller
> -	- setup lcd control registers
> -	- setup dma descriptor
> -	- reenable lcd controller
> -	*/
> -
> -	/* disable the lcd controller */
> -	am200_disable_lcd_controller(par);
> -
> -	/* setup lcd control registers */
> -	LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
> -		| LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
> -
> -	LCCR1 = (par->info->var.xres/2 - 1) /* pixels per line */
> -		| (27 << 10) /* hsync pulse width - 1 */
> -		| (33 << 16) /* eol pixel count */
> -		| (33 << 24); /* bol pixel count */
> -
> -	LCCR2 = (par->info->var.yres - 1) /* lines per panel */
> -		| (24 << 10) /* vsync pulse width - 1 */
> -		| (2 << 16) /* eof pixel count */
> -		| (0 << 24); /* bof pixel count */
> -
> -	LCCR3 = 2 /* pixel clock divisor */
> -		| (24 << 8) /* AC Bias pin freq */
> -		| LCCR3_16BPP /* BPP */
> -		| LCCR3_PCP;  /* PCP falling edge */
> +	struct metronomefb_par *par = data;
>  
> +	dev_dbg(&am200_device->dev, "ENTER %s\n", __func__);
> +	par->metromem = NULL;
> +	par->metromem_dma = 0;
> +	dev_dbg(&am200_device->dev, "mod_put %p\n", am200_board.fbmaster);
> +	module_put(am200_board.fbmaster);
>  }
>  
> -static void am200_post_dma_setup(struct metronomefb_par *par)
> +static int am200_setup_fb(struct metronomefb_par *par)
>  {
> -	par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
> -	par->metromem_desc->mFSADR0 = par->metromem_dma;
> -	par->metromem_desc->mFIDR0 = 0;
> -	par->metromem_desc->mLDCMD0 = par->info->var.xres
> -					* par->info->var.yres;
> -	am200_enable_lcd_controller(par);
> +	int ret;
> +
> +	am200_fb_info.extra_video_mem = par->extra_size;
> +	am200_fb_info.extra_data = (void *) par;
> +	am200_fb_info.share_video_mem = am200_share_video_mem;
> +	am200_fb_info.unshare_video_mem = am200_unshare_video_mem;
> +
> +	switch (panel_type) {
> +	case 6:
> +		am200_fb_info.modes = &am200_fb_mode_6inch;
> +		break;
> +	case 8:
> +		am200_fb_info.modes = &am200_fb_mode_8inch;
> +		break;
> +	case 97:
> +		am200_fb_info.modes = &am200_fb_mode_9inch7;
> +		break;
> +	default:
> +		dev_err(&am200_device->dev, "invalid panel_type selection,"
> +						" setting to 6\n");
> +		am200_fb_info.modes = &am200_fb_mode_6inch;
> +		break;
> +	}
> +
> +	ret = am200_pxa_register_device(&pxa_device_fb, &am200_fb_info);
> +	return ret;
>  }
>  
> -static void am200_free_irq(struct fb_info *info)
> +static int am200_get_panel_type(void)
>  {
> -	free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
> +	return panel_type;
>  }
>  
>  static irqreturn_t am200_handle_irq(int irq, void *dev_id)
> @@ -212,53 +254,59 @@ static irqreturn_t am200_handle_irq(int irq, void *dev_id)
>  
>  static int am200_setup_irq(struct fb_info *info)
>  {
> -	int retval;
> +	int ret;
>  
> -	retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
> +	ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
>  				IRQF_DISABLED, "AM200", info);
> -	if (retval) {
> -		printk(KERN_ERR "am200epd: request_irq failed: %d\n", retval);
> -		return retval;
> +	if (ret) {
> +		dev_err(&am200_device->dev, "request_irq failed: %d\n", ret);
> +		return ret;
>  	}
>  
> -	return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
> +	ret = set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);

This can be specified in request_irq(), e.g.

	request_irq(..., IRQF_DISABLED | IRQF_TRIGGER_FALLING, ...)

the rest of the edge configuration work will be automatically done.

> +	if (ret)
> +		dev_err(&am200_device->dev, "set_irq_type failed: %d\n", ret);
> +
> +	return ret;
>  }
>  
>  static void am200_set_rst(struct metronomefb_par *par, int state)
>  {
> -	am200_set_gpio_output(RST_GPIO_PIN, state);
> +	gpio_set_value(RST_GPIO_PIN, state);
>  }
>  
>  static void am200_set_stdby(struct metronomefb_par *par, int state)
>  {
> -	am200_set_gpio_output(STDBY_GPIO_PIN, state);
> +	gpio_set_value(STDBY_GPIO_PIN, state);
>  }
>  
>  static int am200_wait_event(struct metronomefb_par *par)
>  {
> -	return wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
> +	return wait_event_timeout(par->waitq, gpio_get_value(RDY_GPIO_PIN), HZ);
>  }
>  
>  static int am200_wait_event_intr(struct metronomefb_par *par)
>  {
> -	return wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
> +	int ret;
> +
> +	ret = wait_event_interruptible_timeout(par->waitq,
> +					gpio_get_value(RDY_GPIO_PIN), HZ);
> +	return ret;
>  }
>  
>  static struct metronome_board am200_board = {
>  	.owner			= THIS_MODULE,
> -	.free_irq		= am200_free_irq,
>  	.setup_irq		= am200_setup_irq,
> -	.init_gpio_regs		= am200_init_gpio_regs,
> -	.init_lcdc_regs		= am200_init_lcdc_regs,
> -	.post_dma_setup		= am200_post_dma_setup,
> +	.setup_io		= am200_init_gpio_regs,
> +	.setup_fb		= am200_setup_fb,
>  	.set_rst		= am200_set_rst,
>  	.set_stdby		= am200_set_stdby,
>  	.met_wait_event		= am200_wait_event,
>  	.met_wait_event_intr	= am200_wait_event_intr,
> +	.get_panel_type		= am200_get_panel_type,
> +	.cleanup		= am200_cleanup,
>  };
>  
> -static struct platform_device *am200_device;
> -
>  static int __init am200_init(void)
>  {
>  	int ret;
> @@ -284,9 +332,13 @@ static int __init am200_init(void)
>  
>  static void __exit am200_exit(void)
>  {
> +	platform_device_unregister(am200_pxa_device_fb);
>  	platform_device_unregister(am200_device);
>  }
>  
> +module_param(panel_type, uint, 0);
> +MODULE_PARM_DESC(panel_type, "Select the panel type: 6, 8, 97");
> +
>  module_init(am200_init);
>  module_exit(am200_exit);
>  
> diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
> index b72b73a..fe0eb07 100644
> --- a/arch/arm/mach-pxa/devices.c
> +++ b/arch/arm/mach-pxa/devices.c
> @@ -127,6 +127,7 @@ struct platform_device pxa_device_fb = {
>  	.num_resources	= ARRAY_SIZE(pxafb_resources),
>  	.resource	= pxafb_resources,
>  };
> +EXPORT_SYMBOL_GPL(pxa_device_fb);
>  
>  void __init set_pxa_fb_info(struct pxafb_mach_info *info)
>  {


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 09/10] metronomefb: convert printk to dev_dbg/err messages

[Eric Miao]

Jaya Kumar wrote:
> This patch converts the printk messages in metronomefb to dev_dbg/err type
> messages.
> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>

Acked-by: Eric Miao <eric.miao@marvell.com>

Except that you may want to disable DEBUG by default when pushing upstream.

> ---
>  drivers/video/metronomefb.c |   49 +++++++++++++++++++-----------------------
>  1 files changed, 22 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
> index cc4c038..8ccd113 100644
> --- a/drivers/video/metronomefb.c
> +++ b/drivers/video/metronomefb.c
> @@ -18,6 +18,8 @@
>   * is provided as am200epd.c
>   *
>   */
> +#define DEBUG 1
> +
>  #include <linux/module.h>
>  #include <linux/kernel.h>
>  #include <linux/errno.h>
> @@ -40,15 +42,6 @@
>  
>  #include <asm/unaligned.h>
>  
> -
> -#define DEBUG 1
> -#ifdef DEBUG
> -#define DPRINTK(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)
> -#else
> -#define DPRINTK(f, a...)
> -#endif
> -
> -
>  /* Display specific information */
>  #define DPY_W 832
>  #define DPY_H 622
> @@ -135,8 +128,8 @@ static u16 calc_img_cksum(u16 *start, int length)
>  
>  /* here we decode the incoming waveform file and populate metromem */
>  #define EXP_WFORM_SIZE 47001
> -static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
> -				u8 *frame_count)
> +static int __devinit load_waveform(u8 *mem, size_t size, int m, int t,
> +				struct metronomefb_par *par)
>  {
>  	int tta;
>  	int wmta;
> @@ -148,9 +141,11 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
>  	int wfm_idx, owfm_idx;
>  	int mem_idx = 0;
>  	struct waveform_hdr *wfm_hdr;
> +	u8 *metromem = par->metromem_wfm;
> +	struct device *dev = par->info->dev;
>  
>  	if (size != EXP_WFORM_SIZE) {
> -		printk(KERN_ERR "Error: unexpected size %d != %d\n", size,
> +		dev_err(dev, "Error: unexpected size %d != %d\n", size,
>  					EXP_WFORM_SIZE);
>  		return -EINVAL;
>  	}
> @@ -158,16 +153,16 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
>  	wfm_hdr = (struct waveform_hdr *) mem;
>  
>  	if (wfm_hdr->fvsn != 1) {
> -		printk(KERN_ERR "Error: bad fvsn %x\n", wfm_hdr->fvsn);
> +		dev_err(dev, "Error: bad fvsn %x\n", wfm_hdr->fvsn);
>  		return -EINVAL;
>  	}
>  	if (wfm_hdr->luts != 0) {
> -		printk(KERN_ERR "Error: bad luts %x\n", wfm_hdr->luts);
> +		dev_err(dev, "Error: bad luts %x\n", wfm_hdr->luts);
>  		return -EINVAL;
>  	}
>  	cksum = calc_cksum(32, 47, mem);
>  	if (cksum != wfm_hdr->wfm_cs) {
> -		printk(KERN_ERR "Error: bad cksum %x != %x\n", cksum,
> +		dev_err(dev, "Error: bad cksum %x != %x\n", cksum,
>  					wfm_hdr->wfm_cs);
>  		return -EINVAL;
>  	}
> @@ -175,7 +170,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
>  	wfm_hdr->trc += 1;
>  	for (i = 0; i < 5; i++) {
>  		if (*(wfm_hdr->stuff2a + i) != 0) {
> -			printk(KERN_ERR "Error: unexpected value in padding\n");
> +			dev_err(dev, "Error: unexpected value in padding\n");
>  			return -EINVAL;
>  		}
>  	}
> @@ -200,7 +195,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
>  		return -EINVAL;
>  	cksum = calc_cksum(sizeof(*wfm_hdr), cksum_idx, mem);
>  	if (cksum != mem[cksum_idx]) {
> -		printk(KERN_ERR "Error: bad temperature range table cksum"
> +		dev_err(dev, "Error: bad temperature range table cksum"
>  				" %x != %x\n", cksum, mem[cksum_idx]);
>  		return -EINVAL;
>  	}
> @@ -212,7 +207,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
>  		return -EINVAL;
>  	cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
>  	if (cksum != mem[cksum_idx]) {
> -		printk(KERN_ERR "Error: bad mode table address cksum"
> +		dev_err(dev, "Error: bad mode table address cksum"
>  				" %x != %x\n", cksum, mem[cksum_idx]);
>  		return -EINVAL;
>  	}
> @@ -224,7 +219,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
>  		return -EINVAL;
>  	cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
>  	if (cksum != mem[cksum_idx]) {
> -		printk(KERN_ERR "Error: bad temperature table address cksum"
> +		dev_err(dev, "Error: bad temperature table address cksum"
>  			" %x != %x\n", cksum, mem[cksum_idx]);
>  		return -EINVAL;
>  	}
> @@ -259,11 +254,11 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
>  		return -EINVAL;
>  	cksum = calc_cksum(owfm_idx, cksum_idx, mem);
>  	if (cksum != mem[cksum_idx]) {
> -		printk(KERN_ERR "Error: bad waveform data cksum"
> +		dev_err(dev, "Error: bad waveform data cksum"
>  				" %x != %x\n", cksum, mem[cksum_idx]);
>  		return -EINVAL;
>  	}
> -	*frame_count = (mem_idx/64);
> +	par->frame_count = (mem_idx/64);
>  
>  	return 0;
>  }
> @@ -662,15 +657,15 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
>  		b) process waveform and decode into metromem */
>  	retval = request_firmware(&fw_entry, "metronome.wbf", &dev->dev);
>  	if (retval < 0) {
> -		printk(KERN_ERR "metronomefb: couldn't get waveform\n");
> +		dev_err(&dev->dev, "Failed to get waveform\n");
>  		goto err_dma_free;
>  	}
>  
> -	retval = load_waveform((u8 *) fw_entry->data, fw_entry->size,
> -				par->metromem_wfm, 3, 31, &par->frame_count);
> +	retval = load_waveform((u8 *) fw_entry->data, fw_entry->size, 3, 31,
> +				par);
>  	release_firmware(fw_entry);
>  	if (retval < 0) {
> -		printk(KERN_ERR "metronomefb: couldn't process waveform\n");
> +		dev_err(&dev->dev, "Failed processing waveform\n");
>  		goto err_dma_free;
>  	}
>  
> @@ -688,7 +683,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
>  
>  	retval = fb_alloc_cmap(&info->cmap, 8, 0);
>  	if (retval < 0) {
> -		printk(KERN_ERR "Failed to allocate colormap\n");
> +		dev_err(&dev->dev, "Failed to allocate colormap\n");
>  		goto err_fb_rel;
>  	}
>  
> @@ -704,7 +699,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
>  
>  	platform_set_drvdata(dev, info);
>  
> -	printk(KERN_INFO
> +	dev_dbg(&dev->dev,
>  		"fb%d: Metronome frame buffer device, using %dK of video"
>  		" memory\n", info->node, videomemorysize >> 10);
>  


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 01/10] pxafb: fix ifdef for command line option handling

[Russell King - ARM Linux]

On Thu, Jun 12, 2008 at 12:59:12PM -0400, Jaya Kumar wrote:
> This bug was found and fixed by Lothar Wassmann.
> 
> Previously, the use of ifndef CONFIG_MODULES made it such that pxafb command
> line option parsing was dependent on whether the kernel was built with module
> support. The ifndef should be MODULE so that parsing is dependent only on
> whether the driver is built-in or not.
> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>

Ok.

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 02/10] pxafb: cleanup and fix order of failure handling

[Russell King - ARM Linux]

On Thu, Jun 12, 2008 at 12:59:13PM -0400, Jaya Kumar wrote:
> This issue was found by Krzysztof Helt and Eric Miao.
> 
> pxafb had issues in the order with which it cleaned up if errors occurred
> during a probe. This patch reorders the failure handling sequence and also
> frees the cmap and clk.
> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>

Ok.

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 03/10] pxafb: fix __devinit/exit annotations

[Russell King - ARM Linux]

On Thu, Jun 12, 2008 at 12:59:14PM -0400, Jaya Kumar wrote:
> This patch fixes pxafb's init/exit annotations. It uses __devinit/exit for
> probe functions and __init for init functions. g_options is left as
> __devinitdata since it is used by both.
> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>

Ok.

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 04/10] pxafb: add exit and remove handlers

[Russell King - ARM Linux]

On Thu, Jun 12, 2008 at 12:59:15PM -0400, Jaya Kumar wrote:
> This patch adds exit and remove handlers to pxafb so that it can be loaded
> and unloaded as a module.
> 
> Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>

Ok.

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Russell King - ARM Linux]

On Thu, Jun 12, 2008 at 12:59:17PM -0400, Jaya Kumar wrote:
> +static unsigned long gumstix_pin_config[] __initdata = {
> +#ifdef CONFIG_BT
> +	GPIO12_32KHz,
> +	/* BTUART */
> +	GPIO42_HWUART_RXD,
> +	GPIO43_HWUART_TXD,
> +	GPIO44_HWUART_CTS,
> +	GPIO45_HWUART_RTSL,
> +#endif
> +#ifdef CONFIG_MMC_PXA
> +	/* MMC */
> +	GPIO6_MMC_CLK,
> +	GPIO53_MMC_CLK,
> +	GPIO8_MMC_CS0,
> +#endif

Should GPIO configurations depend on whether the driver support's built
in or not?  Surely the hardware is there irrespective of the kernel's
configuration - especially if these are built as a module.

>  static struct clk pxa25x_clks[] = {
> +	{
> +		.name           = "CLK_32K",
> +		.ops            = &clk_32k_ops,
> +		.rate           = 32000,

Most 32kHz clocks are 32768Hz not 32000Hz.  Are you sure this is correct?

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Jaya Kumar]

On Thu, Jun 12, 2008 at 10:01 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> Jaya Kumar wrote:
>
> I'd suggest we use
>
> #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
>
> so that even when PXA MMCI is built as a module, the platform data
> is still available for later bind. Same below to the BT.

Yup, there are problems with my assumptions there. I see Russell's
point that gpio setup shouldn't depend on whether the driver is
enabled or not. I wasn't sure if all gumstix-F's had MMC and BT on
those gpio's so I tried to hedge that with CONFIG options. It looks
like it is safe to remove the CONFIG so I'll change that over.

>
> The 32KHz oscillator should be on by default, so I'm thinking of:
>
> 1. remove this clock source
>
> or
>
> 2. enable/disable the clk by enable/disable the pin configuration
> (i.e. switch between GPIO12_32KHz and GPIO12_GPIO)

Ok. I'll go read up and try to solve this. I think I put the enable in
there because it initially didn't work on my setup. I saw that the
gumstix bluetooth startup script S30bluetooth was manually tweaking
that using the pxaregs proc_gpio patch.

        echo -n "Starting 32kHz clock..."
        /usr/sbin/pxaregs OSCC_OON 1
        while /usr/sbin/pxaregs OSCC_OOK | tail -n 1 | grep -q -v 1;do
                echo -n '.'
                sleep 1
        done
        echo "Settled"

From the gumstix faq:
http://docwiki.gumstix.org/Frequently_asked_questions/Bluetooth
The new bluetooth module needs a 32Khz clock signal to be fed to the
module from the PXA by setting one of the GPIO lines to a special alt
function mode, and enabling the OSCC on the PXA. This is done properly
by the u-boot in the latest buildroot revisions, (as of Jan 27, 2006)
and double-checked by the latest bluetooth startup scripts in the
buildroot using pxaregs to ensure that the clock is in fact ticking
before attempting to talk to the BT module.

> As said, the 32K timer should really be started on the very begining,
> I'd prefer a some kind of warning here if OSCC_OOK isn't set.

Ok, I'll fix this.

>
>> +
>> +static void clk_32k_disable(struct clk *clk)
>> +{
>> +     OSCC &= ~OSCC_OON;
>> +}
>> +
>
> The 32K timer cannot be disabled once started, until a power-on or
> hardware reset occurs.

Ok, I'll take this out.

Thanks,
jaya

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Jaya Kumar]

On Fri, Jun 13, 2008 at 3:42 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Thu, Jun 12, 2008 at 12:59:17PM -0400, Jaya Kumar wrote:
>> +static unsigned long gumstix_pin_config[] __initdata = {
>> +#ifdef CONFIG_BT
>
> Should GPIO configurations depend on whether the driver support's built
> in or not?  Surely the hardware is there irrespective of the kernel's
> configuration - especially if these are built as a module.

You are right. I wasn't sure if all gumstix-F's had the same gpio
setup so I tried to hedge that with config options. But it looks safe
to remove that so I'll take them out.

>
>>  static struct clk pxa25x_clks[] = {
>> +     {
>> +             .name           = "CLK_32K",
>> +             .ops            = &clk_32k_ops,
>> +             .rate           = 32000,
>
> Most 32kHz clocks are 32768Hz not 32000Hz.  Are you sure this is correct?
>

You are right, that should be 32768. I'll fix that.

Thanks,
jaya

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 07/10] am200epd: move am200epd to mach-pxa

[Jaya Kumar]

On Thu, Jun 12, 2008 at 10:12 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> Jaya Kumar wrote:
>> The am200epd driver was designed with bad assumptions. It manipulated
>> GPSR/GPLR registers directly. It relied on direct access to the pxa LCDC
>> registers which have since conflicted with commit
>> ce4fb7b892a6d6c6a0f87366b26fd834d2923dd7 . This patch moves it into
>> mach-pxa in preparation for an overhaul. This is done as a move rather
>> than a removal in order to facilitate code review.
>
> You may generate the patch with "-M" option, so that git can recognize
> the file rename/move change.

Thanks! I had used git-mv and wondered why the patch was just a normal
diff when I generated it. For any other git newbies like myself, it
was:

git-format-patch -M -n --signoff --subject-prefix="RFC 2.6.26-rc3"
eb90d81d03c0917b0fd629f6342554a3b58ea52c
and that gives a nice:
---
 arch/arm/mach-pxa/Kconfig                       |   17 +++++++++++++++++
 arch/arm/mach-pxa/Makefile                      |    1 +
 {drivers/video => arch/arm/mach-pxa}/am200epd.c |    0
 drivers/video/Kconfig                           |   13 -------------
 drivers/video/Makefile                          |    1 -
 5 files changed, 18 insertions(+), 14 deletions(-)
 rename {drivers/video => arch/arm/mach-pxa}/am200epd.c (100%)

>
> Also, I think it would be better to merge this commit with your
> following [patch 08] am200epd: conver to share fb and use gpio api,
> that will be helpful for code review, and "-M" option should be
> smart enough to make the change clear.
>

Ok, git doesn't give me that result. When I merged the move patch with
the change patch, it no longer detects it as a move. I get the
following output:

 arch/arm/mach-pxa/Kconfig    |   17 ++
 arch/arm/mach-pxa/Makefile   |    1 +
 arch/arm/mach-pxa/am200epd.c |  347 ++++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-pxa/devices.c  |    1 +
 drivers/video/Kconfig        |   13 --
 drivers/video/Makefile       |    1 -
 drivers/video/am200epd.c     |  295 -----------------------------------
 7 files changed, 366 insertions(+), 309 deletions(-)
 create mode 100644 arch/arm/mach-pxa/am200epd.c
 delete mode 100644 drivers/video/am200epd.c

If it's okay, then I'll just use that when I regenerate the patchset next time.

Thanks,
jaya

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [Linux-fbdev-devel] [RFC 2.6.26-rc3 05/10] pxafb: add shared framebuffer interface

[Krzysztof Helt]

On Thu, 12 Jun 2008 12:59:16 -0400
Jaya Kumar <jayakumar.lkml@gmail.com> wrote:

> diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
> index 89f1b48..434587f 100644
> --- a/drivers/video/pxafb.c
> +++ b/drivers/video/pxafb.c
> @@ -1701,8 +1725,12 @@ static int __devinit pxafb_probe(struct platform_device *dev)
>  	}
>  
>  	/* Initialize video memory */
> -	ret = pxafb_map_video_memory(fbi);
> -	if (ret) {
> +	ret = pxafb_map_video_memory(fbi, inf);
> +	if (ret == -ENODEV) {
> +		dev_err(&dev->dev, "Failed device binding: %d\n", ret);
> +		ret = -ENODEV;

This line is redundant as the ret is already -ENODEV.

> +		goto failed_free_mem;
> +	} else if (ret) {
>  		dev_err(&dev->dev, "Failed to allocate video RAM: %d\n", ret);
>  		ret = -ENOMEM;

Probably, there is no need to change the error code (ret). You can drop this line.

Regards,
Krzysztof

----------------------------------------------------------------------
Z Map24 Twoja droga jest prosta! Sprawdz!
kliknij >>> http://link.interia.pl/f1e3b


-------------------------------------------------------------------
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

Re: [RFC 2.6.26-rc3 08/10] am200epd: convert to shared fb and use gpio api

[Jaya Kumar]

On Thu, Jun 12, 2008 at 10:20 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> Jaya Kumar wrote:
>> This patch converts am200epd to use pxafb's fb and to stop performing
>> direct access to LCDC registers. It now uses the generic GPIO api.
>>
>
> Mmm..., this patch makes the code much cleaner now, see my comments below.

Thanks :)

>> +static struct pxafb_mach_info am200_fb_info = {
>> +     .modes          = &am200_fb_mode_6inch,
>> +     .num_modes      = 1,
>> +     .lccr0          = LCCR0_Pas | LCCR0_Sngl | LCCR0_Color,
>> +     .lccr3          = 0,
>> +     .lcd_conn       = LCD_TYPE_COLOR_TFT | LCD_PCLK_EDGE_FALL |
>> +                       LCD_AC_BIAS_FREQ(24),
>
> You don't need to specify both lccrX and lcd_conn, the pxafb.c should
> be smart enough to guess a correct LCCRx setting based on lcd_conn.

Ok, will fix.

>
> Can set_pxa_fb_info() be used here instead of re-allocating a new
> platform_device with almost same setting as pxa_device_fb?

Actually, I had tried to do that and ran into problems on driver
unload. This is because pxa_device_fb is a statically declared struct
and not allocated using platform_device_alloc. So it is missing a
bunch of stuff needed for device release. I thought about changing
set_pxa_fb_info to do alloc instead but it seems too invasive. This
duplication seems easier.

>> -     return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
>> +     ret = set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
>
> This can be specified in request_irq(), e.g.
>
>        request_irq(..., IRQF_DISABLED | IRQF_TRIGGER_FALLING, ...)
>
> the rest of the edge configuration work will be automatically done.

Ok, will fix.

Thanks,
jaya

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 05/10] pxafb: add shared framebuffer interface

[Jaya Kumar]

On Sun, Jun 15, 2008 at 2:26 AM, Krzysztof Helt <krzysztof.h1@poczta.fm> wrote:
> On Thu, 12 Jun 2008 12:59:16 -0400
> Jaya Kumar <jayakumar.lkml@gmail.com> wrote:
>
>> +     ret = pxafb_map_video_memory(fbi, inf);
>> +     if (ret == -ENODEV) {
>> +             dev_err(&dev->dev, "Failed device binding: %d\n", ret);
>> +             ret = -ENODEV;
>
> This line is redundant as the ret is already -ENODEV.

Arr, sorry about that embarrassing mistake. I don't know why I didn't spot it.

>
>> +             goto failed_free_mem;
>> +     } else if (ret) {
>>               dev_err(&dev->dev, "Failed to allocate video RAM: %d\n", ret);
>>               ret = -ENOMEM;
>
> Probably, there is no need to change the error code (ret). You can drop this line.
>

Ok. Will do.

Thanks,
jaya

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Eric Miao]

Jaya Kumar wrote:
> On Thu, Jun 12, 2008 at 10:01 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
>> Jaya Kumar wrote:
>>
>> I'd suggest we use
>>
>> #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
>>
>> so that even when PXA MMCI is built as a module, the platform data
>> is still available for later bind. Same below to the BT.
> 
> Yup, there are problems with my assumptions there. I see Russell's
> point that gpio setup shouldn't depend on whether the driver is
> enabled or not. I wasn't sure if all gumstix-F's had MMC and BT on
> those gpio's so I tried to hedge that with CONFIG options. It looks
> like it is safe to remove the CONFIG so I'll change that over.
> 
>> The 32KHz oscillator should be on by default, so I'm thinking of:
>>
>> 1. remove this clock source
>>
>> or
>>
>> 2. enable/disable the clk by enable/disable the pin configuration
>> (i.e. switch between GPIO12_32KHz and GPIO12_GPIO)
> 
> Ok. I'll go read up and try to solve this. I think I put the enable in
> there because it initially didn't work on my setup. I saw that the
> gumstix bluetooth startup script S30bluetooth was manually tweaking
> that using the pxaregs proc_gpio patch.
> 
>         echo -n "Starting 32kHz clock..."
>         /usr/sbin/pxaregs OSCC_OON 1
>         while /usr/sbin/pxaregs OSCC_OOK | tail -n 1 | grep -q -v 1;do
>                 echo -n '.'
>                 sleep 1
>         done
>         echo "Settled"
> 
> From the gumstix faq:
> http://docwiki.gumstix.org/Frequently_asked_questions/Bluetooth
> The new bluetooth module needs a 32Khz clock signal to be fed to the
> module from the PXA by setting one of the GPIO lines to a special alt
> function mode, and enabling the OSCC on the PXA. This is done properly
> by the u-boot in the latest buildroot revisions, (as of Jan 27, 2006)
> and double-checked by the latest bluetooth startup scripts in the
> buildroot using pxaregs to ensure that the clock is in fact ticking
> before attempting to talk to the BT module.
> 

OK, so I assume with the latest u-boot (I mean after Jan 27, 2006), it
should boot up with 32KHz timer enabled, and you don't really need to
enable OSCC by default, right? Or would you be kind enough to test that
out?

You see, I'm a bit conservative to add clk support for 32KHz timer in
the kernel, as that should be started earlier, most suitable place will
be in the boot loader. If this doesn't work, we have to work it out in
another way.

>> As said, the 32K timer should really be started on the very begining,
>> I'd prefer a some kind of warning here if OSCC_OOK isn't set.
> 
> Ok, I'll fix this.
> 
>>> +
>>> +static void clk_32k_disable(struct clk *clk)
>>> +{
>>> +     OSCC &= ~OSCC_OON;
>>> +}
>>> +
>> The 32K timer cannot be disabled once started, until a power-on or
>> hardware reset occurs.
> 
> Ok, I'll take this out.
> 
> Thanks,
> jaya


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 07/10] am200epd: move am200epd to mach-pxa

[Eric Miao]

Jaya Kumar wrote:
> On Thu, Jun 12, 2008 at 10:12 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
>> Jaya Kumar wrote:
>>> The am200epd driver was designed with bad assumptions. It manipulated
>>> GPSR/GPLR registers directly. It relied on direct access to the pxa LCDC
>>> registers which have since conflicted with commit
>>> ce4fb7b892a6d6c6a0f87366b26fd834d2923dd7 . This patch moves it into
>>> mach-pxa in preparation for an overhaul. This is done as a move rather
>>> than a removal in order to facilitate code review.
>> You may generate the patch with "-M" option, so that git can recognize
>> the file rename/move change.
> 
> Thanks! I had used git-mv and wondered why the patch was just a normal
> diff when I generated it. For any other git newbies like myself, it
> was:
> 
> git-format-patch -M -n --signoff --subject-prefix="RFC 2.6.26-rc3"
> eb90d81d03c0917b0fd629f6342554a3b58ea52c
> and that gives a nice:
> ---
>  arch/arm/mach-pxa/Kconfig                       |   17 +++++++++++++++++
>  arch/arm/mach-pxa/Makefile                      |    1 +
>  {drivers/video => arch/arm/mach-pxa}/am200epd.c |    0
>  drivers/video/Kconfig                           |   13 -------------
>  drivers/video/Makefile                          |    1 -
>  5 files changed, 18 insertions(+), 14 deletions(-)
>  rename {drivers/video => arch/arm/mach-pxa}/am200epd.c (100%)
> 
>> Also, I think it would be better to merge this commit with your
>> following [patch 08] am200epd: conver to share fb and use gpio api,
>> that will be helpful for code review, and "-M" option should be
>> smart enough to make the change clear.
>>
> 
> Ok, git doesn't give me that result. When I merged the move patch with
> the change patch, it no longer detects it as a move. I get the
> following output:
> 
>  arch/arm/mach-pxa/Kconfig    |   17 ++
>  arch/arm/mach-pxa/Makefile   |    1 +
>  arch/arm/mach-pxa/am200epd.c |  347 ++++++++++++++++++++++++++++++++++++++++++
>  arch/arm/mach-pxa/devices.c  |    1 +
>  drivers/video/Kconfig        |   13 --
>  drivers/video/Makefile       |    1 -
>  drivers/video/am200epd.c     |  295 -----------------------------------
>  7 files changed, 366 insertions(+), 309 deletions(-)
>  create mode 100644 arch/arm/mach-pxa/am200epd.c
>  delete mode 100644 drivers/video/am200epd.c
> 
> If it's okay, then I'll just use that when I regenerate the patchset next time.
> 

Either way is fine to me.

> Thanks,
> jaya


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 08/10] am200epd: convert to shared fb and use gpio api

[Eric Miao]

Jaya Kumar wrote:
> On Thu, Jun 12, 2008 at 10:20 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
>> Jaya Kumar wrote:
>>> This patch converts am200epd to use pxafb's fb and to stop performing
>>> direct access to LCDC registers. It now uses the generic GPIO api.
>>>
>> Mmm..., this patch makes the code much cleaner now, see my comments below.
> 
> Thanks :)
> 
>>> +static struct pxafb_mach_info am200_fb_info = {
>>> +     .modes          = &am200_fb_mode_6inch,
>>> +     .num_modes      = 1,
>>> +     .lccr0          = LCCR0_Pas | LCCR0_Sngl | LCCR0_Color,
>>> +     .lccr3          = 0,
>>> +     .lcd_conn       = LCD_TYPE_COLOR_TFT | LCD_PCLK_EDGE_FALL |
>>> +                       LCD_AC_BIAS_FREQ(24),
>> You don't need to specify both lccrX and lcd_conn, the pxafb.c should
>> be smart enough to guess a correct LCCRx setting based on lcd_conn.
> 
> Ok, will fix.
> 
>> Can set_pxa_fb_info() be used here instead of re-allocating a new
>> platform_device with almost same setting as pxa_device_fb?
> 
> Actually, I had tried to do that and ran into problems on driver
> unload. This is because pxa_device_fb is a statically declared struct
> and not allocated using platform_device_alloc. So it is missing a
> bunch of stuff needed for device release. I thought about changing
> set_pxa_fb_info to do alloc instead but it seems too invasive. This
> duplication seems easier.
> 

I saw the device's name being "pxa2xx-fb", so I assume the pxafb.c
will take over the device, while I didn't see the
platform_unregister_device() in your module unload patch, could you
please be more specific on this, and see if we can work out a better
solution.

>>> -     return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
>>> +     ret = set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
>> This can be specified in request_irq(), e.g.
>>
>>        request_irq(..., IRQF_DISABLED | IRQF_TRIGGER_FALLING, ...)
>>
>> the rest of the edge configuration work will be automatically done.
> 
> Ok, will fix.
> 
> Thanks,
> jaya


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Jaya Kumar]

On Sun, Jun 15, 2008 at 7:21 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> OK, so I assume with the latest u-boot (I mean after Jan 27, 2006), it
> should boot up with 32KHz timer enabled, and you don't really need to
> enable OSCC by default, right? Or would you be kind enough to test that
> out?

Yes, you're right, it should get enabled by default with the newer
u-boot. I'll try it out. A bit scared about reflashing the boot loader
because the gumstix model that I have doesn't have JTAG. :-)

> You see, I'm a bit conservative to add clk support for 32KHz timer in
> the kernel, as that should be started earlier, most suitable place will
> be in the boot loader. If this doesn't work, we have to work it out in
> another way.

Agreed.

Thanks,
jaya

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Jaya Kumar]

On Thu, Jun 12, 2008 at 10:01 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> Jaya Kumar wrote:
>> diff --git a/include/asm-arm/arch-pxa/mfp-pxa25x.h b/include/asm-arm/arch-pxa/mfp-pxa25x.h
>> index 0499323..6c82a74 100644
>> --- a/include/asm-arm/arch-pxa/mfp-pxa25x.h
>> +++ b/include/asm-arm/arch-pxa/mfp-pxa25x.h
>> @@ -79,6 +79,7 @@
>>  #define GPIO43_HWUART_TXD    MFP_CFG_OUT(GPIO43, AF3, DRIVE_HIGH)
>>  #define GPIO44_HWUART_CTS    MFP_CFG_IN(GPIO44, AF3)
>>  #define GPIO45_HWUART_RTS    MFP_CFG_OUT(GPIO45, AF3, DRIVE_HIGH)
>> +#define GPIO45_HWUART_RTSL   MFP_CFG_OUT(GPIO45, AF3, DRIVE_LOW)
>
> Is this board specific or globally applicable? ISTR, RTS is low active,

I suspect it is board specific, ie: gumstix-[basix/connex]-bt
specific. I wasn't able to find schematics for this board but found
what is probably the same part of the design.

http://www.gumstix.org/schematics/B00002-HWUART.png?nocache=1

> so a HIGH in low power mode would be more appropriate that the remote
> DCE will hold its data to send.

I agree that RTS should start high. I'm not sure why the bt device
seems troubled in that state. I'll debug some more.

Thanks,
jaya

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08

Re: [RFC 2.6.26-rc3 08/10] am200epd: convert to shared fb and use gpio api

[Jaya Kumar]

On Sun, Jun 15, 2008 at 7:35 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> I saw the device's name being "pxa2xx-fb", so I assume the pxafb.c
> will take over the device, while I didn't see the
> platform_unregister_device() in your module unload patch, could you
> please be more specific on this, and see if we can work out a better
> solution.
>

Ok, here's my details of the platform handling between am200epd, pxafb
and metronomefb as currently implemented in this patch.

a) At a high level, the concept is that metronomefb is the upper layer
driver that has no arch specific knowledge. It manages interaction
with the Metronome controller. It requires a framebuffer, IO and panel
information from its platform device driver. In this case, its
platform device driver is am200epd.
b) am200epd gets its framebuffer access from pxafb and uses the gpio
api to perform IO on behalf of metronomefb.
c) So, the layers are metronomefb which uses am200epd which uses pxafb.
d) Module reference counting is metronomefb refcounts am200epd which
refcounts pxafb
e) Platform handling between metronomefb and am200epd is am200_device.
am200epd owns the platform_device and metronomefb is the
platform_driver. am200_device is alloc/add-ed and unregistered by
am200epd.
f) Platform handling between am200epd and pxafb is
am200_pxa_device_fb. am200epd owns the platform_device and pxa2xx-fb
(pxafb) is the platform_driver. am200_pxa_device_fb is alloc/add-ed
and unregistered by am200epd.

Okay, now we go to the details:
1] Loading
- The platform_device used between metronomefb and am200epd is
am200_device. It is platform_device_alloced/added by am200epd at init
time and also unregistered by am200epd at exit time.
- Metronomefb reference counts am200epd to make sure that am200epd
cannot be unloaded underneath it.
- Metronomefb calculates the size of additional framebuffer memory it needs.
- am200_setup_fb is called from metronomefb.
- am200_setup_fb calls am200_pxa_register_device.
- This calls platform_device_alloc("pxa2xx-fb" and passes pxafb the
am200_pxa_device_fb platform_device struct through platform_device_add
- pxafb then goes through its probe routine
- pxafb calls pxafb_map_video_memory in which we call
inf->share_video_mem which is am200epd's callback to get access to the
framebuffer and to refcount pxafb
- that completes setup and we return from platform_device_add in
am200epd which causes return from setup_fb back to metronomefb

2] Running
- so now setup is complete and refcounting will be metronomefb 0 ,
am200epd 1 [ by metronomefb] , pxafb 1 [ by am200epd]
eg:
am200epd                5832  1
pxafb                  16712  1
metronomefb             8296  0

3] Unloading
- because of the refcounting, the only order of unloading that this
system allows is metronomefb, am200epd, pxafb.
- when metronomefb is unloaded, board->cleanup and module_put is done
on am200epd
- now am200epd can be unloaded
- when rmmod am200epd, we do:
- am200_exit which does platform_device_unregister on am200_pxa_device_fb
- platform calls pxafb_remove which calls unshare_video_mem
- am200_unshare_video_mem then does the module_put on pxafb so now
pxafb is also ready for cleanup
- then back to am200_exit where we do platform_device_unregister on
am200_device which is clean
- now pxafb can be unloaded like normal

Weaknesses of current implementation:
- double framebuffer devices show up, eg: fb0 and fb1. pxafb registers
a framebuffer and so does metronomefb. But in reality there is only
one display output because pxa's AMLCD bus feeds into metronome and
finally into the E-Ink panel. I should probably add a flag requesting
pxafb skip registering its fb. But at the moment it doesn't harm the
system so I've left it for a future cleanup.
- not sure why the module owner names don't show up in lsmod output.
maybe something to look at but doesn't appear to harm the system.
- probably unnecessary unshare_video_mem because pxafb can't be
unloaded before am200epd in this design. I put this anyway because it
feels symmetrical to have a share and an unshare and I was worried
about stuff like rmmod -f.

I hope this all makes sense and that the design is okay. If not,
please don't hesitate to feedback, I'm happy to rework anything.

Thanks,
jaya

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Andrew Morton]

On Thu, 12 Jun 2008 12:59:17 -0400 Jaya Kumar <jayakumar.lkml@gmail.com> wrote:

> This patch converts gumstix over to the MFP configuration system and adds
> bluetooth support. Added a CLK_32K clock to enable bluetooth.

Please be aware that the regular fbdev maintainer (Tony) has been out
of contact for many months and that I very rarely read
linux-fbdev-devel.  So if/when you have fbdev patches which need
attention, please cc myself directly.



-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[krzysztof.h1]

> On Thu, 12 Jun 2008 12:59:17 -0400 Jaya Kumar <jayakumar.lkml@gmail.com>
> wrote:
> 
> > This patch converts gumstix over to the MFP configuration system and
> adds
> > bluetooth support. Added a CLK_32K clock to enable bluetooth.
> 
> Please be aware that the regular fbdev maintainer (Tony) has been out
> of contact for many months and that I very rarely read
> linux-fbdev-devel.  So if/when you have fbdev patches which need
> attention, please cc myself directly.
> 

Andrew,

Please skip Jaya patches. He sents them to arm-linux and fbdev-devel and got
reviews from me and Eric Miao (I review and Ack only fb related patches, so the gumstix
patch must be acked by Eric Miao).

He fixed and reposted this set few times. The latest repost is here:
http://marc.info/?l=linux-fbdev-devel&m=121742676828595&w=2

However, according to Jaya's answer he wants to push this patches through the arm tree (RMK's patch system):
http://marc.info/?l=linux-fbdev-devel&m=121734957011562&w=2

Any repost of the set to the fbdev-devel will be reviewed by me.

Regards,
Krzysztof
PS. As you are looking through the fbdev-devel, if you wants any old forgotten patch to be reviewed cc it to me and I will do today or tomorrow. I have some time for reviews as I stopped developing new crashes^Wfeatures for now ;-)


----------------------------------------------------------------------
Lubisz zagadki? Zagraj w puzzle na Smaker.pl!
Kliknij >>> http://link.interia.pl/f1eb0


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/

Re: [RFC 2.6.26-rc3 06/10] gumstix: conversion to MFP support and add bluetooth support

[Jaya Kumar]

On Thu, Jul 31, 2008 at 5:59 AM,  <krzysztof.h1@poczta.fm> wrote:
>> On Thu, 12 Jun 2008 12:59:17 -0400 Jaya Kumar <jayakumar.lkml@gmail.com>
>> wrote:
>>
>> > This patch converts gumstix over to the MFP configuration system and
>> adds
>> > bluetooth support. Added a CLK_32K clock to enable bluetooth.
>>
>> Please be aware that the regular fbdev maintainer (Tony) has been out
>> of contact for many months and that I very rarely read
>> linux-fbdev-devel.  So if/when you have fbdev patches which need
>> attention, please cc myself directly.
>>
>
> Andrew,
>
> Please skip Jaya patches. He sents them to arm-linux and fbdev-devel and got
> reviews from me and Eric Miao (I review and Ack only fb related patches, so the gumstix
> patch must be acked by Eric Miao).
>
> He fixed and reposted this set few times. The latest repost is here:
> http://marc.info/?l=linux-fbdev-devel&m=121742676828595&w=2
>
> However, according to Jaya's answer he wants to push this patches through the arm tree (RMK's patch system):
> http://marc.info/?l=linux-fbdev-devel&m=121734957011562&w=2
>
> Any repost of the set to the fbdev-devel will be reviewed by me.
>
> Regards,
> Krzysztof


Hi Andrew, Krzysztof,

Yes, I've been CCing fbdev for review and thanks to Krzysztof for
prior review of the fbdev patches. Once the patchset gets Eric's ack,
I'll push it through rmk for consistency since the previous pxafb
patches also went through rmk's tree.

Thanks,
jaya

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/