All of lore.kernel.org
 help / color / mirror / Atom feed
From: khilman@baylibre.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 1/6] [media] davinci: add support for DT init
Date: Tue, 25 Oct 2016 16:55:31 -0700	[thread overview]
Message-ID: <20161025235536.7342-2-khilman@baylibre.com> (raw)
In-Reply-To: <20161025235536.7342-1-khilman@baylibre.com>

Add basic support for initialization via DT.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
 drivers/media/platform/davinci/vpif.c         |  9 +++++++++
 drivers/media/platform/davinci/vpif_capture.c | 14 ++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c
index 0380cf2e5775..077e328e0281 100644
--- a/drivers/media/platform/davinci/vpif.c
+++ b/drivers/media/platform/davinci/vpif.c
@@ -464,8 +464,17 @@ static const struct dev_pm_ops vpif_pm = {
 #define vpif_pm_ops NULL
 #endif
 
+#if IS_ENABLED(CONFIG_OF)
+static const struct of_device_id vpif_of_match[] = {
+	{ .compatible = "ti,vpif", },
+	{ /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, vpif_of_match);
+#endif
+
 static struct platform_driver vpif_driver = {
 	.driver = {
+		.of_match_table = of_match_ptr(vpif_of_match),
 		.name	= "vpif",
 		.pm	= vpif_pm_ops,
 	},
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 5104cc0ee40e..79cef74e164f 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1435,6 +1435,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();
@@ -1618,8 +1623,17 @@ static int vpif_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(vpif_pm_ops, vpif_suspend, vpif_resume);
 
+#if IS_ENABLED(CONFIG_OF)
+static const struct of_device_id vpif_capture_of_match[] = {
+	{ .compatible = "ti,vpif-capture", },
+	{ /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, vpif_capture_of_match);
+#endif
+
 static __refdata struct platform_driver vpif_driver = {
 	.driver	= {
+		.of_match_table = of_match_ptr(vpif_capture_of_match),
 		.name	= VPIF_DRIVER_NAME,
 		.pm	= &vpif_pm_ops,
 	},
-- 
2.9.3

WARNING: multiple messages have this Message-ID (diff)
From: Kevin Hilman <khilman@baylibre.com>
To: Hans Verkuil <hverkuil@xs4all.nl>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	linux-media@vger.kernel.org
Cc: "Sekhar Nori" <nsekhar@ti.com>,
	"Axel Haslam" <ahaslam@baylibre.com>,
	"Bartosz Gołaszewski" <bgolaszewski@baylibre.com>,
	"Alexandre Bailon" <abailon@baylibre.com>,
	"David Lechner" <david@lechnology.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 1/6] [media] davinci: add support for DT init
Date: Tue, 25 Oct 2016 16:55:31 -0700	[thread overview]
Message-ID: <20161025235536.7342-2-khilman@baylibre.com> (raw)
In-Reply-To: <20161025235536.7342-1-khilman@baylibre.com>

Add basic support for initialization via DT.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
 drivers/media/platform/davinci/vpif.c         |  9 +++++++++
 drivers/media/platform/davinci/vpif_capture.c | 14 ++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c
index 0380cf2e5775..077e328e0281 100644
--- a/drivers/media/platform/davinci/vpif.c
+++ b/drivers/media/platform/davinci/vpif.c
@@ -464,8 +464,17 @@ static const struct dev_pm_ops vpif_pm = {
 #define vpif_pm_ops NULL
 #endif
 
+#if IS_ENABLED(CONFIG_OF)
+static const struct of_device_id vpif_of_match[] = {
+	{ .compatible = "ti,vpif", },
+	{ /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, vpif_of_match);
+#endif
+
 static struct platform_driver vpif_driver = {
 	.driver = {
+		.of_match_table = of_match_ptr(vpif_of_match),
 		.name	= "vpif",
 		.pm	= vpif_pm_ops,
 	},
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 5104cc0ee40e..79cef74e164f 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1435,6 +1435,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();
@@ -1618,8 +1623,17 @@ static int vpif_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(vpif_pm_ops, vpif_suspend, vpif_resume);
 
+#if IS_ENABLED(CONFIG_OF)
+static const struct of_device_id vpif_capture_of_match[] = {
+	{ .compatible = "ti,vpif-capture", },
+	{ /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, vpif_capture_of_match);
+#endif
+
 static __refdata struct platform_driver vpif_driver = {
 	.driver	= {
+		.of_match_table = of_match_ptr(vpif_capture_of_match),
 		.name	= VPIF_DRIVER_NAME,
 		.pm	= &vpif_pm_ops,
 	},
-- 
2.9.3


  reply	other threads:[~2016-10-25 23:55 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-25 23:55 [RFC PATCH 0/6] media: davinci: VPIF: add DT support Kevin Hilman
2016-10-25 23:55 ` Kevin Hilman
2016-10-25 23:55 ` Kevin Hilman [this message]
2016-10-25 23:55   ` [RFC PATCH 1/6] [media] davinci: add support for DT init Kevin Hilman
2016-10-25 23:55 ` [RFC PATCH 2/6] ARM: davinci: da8xx: VPIF: enable " Kevin Hilman
2016-10-25 23:55   ` Kevin Hilman
2016-10-25 23:55 ` [RFC PATCH 3/6] ARM: dts: davinci: da850: add VPIF Kevin Hilman
2016-10-25 23:55   ` Kevin Hilman
2016-10-25 23:55 ` [RFC PATCH 4/6] ARM: dts: davinci: da850-lcdk: enable VPIF capture Kevin Hilman
2016-10-25 23:55   ` Kevin Hilman
2016-10-25 23:55 ` [RFC PATCH 5/6] [media] davinci: vpif_capture: don't lock over s_stream Kevin Hilman
2016-10-25 23:55   ` Kevin Hilman
2016-10-25 23:55 ` [RFC PATCH 6/6] [media] davinci: vpif_capture: get subdevs from DT Kevin Hilman
2016-10-25 23:55   ` Kevin Hilman
2016-11-11 15:36   ` Hans Verkuil
2016-11-11 15:36     ` Hans Verkuil
2016-11-11 15:50     ` Javier Martinez Canillas
2016-11-11 15:50       ` Javier Martinez Canillas
2016-11-11 15:53       ` Javier Martinez Canillas
2016-11-11 15:53         ` Javier Martinez Canillas
2016-10-28 17:17 ` [RFC PATCH 0/6] media: davinci: VPIF: add DT support Kevin Hilman
2016-10-28 17:17   ` Kevin Hilman
2016-11-11 15:36 ` Hans Verkuil
2016-11-11 15:36   ` Hans Verkuil
2016-11-11 17:55   ` Kevin Hilman
2016-11-11 17:55     ` Kevin Hilman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161025235536.7342-2-khilman@baylibre.com \
    --to=khilman@baylibre.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.