* [PATCH 0/2] ARM: S5PV210: GONI board update for CIF camera support
@ 2011-06-22 16:34 ` Sylwester Nawrocki
0 siblings, 0 replies; 8+ messages in thread
From: Sylwester Nawrocki @ 2011-06-22 16:34 UTC (permalink / raw)
To: linux-arm-kernel, linux-samsung-soc
Cc: kgene.kim, m.szyprowski, kyungmin.park, s.nawrocki, sw0312.kim,
riverful.kim
This patchset adds platform data definition for NOON010PC30 camera sensor
for GONI board and renames sclk_cam clocks on S5PV210 platform which is needed
for FIMC media device driver.
The whole patches converting s5p-fimc to media controller API can be found at:
http://git.infradead.org/users/kmpark/linux-2.6-samsung
branch: s5p-fimc-next
Sylwester Nawrocki (2):
ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
ARM: S5PV210: Add support for NOON010PC30 sensor on GONI board
arch/arm/mach-s5pv210/Kconfig | 1 +
arch/arm/mach-s5pv210/clock.c | 6 +---
arch/arm/mach-s5pv210/mach-goni.c | 52 +++++++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+), 4 deletions(-)
Created against for-next branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
Regards,
--
Sylwester Nawrocki
Samsung Poland R&D Center
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] ARM: S5PV210: GONI board update for CIF camera support
@ 2011-06-22 16:34 ` Sylwester Nawrocki
0 siblings, 0 replies; 8+ messages in thread
From: Sylwester Nawrocki @ 2011-06-22 16:34 UTC (permalink / raw)
To: linux-arm-kernel
This patchset adds platform data definition for NOON010PC30 camera sensor
for GONI board and renames sclk_cam clocks on S5PV210 platform which is needed
for FIMC media device driver.
The whole patches converting s5p-fimc to media controller API can be found at:
http://git.infradead.org/users/kmpark/linux-2.6-samsung
branch: s5p-fimc-next
Sylwester Nawrocki (2):
ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
ARM: S5PV210: Add support for NOON010PC30 sensor on GONI board
arch/arm/mach-s5pv210/Kconfig | 1 +
arch/arm/mach-s5pv210/clock.c | 6 +---
arch/arm/mach-s5pv210/mach-goni.c | 52 +++++++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+), 4 deletions(-)
Created against for-next branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
Regards,
--
Sylwester Nawrocki
Samsung Poland R&D Center
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
2011-06-22 16:34 ` Sylwester Nawrocki
@ 2011-06-22 16:34 ` Sylwester Nawrocki
-1 siblings, 0 replies; 8+ messages in thread
From: Sylwester Nawrocki @ 2011-06-22 16:34 UTC (permalink / raw)
To: linux-arm-kernel, linux-samsung-soc
Cc: kgene.kim, m.szyprowski, kyungmin.park, s.nawrocki, sw0312.kim,
riverful.kim
After s5p-fimc driver cvonversion to the media controller API
the sclk_cam clocks are managed by a top level media device driver
bound to "s5p-fimc-md" platform device. Rename sclk_cam clocks
so they can be aquired by the fimc media device.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/mach-s5pv210/clock.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index b5c95e6..0392f8b 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -844,8 +844,7 @@ static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },
}, {
.clk = {
- .name = "sclk_cam",
- .devname = "s5pv210-fimc.0",
+ .name = "sclk_cam0",
.enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 3),
},
@@ -854,8 +853,7 @@ static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 },
}, {
.clk = {
- .name = "sclk_cam",
- .devname = "s5pv210-fimc.1",
+ .name = "sclk_cam1",
.enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 4),
},
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
@ 2011-06-22 16:34 ` Sylwester Nawrocki
0 siblings, 0 replies; 8+ messages in thread
From: Sylwester Nawrocki @ 2011-06-22 16:34 UTC (permalink / raw)
To: linux-arm-kernel
After s5p-fimc driver cvonversion to the media controller API
the sclk_cam clocks are managed by a top level media device driver
bound to "s5p-fimc-md" platform device. Rename sclk_cam clocks
so they can be aquired by the fimc media device.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/mach-s5pv210/clock.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index b5c95e6..0392f8b 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -844,8 +844,7 @@ static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },
}, {
.clk = {
- .name = "sclk_cam",
- .devname = "s5pv210-fimc.0",
+ .name = "sclk_cam0",
.enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 3),
},
@@ -854,8 +853,7 @@ static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 },
}, {
.clk = {
- .name = "sclk_cam",
- .devname = "s5pv210-fimc.1",
+ .name = "sclk_cam1",
.enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 4),
},
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: S5PV210: Add support for NOON010PC30 sensor on GONI board
2011-06-22 16:34 ` Sylwester Nawrocki
@ 2011-06-22 16:34 ` Sylwester Nawrocki
-1 siblings, 0 replies; 8+ messages in thread
From: Sylwester Nawrocki @ 2011-06-22 16:34 UTC (permalink / raw)
To: linux-arm-kernel, linux-samsung-soc
Cc: kgene.kim, m.szyprowski, kyungmin.park, s.nawrocki, sw0312.kim,
riverful.kim
Add platform data for CIF camera sensor and FIMC platform data
entries for it. Add platform device for s5p-fimc media device
driver and the camera port A I/O pins initialization.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/mach-s5pv210/Kconfig | 1 +
arch/arm/mach-s5pv210/mach-goni.c | 52 +++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 37b5a97..43d6dd8 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -98,6 +98,7 @@ config MACH_GONI
select S5PV210_SETUP_I2C2
select S5PV210_SETUP_KEYPAD
select S5PV210_SETUP_SDHCI
+ select S5PV210_SETUP_FIMC
help
Machine support for Samsung GONI board
S5PC110(MCP) is one of package option of S5PV210
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 31d5aa7..78de63b 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -47,6 +47,10 @@
#include <plat/sdhci.h>
#include <plat/clock.h>
#include <plat/s5p-time.h>
+#include <plat/camport.h>
+
+#include <media/s5p_fimc.h>
+#include <media/noon010pc30.h>
/* Following are default values for UCON, ULCON and UFCON UART registers */
#define GONI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
@@ -271,6 +275,14 @@ static void __init goni_tsp_init(void)
i2c2_devs[0].irq = gpio_to_irq(gpio);
}
+static void goni_camera_init(void)
+{
+ s5pv210_fimc_setup_gpio(S5P_CAMPORT_A);
+
+ /* Set max driver strength on CAM_A_CLKOUT pin. */
+ s5p_gpio_set_drvstr(S5PV210_GPE1(3), S5P_GPIO_DRVSTR_LV4);
+}
+
/* MAX8998 regulators */
#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
@@ -800,6 +812,39 @@ static void goni_setup_sdhci(void)
s3c_sdhci2_set_platdata(&goni_hsmmc2_data);
};
+struct platform_device s5p_device_fimc_md = {
+ .name = "s5p-fimc-md",
+ .id = -1,
+};
+
+static struct noon010pc30_platform_data noon010pc30_pldata = {
+ .clk_rate = 16000000UL,
+ .gpio_nreset = S5PV210_GPB(2), /* CAM_CIF_NRST */
+ .gpio_nstby = S5PV210_GPB(0), /* CAM_CIF_NSTBY */
+};
+
+static struct i2c_board_info noon010pc30_board_info = {
+ I2C_BOARD_INFO("NOON010PC30", 0x60 >> 1),
+ .platform_data = &noon010pc30_pldata,
+};
+
+
+static struct s5p_fimc_isp_info goni_camera_sensors[] = {
+ {
+ .mux_id = 0,
+ .flags = FIMC_CLK_INV_PCLK | FIMC_CLK_INV_VSYNC,
+ .bus_type = FIMC_ITU_601,
+ .board_info = &noon010pc30_board_info,
+ .i2c_bus_num = 0,
+ .clk_frequency = 16000000UL,
+ },
+};
+
+struct s5p_platform_fimc goni_fimc_md_platdata __initdata = {
+ .isp_info = goni_camera_sensors,
+ .num_clients = ARRAY_SIZE(goni_camera_sensors),
+};
+
static struct platform_device *goni_devices[] __initdata = {
&s3c_device_fb,
&s5p_device_onenand,
@@ -812,6 +857,7 @@ static struct platform_device *goni_devices[] __initdata = {
&s5p_device_fimc0,
&s5p_device_fimc1,
&s5p_device_fimc2,
+ &s5p_device_fimc_md,
&s3c_device_hsmmc0,
&s3c_device_hsmmc1,
&s3c_device_hsmmc2,
@@ -875,6 +921,12 @@ static void __init goni_machine_init(void)
/* FB */
s3c_fb_set_platdata(&goni_lcd_pdata);
+ /* FIMC */
+ s3c_set_platdata(&goni_fimc_md_platdata, sizeof(goni_fimc_md_platdata),
+ &s5p_device_fimc_md);
+
+ goni_camera_init();
+
/* SPI */
spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: S5PV210: Add support for NOON010PC30 sensor on GONI board
@ 2011-06-22 16:34 ` Sylwester Nawrocki
0 siblings, 0 replies; 8+ messages in thread
From: Sylwester Nawrocki @ 2011-06-22 16:34 UTC (permalink / raw)
To: linux-arm-kernel
Add platform data for CIF camera sensor and FIMC platform data
entries for it. Add platform device for s5p-fimc media device
driver and the camera port A I/O pins initialization.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/mach-s5pv210/Kconfig | 1 +
arch/arm/mach-s5pv210/mach-goni.c | 52 +++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 37b5a97..43d6dd8 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -98,6 +98,7 @@ config MACH_GONI
select S5PV210_SETUP_I2C2
select S5PV210_SETUP_KEYPAD
select S5PV210_SETUP_SDHCI
+ select S5PV210_SETUP_FIMC
help
Machine support for Samsung GONI board
S5PC110(MCP) is one of package option of S5PV210
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 31d5aa7..78de63b 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -47,6 +47,10 @@
#include <plat/sdhci.h>
#include <plat/clock.h>
#include <plat/s5p-time.h>
+#include <plat/camport.h>
+
+#include <media/s5p_fimc.h>
+#include <media/noon010pc30.h>
/* Following are default values for UCON, ULCON and UFCON UART registers */
#define GONI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
@@ -271,6 +275,14 @@ static void __init goni_tsp_init(void)
i2c2_devs[0].irq = gpio_to_irq(gpio);
}
+static void goni_camera_init(void)
+{
+ s5pv210_fimc_setup_gpio(S5P_CAMPORT_A);
+
+ /* Set max driver strength on CAM_A_CLKOUT pin. */
+ s5p_gpio_set_drvstr(S5PV210_GPE1(3), S5P_GPIO_DRVSTR_LV4);
+}
+
/* MAX8998 regulators */
#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
@@ -800,6 +812,39 @@ static void goni_setup_sdhci(void)
s3c_sdhci2_set_platdata(&goni_hsmmc2_data);
};
+struct platform_device s5p_device_fimc_md = {
+ .name = "s5p-fimc-md",
+ .id = -1,
+};
+
+static struct noon010pc30_platform_data noon010pc30_pldata = {
+ .clk_rate = 16000000UL,
+ .gpio_nreset = S5PV210_GPB(2), /* CAM_CIF_NRST */
+ .gpio_nstby = S5PV210_GPB(0), /* CAM_CIF_NSTBY */
+};
+
+static struct i2c_board_info noon010pc30_board_info = {
+ I2C_BOARD_INFO("NOON010PC30", 0x60 >> 1),
+ .platform_data = &noon010pc30_pldata,
+};
+
+
+static struct s5p_fimc_isp_info goni_camera_sensors[] = {
+ {
+ .mux_id = 0,
+ .flags = FIMC_CLK_INV_PCLK | FIMC_CLK_INV_VSYNC,
+ .bus_type = FIMC_ITU_601,
+ .board_info = &noon010pc30_board_info,
+ .i2c_bus_num = 0,
+ .clk_frequency = 16000000UL,
+ },
+};
+
+struct s5p_platform_fimc goni_fimc_md_platdata __initdata = {
+ .isp_info = goni_camera_sensors,
+ .num_clients = ARRAY_SIZE(goni_camera_sensors),
+};
+
static struct platform_device *goni_devices[] __initdata = {
&s3c_device_fb,
&s5p_device_onenand,
@@ -812,6 +857,7 @@ static struct platform_device *goni_devices[] __initdata = {
&s5p_device_fimc0,
&s5p_device_fimc1,
&s5p_device_fimc2,
+ &s5p_device_fimc_md,
&s3c_device_hsmmc0,
&s3c_device_hsmmc1,
&s3c_device_hsmmc2,
@@ -875,6 +921,12 @@ static void __init goni_machine_init(void)
/* FB */
s3c_fb_set_platdata(&goni_lcd_pdata);
+ /* FIMC */
+ s3c_set_platdata(&goni_fimc_md_platdata, sizeof(goni_fimc_md_platdata),
+ &s5p_device_fimc_md);
+
+ goni_camera_init();
+
/* SPI */
spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* RE: [PATCH 0/2] ARM: S5PV210: GONI board update for CIF camera support
2011-06-22 16:34 ` Sylwester Nawrocki
@ 2011-06-29 13:13 ` Kukjin Kim
-1 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2011-06-29 13:13 UTC (permalink / raw)
To: 'Sylwester Nawrocki', linux-arm-kernel, linux-samsung-soc
Cc: m.szyprowski, kyungmin.park, sw0312.kim, riverful.kim
Sylwester Nawrocki wrote:
>
> This patchset adds platform data definition for NOON010PC30 camera sensor
> for GONI board and renames sclk_cam clocks on S5PV210 platform which is
> needed
> for FIMC media device driver.
>
> The whole patches converting s5p-fimc to media controller API can be found
at:
>
> http://git.infradead.org/users/kmpark/linux-2.6-samsung
> branch: s5p-fimc-next
>
> Sylwester Nawrocki (2):
> ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
> ARM: S5PV210: Add support for NOON010PC30 sensor on GONI board
>
> arch/arm/mach-s5pv210/Kconfig | 1 +
> arch/arm/mach-s5pv210/clock.c | 6 +---
> arch/arm/mach-s5pv210/mach-goni.c | 52
> +++++++++++++++++++++++++++++++++++++
> 3 files changed, 55 insertions(+), 4 deletions(-)
>
> Created against for-next branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
Looks ok to me, applied.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] ARM: S5PV210: GONI board update for CIF camera support
@ 2011-06-29 13:13 ` Kukjin Kim
0 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2011-06-29 13:13 UTC (permalink / raw)
To: linux-arm-kernel
Sylwester Nawrocki wrote:
>
> This patchset adds platform data definition for NOON010PC30 camera sensor
> for GONI board and renames sclk_cam clocks on S5PV210 platform which is
> needed
> for FIMC media device driver.
>
> The whole patches converting s5p-fimc to media controller API can be found
at:
>
> http://git.infradead.org/users/kmpark/linux-2.6-samsung
> branch: s5p-fimc-next
>
> Sylwester Nawrocki (2):
> ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
> ARM: S5PV210: Add support for NOON010PC30 sensor on GONI board
>
> arch/arm/mach-s5pv210/Kconfig | 1 +
> arch/arm/mach-s5pv210/clock.c | 6 +---
> arch/arm/mach-s5pv210/mach-goni.c | 52
> +++++++++++++++++++++++++++++++++++++
> 3 files changed, 55 insertions(+), 4 deletions(-)
>
> Created against for-next branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
Looks ok to me, applied.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-06-29 13:13 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-22 16:34 [PATCH 0/2] ARM: S5PV210: GONI board update for CIF camera support Sylwester Nawrocki
2011-06-22 16:34 ` Sylwester Nawrocki
2011-06-22 16:34 ` [PATCH 1/2] ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver Sylwester Nawrocki
2011-06-22 16:34 ` Sylwester Nawrocki
2011-06-22 16:34 ` [PATCH 2/2] ARM: S5PV210: Add support for NOON010PC30 sensor on GONI board Sylwester Nawrocki
2011-06-22 16:34 ` Sylwester Nawrocki
2011-06-29 13:13 ` [PATCH 0/2] ARM: S5PV210: GONI board update for CIF camera support Kukjin Kim
2011-06-29 13:13 ` Kukjin Kim
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.