From: Karol Lewandowski <k.lewandowsk@samsung.com> To: linux-samsung-soc@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, thomas.abraham@linaro.org, m.szyprowski@samsung.com, kyungmin.park@samsung.com, linux-kernel@vger.kernel.org, olof@lixom.net, kgene.kim@samsung.com, Karol Lewandowski <k.lewandowsk@samsung.com>, Tomasz Stanislawski <t.stanislaws@samsung.com> Subject: [PATCH 10/13] s5p-tv: Add DT-support for HDMI driver Date: Thu, 12 Apr 2012 20:45:29 +0200 [thread overview] Message-ID: <1334256332-29867-11-git-send-email-k.lewandowsk@samsung.com> (raw) In-Reply-To: <1334256332-29867-1-git-send-email-k.lewandowsk@samsung.com> Includes v4l2/dt helper function (hdmi_of_get_i2c_subdev() that probably should be implemented in v4l2 core itself. Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com> Cc: Tomasz Stanislawski <t.stanislaws@samsung.com> --- drivers/media/video/s5p-tv/hdmi_drv.c | 68 ++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/s5p-tv/hdmi_drv.c b/drivers/media/video/s5p-tv/hdmi_drv.c index fff3cab..a402e8f 100644 --- a/drivers/media/video/s5p-tv/hdmi_drv.c +++ b/drivers/media/video/s5p-tv/hdmi_drv.c @@ -29,6 +29,8 @@ #include <linux/pm_runtime.h> #include <linux/clk.h> #include <linux/regulator/consumer.h> +#include <linux/of.h> +#include <linux/of_i2c.h> #include <media/s5p_hdmi.h> #include <media/v4l2-common.h> @@ -712,6 +714,56 @@ static int hdmi_enum_dv_presets(struct v4l2_subdev *sd, return v4l_fill_dv_preset_info(hdmi_conf[preset->index].preset, preset); } +#ifdef CONFIG_OF +/* Heavily based[1] on v4l2_i2c_new_subdev_board() + * + * [1] Copy-pasted, that is + */ +struct v4l2_subdev *hdmi_of_get_i2c_subdev(struct v4l2_device *v4l2_dev, + struct device_node *np, const char *propname) +{ + struct v4l2_subdev *sd = NULL; + struct i2c_client *client; + struct device_node *cnp; + + BUG_ON(!v4l2_dev); + + cnp = of_parse_phandle(np, propname, 0); + if (!cnp) { + dev_err(v4l2_dev->dev, "Can't find subdev %s\n", propname); + goto err; + } + + client = of_find_i2c_device_by_node(cnp); + if (!client) { + dev_err(v4l2_dev->dev, "subdev %s doesn't reference correct node\n", + propname); + goto err; + } + + if (client == NULL || client->driver == NULL) + goto err; + + /* Lock the module so we can safely get the v4l2_subdev pointer */ + if (!try_module_get(client->driver->driver.owner)) + goto err; + sd = i2c_get_clientdata(client); + + /* Register with the v4l2_device which increases the module's + use count as well. */ + if (v4l2_device_register_subdev(v4l2_dev, sd)) { + printk(KERN_ERR "%s: failed to register subdev\n", __func__); + sd = NULL; + } + /* Decrease the module use count to match the first try_module_get. */ + module_put(client->driver->driver.owner); +err: + of_node_put(cnp); + + return sd; +} +#endif + static const struct v4l2_subdev_core_ops hdmi_sd_core_ops = { .s_power = hdmi_s_power, }; @@ -875,6 +927,12 @@ static struct v4l2_subdev *hdmi_get_subdev( struct i2c_adapter *adapter; struct device *dev = hdmi_dev->dev; +#ifdef CONFIG_OF + if (dev->of_node) + return hdmi_of_get_i2c_subdev(&hdmi_dev->v4l2_dev, + dev->of_node, propname); +#endif + if (!bdinfo) { dev_err(dev, "%s info is missing in platform data\n", propname); @@ -913,7 +971,7 @@ static int __devinit hdmi_probe(struct platform_device *pdev) dev_dbg(dev, "probe start\n"); - if (!pdata) { + if (!pdata && !dev->of_node) { dev_err(dev, "platform data is missing\n"); ret = -ENODEV; goto fail; @@ -1037,6 +1095,13 @@ static int __devexit hdmi_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static struct of_device_id hdmi_dt_match[] = { + { .compatible = "samsung,s5pv210-hdmi" }, + { }, +}; +#endif + static struct platform_driver hdmi_driver __refdata = { .probe = hdmi_probe, .remove = __devexit_p(hdmi_remove), @@ -1045,6 +1110,7 @@ static struct platform_driver hdmi_driver __refdata = { .name = "s5p-hdmi", .owner = THIS_MODULE, .pm = &hdmi_pm_ops, + .of_match_table = of_match_ptr(hdmi_dt_match), } }; -- 1.7.9.1
next prev parent reply other threads:[~2012-04-12 18:47 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-04-12 18:45 [RFC/PATCH 00/13] ARM: Exynos4: Add DTS for Samsung's Nuri board Karol Lewandowski 2012-04-12 18:45 ` [PATCH 01/13] regulator: Fix DT node name checking in max8997-pmic Karol Lewandowski 2012-04-24 22:56 ` Olof Johansson 2012-04-24 22:56 ` Olof Johansson 2012-04-24 22:57 ` Olof Johansson 2012-04-12 18:45 ` [PATCH 02/13] ARM: Add document to list devices with trivial DT description Karol Lewandowski 2012-04-12 18:45 ` [PATCH 03/13] s5p-g2d: Make it possible to instantiate driver from DT Karol Lewandowski 2012-04-12 18:45 ` Karol Lewandowski 2012-04-12 18:45 ` [PATCH 04/13] i2c-pxa: Drop leftover comment Karol Lewandowski 2012-04-12 18:45 ` [PATCH 05/13] i2c: Dynamically assign adapter id if it wasn't explictly specified Karol Lewandowski 2012-04-12 18:45 ` [PATCH 06/13] s5p-tv: Add initial DT-support for SiI9234 Karol Lewandowski 2012-04-12 18:45 ` Karol Lewandowski 2012-04-12 18:45 ` [PATCH 07/13] s5p-tv: Add initial DT-support for TV mixer Karol Lewandowski 2012-04-12 18:45 ` [PATCH 08/13] s5p-tv: Add initial DT-support for HDMIPHY Karol Lewandowski 2012-04-12 18:45 ` [PATCH 09/13] s5p-tv: Move HDMIPHY and MHL subdev probing to dedicated function Karol Lewandowski 2012-04-13 6:42 ` Tomasz Stanislawski 2012-04-12 18:45 ` Karol Lewandowski [this message] 2012-04-13 7:21 ` [PATCH 10/13] s5p-tv: Add DT-support for HDMI driver Tomasz Stanislawski 2012-04-12 18:45 ` [PATCH 11/13] ARM: Exynos4: dts: Specify address and size cells for i2c controllers Karol Lewandowski 2012-04-12 18:45 ` [PATCH 12/13] ARM: Exynos4: Add few more i2c OF compat definitions Karol Lewandowski 2012-04-12 18:45 ` [PATCH 13/13] ARM: dts: Add initial dts for Samsung's NURI board based on Exynos4210 Karol Lewandowski
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=1334256332-29867-11-git-send-email-k.lewandowsk@samsung.com \ --to=k.lewandowsk@samsung.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=kgene.kim@samsung.com \ --cc=kyungmin.park@samsung.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=olof@lixom.net \ --cc=t.stanislaws@samsung.com \ --cc=thomas.abraham@linaro.org \ --subject='Re: [PATCH 10/13] s5p-tv: Add DT-support for HDMI driver' \ /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
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.