ARM: davinci: vpif capture & display support
Subsystems (3)
v2 cover ARM: davinci: vpif capture & display support
This series adds pdata quirks and other changes required to make vpif work on the da850-evm board.
v1 -> v2:
- added patch 1/5 - don't bail-out from pdata_quirks_check() after applying a single quirk
- changed the comment above the new fixed regulator to make it more descriptive
- removed unnecessary #ifdefs from pdata-quirks.c
Bartosz Golaszewski (3):
ARM: davinci: da8xx: allow having multiple pdata-quirks
ARM: da850-evm: add a fixed regulator for the UI board IO expander
ARM: davinci: add pdata-quirks for da850-evm vpif display
Kevin Hilman (2):
ARM: davinci: board-da850-evm: add I2C ID for VPIF
ARM: davinci: da8xx: add pdata-quirks for VPIF capture
arch/arm/mach-davinci/board-da850-evm.c | 4 + arch/arm/mach-davinci/da8xx-dt.c | 1 + arch/arm/mach-davinci/pdata-quirks.c | 171 +++++++++++++++++++++++++++++++- 3 files changed, 175 insertions(+), 1 deletion(-)
Signature · 1 line
2.9.3
PATCH v2 1/5 ARM: davinci: da8xx: allow having multiple pdata-quirks
We currently bail-out after applying a single quirk. We will want to reuse the function doing the vpif capture registration so remove the break; and continue iterating over the quirk array.
--- arch/arm/mach-davinci/pdata-quirks.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-davinci/pdata-quirks.c +0 -1
@@ -23,7 +23,6 @@ static void pdata_quirks_check(struct pdata_init *quirks)if (of_machine_is_compatible (quirks->compatible)) {if (quirks->fn) quirks->fn (); -break ; } quirks++; }
Signature · 1 line
2.9.3
PATCH v2 2/5 ARM: davinci: board-da850-evm: add I2C ID for VPIF
In reply to Bartosz GolaszewskiFrom: Kevin Hilman <[email protected]>
VPIF capture driver now has a way to specific I2C adapter ID (was previously hard-coded.) Use the new interface.
--- arch/arm/mach-davinci/board-da850-evm.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-davinci/board-da850-evm.c +1 -0
@@ -1213,6 +1213,7 @@ static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = {static struct vpif_capture_config da850_vpif_capture_config = { .subdev_info = da850_vpif_capture_sdev_info, .subdev_count =ARRAY_SIZE (da850_vpif_capture_sdev_info), + .i2c_adapter_id =1 , .chan_config[0 ] = { .inputs = da850_ch0_inputs, .input_count =ARRAY_SIZE (da850_ch0_inputs),
Signature · 1 line
2.9.3
PATCH v2 3/5 ARM: davinci: da8xx: add pdata-quirks for VPIF capture
In reply to Bartosz GolaszewskiFrom: Kevin Hilman <[email protected]>
For da8xx DT platforms, use pdata-quirks to add legacy platform data for vpif_capture driver.
Passing legacy platform_data is required until the V4L2 framework, and subdevice drivers (such as the tvp514x) grow a way of selecting input and output routing (c.f. V4L2 s_routing API)
--- arch/arm/mach-davinci/da8xx-dt.c | 1 + arch/arm/mach-davinci/pdata-quirks.c | 104 +++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+)
arch/arm/mach-davinci/da8xx-dt.c +1 -0
@@ -53,6 +53,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {OF_DEV_AUXDATA ("ti,da830-musb" ,0x01e00000 ,"musb-da8xx" ,NULL ),OF_DEV_AUXDATA ("ti,da830-usb-phy" ,0x01c1417c ,"da8xx-usb-phy" ,NULL ),OF_DEV_AUXDATA ("ti,da850-ahci" ,0x01e18000 ,"ahci_da850" ,NULL ), + OF_DEV_AUXDATA("ti,da850-vpif", 0x01e17000, "vpif", NULL), {} };
arch/arm/mach-davinci/pdata-quirks.c +104 -0
123 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH v2 4/5 ARM: da850-evm: add a fixed regulator for the UI board IO expander
In reply to Bartosz GolaszewskiWithout this regulator the tca6416 GPIO expander on the UI board can't be probed in board file mode and we're not getting VPIF IRQs.
--- arch/arm/mach-davinci/board-da850-evm.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-davinci/board-da850-evm.c +3 -0
@@ -828,6 +828,9 @@ static struct regulator_consumer_supply fixed_supplies[] = {/* Baseboard 1.8V: 5V -> TPS73701DCQ -> 1.8V */ REGULATOR_SUPPLY ("DVDD" ,"1-0018" ), + +/* UI card 3.3V: 5V -> TPS73701DCQ -> 3.3V */ + REGULATOR_SUPPLY("vcc", "1-0020"), };/* TPS65070 voltage regulator support */
Signature · 1 line
2.9.3
PATCH v2 5/5 ARM: davinci: add pdata-quirks for da850-evm vpif display
In reply to Bartosz GolaszewskiSimilarly to vpif capture: we need to register the vpif display driver and the corresponding adv7343 encoder in pdata-quirks as the DT support is not complete - there isn't currently a way to define the output_routing in the V4L2 drivers (c.f. s_routing) via DT.
--- arch/arm/mach-davinci/pdata-quirks.c | 72 ++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 3 deletions(-)
arch/arm/mach-davinci/pdata-quirks.c +69 -3
@@ -11,6 +11,7 @@#include <linux/of_platform.h> #include <media/i2c/tvp514x.h> +#include <media/i2c/adv7343.h> #include <mach/common.h> #include <mach/da8xx.h>
@@ -105,7 +106,7 @@ static struct vpif_capture_config da850_vpif_capture_config = { .card_name = "DA850/OMAP-L138 Video Capture", }; -static void __init da850_vpif_legacy_init (void ) +static void __init da850_vpif_capture_legacy_init (void ) {int ret;
@@ -119,6 +120,70 @@ static void __init da850_vpif_legacy_init(void) __func__, ret); } +static struct adv7343_platform_data adv7343_pdata = { + .mode_config = { + .dac = {1 ,1 ,1 }, + }, + .sd_config = { + .sd_dac_out = {1 }, + }, +}; + +static struct vpif_subdev_info da850_vpif_subdev[] = { + { + .name ="adv7343" , + .board_info = { +I2C_BOARD_INFO ("adv7343" ,0x2a ), + .platform_data = &adv7343_pdata, + }, + }, +}; + +static const struct vpif_output da850_ch0_outputs[] = { + { + .output = { + .index =0 , + .name ="Composite" , + .type =V4L2_OUTPUT_TYPE_ANALOG , + .capabilities =V4L2_OUT_CAP_STD , + .std =V4L2_STD_ALL , + }, + .subdev_name ="adv7343" , + .output_route =ADV7343_COMPOSITE_ID , + }, + { + .output = { + .index =1 , + .name ="S-Video" , + .type =V4L2_OUTPUT_TYPE_ANALOG , + .capabilities =V4L2_OUT_CAP_STD , + .std =V4L2_STD_ALL , + }, + .subdev_name ="adv7343" , + .output_route =ADV7343_SVIDEO_ID , + }, +}; + +static struct vpif_display_config da850_vpif_display_config = { + .subdevinfo = da850_vpif_subdev, + .subdev_count =ARRAY_SIZE (da850_vpif_subdev), + .chan_config[0 ] = { + .outputs = da850_ch0_outputs, + .output_count =ARRAY_SIZE (da850_ch0_outputs), + }, + .card_name ="DA850/OMAP-L138 Video Display" , +}; + +static void __init da850_vpif_display_legacy_init (void ) +{ +int ret; + + ret =da850_register_vpif_display (&da850_vpif_display_config); +if (ret) +pr_warn ("%s: VPIF display setup failed: %d\n" , + __func__, ret); +} +static void pdata_quirks_check (struct pdata_init *quirks) {while (quirks->compatible) {
@@ -131,8 +196,9 @@ static void pdata_quirks_check(struct pdata_init *quirks) }static struct pdata_init pdata_quirks[]__initdata = { - {"ti,da850-lcdk" , da850_vpif_legacy_init, }, - {"ti,da850-evm" , da850_vpif_legacy_init, }, + {"ti,da850-lcdk" , da850_vpif_capture_legacy_init, }, + {"ti,da850-evm" , da850_vpif_display_legacy_init, }, + {"ti,da850-evm" , da850_vpif_capture_legacy_init, }, {/* sentinel */ }, };
Signature · 1 line
2.9.3
2017-02-21 16:49 GMT+01:00 Bartosz Golaszewski <[email protected]>:
Quoted 19 lines
This series adds pdata quirks and other changes required to make vpif work on the da850-evm board.
v1 -> v2:
- added patch 1/5 - don't bail-out frompdata_quirks_check()after applying a single quirk
- changed the comment above the new fixed regulator to make it more descriptive
- removed unnecessary #ifdefs frompdata-quirks.cBartosz Golaszewski (3):
ARM: davinci: da8xx: allow having multiple pdata-quirks
ARM: da850-evm: add a fixed regulator for the UI board IO expander
ARM: davinci: add pdata-quirks for da850-evm vpif displayKevin Hilman (2):
ARM: davinci: board-da850-evm: add I2C ID for VPIF
ARM: davinci: da8xx: add pdata-quirks for VPIF capture
Quoted 8 lines
arch/arm/mach-davinci/board-da850-evm.c | 4 + arch/arm/mach-davinci/da8xx-dt.c | 1 + arch/arm/mach-davinci/pdata-quirks.c | 171 +++++++++++++++++++++++++++++++- 3 files changed, 175 insertions(+), 1 deletion(-)--
2.9.3
Hi Sekhar,
please don't review/apply these patches yet - the enable GPIOs for vpif capture need to be added here as well - I'll send a v3.
Thanks,
Bartosz