| Message ID | 201304232132.52741.sergei.shtylyov@cogentembedded.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 04/23/2013 09:32 PM, Sergei Shtylyov wrote: > From: Vladimir Barinov <vladimir.barinov@cogentembedded.com> > > Add ML86V7667 platform devices on BOCK-W board, configure VIN0/1 pins, and > register VIN0/1 devices with the ML86V7667 specific platform data. > > Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com> > [Sergei: some macro/comment cleanup; updated the copyrights, removed duplicate > #include, annotated all platform data as '__initdata'.] > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > --- > Changes since version 2: > - removed duplicate #include <linux/pinctrl/machine.h>; > - annotated all platform data as '__initdata' since they're kmemdup()'ed while > registering the platform devices anyway; > - resolved rejects, refreshed the patch. > > arch/arm/mach-shmobile/board-bockw.c | 39 +++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > > Index: renesas/arch/arm/mach-shmobile/board-bockw.c > =================================================================== > --- renesas.orig/arch/arm/mach-shmobile/board-bockw.c > +++ renesas/arch/arm/mach-shmobile/board-bockw.c [...] > @@ -80,6 +101,16 @@ static const struct pinctrl_map bockw_pi > "sdhi0_data4", "sdhi0"), > PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", > "sdhi0_wp", "sdhi0"), > + /* VIN0 */ > + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", > + "vin0_clk", "vin0"), > + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", > + "vin0_data8", "vin0"), > + /* VIN1 */ > + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", > + "vin1_clk", "vin1"), > + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", > + "vin1_data8", "vin1"), > }; It turned out that VIN1 signal VI1_CLK conflicts with Ether signal ETH_REF_CLK. So I'm a bit at a loss here: whether I should totally remove VIN1 device if I'm going to add Ether device, or add a BOCK-W specific submenu to Kconfig, or add driver specific #ifdef's in the code to disable VIN1 if sh_eth driver is enabled?... WBR, Sergei
On Sat, Apr 27, 2013 at 03:00:10AM +0400, Sergei Shtylyov wrote: > Hello. > > On 04/23/2013 09:32 PM, Sergei Shtylyov wrote: > > >From: Vladimir Barinov <vladimir.barinov@cogentembedded.com> > > > >Add ML86V7667 platform devices on BOCK-W board, configure VIN0/1 pins, and > >register VIN0/1 devices with the ML86V7667 specific platform data. > > > >Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com> > >[Sergei: some macro/comment cleanup; updated the copyrights, removed duplicate > >#include, annotated all platform data as '__initdata'.] > >Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > > >--- > >Changes since version 2: > >- removed duplicate #include <linux/pinctrl/machine.h>; > >- annotated all platform data as '__initdata' since they're kmemdup()'ed while > > registering the platform devices anyway; > >- resolved rejects, refreshed the patch. > > > > arch/arm/mach-shmobile/board-bockw.c | 39 +++++++++++++++++++++++++++++++++++ > > 1 file changed, 39 insertions(+) > > > >Index: renesas/arch/arm/mach-shmobile/board-bockw.c > >=================================================================== > >--- renesas.orig/arch/arm/mach-shmobile/board-bockw.c > >+++ renesas/arch/arm/mach-shmobile/board-bockw.c > > [...] > > >@@ -80,6 +101,16 @@ static const struct pinctrl_map bockw_pi > > "sdhi0_data4", "sdhi0"), > > PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", > > "sdhi0_wp", "sdhi0"), > >+ /* VIN0 */ > >+ PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", > >+ "vin0_clk", "vin0"), > >+ PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", > >+ "vin0_data8", "vin0"), > >+ /* VIN1 */ > >+ PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", > >+ "vin1_clk", "vin1"), > >+ PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", > >+ "vin1_data8", "vin1"), > > }; > > It turned out that VIN1 signal VI1_CLK conflicts with Ether > signal ETH_REF_CLK. > So I'm a bit at a loss here: whether I should totally remove VIN1 > device if I'm going > to add Ether device, or add a BOCK-W specific submenu to Kconfig, or > add driver > specific #ifdef's in the code to disable VIN1 if sh_eth driver is > enabled?... My preference, in order is: * Remove VIN1 (is it used?) * Kconfig-foo * #ifdef nastiness
Hello. On 01-05-2013 13:09, Simon Horman wrote: >> On 04/23/2013 09:32 PM, Sergei Shtylyov wrote: >>> From: Vladimir Barinov <vladimir.barinov@cogentembedded.com> >>> Add ML86V7667 platform devices on BOCK-W board, configure VIN0/1 pins, and >>> register VIN0/1 devices with the ML86V7667 specific platform data. >>> Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com> >>> [Sergei: some macro/comment cleanup; updated the copyrights, removed duplicate >>> #include, annotated all platform data as '__initdata'.] >>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> >>> --- >>> Changes since version 2: >>> - removed duplicate #include <linux/pinctrl/machine.h>; >>> - annotated all platform data as '__initdata' since they're kmemdup()'ed while >>> registering the platform devices anyway; >>> - resolved rejects, refreshed the patch. >>> arch/arm/mach-shmobile/board-bockw.c | 39 +++++++++++++++++++++++++++++++++++ >>> 1 file changed, 39 insertions(+) >>> Index: renesas/arch/arm/mach-shmobile/board-bockw.c >>> =================================================================== >>> --- renesas.orig/arch/arm/mach-shmobile/board-bockw.c >>> +++ renesas/arch/arm/mach-shmobile/board-bockw.c >> [...] >>> @@ -80,6 +101,16 @@ static const struct pinctrl_map bockw_pi >>> "sdhi0_data4", "sdhi0"), >>> PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", >>> "sdhi0_wp", "sdhi0"), >>> + /* VIN0 */ >>> + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", >>> + "vin0_clk", "vin0"), >>> + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", >>> + "vin0_data8", "vin0"), >>> + /* VIN1 */ >>> + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", >>> + "vin1_clk", "vin1"), >>> + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", >>> + "vin1_data8", "vin1"), >>> }; >> It turned out that VIN1 signal VI1_CLK conflicts with Ether >> signal ETH_REF_CLK. >> So I'm a bit at a loss here: whether I should totally remove VIN1 >> device if I'm going >> to add Ether device, or add a BOCK-W specific submenu to Kconfig, or >> add driver >> specific #ifdef's in the code to disable VIN1 if sh_eth driver is >> enabled?... > My preference, in order is: > * Remove VIN1 (is it used?) At least video decoders are connected to both VIN0 and VIN1. > * Kconfig-foo > * #ifdef nastiness I took the 3rd approach but luckily it was possible without #ifdef, using *if* (!IS_ENABLED(CONFIG_SH_ETH)) statement. Working patch posted on Monday. WBR, Sergei
On Wed, May 01, 2013 at 07:34:17PM +0400, Sergei Shtylyov wrote: > Hello. > > On 01-05-2013 13:09, Simon Horman wrote: > > >>On 04/23/2013 09:32 PM, Sergei Shtylyov wrote: > > >>>From: Vladimir Barinov <vladimir.barinov@cogentembedded.com> > > >>>Add ML86V7667 platform devices on BOCK-W board, configure VIN0/1 pins, and > >>>register VIN0/1 devices with the ML86V7667 specific platform data. > > >>>Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com> > >>>[Sergei: some macro/comment cleanup; updated the copyrights, removed duplicate > >>>#include, annotated all platform data as '__initdata'.] > >>>Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > >>>--- > >>>Changes since version 2: > >>>- removed duplicate #include <linux/pinctrl/machine.h>; > >>>- annotated all platform data as '__initdata' since they're kmemdup()'ed while > >>> registering the platform devices anyway; > >>>- resolved rejects, refreshed the patch. > > >>> arch/arm/mach-shmobile/board-bockw.c | 39 +++++++++++++++++++++++++++++++++++ > >>> 1 file changed, 39 insertions(+) > > >>>Index: renesas/arch/arm/mach-shmobile/board-bockw.c > >>>=================================================================== > >>>--- renesas.orig/arch/arm/mach-shmobile/board-bockw.c > >>>+++ renesas/arch/arm/mach-shmobile/board-bockw.c > > >>[...] > > >>>@@ -80,6 +101,16 @@ static const struct pinctrl_map bockw_pi > >>> "sdhi0_data4", "sdhi0"), > >>> PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", > >>> "sdhi0_wp", "sdhi0"), > >>>+ /* VIN0 */ > >>>+ PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", > >>>+ "vin0_clk", "vin0"), > >>>+ PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", > >>>+ "vin0_data8", "vin0"), > >>>+ /* VIN1 */ > >>>+ PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", > >>>+ "vin1_clk", "vin1"), > >>>+ PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", > >>>+ "vin1_data8", "vin1"), > >>> }; > > >> It turned out that VIN1 signal VI1_CLK conflicts with Ether > >>signal ETH_REF_CLK. > >>So I'm a bit at a loss here: whether I should totally remove VIN1 > >>device if I'm going > >>to add Ether device, or add a BOCK-W specific submenu to Kconfig, or > >>add driver > >>specific #ifdef's in the code to disable VIN1 if sh_eth driver is > >>enabled?... > > >My preference, in order is: > > >* Remove VIN1 (is it used?) > > At least video decoders are connected to both VIN0 and VIN1. > > >* Kconfig-foo > >* #ifdef nastiness > > I took the 3rd approach but luckily it was possible without > #ifdef, using *if* (!IS_ENABLED(CONFIG_SH_ETH)) statement. Working > patch posted on Monday. Thanks.
Index: renesas/arch/arm/mach-shmobile/board-bockw.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/board-bockw.c +++ renesas/arch/arm/mach-shmobile/board-bockw.c @@ -3,6 +3,7 @@ * * Copyright (C) 2013 Renesas Solutions Corp. * Copyright (C) 2013 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> + * Copyright (C) 2013 Cogent Embedded, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +26,7 @@ #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/smsc911x.h> +#include <media/soc_camera.h> #include <mach/common.h> #include <mach/irqs.h> #include <mach/r8a7778.h> @@ -65,6 +67,25 @@ static struct sh_mobile_sdhi_info sdhi0_ static struct rcar_phy_platform_data usb_phy_platform_data __initdata; +static struct rcar_vin_platform_data vin_platform_data __initdata = { + .flags = RCAR_VIN_BT656, +}; + +/* In the default configuration both decoders reside on I2C bus 0 */ +#define BOCKW_CAMERA(idx) \ +static struct i2c_board_info camera##idx##_info = { \ + I2C_BOARD_INFO("ml86v7667", 0x41 + 2 * (idx)), \ +}; \ + \ +static struct soc_camera_link iclink##idx##_ml86v7667 __initdata = { \ + .bus_id = idx, \ + .i2c_adapter_id = 0, \ + .board_info = &camera##idx##_info, \ +}; + +BOCKW_CAMERA(0); +BOCKW_CAMERA(1); + static const struct pinctrl_map bockw_pinctrl_map[] = { /* SCIF0 */ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778", @@ -80,6 +101,16 @@ static const struct pinctrl_map bockw_pi "sdhi0_data4", "sdhi0"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", "sdhi0_wp", "sdhi0"), + /* VIN0 */ + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", + "vin0_clk", "vin0"), + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.0", "pfc-r8a7778", + "vin0_data8", "vin0"), + /* VIN1 */ + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", + "vin1_clk", "vin1"), + PIN_MAP_MUX_GROUP_DEFAULT("rcar_vin.1", "pfc-r8a7778", + "vin1_data8", "vin1"), }; #define FPGA 0x18200000 @@ -94,6 +125,14 @@ static void __init bockw_init(void) r8a7778_init_irq_extpin(1); r8a7778_add_standard_devices(); r8a7778_add_usb_phy_device(&usb_phy_platform_data); + r8a7778_add_vin_device(0, &vin_platform_data); + r8a7778_add_vin_device(1, &vin_platform_data); + platform_device_register_data(&platform_bus, "soc-camera-pdrv", 0, + &iclink0_ml86v7667, + sizeof(iclink0_ml86v7667)); + platform_device_register_data(&platform_bus, "soc-camera-pdrv", 1, + &iclink1_ml86v7667, + sizeof(iclink1_ml86v7667)); pinctrl_register_mappings(bockw_pinctrl_map, ARRAY_SIZE(bockw_pinctrl_map));