Re: [PATCH v2 4/6] v4l: vsp1: Add DT support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




Hi Laurent,

I've got just couple minor comments...

On 04/02/2014 08:01 PM, Laurent Pinchart wrote:
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
---
  .../devicetree/bindings/media/renesas,vsp1.txt     | 43 ++++++++++++++++++
  drivers/media/platform/vsp1/vsp1_drv.c             | 52 ++++++++++++++++++----
  2 files changed, 87 insertions(+), 8 deletions(-)
  create mode 100644 Documentation/devicetree/bindings/media/renesas,vsp1.txt

Hi,

This is the last call for DT bindings review, with a small change to the
bindings compared to v1. If I don't get any reply I'll assume that those
(pretty simple) bindings are perfect :-)

Changes since v1:

- Drop the clock-names property, as the VSP1 uses a single clock

diff --git a/Documentation/devicetree/bindings/media/renesas,vsp1.txt b/Documentation/devicetree/bindings/media/renesas,vsp1.txt
new file mode 100644
index 0000000..45c1d3c
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/renesas,vsp1.txt
@@ -0,0 +1,43 @@
+* Renesas VSP1 Video Processing Engine
+
+The VSP1 is a video processing engine that supports up-/down-scaling, alpha
+blending, color space conversion and various other image processing features.
+It can be found in the Renesas R-Car second generation SoCs.
+
+Required properties:
+
+  - compatible: Must contain "renesas,vsp1"
+
+  - reg: Base address and length of the registers block for the VSP1.
+  - interrupt-parent, interrupts: Specifier for the VSP1 interrupt.

I don't think 'interrupt-parent' needs to be documented in this device's
binding, I'd say it belongs more to the interrupt controller binding.
In any case, I would separate interrupt-parent and interrupt properties,
as the former contains a phandle to the parent interrupt controller and
the latter contains the vsp1 interrupt specifier.

I'd humbly suggest to rephrase it to something along the lines of:

     - interrupts: should contain the VSP1 interrupt specifier.

+  - clocks: A phandle + clock-specifier pair for the VSP1 functional clock.
+
+  - renesas,#rpf: Number of Read Pixel Formatter (RPF) modules in the VSP1.
+  - renesas,#uds: Number of Up Down Scaler (UDS) modules in the VSP1.
+  - renesas,#wpf: Number of Write Pixel Formatter (WPF) modules in the VSP1.
+
+
+Optional properties:
+
+  - renesas,has-lif: Boolean, indicates that the LCD Interface (LIF) module is
+    available.
+  - renesas,has-lut: Boolean, indicates that the Look Up Table (LUT) module is
+    available.
+  - renesas,has-sru: Boolean, indicates that the Super Resolution Unit (SRU)
+    module is available.
+
+
+Example: R8A7790 (R-Car H2) VSP1-S node
+
+	vsp1@fe928000 {
+		compatible = "renesas,vsp1";
+		reg = <0 0xfe928000 0 0x8000>;

These register ranges look suspicious, shouldn't this be just
<0xfe928000 0x8000> ? What is the #address-cells and #size-cells
values for this node ?

+		interrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp1_clks R8A7790_CLK_VSP1_S>;
+
+		renesas,has-lut;
+		renesas,has-sru;
+		renesas,#rpf = <5>;
+		renesas,#uds = <3>;
+		renesas,#wpf = <4>;
+	};
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index 28e1de3..644650f 100644
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -16,6 +16,7 @@
  #include <linux/device.h>
  #include <linux/interrupt.h>
  #include <linux/module.h>
+#include <linux/of.h>
  #include <linux/platform_device.h>
  #include <linux/videodev2.h>

@@ -431,34 +432,59 @@ static const struct dev_pm_ops vsp1_pm_ops = {
   * Platform Driver
   */

-static struct vsp1_platform_data *
-vsp1_get_platform_data(struct platform_device *pdev)
+static int vsp1_validate_platform_data(struct platform_device *pdev,
+				       struct vsp1_platform_data *pdata)
  {
-	struct vsp1_platform_data *pdata = pdev->dev.platform_data;
-
  	if (pdata == NULL) {
  		dev_err(&pdev->dev, "missing platform data\n");
-		return NULL;
+		return -EINVAL;
  	}

  	if (pdata->rpf_count <= 0 || pdata->rpf_count > VPS1_MAX_RPF) {
  		dev_err(&pdev->dev, "invalid number of RPF (%u)\n",
  			pdata->rpf_count);
-		return NULL;
+		return -EINVAL;
  	}

  	if (pdata->uds_count <= 0 || pdata->uds_count > VPS1_MAX_UDS) {
  		dev_err(&pdev->dev, "invalid number of UDS (%u)\n",
  			pdata->uds_count);
-		return NULL;
+		return -EINVAL;
  	}

  	if (pdata->wpf_count <= 0 || pdata->wpf_count > VPS1_MAX_WPF) {
  		dev_err(&pdev->dev, "invalid number of WPF (%u)\n",
  			pdata->wpf_count);
-		return NULL;
+		return -EINVAL;
  	}

+	return 0;
+}
+
+static struct vsp1_platform_data *
+vsp1_get_platform_data(struct platform_device *pdev)
+{
+	struct device_node *np = pdev->dev.of_node;
+	struct vsp1_platform_data *pdata;
+
+	if (!IS_ENABLED(CONFIG_OF) || np == NULL)
+		return pdev->dev.platform_data;
+
+	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+	if (pdata == NULL)
+		return NULL;
+
+	if (of_property_read_bool(np, "renesas,has-lif"))
+		pdata->features |= VSP1_HAS_LIF;
+	if (of_property_read_bool(np, "renesas,has-lut"))
+		pdata->features |= VSP1_HAS_LUT;
+	if (of_property_read_bool(np, "renesas,has-sru"))
+		pdata->features |= VSP1_HAS_SRU;
+
+	of_property_read_u32(np, "renesas,#rpf", &pdata->rpf_count);
+	of_property_read_u32(np, "renesas,#uds", &pdata->uds_count);
+	of_property_read_u32(np, "renesas,#wpf", &pdata->wpf_count);
+
  	return pdata;
  }

@@ -481,6 +507,10 @@ static int vsp1_probe(struct platform_device *pdev)
  	if (vsp1->pdata == NULL)
  		return -ENODEV;

+	ret = vsp1_validate_platform_data(pdev, vsp1->pdata);
+	if (ret < 0)
+		return ret;
+
  	/* I/O, IRQ and clock resources */
  	io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	vsp1->mmio = devm_ioremap_resource(&pdev->dev, io);
@@ -527,6 +557,11 @@ static int vsp1_remove(struct platform_device *pdev)
  	return 0;
  }

+static const struct of_device_id vsp1_of_match[] = {
+	{ .compatible = "renesas,vsp1" },
+	{ },
+};
+
  static struct platform_driver vsp1_platform_driver = {
  	.probe		= vsp1_probe,
  	.remove		= vsp1_remove,
@@ -534,6 +569,7 @@ static struct platform_driver vsp1_platform_driver = {
  		.owner	= THIS_MODULE,
  		.name	= "vsp1",
  		.pm	= &vsp1_pm_ops,
+		.of_match_table = of_match_ptr(vsp1_of_match),

Is of_match_ptr() really useful here, when vsp1_of_match[] array
is always compiled in ?

  	},
  };

Otherwise this binding indeed looks perfect to me. ;)

--
Regards,
Sylwester
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]
  Powered by Linux