ARM: shmobile: r8a7779: add VIN support
Subsystems (5)
PATCH v2 2/4 ARM: shmobile: r8a7779: add VIN support
From: Vladimir Barinov <[email protected]>
Add VIN clocks and platform devices for R8A7779 SoC; add function to register the VIN platform devices.
[Sergei: added 'id' parameter check to r8a7779_add_vin_device(), renamed some variables.]
---
Changes since the original posting:
- added 'id' parameter check to r8a7779_add_vin_device().
arch/arm/mach-shmobile/clock-r8a7779.c | 10 ++++++ arch/arm/mach-shmobile/include/mach/r8a7779.h | 3 ++ arch/arm/mach-shmobile/setup-r8a7779.c | 38 ++++++++++++++++++++++++++ 3 files changed, 51 insertions(+)
arch/arm/mach-shmobile/clock-r8a7779.c +10 -0
@@ -112,7 +112,9 @@ static struct clk *main_clks[] = { };enum {MSTP323 ,MSTP322 ,MSTP321 ,MSTP320 , +MSTP120 ,MSTP116 ,MSTP115 ,MSTP114 , +MSTP110 ,MSTP109 ,MSTP108 ,MSTP103 ,MSTP101 ,MSTP100 ,MSTP030 ,MSTP029 ,MSTP028 ,MSTP027 ,MSTP026 ,MSTP025 ,MSTP024 ,MSTP023 ,MSTP022 ,MSTP021 ,
@@ -125,9 +127,13 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP322] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 22, 0), /* SDHI1 */ [MSTP321] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 21, 0), /* SDHI2 */ [MSTP320] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 20, 0), /* SDHI3 */ + [MSTP120] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 20, 0), /* VIN3 */ [MSTP116] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 16, 0), /* PCIe */ [MSTP115] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 15, 0), /* SATA */ [MSTP114] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 14, 0), /* Ether */ + [MSTP110] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 10, 0), /* VIN0 */ + [MSTP109] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 9, 0), /* VIN1 */ + [MSTP108] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 8, 0), /* VIN2 */ [MSTP103] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 3, 0), /* DU */ [MSTP101] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 1, 0), /* USB2 */ [MSTP100] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 0, 0), /* USB0/1 */
@@ -162,10 +168,14 @@ static struct clk_lookup lookups[] = {CLKDEV_CON_ID ("peripheral_clk" , &clkp_clk),/* MSTP32 clocks */ +CLKDEV_DEV_ID ("rcar_vin.3" , &mstp_clks[MSTP120 ]),/* VIN3 */ CLKDEV_DEV_ID ("rcar-pcie" , &mstp_clks[MSTP116 ]),/* PCIe */ CLKDEV_DEV_ID ("sata_rcar" , &mstp_clks[MSTP115 ]),/* SATA */ CLKDEV_DEV_ID ("fc600000.sata" , &mstp_clks[MSTP115 ]),/* SATA w/DT */ CLKDEV_DEV_ID ("sh-eth" , &mstp_clks[MSTP114 ]),/* Ether */ +CLKDEV_DEV_ID ("rcar_vin.0" , &mstp_clks[MSTP110 ]),/* VIN0 */ +CLKDEV_DEV_ID ("rcar_vin.1" , &mstp_clks[MSTP109 ]),/* VIN1 */ +CLKDEV_DEV_ID ("rcar_vin.2" , &mstp_clks[MSTP108 ]),/* VIN2 */ CLKDEV_DEV_ID ("ehci-platform.1" , &mstp_clks[MSTP101 ]),/* USB EHCI port2 */ CLKDEV_DEV_ID ("ohci-platform.1" , &mstp_clks[MSTP101 ]),/* USB OHCI port2 */ CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
arch/arm/mach-shmobile/include/mach/r8a7779.h +3 -0
@@ -5,6 +5,7 @@#include <linux/pm_domain.h> #include <linux/sh_eth.h> #include <linux/usb/rcar-phy.h> +#include <linux/platform_data/camera-rcar.h> struct platform_device ;
@@ -35,6 +36,8 @@ extern void r8a7779_add_standard_devicesextern void r8a7779_add_standard_devices_dt (void );extern void r8a7779_add_ether_device (struct sh_eth_plat_data *pdata);extern void r8a7779_add_usb_phy_device (struct rcar_phy_platform_data *pdata); +extern void r8a7779_add_vin_device (int idx, +struct rcar_vin_platform_data *pdata);extern void r8a7779_init_late (void );extern void r8a7779_clock_init (void );extern void r8a7779_pinmux_init (void );
arch/arm/mach-shmobile/setup-r8a7779.c +38 -0
@@ -559,6 +559,33 @@ static struct resource ether_resources[] }, }; +#define R8A7779_VIN (idx) \ +static struct resource vin##idx##_resources[] = { \ + DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000), \ + DEFINE_RES_IRQ(gic_iid(0x5f + (idx))), \ +}; \ + \ +static struct platform_device_info vin##idx##_info = { \ + .parent = &platform_bus, \ + .name = "rcar_vin", \ + .id = idx, \ + .res = vin##idx##_resources, \ + .num_res = ARRAY_SIZE(vin##idx##_resources), \ + .dma_mask = DMA_BIT_MASK(32), \ +} + +R8A7779_VIN (0 ); +R8A7779_VIN (1 ); +R8A7779_VIN (2 ); +R8A7779_VIN (3 ); + +static struct platform_device_info *vin_info_table[]__initdata = { + &vin0_info, + &vin1_info, + &vin2_info, + &vin3_info, +}; +static struct platform_device *r8a7779_devices_dt[]__initdata = { &scif0_device, &scif1_device,
@@ -610,6 +637,17 @@ void __init r8a7779_add_usb_phy_device(s pdata, sizeof(*pdata)); } +void __init r8a7779_add_vin_device (int id, +struct rcar_vin_platform_data *pdata) +{ +BUG_ON (id <0 || id >3 ); + + vin_info_table[id]->data = pdata; + vin_info_table[id]->size_data =sizeof (struct rcar_vin_platform_data ); + +platform_device_register_full (vin_info_table[id]); +} +/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ void __init __weak r8a7779_register_twd (void ) { }
PATCH v2 2/4 ARM: shmobile: r8a7779: add VIN support
Hello.
Quoted 9 lines · Sergei Shtylyov
From: Vladimir Barinov <[email protected]>
Add VIN clocks and platform devices for R8A7779 SoC; add function to register the VIN platform devices.
Signed-off-by Vladimir Barinov <[email protected]>[Sergei: added 'id' parameter check to
r8a7779_add_vin_device(), renamed some variables.]Signed-off-by Sergei Shtylyov <[email protected]>
[...]
Quoted 5 lines
Index:
renesas/arch/arm/mach-shmobile/setup-r8a7779.c
===================================================================
arch/arm/mach-shmobile/setup-r8a7779.c static struct resource ether_resources[] · line 568
Quoted 10 lines
arch/arm/mach-shmobile/setup-r8a7779.c +7
-0@@ -559,6 +559,33 @@ static struct resource ether_resources[] }, }; +#define R8A7779_VIN (idx) \ +static struct resource vin##idx##_resources[] = { \ + DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000), \ + DEFINE_RES_IRQ(gic_iid(0x5f + (idx))), \ +}; \ + \ +static struct platform_device_info vin##idx##_info = { \
Hm, probably should have marked this as '__initdata'... maybe
the resources too.
Quoted 8 lines
arch/arm/mach-shmobile/setup-r8a7779.c +7
-0+ .parent = &platform_bus, \ + .name = "rcar_vin", \ + .id = idx, \ + .res = vin##idx##_resources, \ + .num_res = ARRAY_SIZE(vin##idx##_resources), \ + .dma_mask = DMA_BIT_MASK(32), \ +}
PATCH v2 2/4 ARM: shmobile: r8a7779: add VIN support
Quoted 25 lines · Sergei Shtylyov
Hello.
Quoted 9 lines · Sergei Shtylyov
From: Vladimir Barinov <[email protected]>
Add VIN clocks and platform devices for R8A7779 SoC; add function to register the VIN platform devices.
Signed-off-by Vladimir Barinov <[email protected]>[Sergei: added 'id' parameter check to
r8a7779_add_vin_device(), renamed some variables.]Signed-off-by Sergei Shtylyov <[email protected]>[...]
Quoted 9 lines
Index:
renesas/arch/arm/mach-shmobile/setup-r8a7779.c
===================================================================arch/arm/mach-shmobile/setup-r8a7779.c +2
-0@@ -559,6 +559,33 @@ static struct resource ether_resources[] }, }; +#define R8A7779_VIN (idx) \ +static struct resource vin##idx##_resources[] = { \
Quoted 8 lines
arch/arm/mach-shmobile/setup-r8a7779.c static struct resource ether_resources[] · line 568
Quoted 5 lines
arch/arm/mach-shmobile/setup-r8a7779.c +5
-0+DEFINE_RES_MEM (0xffc50000 +0x1000 * (idx),0x1000 ), \ + DEFINE_RES_IRQ(gic_iid(0x5f + (idx))), \ +}; \ + \ +static struct platform_device_info vin##idx##_info = { \Hm, probably should have marked this as '
__initdata'... maybe
the resources too.
That doesn't seem to be the case for other devices in that or other shmobile files. Am I missing something or should numerous other devices be updated?
Quoted 14 lines
arch/arm/mach-shmobile/setup-r8a7779.c static struct resource ether_resources[]
Quoted 9 lines
arch/arm/mach-shmobile/setup-r8a7779.c +7
-0+ .parent = &platform_bus, \ + .name = "rcar_vin", \ + .id = idx, \ + .res = vin##idx##_resources, \ + .num_res = ARRAY_SIZE(vin##idx##_resources), \ + .dma_mask = DMA_BIT_MASK(32), \ +}--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 2/4 ARM: shmobile: r8a7779: add VIN support
Hello.
Quoted 30 lines · Simon Horman
Quoted 21 lines
Quoted 9 lines
From: Vladimir Barinov <[email protected]>
Add VIN clocks and platform devices for R8A7779 SoC; add function to register the VIN platform devices.
Signed-off-by Vladimir Barinov <[email protected]>[Sergei: added 'id' parameter check to
r8a7779_add_vin_device(), renamed some variables.]Signed-off-by Sergei Shtylyov <[email protected]>[...]
Quoted 9 lines
Index:
renesas/arch/arm/mach-shmobile/setup-r8a7779.c
===================================================================arch/arm/mach-shmobile/setup-r8a7779.c +2
-0@@ -559,6 +559,33 @@ static struct resource ether_resources[] }, }; +#define R8A7779_VIN (idx) \ +static struct resource vin##idx##_resources[] = { \Quoted 8 lines
arch/arm/mach-shmobile/setup-r8a7779.c static struct resource ether_resources[] · line 568
Quoted 5 lines
arch/arm/mach-shmobile/setup-r8a7779.c +5
-0+DEFINE_RES_MEM (0xffc50000 +0x1000 * (idx),0x1000 ), \ + DEFINE_RES_IRQ(gic_iid(0x5f + (idx))), \ +}; \ + \ +static struct platform_device_info vin##idx##_info = { \Hm, probably should have marked this as '
__initdata'... maybe
the resources too.
Quoted 3 lines
That doesn't seem to be the case for other devices in that or other shmobile files. Am I missing something or should numerous other devices be updated?
If the device is registered using platform_device_register_*(), it seems
worth marking the resources, the platfrom data and 'struct platform_device_info' as '__initdata' as they're copied to the memory allocated from heap anyway and hence not needed past the init phase...
WBR, Sergei
PATCH v2 2/4 ARM: shmobile: r8a7779: add VIN support
Quoted 38 lines · Sergei Shtylyov
Hello.
Quoted 30 lines · Simon Horman
Quoted 21 lines
Quoted 9 lines
From: Vladimir Barinov <[email protected]>
Add VIN clocks and platform devices for R8A7779 SoC; add function to register the VIN platform devices.
Signed-off-by Vladimir Barinov <[email protected]>[Sergei: added 'id' parameter check to
r8a7779_add_vin_device(), renamed some variables.]Signed-off-by Sergei Shtylyov <[email protected]>[...]
Quoted 9 lines
Index:
renesas/arch/arm/mach-shmobile/setup-r8a7779.c
===================================================================arch/arm/mach-shmobile/setup-r8a7779.c +2
-0@@ -559,6 +559,33 @@ static struct resource ether_resources[] }, }; +#define R8A7779_VIN (idx) \ +static struct resource vin##idx##_resources[] = { \Quoted 8 lines
arch/arm/mach-shmobile/setup-r8a7779.c static struct resource ether_resources[] · line 568
Quoted 5 lines
arch/arm/mach-shmobile/setup-r8a7779.c +5
-0+DEFINE_RES_MEM (0xffc50000 +0x1000 * (idx),0x1000 ), \ + DEFINE_RES_IRQ(gic_iid(0x5f + (idx))), \ +}; \ + \ +static struct platform_device_info vin##idx##_info = { \Hm, probably should have marked this as '
__initdata'... maybe
the resources too.Quoted 3 lines
That doesn't seem to be the case for other devices in that or other shmobile files. Am I missing something or should numerous other devices be updated?
Quoted 5 lines
If the device is registered using platform_device_register_*(),
it seems worth marking the resources, the platfrom data and 'structplatform_device_info' as '__initdata' as they're copied to the memory allocated from heap anyway and hence not needed past the init phase...
Thanks for the explanation, that make sense.