|
@@ -138,6 +138,7 @@ struct dw_hdmi {
|
|
|
struct device *dev;
|
|
|
struct clk *isfr_clk;
|
|
|
struct clk *iahb_clk;
|
|
|
+ struct clk *cec_clk;
|
|
|
struct dw_hdmi_i2c *i2c;
|
|
|
|
|
|
struct hdmi_data_info hdmi_data;
|
|
@@ -2382,6 +2383,26 @@ __dw_hdmi_probe(struct platform_device *pdev,
|
|
|
goto err_isfr;
|
|
|
}
|
|
|
|
|
|
+ hdmi->cec_clk = devm_clk_get(hdmi->dev, "cec");
|
|
|
+ if (PTR_ERR(hdmi->cec_clk) == -ENOENT) {
|
|
|
+ hdmi->cec_clk = NULL;
|
|
|
+ } else if (IS_ERR(hdmi->cec_clk)) {
|
|
|
+ ret = PTR_ERR(hdmi->cec_clk);
|
|
|
+ if (ret != -EPROBE_DEFER)
|
|
|
+ dev_err(hdmi->dev, "Cannot get HDMI cec clock: %d\n",
|
|
|
+ ret);
|
|
|
+
|
|
|
+ hdmi->cec_clk = NULL;
|
|
|
+ goto err_iahb;
|
|
|
+ } else {
|
|
|
+ ret = clk_prepare_enable(hdmi->cec_clk);
|
|
|
+ if (ret) {
|
|
|
+ dev_err(hdmi->dev, "Cannot enable HDMI cec clock: %d\n",
|
|
|
+ ret);
|
|
|
+ goto err_iahb;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/* Product and revision IDs */
|
|
|
hdmi->version = (hdmi_readb(hdmi, HDMI_DESIGN_ID) << 8)
|
|
|
| (hdmi_readb(hdmi, HDMI_REVISION_ID) << 0);
|
|
@@ -2518,6 +2539,8 @@ err_iahb:
|
|
|
cec_notifier_put(hdmi->cec_notifier);
|
|
|
|
|
|
clk_disable_unprepare(hdmi->iahb_clk);
|
|
|
+ if (hdmi->cec_clk)
|
|
|
+ clk_disable_unprepare(hdmi->cec_clk);
|
|
|
err_isfr:
|
|
|
clk_disable_unprepare(hdmi->isfr_clk);
|
|
|
err_res:
|
|
@@ -2541,6 +2564,8 @@ static void __dw_hdmi_remove(struct dw_hdmi *hdmi)
|
|
|
|
|
|
clk_disable_unprepare(hdmi->iahb_clk);
|
|
|
clk_disable_unprepare(hdmi->isfr_clk);
|
|
|
+ if (hdmi->cec_clk)
|
|
|
+ clk_disable_unprepare(hdmi->cec_clk);
|
|
|
|
|
|
if (hdmi->i2c)
|
|
|
i2c_del_adapter(&hdmi->i2c->adap);
|