Few omap1 patches for v2.6.37 merge window
Subsystems (3)
Tony Lindgren
reviewercover Few omap1 patches for v2.6.37 merge window
Hi all,
Here are some omap1 related patches I've picked up for the upcoming merge window.
Regards,
Tony
---
Janusz Krzysztofik (3):
OMAP1: Add support for SoC camera interface
OMAP1: Amstrad Delta: add support for camera
OMAP1: Amstrad Delta: add camera controlled LEDS trigger
arch/arm/mach-omap1/board-ams-delta.c | 69 +++++++++++++++++++++++++++++ arch/arm/mach-omap1/devices.c | 43 ++++++++++++++++++ arch/arm/mach-omap1/include/mach/camera.h | 11 +++++ 3 files changed, 123 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap1/include/mach/camera.h
Signature · 1 line
Signature
Tony Lindgren
reviewerPATCH 1/3 OMAP1: Add support for SoC camera interface
From: Janusz Krzysztofik <[email protected]>
This patch adds a definition of the OMAP1 camera interface platform device, and a function that allows for providing a board specific platform data. The device will be used with the upcoming OMAP1 SoC camera interface driver.
--- arch/arm/mach-omap1/devices.c | 43 +++++++++++++++++++++++++++++ arch/arm/mach-omap1/include/mach/camera.h | 11 +++++++ 2 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap1/include/mach/camera.h
arch/arm/mach-omap1/devices.c +43 -0
@@ -9,6 +9,7 @@* (at your option) any later version. */ +#include <linux/dma-mapping.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -191,6 +192,48 @@ static inline void omap_init_spi100k(void) }#endif + +#define OMAP1_CAMERA_BASE 0xfffb6800 +#define OMAP1_CAMERA_IOSIZE 0x1c + +static struct resource omap1_camera_resources[] = { + [0 ] = { + .start =OMAP1_CAMERA_BASE , + .end =OMAP1_CAMERA_BASE +OMAP1_CAMERA_IOSIZE -1 , + .flags =IORESOURCE_MEM , + }, + [1 ] = { + .start =INT_CAMERA , + .flags =IORESOURCE_IRQ , + }, +}; + +static u64 omap1_camera_dma_mask =DMA_BIT_MASK (32 ); + +static struct platform_device omap1_camera_device = { + .name ="omap1-camera" , + .id =0 ,/* This is used to put cameras on this interface */ + .dev = { + .dma_mask = &omap1_camera_dma_mask, + .coherent_dma_mask =DMA_BIT_MASK (32 ), + }, + .num_resources =ARRAY_SIZE (omap1_camera_resources), + .resource = omap1_camera_resources, +}; + +void __init omap1_camera_init (void *info) +{ +struct platform_device *dev = &omap1_camera_device; +int ret; + + dev->dev.platform_data = info; + + ret =platform_device_register (dev); +if (ret) +dev_err (&dev->dev,"unable to register device: %d\n" , ret); +} + +/*-------------------------------------------------------------------------*/ static inline void omap_init_sti (void ) {}
arch/arm/mach-omap1/include/mach/camera.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef __ASM_ARCH_CAMERA_H_ +#define __ASM_ARCH_CAMERA_H_ + +void omap1_camera_init (void *); + +static inline void omap1_set_camera_info (struct omap1_cam_platform_data *info) +{ +omap1_camera_init (info); +} + +#endif /* __ASM_ARCH_CAMERA_H_ */
Tony Lindgren
reviewerPATCH 2/3 OMAP1: Amstrad Delta: add support for camera
In reply to Tony LindgrenFrom: Janusz Krzysztofik <[email protected]>
This patch adds configuration data and initialization code required for camera support to the Amstrad Delta board.
Three devices are declared: SoC camera, OMAP1 camera interface and OV6650 sensor.
Default 12MHz clock has been selected for driving the sensor. Pixel clock has been limited to get reasonable frame rates, not exceeding the board capabilities. Since both devices (interface and sensor) support both pixel clock polarities, decision on polarity selection has been left to drivers. Interface GPIO line has been found not functional, thus not configured.
--- arch/arm/mach-omap1/board-ams-delta.c | 45 +++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/board-ams-delta.c +45 -0
@@ -19,6 +19,8 @@#include <linux/platform_device.h> #include <linux/serial_8250.h> +#include <media/soc_camera.h> +#include <asm/serial.h> #include <mach/hardware.h> #include <asm/mach-types.h>
@@ -32,6 +34,7 @@#include <plat/usb.h> #include <plat/board.h> #include <plat/common.h> +#include <mach/camera.h> #include <mach/ams-delta-fiq.h>
@@ -213,10 +216,37 @@ static struct platform_device ams_delta_led_device = { .id = -1 }; +static struct i2c_board_info ams_delta_camera_board_info[] = { + { +I2C_BOARD_INFO ("ov6650" ,0x60 ), + }, +}; + +static struct soc_camera_link __initdata ams_delta_iclink = { + .bus_id =0 ,/* OMAP1 SoC camera bus */ + .i2c_adapter_id =1 , + .board_info = &ams_delta_camera_board_info[0 ], + .module_name ="ov6650" , +}; + +static struct platform_device ams_delta_camera_device = { + .name ="soc-camera-pdrv" , + .id =0 , + .dev = { + .platform_data = &ams_delta_iclink, + }, +}; + +static struct omap1_cam_platform_data ams_delta_camera_platform_data = { + .camexclk_khz =12000 ,/* default 12MHz clock, no extra DPLL */ + .lclk_khz_max =1334 ,/* results in 5fps CIF, 10fps QCIF */ +}; +static struct platform_device *ams_delta_devices[]__initdata = { &ams_delta_kp_device, &ams_delta_lcd_device, &ams_delta_led_device, + &ams_delta_camera_device, };static void __init ams_delta_init (void )
@@ -225,6 +255,20 @@ static void __init ams_delta_init(void)omap_cfg_reg (UART1_TX );omap_cfg_reg (UART1_RTS ); +/* parallel camera interface */ +omap_cfg_reg (H19_1610_CAM_EXCLK ); +omap_cfg_reg (J15_1610_CAM_LCLK ); +omap_cfg_reg (L18_1610_CAM_VS ); +omap_cfg_reg (L15_1610_CAM_HS ); +omap_cfg_reg (L19_1610_CAM_D0 ); +omap_cfg_reg (K14_1610_CAM_D1 ); +omap_cfg_reg (K15_1610_CAM_D2 ); +omap_cfg_reg (K19_1610_CAM_D3 ); +omap_cfg_reg (K18_1610_CAM_D4 ); +omap_cfg_reg (J14_1610_CAM_D5 ); +omap_cfg_reg (J19_1610_CAM_D6 ); +omap_cfg_reg (J18_1610_CAM_D7 ); +iotable_init (ams_delta_io_desc,ARRAY_SIZE (ams_delta_io_desc)); omap_board_config = ams_delta_config;
@@ -236,6 +280,7 @@ static void __init ams_delta_init(void)ams_delta_latch2_write (~0 ,0 );omap1_usb_init (&ams_delta_usb_config); +omap1_set_camera_info (&ams_delta_camera_platform_data);platform_add_devices (ams_delta_devices,ARRAY_SIZE (ams_delta_devices));#ifdef CONFIG_AMS_DELTA_FIQ
Tony Lindgren
reviewerPATCH 3/3 OMAP1: Amstrad Delta: add camera controlled LEDS trigger
In reply to Tony LindgrenFrom: Janusz Krzysztofik <[email protected]>
This patch extends the Amstrad Delta camera support with LEDS trigger that can be used for automatic control of the on-board camera LED. The led turns on automatically on camera device open and turns off on camera device close.
--- arch/arm/mach-omap1/board-ams-delta.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/board-ams-delta.c +24 -0
@@ -16,6 +16,7 @@#include <linux/init.h> #include <linux/input.h> #include <linux/interrupt.h> +#include <linux/leds.h> #include <linux/platform_device.h> #include <linux/serial_8250.h>
@@ -222,11 +223,30 @@ static struct i2c_board_info ams_delta_camera_board_info[] = { }, }; +#ifdef CONFIG_LEDS_TRIGGERS +DEFINE_LED_TRIGGER (ams_delta_camera_led_trigger); + +static int ams_delta_camera_power (struct device *dev,int power) +{ +/* +* turn on camera LED +*/ +if (power) +led_trigger_event (ams_delta_camera_led_trigger,LED_FULL ); +else +led_trigger_event (ams_delta_camera_led_trigger,LED_OFF ); +return 0 ; +} +#else +#define ams_delta_camera_power NULL +#endif +static struct soc_camera_link __initdata ams_delta_iclink = { .bus_id =0 ,/* OMAP1 SoC camera bus */ .i2c_adapter_id =1 , .board_info = &ams_delta_camera_board_info[0 ], .module_name ="ov6650" , + .power = ams_delta_camera_power, };static struct platform_device ams_delta_camera_device = {
@@ -281,6 +301,10 @@ static void __init ams_delta_init(void)omap1_usb_init (&ams_delta_usb_config);omap1_set_camera_info (&ams_delta_camera_platform_data); +#ifdef CONFIG_LEDS_TRIGGERS +led_trigger_register_simple ("ams_delta_camera" , + &ams_delta_camera_led_trigger); +#endif platform_add_devices (ams_delta_devices,ARRAY_SIZE (ams_delta_devices));#ifdef CONFIG_AMS_DELTA_FIQ