davinci: VPIF: add DT support

Fix problems with automatic module loading by adding MODULE_ALIAS. Also fix various load-time errors cause by incorrect or not present platform_data.

Fix problems with automatic module loading by adding MODULE_ALIAS. Also fix various load-time errors cause by incorrect or not present platform_data.

Signed-off-by Kevin Hilman <[email protected]>

---
 drivers/media/platform/davinci/vpif.c         |  5 ++++-
 drivers/media/platform/davinci/vpif_capture.c | 15 ++++++++++++++-
 drivers/media/platform/davinci/vpif_display.c |  6 ++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

drivers/media/platform/davinci/vpif.c +4 -1

index 0380cf2e5775..f50148dcba64 100644
@@ -32,6 +32,9 @@
 MODULE_DESCRIPTION("TI DaVinci Video Port Interface driver");
 MODULE_LICENSE("GPL");
 
+#define VPIF_DRIVER_NAME	"vpif"
+MODULE_ALIAS("platform:" VPIF_DRIVER_NAME);
+
 #define VPIF_CH0_MAX_MODES	22
 #define VPIF_CH1_MAX_MODES	2
 #define VPIF_CH2_MAX_MODES	15

@@ -466,7 +469,7 @@ static const struct dev_pm_ops vpif_pm = {
 
 static struct platform_driver vpif_driver = {
 	.driver = {
-		.name	= "vpif",
+		.name	= VPIF_DRIVER_NAME,
 		.pm	= vpif_pm_ops,
 	},
 	.remove = vpif_remove,

drivers/media/platform/davinci/vpif_capture.c +5 -0

index 5104cc0ee40e..20c4344ed118 100644
@@ -45,6 +45,7 @@ module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Debug level 0-1");
 
 #define VPIF_DRIVER_NAME	"vpif_capture"
+MODULE_ALIAS("platform:" VPIF_DRIVER_NAME);
 
 /* global variables */
 static struct vpif_device vpif_obj = { {NULL} };

@@ -647,6 +648,10 @@ static int vpif_input_to_subdev(
 
 	vpif_dbg(2, debug, "vpif_input_to_subdev\n");
 
+	if (!chan_cfg)
+		return -1;
+	if (input_index >= chan_cfg->input_count)
+		return -1;
 	subdev_name = chan_cfg->inputs[input_index].subdev_name;
 	if (subdev_name == NULL)
 		return -1;

drivers/media/platform/davinci/vpif_capture.c +8 -0

 			return i;
 	}
 	return -1;

@@ -685,6 +690,9 @@ static int vpif_set_input(
 	if (sd_index >= 0) {
 		sd = vpif_obj.sd[sd_index];
 		subdev_info = &vpif_cfg->subdev_info[sd_index];
+	} else {
+		/* no subdevice, no input to setup */
+		return 0;
 	}
 
 	/* first setup input path from sub device to vpif */

@@ -1435,6 +1443,11 @@ static __init int vpif_probe(struct platform_device *pdev)
 	int res_idx = 0;
 	int i, err;
 
+	if (!pdev->dev.platform_data) {
+		dev_warn(&pdev->dev, "Missing platform data.  Giving up.\n");
+		return -EINVAL;
+	}
+
 	vpif_dev = &pdev->dev;
 
 	err = initialize_vpif();

drivers/media/platform/davinci/vpif_display.c +6 -0

index 75b27233ec2f..7f632b757d32 100644
@@ -42,6 +42,7 @@ module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Debug level 0-1");
 
 #define VPIF_DRIVER_NAME	"vpif_display"
+MODULE_ALIAS("platform:" VPIF_DRIVER_NAME);
 
 /* Is set to 1 in case of SDTV formats, 2 in case of HDTV formats. */
 static int ycmux_mode;

@@ -1249,6 +1250,11 @@ static __init int vpif_probe(struct platform_device *pdev)
 	int res_idx = 0;
 	int i, err;
 
+	if (!pdev->dev.platform_data) {
+		dev_warn(&pdev->dev, "Missing platform data.  Giving up.\n");
+		return -EINVAL;
+	}
+
 	vpif_dev = &pdev->dev;
 	err = initialize_vpif();
 

Quoted 50 lines · Kevin Hilman

Fix problems with automatic module loading by adding MODULE_ALIAS. Also fix various load-time errors cause by incorrect or not present platform_data.

Signed-off-by Kevin Hilman <[email protected]>

---
 drivers/media/platform/davinci/vpif.c         |  5 ++++-
 drivers/media/platform/davinci/vpif_capture.c | 15 ++++++++++++++-
 drivers/media/platform/davinci/vpif_display.c |  6 ++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

drivers/media/platform/davinci/vpif.c +4 -1

index 0380cf2e5775..f50148dcba64 100644
@@ -32,6 +32,9 @@
 MODULE_DESCRIPTION("TI DaVinci Video Port Interface driver");
 MODULE_LICENSE("GPL");
 
+#define VPIF_DRIVER_NAME	"vpif"
+MODULE_ALIAS("platform:" VPIF_DRIVER_NAME);
+
 #define VPIF_CH0_MAX_MODES	22
 #define VPIF_CH1_MAX_MODES	2
 #define VPIF_CH2_MAX_MODES	15

@@ -466,7 +469,7 @@ static const struct dev_pm_ops vpif_pm = {
 
 static struct platform_driver vpif_driver = {
 	.driver = {
-		.name	= "vpif",
+		.name	= VPIF_DRIVER_NAME,
 		.pm	= vpif_pm_ops,
 	},
 	.remove = vpif_remove,

drivers/media/platform/davinci/vpif_capture.c +1 -0

index 5104cc0ee40e..20c4344ed118 100644
@@ -45,6 +45,7 @@ module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Debug level 0-1");
 
 #define VPIF_DRIVER_NAME	"vpif_capture"
+MODULE_ALIAS("platform:" VPIF_DRIVER_NAME);
 
 /* global variables */
 static struct vpif_device vpif_obj = { {NULL} };

@@ -647,6 +648,10 @@ static int vpif_input_to_subdev(
 
 	vpif_dbg(2, debug, "vpif_input_to_subdev\n");
 

drivers/media/platform/davinci/vpif_capture.c static int vpif_input_to_subdev( · line 662

Quoted 13 lines

drivers/media/platform/davinci/vpif_capture.c +5 -1

+	if (!chan_cfg)
+		return -1;
+	if (input_index >= chan_cfg->input_count)
+		return -1;
 	subdev_name = chan_cfg->inputs[input_index].subdev_name;
 	if (subdev_name == NULL)
 		return -1;

@@ -654,7 +659,7 @@ static int vpif_input_to_subdev(
 	/* loop through the sub device list to get the sub device info */
 	for (i = 0; i < vpif_cfg->subdev_count; i++) {
 		subdev_info = &vpif_cfg->subdev_info[i];
-		if (!strcmp(subdev_info->name, subdev_name))
+		if (subdev_info && !strcmp(subdev_info->name, subdev_name))

Why this change? subdev_info can never be NULL.

Remove hard-coded I2C adapter in favor of getting the ID from platform_data.

Signed-off-by Kevin Hilman <[email protected]>

---
 drivers/media/platform/davinci/vpif_capture.c | 5 ++++-
 include/media/davinci/vpif_types.h            | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

drivers/media/platform/davinci/vpif_capture.c +0 -0

index 20c4344ed118..c24049acd40a 100644

drivers/media/platform/davinci/vpif_capture.c +3 -0

+
+		i2c_adap = i2c_get_adapter(i2c_id);
+		WARN_ON(!i2c_adap);
 		for (i = 0; i < subdev_count; i++) {
 			subdevdata = &vpif_obj.config->subdev_info[i];
 			vpif_obj.sd[i] =

include/media/davinci/vpif_types.h +1 -0

index 3cb1704a0650..4282a7db99d4 100644
@@ -82,6 +82,7 @@ struct vpif_capture_config {
 	struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS];
 	struct vpif_subdev_info *subdev_info;
 	int subdev_count;
+	int i2c_adapter_id;
 	const char *card_name;
 	struct v4l2_async_subdev **asd;	/* Flat array, arranged in groups */
 	int *asd_sizes;		/* 0-terminated array of asd group sizes */

Prepare the groundwork for adding DT support for davinci VPIF drivers. This series does some fixups/cleanups and then adds the DT binding and DT compatible string matching for DT probing.

The controversial part from previous versions around async subdev parsing, and specifically hard-coding the input/output routing of subdevs, has been left out of this series. That part can be done as a follow-on step after agreement has been reached on the path forward.

With this version, platforms can still use the VPIF capture/display drivers, but must provide platform_data for the subdevs and subdev routing.

Quoted 8 lines · Kevin Hilman

Prepare the groundwork for adding DT support for davinci VPIF drivers. This series does some fixups/cleanups and then adds the DT binding and DT compatible string matching for DT probing.

The controversial part from previous versions around async subdev parsing, and specifically hard-coding the input/output routing of subdevs, has been left out of this series. That part can be done as a follow-on step after agreement has been reached on the path forward.

I had a similar need for another board (OMAP3 IGEPv2), that has a TVP5151 video decoder (that also supports 2 composite or 1 s-video signal) attached to the OMAP3 ISP.

I posted some RFC patches [0] to define the input signals in the DT, and AFAICT Laurent and Hans were not against the approach but just had some comments on the DT binding.

Basically they wanted the ports to be directly in the tvp5150 node instead of under a connectors sub-node [1] and to just be called just a (input / output) port instead of a connector [2].

Unfortunately I was busy with other tasks so I couldn't res-pin the patches, but I think you could have something similar in the DT binding for your case and it shouldn't be hard to parse the ports / endpoints in the driver to get that information from DT and setup the input and output pins.

Quoted 4 lines

With is version, platforms can still use the VPIF capture/display drivers, but must provide platform_data for the subdevs and subdev routing.

I guess DT backward compatibility isn't a big issue on this platform, since support for the platform is quite recently and after all someone who wants to use the vpif with current DT will need platform data and pdata-quirks anyways.

So I agree with you that the input / output signals lookup from DT could be done as a follow-up.

Prepare the groundwork for adding DT support for davinci VPIF drivers. This series does some fixups/cleanups and then adds the DT binding and DT compatible string matching for DT probing.

The controversial part from previous versions around async subdev parsing, and specifically hard-coding the input/output routing of subdevs, has been left out of this series. That part can be done as a follow-on step after agreement has been reached on the path forward. With this version, platforms can still use the VPIF capture/display drivers, but must provide platform_data for the subdevs and subdev routing.

Tested video capture to memory on da850-lcdk board using composite input.

Changes since v5:
- locking fix: updated comment around lock variable
- binding doc: added example for
- added reviewed-by tags from Laurent (thanks!)

Changes since v4:
- dropped controversial async subdev parsing support. That can be done as a follow-up step after the discussions have finalized on the right approach.
- DT binding Acked by DT maintainer (Rob H.)
- reworked locking fix (suggested by Laurent)

Changes since v3:
- move to a single VPIF node, DT binding updated accordingly
- misc fixes/updates based on reviews from Sakari

Changes since v2:
- DT binding doc: fix example to use correct compatible

Changes since v1:
- more specific compatible strings, based on SoC: ti,da850-vpif*
- fix locking bug when unlocking over subdev s_stream

Kevin Hilman (5):
[media] davinci: VPIF: fix module loading, init errors [media] davinci: vpif_capture: remove hard-coded I2C adapter id [media] davinci: vpif_capture: fix start/stop streaming locking [media] dt-bindings: add TI VPIF documentation [media] davinci: VPIF: add basic support for DT init

 .../devicetree/bindings/media/ti,da850-vpif.txt    | 83 ++++++++++++++++++++++
 drivers/media/platform/davinci/vpif.c              | 14 +++-
 drivers/media/platform/davinci/vpif_capture.c      | 26 +++++--
 drivers/media/platform/davinci/vpif_capture.h      |  2 +-
 drivers/media/platform/davinci/vpif_display.c      |  6 ++
 include/media/davinci/vpif_types.h                 |  1 +
 6 files changed, 125 insertions(+), 7 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/media/ti,da850-vpif.txt

Quoted 12 lines · Kevin Hilman

Prepare the groundwork for adding DT support for davinci VPIF drivers. This series does some fixups/cleanups and then adds the DT binding and DT compatible string matching for DT probing.

The controversial part from previous versions around async subdev parsing, and specifically hard-coding the input/output routing of subdevs, has been left out of this series. That part can be done as a follow-on step after agreement has been reached on the path forward. With this version, platforms can still use the VPIF capture/display drivers, but must provide platform_data for the subdevs and subdev routing.

Quoted 2 lines

Tested video capture to memory on da850-lcdk board using composite input.

Other than the comment for the first patch this series looks good.

So once that's addressed I'll queue it up for 4.11.

Quoted 16 lines · Hans Verkuil

Quoted 14 lines · Kevin Hilman

Prepare the groundwork for adding DT support for davinci VPIF drivers. This series does some fixups/cleanups and then adds the DT binding and DT compatible string matching for DT probing.

The controversial part from previous versions around async subdev parsing, and specifically hard-coding the input/output routing of subdevs, has been left out of this series. That part can be done as a follow-on step after agreement has been reached on the path forward. With this version, platforms can still use the VPIF capture/display drivers, but must provide platform_data for the subdevs and subdev routing.

Tested video capture to memory on da850-lcdk board using composite input.

Quoted 3 lines

Other than the comment for the first patch this series looks good.

So once that's addressed I'll queue it up for 4.11.

I've fixed that issue, and sent an update for just that patch in reply to the original.

Thanks for the review,

Quoted 25 lines · Kevin Hilman

Quoted 13 lines · Hans Verkuil

Quoted 12 lines · Kevin Hilman

Prepare the groundwork for adding DT support for davinci VPIF drivers. This series does some fixups/cleanups and then adds the DT binding and DT compatible string matching for DT probing.

The controversial part from previous versions around async subdev parsing, and specifically hard-coding the input/output routing of subdevs, has been left out of this series. That part can be done as a follow-on step after agreement has been reached on the path forward. With this version, platforms can still use the VPIF capture/display drivers, but must provide platform_data for the subdevs and subdev routing.

Quoted 6 lines

Quoted 2 lines

Tested video capture to memory on da850-lcdk board using composite input.

Other than the comment for the first patch this series looks good.

So once that's addressed I'll queue it up for 4.11.

I've fixed that issue, and sent an update for just that patch in reply to the original.

Quoted 1 line

Thanks for the review,

Gentle ping on this series.

I'm still not seeing this series yet in linux-next, so am worried it might not make it for v4.11.

Kevin

Quoted 12 lines · Kevin Hilman

Prepare the groundwork for adding DT support for davinci VPIF drivers. This series does some fixups/cleanups and then adds the DT binding and DT compatible string matching for DT probing.

The controversial part from previous versions around async subdev parsing, and specifically hard-coding the input/output routing of subdevs, has been left out of this series. That part can be done as a follow-on step after agreement has been reached on the path forward. With this version, platforms can still use the VPIF capture/display drivers, but must provide platform_data for the subdevs and subdev routing.

Quoted 2 lines

Tested video capture to memory on da850-lcdk board using composite input.

Other than the comment for the first patch this series looks good.

So once that's addressed I'll queue it up for 4.11.

Quoted 16 lines · Hans Verkuil

Quoted 14 lines · Kevin Hilman

Prepare the groundwork for adding DT support for davinci VPIF drivers. This series does some fixups/cleanups and then adds the DT binding and DT compatible string matching for DT probing.

The controversial part from previous versions around async subdev parsing, and specifically hard-coding the input/output routing of subdevs, has been left out of this series. That part can be done as a follow-on step after agreement has been reached on the path forward. With this version, platforms can still use the VPIF capture/display drivers, but must provide platform_data for the subdevs and subdev routing.

Tested video capture to memory on da850-lcdk board using composite input.

Quoted 3 lines

Other than the comment for the first patch this series looks good.

So once that's addressed I'll queue it up for 4.11.

Can you provide an immutable commit (as it will reach v4.11) with with this series applied? I have some platform changes to queue for v4.11 that depend on the driver updates.

Hi Sekhar,

Quoted 21 lines · On Tuesday 03 Jan 2017 14:33:00 Sekhar Nori wrote:

Quoted 19 lines · Hans Verkuil

Quoted 12 lines · Kevin Hilman

Prepare the groundwork for adding DT support for davinci VPIF drivers. This series does some fixups/cleanups and then adds the DT binding and DT compatible string matching for DT probing.

The controversial part from previous versions around async subdev parsing, and specifically hard-coding the input/output routing of subdevs, has been left out of this series. That part can be done as a follow-on step after agreement has been reached on the path forward. With this version, platforms can still use the VPIF capture/display drivers, but must provide platform_data for the subdevs and subdev routing.

Quoted 2 lines

Tested video capture to memory on da850-lcdk board using composite input.

Other than the comment for the first patch this series looks good.

So once that's addressed I'll queue it up for 4.11.

Quoted 3 lines

Can you provide an immutable commit (as it will reach v4.11) with with this series applied? I have some platform changes to queue for v4.11 that depend on the driver updates.

I don't think that's possible, given that Mauro rewrites all patches when handling pull requests to prepend [media] to the subject line and to add his SoB. Only Mauro can thus provide a stable branch, Hans can't.