| From b103f1c92961ce58578d075876d16a06fd7504c1 Mon Sep 17 00:00:00 2001 |
| From: Vladimir Barinov <vladimir.barinov@cogentembedded.com> |
| Date: Thu, 22 Aug 2013 17:36:36 -0300 |
| Subject: [media] ARM: shmobile: r8a7778: add VIN support |
| |
| Add VIN clocks and platform devices on R8A7778 SoC; add function to register |
| the VIN platform devices. |
| [Sergei: added 'id' parameter check to r8a7778_add_vin_device(), used '*pdata' |
| in *sizeof* operator, and added an empty line there; renamed some variables, |
| annotated 'vin[01]_info' and vin[01]_resources[] as '__initdata'.] |
| |
| Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com> |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Acked-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> |
| (cherry picked from commit 803c2df217525495fc440fc9b314b22427dc5db6) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/mach-shmobile/clock-r8a7778.c |
| arch/arm/mach-shmobile/include/mach/r8a7778.h |
| arch/arm/mach-shmobile/setup-r8a7778.c |
| --- |
| arch/arm/mach-shmobile/clock-r8a7778.c | 5 ++++ |
| arch/arm/mach-shmobile/include/mach/r8a7778.h | 3 +++ |
| arch/arm/mach-shmobile/setup-r8a7778.c | 34 +++++++++++++++++++++++++++ |
| 3 files changed, 42 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c |
| index 53798e50..dea199d4 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7778.c |
| @@ -106,6 +106,7 @@ enum { |
| MSTP331, |
| MSTP323, MSTP322, MSTP321, |
| MSTP114, |
| + MSTP110, MSTP109, |
| MSTP100, |
| MSTP030, |
| MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, |
| @@ -119,6 +120,8 @@ static struct clk mstp_clks[MSTP_NR] = { |
| [MSTP322] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 22, 0), /* SDHI1 */ |
| [MSTP321] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 21, 0), /* SDHI2 */ |
| [MSTP114] = SH_CLK_MSTP32(&p_clk, MSTPCR1, 14, 0), /* Ether */ |
| + [MSTP110] = SH_CLK_MSTP32(&s_clk, MSTPCR1, 10, 0), /* VIN0 */ |
| + [MSTP109] = SH_CLK_MSTP32(&s_clk, MSTPCR1, 9, 0), /* VIN1 */ |
| [MSTP100] = SH_CLK_MSTP32(&p_clk, MSTPCR1, 0, 0), /* USB0/1 */ |
| [MSTP030] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 30, 0), /* I2C0 */ |
| [MSTP029] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 29, 0), /* I2C1 */ |
| @@ -146,6 +149,8 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */ |
| CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */ |
| CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */ |
| + CLKDEV_DEV_ID("r8a7778-vin.0", &mstp_clks[MSTP110]), /* VIN0 */ |
| + CLKDEV_DEV_ID("r8a7778-vin.1", &mstp_clks[MSTP109]), /* VIN1 */ |
| CLKDEV_DEV_ID("ehci-platform", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */ |
| CLKDEV_DEV_ID("ohci-platform", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */ |
| CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */ |
| diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| index 41fd6da2..adfcf51b 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| +++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| @@ -19,10 +19,13 @@ |
| #define __ASM_R8A7778_H__ |
| |
| #include <linux/sh_eth.h> |
| +#include <linux/platform_data/camera-rcar.h> |
| |
| extern void r8a7778_add_standard_devices(void); |
| extern void r8a7778_add_standard_devices_dt(void); |
| extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata); |
| +extern void r8a7778_add_vin_device(int id, |
| + struct rcar_vin_platform_data *pdata); |
| extern void r8a7778_add_dt_devices(void); |
| |
| extern void r8a7778_init_late(void); |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c |
| index 604cf36b..6a2657eb 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7778.c |
| @@ -281,6 +281,40 @@ void __init r8a7778_register_hspi(int id) |
| hspi_resources + (2 * id), 2); |
| } |
| |
| +/* VIN */ |
| +#define R8A7778_VIN(idx) \ |
| +static struct resource vin##idx##_resources[] __initdata = { \ |
| + DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000), \ |
| + DEFINE_RES_IRQ(gic_iid(0x5a)), \ |
| +}; \ |
| + \ |
| +static struct platform_device_info vin##idx##_info __initdata = { \ |
| + .parent = &platform_bus, \ |
| + .name = "r8a7778-vin", \ |
| + .id = idx, \ |
| + .res = vin##idx##_resources, \ |
| + .num_res = ARRAY_SIZE(vin##idx##_resources), \ |
| + .dma_mask = DMA_BIT_MASK(32), \ |
| +} |
| + |
| +R8A7778_VIN(0); |
| +R8A7778_VIN(1); |
| + |
| +static struct platform_device_info *vin_info_table[] __initdata = { |
| + &vin0_info, |
| + &vin1_info, |
| +}; |
| + |
| +void __init r8a7778_add_vin_device(int id, struct rcar_vin_platform_data *pdata) |
| +{ |
| + BUG_ON(id < 0 || id > 1); |
| + |
| + vin_info_table[id]->data = pdata; |
| + vin_info_table[id]->size_data = sizeof(*pdata); |
| + |
| + platform_device_register_full(vin_info_table[id]); |
| +} |
| + |
| void __init r8a7778_add_dt_devices(void) |
| { |
| int i; |
| -- |
| 1.8.4.3.gca3854a |
| |