Commit 5145aa76 authored by Tomasz Stanislawski's avatar Tomasz Stanislawski Committed by Mauro Carvalho Chehab

[media] v4l: s5p-tv: hdmi: integrate with MHL

Adding support for using MHL (SiI9234 or other) chip if its configuration was
passed to HDMI by platfrom data.
Signed-off-by: default avatarTomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 350f2f4d
...@@ -67,6 +67,8 @@ struct hdmi_device { ...@@ -67,6 +67,8 @@ struct hdmi_device {
struct v4l2_device v4l2_dev; struct v4l2_device v4l2_dev;
/** subdev of HDMIPHY interface */ /** subdev of HDMIPHY interface */
struct v4l2_subdev *phy_sd; struct v4l2_subdev *phy_sd;
/** subdev of MHL interface */
struct v4l2_subdev *mhl_sd;
/** configuration of current graphic mode */ /** configuration of current graphic mode */
const struct hdmi_preset_conf *cur_conf; const struct hdmi_preset_conf *cur_conf;
/** current preset */ /** current preset */
...@@ -572,7 +574,15 @@ static int hdmi_streamon(struct hdmi_device *hdev) ...@@ -572,7 +574,15 @@ static int hdmi_streamon(struct hdmi_device *hdev)
if (tries == 0) { if (tries == 0) {
dev_err(dev, "hdmiphy's pll could not reach steady state.\n"); dev_err(dev, "hdmiphy's pll could not reach steady state.\n");
v4l2_subdev_call(hdev->phy_sd, video, s_stream, 0); v4l2_subdev_call(hdev->phy_sd, video, s_stream, 0);
hdmi_dumpregs(hdev, "s_stream"); hdmi_dumpregs(hdev, "hdmiphy - s_stream");
return -EIO;
}
/* starting MHL */
ret = v4l2_subdev_call(hdev->mhl_sd, video, s_stream, 1);
if (hdev->mhl_sd && ret) {
v4l2_subdev_call(hdev->phy_sd, video, s_stream, 0);
hdmi_dumpregs(hdev, "mhl - s_stream");
return -EIO; return -EIO;
} }
...@@ -603,6 +613,7 @@ static int hdmi_streamoff(struct hdmi_device *hdev) ...@@ -603,6 +613,7 @@ static int hdmi_streamoff(struct hdmi_device *hdev)
clk_set_parent(res->sclk_hdmi, res->sclk_pixel); clk_set_parent(res->sclk_hdmi, res->sclk_pixel);
clk_enable(res->sclk_hdmi); clk_enable(res->sclk_hdmi);
v4l2_subdev_call(hdev->mhl_sd, video, s_stream, 0);
v4l2_subdev_call(hdev->phy_sd, video, s_stream, 0); v4l2_subdev_call(hdev->phy_sd, video, s_stream, 0);
hdmi_dumpregs(hdev, "streamoff"); hdmi_dumpregs(hdev, "streamoff");
...@@ -724,6 +735,7 @@ static int hdmi_runtime_suspend(struct device *dev) ...@@ -724,6 +735,7 @@ static int hdmi_runtime_suspend(struct device *dev)
struct hdmi_device *hdev = sd_to_hdmi_dev(sd); struct hdmi_device *hdev = sd_to_hdmi_dev(sd);
dev_dbg(dev, "%s\n", __func__); dev_dbg(dev, "%s\n", __func__);
v4l2_subdev_call(hdev->mhl_sd, core, s_power, 0);
hdmi_resource_poweroff(&hdev->res); hdmi_resource_poweroff(&hdev->res);
return 0; return 0;
} }
...@@ -742,6 +754,11 @@ static int hdmi_runtime_resume(struct device *dev) ...@@ -742,6 +754,11 @@ static int hdmi_runtime_resume(struct device *dev)
if (ret) if (ret)
goto fail; goto fail;
/* starting MHL */
ret = v4l2_subdev_call(hdev->mhl_sd, core, s_power, 1);
if (hdev->mhl_sd && ret)
goto fail;
dev_dbg(dev, "poweron succeed\n"); dev_dbg(dev, "poweron succeed\n");
return 0; return 0;
...@@ -852,7 +869,7 @@ static int __devinit hdmi_probe(struct platform_device *pdev) ...@@ -852,7 +869,7 @@ static int __devinit hdmi_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct resource *res; struct resource *res;
struct i2c_adapter *phy_adapter; struct i2c_adapter *adapter;
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
struct hdmi_device *hdmi_dev = NULL; struct hdmi_device *hdmi_dev = NULL;
struct s5p_hdmi_platform_data *pdata = dev->platform_data; struct s5p_hdmi_platform_data *pdata = dev->platform_data;
...@@ -927,23 +944,44 @@ static int __devinit hdmi_probe(struct platform_device *pdev) ...@@ -927,23 +944,44 @@ static int __devinit hdmi_probe(struct platform_device *pdev)
goto fail_vdev; goto fail_vdev;
} }
phy_adapter = i2c_get_adapter(pdata->hdmiphy_bus); adapter = i2c_get_adapter(pdata->hdmiphy_bus);
if (phy_adapter == NULL) { if (adapter == NULL) {
dev_err(dev, "adapter request failed\n"); dev_err(dev, "hdmiphy adapter request failed\n");
ret = -ENXIO; ret = -ENXIO;
goto fail_vdev; goto fail_vdev;
} }
hdmi_dev->phy_sd = v4l2_i2c_new_subdev_board(&hdmi_dev->v4l2_dev, hdmi_dev->phy_sd = v4l2_i2c_new_subdev_board(&hdmi_dev->v4l2_dev,
phy_adapter, pdata->hdmiphy_info, NULL); adapter, pdata->hdmiphy_info, NULL);
/* on failure or not adapter is no longer useful */ /* on failure or not adapter is no longer useful */
i2c_put_adapter(phy_adapter); i2c_put_adapter(adapter);
if (hdmi_dev->phy_sd == NULL) { if (hdmi_dev->phy_sd == NULL) {
dev_err(dev, "missing subdev for hdmiphy\n"); dev_err(dev, "missing subdev for hdmiphy\n");
ret = -ENODEV; ret = -ENODEV;
goto fail_vdev; goto fail_vdev;
} }
/* initialization of MHL interface if present */
if (pdata->mhl_info) {
adapter = i2c_get_adapter(pdata->mhl_bus);
if (adapter == NULL) {
dev_err(dev, "MHL adapter request failed\n");
ret = -ENXIO;
goto fail_vdev;
}
hdmi_dev->mhl_sd = v4l2_i2c_new_subdev_board(
&hdmi_dev->v4l2_dev, adapter,
pdata->mhl_info, NULL);
/* on failure or not adapter is no longer useful */
i2c_put_adapter(adapter);
if (hdmi_dev->mhl_sd == NULL) {
dev_err(dev, "missing subdev for MHL\n");
ret = -ENODEV;
goto fail_vdev;
}
}
clk_enable(hdmi_dev->res.hdmi); clk_enable(hdmi_dev->res.hdmi);
pm_runtime_enable(dev); pm_runtime_enable(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment