All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 1/2] media: soc_camera: pxa_camera device-tree support
@ 2014-06-29 14:19 Robert Jarzmik
  2014-06-29 14:20 ` [PATCH v3 2/2] media: soc_camera: pxa_camera documentation " Robert Jarzmik
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Robert Jarzmik @ 2014-06-29 14:19 UTC (permalink / raw)
  To: g.liakhovetski, devicetree, Mark Rutland; +Cc: linux-media, Robert Jarzmik

Add device-tree support to pxa_camera host driver.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

---
Since V1: Mark's review
          - tmp u32 to long conversion for clock rate
          - use device-tree clock binding for mclk output clock
          - wildcard pxa27x becomes pxa270
---
 drivers/media/platform/soc_camera/pxa_camera.c | 80 +++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index d4df305..e76c2ab 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -34,6 +34,7 @@
 #include <media/videobuf-dma-sg.h>
 #include <media/soc_camera.h>
 #include <media/soc_mediabus.h>
+#include <media/v4l2-of.h>
 
 #include <linux/videodev2.h>
 
@@ -1650,6 +1651,67 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = {
 	.set_bus_param	= pxa_camera_set_bus_param,
 };
 
+static int pxa_camera_pdata_from_dt(struct device *dev,
+				    struct pxa_camera_dev *pcdev)
+{
+	int err = 0;
+	u32 mclk_rate = 0;
+	struct device_node *np = dev->of_node;
+	struct v4l2_of_endpoint ep;
+
+	err = of_property_read_u32(np, "clock-frequency",
+				   &mclk_rate);
+	if (!err) {
+		pcdev->platform_flags |= PXA_CAMERA_MCLK_EN;
+		pcdev->mclk = mclk_rate;
+	}
+
+	np = of_graph_get_next_endpoint(np, NULL);
+	if (!np) {
+		dev_err(dev, "could not find endpoint\n");
+		return -EINVAL;
+	}
+
+	err = v4l2_of_parse_endpoint(np, &ep);
+	if (err) {
+		dev_err(dev, "could not parse endpoint\n");
+		return err;
+	}
+
+	switch (ep.bus.parallel.bus_width) {
+	case 4:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_4;
+		break;
+	case 5:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_5;
+		break;
+	case 8:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_8;
+		break;
+	case 9:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_9;
+		break;
+	case 10:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_10;
+		break;
+	default:
+		break;
+	};
+
+	if (ep.bus.parallel.flags & V4L2_MBUS_MASTER)
+		pcdev->platform_flags |= PXA_CAMERA_MASTER;
+	if (ep.bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
+		pcdev->platform_flags |= PXA_CAMERA_HSP;
+	if (ep.bus.parallel.flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
+		pcdev->platform_flags |= PXA_CAMERA_VSP;
+	if (ep.bus.parallel.flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
+		pcdev->platform_flags |= PXA_CAMERA_PCLK_EN | PXA_CAMERA_PCP;
+	if (ep.bus.parallel.flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
+		pcdev->platform_flags |= PXA_CAMERA_PCLK_EN;
+
+	return 0;
+}
+
 static int pxa_camera_probe(struct platform_device *pdev)
 {
 	struct pxa_camera_dev *pcdev;
@@ -1676,7 +1738,15 @@ static int pxa_camera_probe(struct platform_device *pdev)
 	pcdev->res = res;
 
 	pcdev->pdata = pdev->dev.platform_data;
-	pcdev->platform_flags = pcdev->pdata->flags;
+	if (&pdev->dev.of_node && !pcdev->pdata) {
+		err = pxa_camera_pdata_from_dt(&pdev->dev, pcdev);
+	} else {
+		pcdev->platform_flags = pcdev->pdata->flags;
+		pcdev->mclk = pcdev->pdata->mclk_10khz * 10000;
+	}
+	if (err < 0)
+		return err;
+
 	if (!(pcdev->platform_flags & (PXA_CAMERA_DATAWIDTH_8 |
 			PXA_CAMERA_DATAWIDTH_9 | PXA_CAMERA_DATAWIDTH_10))) {
 		/*
@@ -1693,7 +1763,6 @@ static int pxa_camera_probe(struct platform_device *pdev)
 		pcdev->width_flags |= 1 << 8;
 	if (pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_10)
 		pcdev->width_flags |= 1 << 9;
-	pcdev->mclk = pcdev->pdata->mclk_10khz * 10000;
 	if (!pcdev->mclk) {
 		dev_warn(&pdev->dev,
 			 "mclk == 0! Please, fix your platform data. "
@@ -1799,10 +1868,17 @@ static const struct dev_pm_ops pxa_camera_pm = {
 	.resume		= pxa_camera_resume,
 };
 
+static const struct of_device_id pxa_camera_of_match[] = {
+	{ .compatible = "marvell,pxa270-qci", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, pxa_camera_of_match);
+
 static struct platform_driver pxa_camera_driver = {
 	.driver		= {
 		.name	= PXA_CAM_DRV_NAME,
 		.pm	= &pxa_camera_pm,
+		.of_match_table = of_match_ptr(pxa_camera_of_match),
 	},
 	.probe		= pxa_camera_probe,
 	.remove		= pxa_camera_remove,
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v3 2/2] media: soc_camera: pxa_camera documentation device-tree support
  2014-06-29 14:19 [PATCH v3 1/2] media: soc_camera: pxa_camera device-tree support Robert Jarzmik
@ 2014-06-29 14:20 ` Robert Jarzmik
  2014-07-05  8:29 ` [PATCH v3 1/2] media: soc_camera: pxa_camera " Robert Jarzmik
  2014-07-23  9:28 ` Guennadi Liakhovetski
  2 siblings, 0 replies; 11+ messages in thread
From: Robert Jarzmik @ 2014-06-29 14:20 UTC (permalink / raw)
  To: g.liakhovetski, devicetree, Mark Rutland; +Cc: linux-media, Robert Jarzmik

Add device-tree bindings documentation for pxa_camera driver.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

---
Since V1: Mark's review
          - wildcard pxa27x becomes pxa270
          - clock name "camera" becomes "ciclk"
          - add mclk clock provider
---
 .../devicetree/bindings/media/pxa-camera.txt       | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/media/pxa-camera.txt

diff --git a/Documentation/devicetree/bindings/media/pxa-camera.txt b/Documentation/devicetree/bindings/media/pxa-camera.txt
new file mode 100644
index 0000000..11f5b5d
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/pxa-camera.txt
@@ -0,0 +1,43 @@
+Marvell PXA camera host interface
+
+Required properties:
+ - compatible: Should be "marvell,pxa270-qci"
+ - reg: register base and size
+ - interrupts: the interrupt number
+ - any required generic properties defined in video-interfaces.txt
+
+Optional properties:
+ - clocks: input clock (see clock-bindings.txt)
+ - clock-output-names: should contain the name of the clock driving the
+                       sensor master clock MCLK
+ - clock-frequency: host interface is driving MCLK, and MCLK rate is this rate
+
+Example:
+
+	pxa_camera: pxa_camera@50000000 {
+		compatible = "marvell,pxa270-qci";
+		reg = <0x50000000 0x1000>;
+		interrupts = <33>;
+
+		clocks = <&pxa2xx_clks 24>;
+		clock-names = "ciclk";
+		clock-frequency = <50000000>;
+		clock-output-names = "qci_mclk";
+
+		status = "okay";
+
+		port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			/* Parallel bus endpoint */
+			qci: endpoint@0 {
+				reg = <0>;		/* Local endpoint # */
+				remote-endpoint = <&mt9m111_1>;
+				bus-width = <8>;	/* Used data lines */
+				hsync-active = <0>;	/* Active low */
+				vsync-active = <0>;	/* Active low */
+				pclk-sample = <1>;	/* Rising */
+			};
+		};
+	};
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 1/2] media: soc_camera: pxa_camera device-tree support
  2014-06-29 14:19 [PATCH v3 1/2] media: soc_camera: pxa_camera device-tree support Robert Jarzmik
  2014-06-29 14:20 ` [PATCH v3 2/2] media: soc_camera: pxa_camera documentation " Robert Jarzmik
@ 2014-07-05  8:29 ` Robert Jarzmik
  2014-07-14 17:07   ` Robert Jarzmik
  2014-07-23  9:28 ` Guennadi Liakhovetski
  2 siblings, 1 reply; 11+ messages in thread
From: Robert Jarzmik @ 2014-07-05  8:29 UTC (permalink / raw)
  To: g.liakhovetski; +Cc: devicetree, Mark Rutland, linux-media

Robert Jarzmik <robert.jarzmik@free.fr> writes:

Hi Guennadi, Mark,

Can I consider my work done for this serie, or am I forgetting pending comments
? If done, an ack from Mark would be good.

Cheers.

--
Robert

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 1/2] media: soc_camera: pxa_camera device-tree support
  2014-07-05  8:29 ` [PATCH v3 1/2] media: soc_camera: pxa_camera " Robert Jarzmik
@ 2014-07-14 17:07   ` Robert Jarzmik
  0 siblings, 0 replies; 11+ messages in thread
From: Robert Jarzmik @ 2014-07-14 17:07 UTC (permalink / raw)
  To: g.liakhovetski, Mark Rutland; +Cc: devicetree, linux-media

Robert Jarzmik <robert.jarzmik@free.fr> writes:

> Robert Jarzmik <robert.jarzmik@free.fr> writes:
>
> Hi Guennadi, Mark,
>
> Can I consider my work done for this serie, or am I forgetting pending comments
> ? If done, an ack from Mark would be good.
Mark, ping ?

Cheers.

-- 
Robert

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 1/2] media: soc_camera: pxa_camera device-tree support
  2014-06-29 14:19 [PATCH v3 1/2] media: soc_camera: pxa_camera device-tree support Robert Jarzmik
  2014-06-29 14:20 ` [PATCH v3 2/2] media: soc_camera: pxa_camera documentation " Robert Jarzmik
  2014-07-05  8:29 ` [PATCH v3 1/2] media: soc_camera: pxa_camera " Robert Jarzmik
@ 2014-07-23  9:28 ` Guennadi Liakhovetski
  2014-07-23 17:17   ` [PATCH v4 " Guennadi Liakhovetski
  2 siblings, 1 reply; 11+ messages in thread
From: Guennadi Liakhovetski @ 2014-07-23  9:28 UTC (permalink / raw)
  To: Robert Jarzmik; +Cc: devicetree, Mark Rutland, linux-media

Hi Robert,

Thanks for an updated patch. One question:

On Sun, 29 Jun 2014, Robert Jarzmik wrote:

> Add device-tree support to pxa_camera host driver.
> 
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
> 
> ---
> Since V1: Mark's review
>           - tmp u32 to long conversion for clock rate
>           - use device-tree clock binding for mclk output clock
>           - wildcard pxa27x becomes pxa270
> ---
>  drivers/media/platform/soc_camera/pxa_camera.c | 80 +++++++++++++++++++++++++-
>  1 file changed, 78 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
> index d4df305..e76c2ab 100644
> --- a/drivers/media/platform/soc_camera/pxa_camera.c
> +++ b/drivers/media/platform/soc_camera/pxa_camera.c
> @@ -34,6 +34,7 @@
>  #include <media/videobuf-dma-sg.h>
>  #include <media/soc_camera.h>
>  #include <media/soc_mediabus.h>
> +#include <media/v4l2-of.h>
>  
>  #include <linux/videodev2.h>
>  
> @@ -1650,6 +1651,67 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = {
>  	.set_bus_param	= pxa_camera_set_bus_param,
>  };
>  
> +static int pxa_camera_pdata_from_dt(struct device *dev,
> +				    struct pxa_camera_dev *pcdev)
> +{
> +	int err = 0;
> +	u32 mclk_rate = 0;
> +	struct device_node *np = dev->of_node;
> +	struct v4l2_of_endpoint ep;
> +
> +	err = of_property_read_u32(np, "clock-frequency",
> +				   &mclk_rate);
> +	if (!err) {
> +		pcdev->platform_flags |= PXA_CAMERA_MCLK_EN;
> +		pcdev->mclk = mclk_rate;
> +	}
> +
> +	np = of_graph_get_next_endpoint(np, NULL);

Isn't an of_node_put() required after this?

Thanks
Guennadi

> +	if (!np) {
> +		dev_err(dev, "could not find endpoint\n");
> +		return -EINVAL;
> +	}
> +
> +	err = v4l2_of_parse_endpoint(np, &ep);
> +	if (err) {
> +		dev_err(dev, "could not parse endpoint\n");
> +		return err;
> +	}
> +
> +	switch (ep.bus.parallel.bus_width) {
> +	case 4:
> +		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_4;
> +		break;
> +	case 5:
> +		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_5;
> +		break;
> +	case 8:
> +		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_8;
> +		break;
> +	case 9:
> +		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_9;
> +		break;
> +	case 10:
> +		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_10;
> +		break;
> +	default:
> +		break;
> +	};
> +
> +	if (ep.bus.parallel.flags & V4L2_MBUS_MASTER)
> +		pcdev->platform_flags |= PXA_CAMERA_MASTER;
> +	if (ep.bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
> +		pcdev->platform_flags |= PXA_CAMERA_HSP;
> +	if (ep.bus.parallel.flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
> +		pcdev->platform_flags |= PXA_CAMERA_VSP;
> +	if (ep.bus.parallel.flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
> +		pcdev->platform_flags |= PXA_CAMERA_PCLK_EN | PXA_CAMERA_PCP;
> +	if (ep.bus.parallel.flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
> +		pcdev->platform_flags |= PXA_CAMERA_PCLK_EN;
> +
> +	return 0;
> +}
> +
>  static int pxa_camera_probe(struct platform_device *pdev)
>  {
>  	struct pxa_camera_dev *pcdev;
> @@ -1676,7 +1738,15 @@ static int pxa_camera_probe(struct platform_device *pdev)
>  	pcdev->res = res;
>  
>  	pcdev->pdata = pdev->dev.platform_data;
> -	pcdev->platform_flags = pcdev->pdata->flags;
> +	if (&pdev->dev.of_node && !pcdev->pdata) {
> +		err = pxa_camera_pdata_from_dt(&pdev->dev, pcdev);
> +	} else {
> +		pcdev->platform_flags = pcdev->pdata->flags;
> +		pcdev->mclk = pcdev->pdata->mclk_10khz * 10000;
> +	}
> +	if (err < 0)
> +		return err;
> +
>  	if (!(pcdev->platform_flags & (PXA_CAMERA_DATAWIDTH_8 |
>  			PXA_CAMERA_DATAWIDTH_9 | PXA_CAMERA_DATAWIDTH_10))) {
>  		/*
> @@ -1693,7 +1763,6 @@ static int pxa_camera_probe(struct platform_device *pdev)
>  		pcdev->width_flags |= 1 << 8;
>  	if (pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_10)
>  		pcdev->width_flags |= 1 << 9;
> -	pcdev->mclk = pcdev->pdata->mclk_10khz * 10000;
>  	if (!pcdev->mclk) {
>  		dev_warn(&pdev->dev,
>  			 "mclk == 0! Please, fix your platform data. "
> @@ -1799,10 +1868,17 @@ static const struct dev_pm_ops pxa_camera_pm = {
>  	.resume		= pxa_camera_resume,
>  };
>  
> +static const struct of_device_id pxa_camera_of_match[] = {
> +	{ .compatible = "marvell,pxa270-qci", },
> +	{},
> +};
> +MODULE_DEVICE_TABLE(of, pxa_camera_of_match);
> +
>  static struct platform_driver pxa_camera_driver = {
>  	.driver		= {
>  		.name	= PXA_CAM_DRV_NAME,
>  		.pm	= &pxa_camera_pm,
> +		.of_match_table = of_match_ptr(pxa_camera_of_match),
>  	},
>  	.probe		= pxa_camera_probe,
>  	.remove		= pxa_camera_remove,
> -- 
> 2.0.0.rc2
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v4 1/2] media: soc_camera: pxa_camera device-tree support
  2014-07-23  9:28 ` Guennadi Liakhovetski
@ 2014-07-23 17:17   ` Guennadi Liakhovetski
  2014-07-23 17:23     ` Robert Jarzmik
       [not found]     ` <8761invo7p.fsf@free.fr>
  0 siblings, 2 replies; 11+ messages in thread
From: Guennadi Liakhovetski @ 2014-07-23 17:17 UTC (permalink / raw)
  To: Robert Jarzmik; +Cc: devicetree, Mark Rutland, linux-media

Add device-tree support to pxa_camera host driver.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
[g.liakhovetski@gmx.de: added of_node_put()]
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---

Robert, could you review and test this version, please?

Thanks
Guennadi

 drivers/media/platform/soc_camera/pxa_camera.c | 81 +++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index d4df305..64dc80c 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -34,6 +34,7 @@
 #include <media/videobuf-dma-sg.h>
 #include <media/soc_camera.h>
 #include <media/soc_mediabus.h>
+#include <media/v4l2-of.h>
 
 #include <linux/videodev2.h>
 
@@ -1650,6 +1651,68 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = {
 	.set_bus_param	= pxa_camera_set_bus_param,
 };
 
+static int pxa_camera_pdata_from_dt(struct device *dev,
+				    struct pxa_camera_dev *pcdev)
+{
+	u32 mclk_rate;
+	struct device_node *np = dev->of_node;
+	struct v4l2_of_endpoint ep;
+	int err = of_property_read_u32(np, "clock-frequency",
+				       &mclk_rate);
+	if (!err) {
+		pcdev->platform_flags |= PXA_CAMERA_MCLK_EN;
+		pcdev->mclk = mclk_rate;
+	}
+
+	np = of_graph_get_next_endpoint(np, NULL);
+	if (!np) {
+		dev_err(dev, "could not find endpoint\n");
+		return -EINVAL;
+	}
+
+	err = v4l2_of_parse_endpoint(np, &ep);
+	if (err) {
+		dev_err(dev, "could not parse endpoint\n");
+		goto out;
+	}
+
+	switch (ep.bus.parallel.bus_width) {
+	case 4:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_4;
+		break;
+	case 5:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_5;
+		break;
+	case 8:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_8;
+		break;
+	case 9:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_9;
+		break;
+	case 10:
+		pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_10;
+		break;
+	default:
+		break;
+	};
+
+	if (ep.bus.parallel.flags & V4L2_MBUS_MASTER)
+		pcdev->platform_flags |= PXA_CAMERA_MASTER;
+	if (ep.bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
+		pcdev->platform_flags |= PXA_CAMERA_HSP;
+	if (ep.bus.parallel.flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
+		pcdev->platform_flags |= PXA_CAMERA_VSP;
+	if (ep.bus.parallel.flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
+		pcdev->platform_flags |= PXA_CAMERA_PCLK_EN | PXA_CAMERA_PCP;
+	if (ep.bus.parallel.flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
+		pcdev->platform_flags |= PXA_CAMERA_PCLK_EN;
+
+out:
+	of_node_put(np);
+
+	return err;
+}
+
 static int pxa_camera_probe(struct platform_device *pdev)
 {
 	struct pxa_camera_dev *pcdev;
@@ -1676,7 +1739,15 @@ static int pxa_camera_probe(struct platform_device *pdev)
 	pcdev->res = res;
 
 	pcdev->pdata = pdev->dev.platform_data;
-	pcdev->platform_flags = pcdev->pdata->flags;
+	if (&pdev->dev.of_node && !pcdev->pdata) {
+		err = pxa_camera_pdata_from_dt(&pdev->dev, pcdev);
+	} else {
+		pcdev->platform_flags = pcdev->pdata->flags;
+		pcdev->mclk = pcdev->pdata->mclk_10khz * 10000;
+	}
+	if (err < 0)
+		return err;
+
 	if (!(pcdev->platform_flags & (PXA_CAMERA_DATAWIDTH_8 |
 			PXA_CAMERA_DATAWIDTH_9 | PXA_CAMERA_DATAWIDTH_10))) {
 		/*
@@ -1693,7 +1764,6 @@ static int pxa_camera_probe(struct platform_device *pdev)
 		pcdev->width_flags |= 1 << 8;
 	if (pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_10)
 		pcdev->width_flags |= 1 << 9;
-	pcdev->mclk = pcdev->pdata->mclk_10khz * 10000;
 	if (!pcdev->mclk) {
 		dev_warn(&pdev->dev,
 			 "mclk == 0! Please, fix your platform data. "
@@ -1799,10 +1869,17 @@ static const struct dev_pm_ops pxa_camera_pm = {
 	.resume		= pxa_camera_resume,
 };
 
+static const struct of_device_id pxa_camera_of_match[] = {
+	{ .compatible = "marvell,pxa270-qci", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, pxa_camera_of_match);
+
 static struct platform_driver pxa_camera_driver = {
 	.driver		= {
 		.name	= PXA_CAM_DRV_NAME,
 		.pm	= &pxa_camera_pm,
+		.of_match_table = of_match_ptr(pxa_camera_of_match),
 	},
 	.probe		= pxa_camera_probe,
 	.remove		= pxa_camera_remove,
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v4 1/2] media: soc_camera: pxa_camera device-tree support
  2014-07-23 17:17   ` [PATCH v4 " Guennadi Liakhovetski
@ 2014-07-23 17:23     ` Robert Jarzmik
       [not found]     ` <8761invo7p.fsf@free.fr>
  1 sibling, 0 replies; 11+ messages in thread
From: Robert Jarzmik @ 2014-07-23 17:23 UTC (permalink / raw)
  To: Guennadi Liakhovetski; +Cc: devicetree, Mark Rutland, linux-media

Guennadi Liakhovetski <g.liakhovetski@gmx.de> writes:

> Add device-tree support to pxa_camera host driver.
>
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
> [g.liakhovetski@gmx.de: added of_node_put()]
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> Robert, could you review and test this version, please?
Yeah, sure, a couple of hours and it will be tested.

Cheers.

--
Robert

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v4 1/2] media: soc_camera: pxa_camera device-tree support
       [not found]     ` <8761invo7p.fsf@free.fr>
@ 2014-07-24 21:03       ` Guennadi Liakhovetski
  2014-07-25 22:18         ` Robert Jarzmik
  0 siblings, 1 reply; 11+ messages in thread
From: Guennadi Liakhovetski @ 2014-07-24 21:03 UTC (permalink / raw)
  To: Robert Jarzmik; +Cc: devicetree, Mark Rutland, Linux Media Mailing List

(re-adding Cc)

On Wed, 23 Jul 2014, Robert Jarzmik wrote:

> Guennadi Liakhovetski <g.liakhovetski@gmx.de> writes:
> 
> > Add device-tree support to pxa_camera host driver.
> >
> > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
> > [g.liakhovetski@gmx.de: added of_node_put()]
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > ---
> >
> > Robert, could you review and test this version, please?
> Review +1.
> Tested and works fine, so good to go.

Thanks for a quick test! One question: to test this you also needed a 
version of Ben's "soc_camera: add support for dt binding soc_camera 
drivers" patch, right? Did you use the last version from Ben or my amended 
version, that I sent yesterday? If you didn't use my version, would it be 
possible for you to test it and reply with your tested-by if all looks ok?

Thanks
Guennadi

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v4 1/2] media: soc_camera: pxa_camera device-tree support
  2014-07-24 21:03       ` Guennadi Liakhovetski
@ 2014-07-25 22:18         ` Robert Jarzmik
       [not found]           ` <87oawdccaj.fsf-GANU6spQydw@public.gmane.org>
  0 siblings, 1 reply; 11+ messages in thread
From: Robert Jarzmik @ 2014-07-25 22:18 UTC (permalink / raw)
  To: Guennadi Liakhovetski; +Cc: devicetree, Mark Rutland, Linux Media Mailing List

Guennadi Liakhovetski <g.liakhovetski@gmx.de> writes:

> Thanks for a quick test! One question: to test this you also needed a 
> version of Ben's "soc_camera: add support for dt binding soc_camera 
> drivers" patch, right?
Yes.

> Did you use the last version from Ben or my amended version, that I sent
> yesterday?
Ben's version.

> If you didn't use my version, would it be possible for you to test it and
> reply with your tested-by if all looks ok?
Of course, as soon as I find it. And yes, linux-media periodically drops me from
the list members, so I didn't receive it ...

You must be speaking of "[PATCH v6 4/6] soc_camera: add support for dt binding
soc_camera drivers" ... If you could send it to me by mail I wouldn't have to
fight with Google, spinics and others, and I'll concentrate on the testing side
:)

Cheers.

-- 
Robert

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v4 1/2] media: soc_camera: pxa_camera device-tree support
  2014-07-25 22:18         ` Robert Jarzmik
@ 2014-07-26 12:51               ` Robert Jarzmik
  0 siblings, 0 replies; 11+ messages in thread
From: Robert Jarzmik @ 2014-07-26 12:51 UTC (permalink / raw)
  To: Guennadi Liakhovetski
  Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, Mark Rutland,
	Linux Media Mailing List

Robert Jarzmik <robert.jarzmik-GANU6spQydw@public.gmane.org> writes:
> Guennadi Liakhovetski <g.liakhovetski-Mmb7MZpHnFY@public.gmane.org> writes:
>> If you didn't use my version, would it be possible for you to test it and
>> reply with your tested-by if all looks ok?
> Of course, as soon as I find it. And yes, linux-media periodically drops me from
> the list members, so I didn't receive it ...

OK, found and tested, is works good.
Please take my :
Tested-by: Robert Jarzmik <robert.jarzmik-GANU6spQydw@public.gmane.org>

Cheers.

--
Robert
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v4 1/2] media: soc_camera: pxa_camera device-tree support
@ 2014-07-26 12:51               ` Robert Jarzmik
  0 siblings, 0 replies; 11+ messages in thread
From: Robert Jarzmik @ 2014-07-26 12:51 UTC (permalink / raw)
  To: Guennadi Liakhovetski; +Cc: devicetree, Mark Rutland, Linux Media Mailing List

Robert Jarzmik <robert.jarzmik@free.fr> writes:
> Guennadi Liakhovetski <g.liakhovetski@gmx.de> writes:
>> If you didn't use my version, would it be possible for you to test it and
>> reply with your tested-by if all looks ok?
> Of course, as soon as I find it. And yes, linux-media periodically drops me from
> the list members, so I didn't receive it ...

OK, found and tested, is works good.
Please take my :
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>

Cheers.

--
Robert

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2014-07-26 12:58 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-29 14:19 [PATCH v3 1/2] media: soc_camera: pxa_camera device-tree support Robert Jarzmik
2014-06-29 14:20 ` [PATCH v3 2/2] media: soc_camera: pxa_camera documentation " Robert Jarzmik
2014-07-05  8:29 ` [PATCH v3 1/2] media: soc_camera: pxa_camera " Robert Jarzmik
2014-07-14 17:07   ` Robert Jarzmik
2014-07-23  9:28 ` Guennadi Liakhovetski
2014-07-23 17:17   ` [PATCH v4 " Guennadi Liakhovetski
2014-07-23 17:23     ` Robert Jarzmik
     [not found]     ` <8761invo7p.fsf@free.fr>
2014-07-24 21:03       ` Guennadi Liakhovetski
2014-07-25 22:18         ` Robert Jarzmik
     [not found]           ` <87oawdccaj.fsf-GANU6spQydw@public.gmane.org>
2014-07-26 12:51             ` Robert Jarzmik
2014-07-26 12:51               ` Robert Jarzmik

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.