r4940 - developers/werner/gta03/cam/patches

werner at docs.openmoko.org werner at docs.openmoko.org
Fri Feb 27 05:39:06 CET 2009 

Author: werner
Date: 2009-02-27 05:39:05 +0100 (Fri, 27 Feb 2009)
New Revision: 4940

Added:
   developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
   developers/werner/gta03/cam/patches/mach-gta03-add-cam.patch
Modified:
   developers/werner/gta03/cam/patches/add-s3c-camif.patch
   developers/werner/gta03/cam/patches/series
Log:
Add CAMIF platform device and use it on GTA03. We now crash one clock later ;-)



Added: developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch	                        (rev 0)
+++ developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch	2009-02-27 04:39:05 UTC (rev 4940)
@@ -0,0 +1,90 @@
+Index: cam/arch/arm/plat-s3c/dev-camif.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ cam/arch/arm/plat-s3c/dev-camif.c	2009-02-27 12:32:43.000000000 +0800
+@@ -0,0 +1,59 @@
++/* linux/arch/arm/plat-s3c/dev-hsmmc.c
++ *
++ * Copyright (c) 2008 Simtec Electronics
++ *	Ben Dooks <ben at simtec.co.uk>
++ *	http://armlinux.simtec.co.uk/
++ *
++ * S3C series device definition for camera interface devices
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++*/
++
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++#include <linux/mmc/host.h>
++
++#include <mach/map.h>
++#include <plat/devs.h>
++#include <plat/cpu.h>
++
++
++#define	S3C6400_PA_CAMIF	0x78000000
++#define S3C24XX_SZ_CAMIF	(0x1000)
++
++
++static struct resource s3c_camif_resource[] = {
++	[0] = {
++		.start = S3C6400_PA_CAMIF,
++		.end   = S3C6400_PA_CAMIF + S3C24XX_SZ_CAMIF - 1,
++		.flags = IORESOURCE_MEM,
++	},
++	[1] = {
++		.start = IRQ_CAMIF_C,
++		.end   = IRQ_CAMIF_C,
++		.flags = IORESOURCE_IRQ,
++	},
++	[2] = {
++		.start = IRQ_CAMIF_P,
++		.end   = IRQ_CAMIF_P,
++		.flags = IORESOURCE_IRQ,
++	}
++
++};
++
++static u64 s3c_device_camif_dmamask = 0xffffffffUL;
++
++struct platform_device s3c_device_camif = {
++	.name		  = "s3c-camif",
++	.id		  = -1,
++	.num_resources	  = ARRAY_SIZE(s3c_camif_resource),
++	.resource	  = s3c_camif_resource,
++	.dev              = {
++		.dma_mask = &s3c_device_camif_dmamask,
++		.coherent_dma_mask = 0xffffffffUL
++	}
++};
++
++EXPORT_SYMBOL(s3c_device_camif);
+Index: cam/arch/arm/plat-s3c/Kconfig
+===================================================================
+--- cam.orig/arch/arm/plat-s3c/Kconfig	2009-02-27 12:29:18.000000000 +0800
++++ cam/arch/arm/plat-s3c/Kconfig	2009-02-27 12:29:23.000000000 +0800
+@@ -193,4 +193,9 @@
+ 	help
+ 	  Compile in platform device definition for framebuffer
+ 
++config S3C_DEV_CAMIF
++	bool
++	help
++	  Compile in platform device definitions for camera interface code
++
+ endif
+Index: cam/arch/arm/plat-s3c/Makefile
+===================================================================
+--- cam.orig/arch/arm/plat-s3c/Makefile	2009-02-27 12:29:18.000000000 +0800
++++ cam/arch/arm/plat-s3c/Makefile	2009-02-27 12:29:23.000000000 +0800
+@@ -31,6 +31,7 @@
+ obj-y				+= dev-i2c0.o
+ obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o
+ obj-$(CONFIG_S3C_DEV_FB)	+= dev-fb.o
++obj-$(CONFIG_S3C_DEV_CAMIF)	+= dev-camif.o
+ 
+ obj-$(CONFIG_S3C_PWM)		+= pwm.o
+ obj-$(CONFIG_S3C_DMA)		+= dma.o

Modified: developers/werner/gta03/cam/patches/add-s3c-camif.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-camif.patch	2009-02-26 15:59:11 UTC (rev 4939)
+++ developers/werner/gta03/cam/patches/add-s3c-camif.patch	2009-02-27 04:39:05 UTC (rev 4940)
@@ -1,7 +1,7 @@
 Index: cam/drivers/media/video/s3c_camera_driver.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ cam/drivers/media/video/s3c_camera_driver.c	2009-02-26 21:30:41.000000000 +0800
++++ cam/drivers/media/video/s3c_camera_driver.c	2009-02-27 11:44:41.000000000 +0800
 @@ -0,0 +1,1884 @@
 +/* drivers/media/video/s3c_camera_driver.c
 + *
@@ -1845,6 +1845,7 @@
 +
 +void s3c_camif_open_sensor(camif_cis_t *cis)
 +{
++printk("cam_clock %p cis %p\n", cam_clock, cis);
 +	clk_set_rate(cam_clock, cis->camclk);
 +	s3c_camif_reset(cis->reset_type, cis->reset_udelay);
 +}
@@ -1886,11 +1887,10 @@
 +MODULE_AUTHOR("Jinsung Yang <jsgood.yang at samsung.com>");
 +MODULE_DESCRIPTION("S3C Camera Driver for FIMC Interface");
 +MODULE_LICENSE("GPL");
-+
 Index: cam/drivers/media/video/s3c_camif.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ cam/drivers/media/video/s3c_camif.c	2009-02-26 22:28:44.000000000 +0800
++++ cam/drivers/media/video/s3c_camif.c	2009-02-26 23:54:22.000000000 +0800
 @@ -0,0 +1,1872 @@
 +/* drivers/media/video/s3c_camif.c
 + *
@@ -3767,7 +3767,7 @@
 Index: cam/drivers/media/video/s3c_camif.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ cam/drivers/media/video/s3c_camif.h	2009-02-26 21:30:41.000000000 +0800
++++ cam/drivers/media/video/s3c_camif.h	2009-02-26 23:54:22.000000000 +0800
 @@ -0,0 +1,404 @@
 +/* drivers/media/video/s3c_camif.h
 + *
@@ -4176,7 +4176,7 @@
 Index: cam/drivers/media/video/videodev2_s3c.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ cam/drivers/media/video/videodev2_s3c.h	2009-02-26 21:30:41.000000000 +0800
++++ cam/drivers/media/video/videodev2_s3c.h	2009-02-26 23:54:22.000000000 +0800
 @@ -0,0 +1,210 @@
 +#ifndef __VIDEODEV2_S3C_H_
 +#define __VIDEODEV2_S3C_H_

Added: developers/werner/gta03/cam/patches/mach-gta03-add-cam.patch
===================================================================
--- developers/werner/gta03/cam/patches/mach-gta03-add-cam.patch	                        (rev 0)
+++ developers/werner/gta03/cam/patches/mach-gta03-add-cam.patch	2009-02-27 04:39:05 UTC (rev 4940)
@@ -0,0 +1,33 @@
+Index: cam/arch/arm/mach-s3c6410/mach-om-gta03.c
+===================================================================
+--- cam.orig/arch/arm/mach-s3c6410/mach-om-gta03.c	2009-02-27 12:15:24.000000000 +0800
++++ cam/arch/arm/mach-s3c6410/mach-om-gta03.c	2009-02-27 12:17:54.000000000 +0800
+@@ -84,6 +84,8 @@
+ #include <plat/regs-usb-hs-otg.h>
+ 
+ extern struct platform_device s3c_device_usbgadget;
++extern struct platform_device s3c_device_camif; /* @@@ chgange plat/devs.h */
++
+ 
+ /* -------------------------------------------------------------------------------
+  * GTA03 FIQ related
+@@ -873,6 +875,7 @@
+ 	&gta03_device_spi_lcm,
+ 	&s3c_device_usbgadget,
+ 	&s3c24xx_pwm_device,
++	&s3c_device_camif,
+ };
+ 
+ 
+Index: cam/arch/arm/mach-s3c6410/Kconfig
+===================================================================
+--- cam.orig/arch/arm/mach-s3c6410/Kconfig	2009-02-27 12:18:00.000000000 +0800
++++ cam/arch/arm/mach-s3c6410/Kconfig	2009-02-27 12:19:57.000000000 +0800
+@@ -70,6 +70,7 @@
+ 	select S3C6410_SETUP_SDHCI
+ 	select S3C64XX_SETUP_I2C1
+ 	select S3C_DEV_FB
++	select S3C_DEV_CAMIF
+ 	select S3C64XX_SETUP_FB_24BPP
+ #	select SENSORS_PCF50633
+ 	select POWER_SUPPLY

Modified: developers/werner/gta03/cam/patches/series
===================================================================
--- developers/werner/gta03/cam/patches/series	2009-02-26 15:59:11 UTC (rev 4939)
+++ developers/werner/gta03/cam/patches/series	2009-02-27 04:39:05 UTC (rev 4940)
@@ -1,7 +1,8 @@
 add-s3c-cam-config.patch
-#mach-gta03-add-cam.patch
 add-s3c-camif-regs.patch
 add-samsung-cams-i2c.patch
 add-s5k4.patch
+add-64xx-cam-clock.patch
 add-s3c-camif.patch
-add-64xx-cam-clock.patch
+add-s3c-cam-platform.patch
+mach-gta03-add-cam.patch

More information about the commitlog mailing list