From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko Stuebner) Date: Tue, 10 Mar 2015 00:22:49 +0100 Subject: [PATCH 2/3] drm/bridge: dw-hdmi: support optional supply regulators In-Reply-To: <1429128.MSqYm0qZ9p@phil> References: <1429128.MSqYm0qZ9p@phil> Message-ID: <2297963.iMSNqyfSUx@phil> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org At least the Rockchip variant of the dw_hdmi can have controllable power supplies providing 1.0 and 1.8V. Therefore add the possibility for the generic bridge driver to enable supplies provided by the hw-specific drivers. Signed-off-by: Heiko Stuebner --- .../devicetree/bindings/drm/bridge/dw_hdmi.txt | 5 ++++ drivers/gpu/drm/bridge/dw_hdmi.c | 27 +++++++++++++++++++++- drivers/gpu/drm/imx/dw_hdmi-imx.c | 3 ++- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 15 +++++++++++- include/drm/bridge/dw_hdmi.h | 3 ++- 5 files changed, 49 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt b/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt index a905c14..bb74640 100644 --- a/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt +++ b/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt @@ -22,6 +22,11 @@ Optional properties - ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing - clocks, clock-names: phandle to the HDMI CEC clock, name should be "cec" +Supplies: +rockchip,rk3288-dw-hdmi handles two optional power supplies: +- avdd1v0-supply: 1.0V power supply +- avdd1v8-supply: 1.8V power supply + Example: hdmi: hdmi at 0120000 { compatible = "fsl,imx6q-hdmi"; diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index cd6a706..9f8999d 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -114,6 +115,9 @@ struct dw_hdmi { struct hdmi_data_info hdmi_data; const struct dw_hdmi_plat_data *plat_data; + struct regulator_bulk_data *supplies; + int nsupplies; + int vic; u8 edid[HDMI_EDID_LEN]; @@ -879,6 +883,12 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi) int i, ret; bool cscon = false; + if (hdmi->nsupplies > 0) { + ret = regulator_bulk_enable(hdmi->nsupplies, hdmi->supplies); + if (ret) + return ret; + } + /*check csc whether needed activated in HDMI mode */ cscon = (is_color_space_conversion(hdmi) && !hdmi->hdmi_data.video_mode.mdvi); @@ -1105,6 +1115,9 @@ static void dw_hdmi_phy_disable(struct dw_hdmi *hdmi) dw_hdmi_phy_enable_tmds(hdmi, 0); dw_hdmi_phy_enable_power(hdmi, 0); + if (hdmi->nsupplies > 0) + regulator_bulk_disable(hdmi->nsupplies, hdmi->supplies); + hdmi->phy_enabled = false; } @@ -1549,7 +1562,8 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) int dw_hdmi_bind(struct device *dev, struct device *master, void *data, struct drm_encoder *encoder, struct resource *iores, int irq, - const struct dw_hdmi_plat_data *plat_data) + const struct dw_hdmi_plat_data *plat_data, + struct regulator_bulk_data *supplies, int nsupplies) { struct drm_device *drm = data; struct device_node *np = dev->of_node; @@ -1602,6 +1616,17 @@ int dw_hdmi_bind(struct device *dev, struct device *master, if (IS_ERR(hdmi->regs)) return PTR_ERR(hdmi->regs); + if (nsupplies > 0) { + ret = devm_regulator_bulk_get(hdmi->dev, nsupplies, supplies); + if (ret == -EPROBE_DEFER) + return ret; + if (ret) + nsupplies = 0; + } + + hdmi->supplies = supplies; + hdmi->nsupplies = nsupplies; + hdmi->isfr_clk = devm_clk_get(hdmi->dev, "isfr"); if (IS_ERR(hdmi->isfr_clk)) { ret = PTR_ERR(hdmi->isfr_clk); diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c index 121d30c..153e259 100644 --- a/drivers/gpu/drm/imx/dw_hdmi-imx.c +++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c @@ -214,7 +214,8 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master, drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs, DRM_MODE_ENCODER_TMDS); - return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); + return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data, + NULL, 0); } static void dw_hdmi_imx_unbind(struct device *dev, struct device *master, diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index d236faa..c085e88 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -24,6 +25,8 @@ #define GRF_SOC_CON6 0x025c #define HDMI_SEL_VOP_LIT (1 << 4) +#define HDMI_NUM_REGULATORS 2 + struct rockchip_hdmi { struct device *dev; struct regmap *regmap; @@ -248,6 +251,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, struct platform_device *pdev = to_platform_device(dev); const struct dw_hdmi_plat_data *plat_data; const struct of_device_id *match; + struct regulator_bulk_data *supplies; struct drm_device *drm = data; struct drm_encoder *encoder; struct rockchip_hdmi *hdmi; @@ -275,6 +279,14 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, if (!iores) return -ENXIO; + supplies = devm_kcalloc(&pdev->dev, HDMI_NUM_REGULATORS, + sizeof(*supplies), GFP_KERNEL); + if (!supplies) + return -ENOMEM; + + supplies[0].supply = "avdd1v0"; + supplies[1].supply = "avdd1v8"; + platform_set_drvdata(pdev, hdmi); encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); @@ -297,7 +309,8 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs, DRM_MODE_ENCODER_TMDS); - return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); + return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data, + supplies, HDMI_NUM_REGULATORS); } static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master, diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index 5a4f490..7b0fac5 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -57,5 +57,6 @@ void dw_hdmi_unbind(struct device *dev, struct device *master, void *data); int dw_hdmi_bind(struct device *dev, struct device *master, void *data, struct drm_encoder *encoder, struct resource *iores, int irq, - const struct dw_hdmi_plat_data *plat_data); + const struct dw_hdmi_plat_data *plat_data, + struct regulator_bulk_data *supplies, int nsupplies); #endif /* __IMX_HDMI_H__ */ -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Stuebner Subject: [PATCH 2/3] drm/bridge: dw-hdmi: support optional supply regulators Date: Tue, 10 Mar 2015 00:22:49 +0100 Message-ID: <2297963.iMSNqyfSUx@phil> References: <1429128.MSqYm0qZ9p@phil> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1429128.MSqYm0qZ9p@phil> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Philipp Zabel Cc: Fabio Estevam , devicetree@vger.kernel.org, Rob Herring , Pawel Moll , Ian Campbell , Kumar Gala , dianders@chromium.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, broonie@kernel.org, dri-devel@lists.freedesktop.org, Yakir Yang , Andy Yan , Mark Rutland , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org QXQgbGVhc3QgdGhlIFJvY2tjaGlwIHZhcmlhbnQgb2YgdGhlIGR3X2hkbWkgY2FuIGhhdmUgY29u dHJvbGxhYmxlIHBvd2VyIHN1cHBsaWVzCnByb3ZpZGluZyAxLjAgYW5kIDEuOFYuIFRoZXJlZm9y ZSBhZGQgdGhlIHBvc3NpYmlsaXR5IGZvciB0aGUgZ2VuZXJpYyBicmlkZ2UKZHJpdmVyIHRvIGVu YWJsZSBzdXBwbGllcyBwcm92aWRlZCBieSB0aGUgaHctc3BlY2lmaWMgZHJpdmVycy4KClNpZ25l ZC1vZmYtYnk6IEhlaWtvIFN0dWVibmVyIDxoZWlrb0BzbnRlY2guZGU+Ci0tLQogLi4uL2Rldmlj ZXRyZWUvYmluZGluZ3MvZHJtL2JyaWRnZS9kd19oZG1pLnR4dCAgICAgfCAgNSArKysrCiBkcml2 ZXJzL2dwdS9kcm0vYnJpZGdlL2R3X2hkbWkuYyAgICAgICAgICAgICAgICAgICB8IDI3ICsrKysr KysrKysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pbXgvZHdfaGRtaS1pbXguYyAgICAg ICAgICAgICAgICAgIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHdfaGRtaS1y b2NrY2hpcC5jICAgICAgICB8IDE1ICsrKysrKysrKysrLQogaW5jbHVkZS9kcm0vYnJpZGdlL2R3 X2hkbWkuaCAgICAgICAgICAgICAgICAgICAgICAgfCAgMyArKy0KIDUgZmlsZXMgY2hhbmdlZCwg NDkgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0 aW9uL2RldmljZXRyZWUvYmluZGluZ3MvZHJtL2JyaWRnZS9kd19oZG1pLnR4dCBiL0RvY3VtZW50 YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9kcm0vYnJpZGdlL2R3X2hkbWkudHh0CmluZGV4IGE5 MDVjMTQuLmJiNzQ2NDAgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5k aW5ncy9kcm0vYnJpZGdlL2R3X2hkbWkudHh0CisrKyBiL0RvY3VtZW50YXRpb24vZGV2aWNldHJl ZS9iaW5kaW5ncy9kcm0vYnJpZGdlL2R3X2hkbWkudHh0CkBAIC0yMiw2ICsyMiwxMSBAQCBPcHRp b25hbCBwcm9wZXJ0aWVzCiAtIGRkYy1pMmMtYnVzOiBwaGFuZGxlIG9mIGFuIEkyQyBjb250cm9s bGVyIHVzZWQgZm9yIEREQyBFRElEIHByb2JpbmcKIC0gY2xvY2tzLCBjbG9jay1uYW1lczogcGhh bmRsZSB0byB0aGUgSERNSSBDRUMgY2xvY2ssIG5hbWUgc2hvdWxkIGJlICJjZWMiCiAKK1N1cHBs aWVzOgorcm9ja2NoaXAscmszMjg4LWR3LWhkbWkgaGFuZGxlcyB0d28gb3B0aW9uYWwgcG93ZXIg c3VwcGxpZXM6CistIGF2ZGQxdjAtc3VwcGx5OiAxLjBWIHBvd2VyIHN1cHBseQorLSBhdmRkMXY4 LXN1cHBseTogMS44ViBwb3dlciBzdXBwbHkKKwogRXhhbXBsZToKIAloZG1pOiBoZG1pQDAxMjAw MDAgewogCQljb21wYXRpYmxlID0gImZzbCxpbXg2cS1oZG1pIjsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9icmlkZ2UvZHdfaGRtaS5jIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9kd19o ZG1pLmMKaW5kZXggY2Q2YTcwNi4uOWY4OTk5ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2JyaWRnZS9kd19oZG1pLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9kd19oZG1pLmMK QEAgLTE3LDYgKzE3LDcgQEAKICNpbmNsdWRlIDxsaW51eC9jbGsuaD4KICNpbmNsdWRlIDxsaW51 eC9oZG1pLmg+CiAjaW5jbHVkZSA8bGludXgvb2ZfZGV2aWNlLmg+CisjaW5jbHVkZSA8bGludXgv cmVndWxhdG9yL2NvbnN1bWVyLmg+CiAKICNpbmNsdWRlIDxkcm0vZHJtX29mLmg+CiAjaW5jbHVk ZSA8ZHJtL2RybVAuaD4KQEAgLTExNCw2ICsxMTUsOSBAQCBzdHJ1Y3QgZHdfaGRtaSB7CiAJc3Ry dWN0IGhkbWlfZGF0YV9pbmZvIGhkbWlfZGF0YTsKIAljb25zdCBzdHJ1Y3QgZHdfaGRtaV9wbGF0 X2RhdGEgKnBsYXRfZGF0YTsKIAorCXN0cnVjdCByZWd1bGF0b3JfYnVsa19kYXRhICpzdXBwbGll czsKKwlpbnQgbnN1cHBsaWVzOworCiAJaW50IHZpYzsKIAogCXU4IGVkaWRbSERNSV9FRElEX0xF Tl07CkBAIC04NzksNiArODgzLDEyIEBAIHN0YXRpYyBpbnQgZHdfaGRtaV9waHlfaW5pdChzdHJ1 Y3QgZHdfaGRtaSAqaGRtaSkKIAlpbnQgaSwgcmV0OwogCWJvb2wgY3Njb24gPSBmYWxzZTsKIAor CWlmIChoZG1pLT5uc3VwcGxpZXMgPiAwKSB7CisJCXJldCA9IHJlZ3VsYXRvcl9idWxrX2VuYWJs ZShoZG1pLT5uc3VwcGxpZXMsIGhkbWktPnN1cHBsaWVzKTsKKwkJaWYgKHJldCkKKwkJCXJldHVy biByZXQ7CisJfQorCiAJLypjaGVjayBjc2Mgd2hldGhlciBuZWVkZWQgYWN0aXZhdGVkIGluIEhE TUkgbW9kZSAqLwogCWNzY29uID0gKGlzX2NvbG9yX3NwYWNlX2NvbnZlcnNpb24oaGRtaSkgJiYK IAkJCSFoZG1pLT5oZG1pX2RhdGEudmlkZW9fbW9kZS5tZHZpKTsKQEAgLTExMDUsNiArMTExNSw5 IEBAIHN0YXRpYyB2b2lkIGR3X2hkbWlfcGh5X2Rpc2FibGUoc3RydWN0IGR3X2hkbWkgKmhkbWkp CiAJZHdfaGRtaV9waHlfZW5hYmxlX3RtZHMoaGRtaSwgMCk7CiAJZHdfaGRtaV9waHlfZW5hYmxl X3Bvd2VyKGhkbWksIDApOwogCisJaWYgKGhkbWktPm5zdXBwbGllcyA+IDApCisJCXJlZ3VsYXRv cl9idWxrX2Rpc2FibGUoaGRtaS0+bnN1cHBsaWVzLCBoZG1pLT5zdXBwbGllcyk7CisKIAloZG1p LT5waHlfZW5hYmxlZCA9IGZhbHNlOwogfQogCkBAIC0xNTQ5LDcgKzE1NjIsOCBAQCBzdGF0aWMg aW50IGR3X2hkbWlfcmVnaXN0ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRybSwgc3RydWN0IGR3X2hk bWkgKmhkbWkpCiBpbnQgZHdfaGRtaV9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRl dmljZSAqbWFzdGVyLAogCQkgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVy LAogCQkgc3RydWN0IHJlc291cmNlICppb3JlcywgaW50IGlycSwKLQkJIGNvbnN0IHN0cnVjdCBk d19oZG1pX3BsYXRfZGF0YSAqcGxhdF9kYXRhKQorCQkgY29uc3Qgc3RydWN0IGR3X2hkbWlfcGxh dF9kYXRhICpwbGF0X2RhdGEsCisJCSBzdHJ1Y3QgcmVndWxhdG9yX2J1bGtfZGF0YSAqc3VwcGxp ZXMsIGludCBuc3VwcGxpZXMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRhdGE7CiAJ c3RydWN0IGRldmljZV9ub2RlICpucCA9IGRldi0+b2Zfbm9kZTsKQEAgLTE2MDIsNiArMTYxNiwx NyBAQCBpbnQgZHdfaGRtaV9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAq bWFzdGVyLAogCWlmIChJU19FUlIoaGRtaS0+cmVncykpCiAJCXJldHVybiBQVFJfRVJSKGhkbWkt PnJlZ3MpOwogCisJaWYgKG5zdXBwbGllcyA+IDApIHsKKwkJcmV0ID0gZGV2bV9yZWd1bGF0b3Jf YnVsa19nZXQoaGRtaS0+ZGV2LCBuc3VwcGxpZXMsIHN1cHBsaWVzKTsKKwkJaWYgKHJldCA9PSAt RVBST0JFX0RFRkVSKQorCQkJcmV0dXJuIHJldDsKKwkJaWYgKHJldCkKKwkJCW5zdXBwbGllcyA9 IDA7CisJfQorCisJaGRtaS0+c3VwcGxpZXMgPSBzdXBwbGllczsKKwloZG1pLT5uc3VwcGxpZXMg PSBuc3VwcGxpZXM7CisKIAloZG1pLT5pc2ZyX2NsayA9IGRldm1fY2xrX2dldChoZG1pLT5kZXYs ICJpc2ZyIik7CiAJaWYgKElTX0VSUihoZG1pLT5pc2ZyX2NsaykpIHsKIAkJcmV0ID0gUFRSX0VS UihoZG1pLT5pc2ZyX2Nsayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaW14L2R3X2hk bWktaW14LmMgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2R3X2hkbWktaW14LmMKaW5kZXggMTIxZDMw Yy4uMTUzZTI1OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2lteC9kd19oZG1pLWlteC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pbXgvZHdfaGRtaS1pbXguYwpAQCAtMjE0LDcgKzIxNCw4 IEBAIHN0YXRpYyBpbnQgZHdfaGRtaV9pbXhfYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVj dCBkZXZpY2UgKm1hc3RlciwKIAlkcm1fZW5jb2Rlcl9pbml0KGRybSwgZW5jb2RlciwgJmR3X2hk bWlfaW14X2VuY29kZXJfZnVuY3MsCiAJCQkgRFJNX01PREVfRU5DT0RFUl9UTURTKTsKIAotCXJl dHVybiBkd19oZG1pX2JpbmQoZGV2LCBtYXN0ZXIsIGRhdGEsIGVuY29kZXIsIGlvcmVzLCBpcnEs IHBsYXRfZGF0YSk7CisJcmV0dXJuIGR3X2hkbWlfYmluZChkZXYsIG1hc3RlciwgZGF0YSwgZW5j b2RlciwgaW9yZXMsIGlycSwgcGxhdF9kYXRhLAorCQkJICAgIE5VTEwsIDApOwogfQogCiBzdGF0 aWMgdm9pZCBkd19oZG1pX2lteF91bmJpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2 aWNlICptYXN0ZXIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHdfaGRt aS1yb2NrY2hpcC5jIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3X2hkbWktcm9ja2NoaXAu YwppbmRleCBkMjM2ZmFhLi5jMDg1ZTg4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9j a2NoaXAvZHdfaGRtaS1yb2NrY2hpcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9k d19oZG1pLXJvY2tjaGlwLmMKQEAgLTExLDYgKzExLDcgQEAKICNpbmNsdWRlIDxsaW51eC9wbGF0 Zm9ybV9kZXZpY2UuaD4KICNpbmNsdWRlIDxsaW51eC9tZmQvc3lzY29uLmg+CiAjaW5jbHVkZSA8 bGludXgvcmVnbWFwLmg+CisjaW5jbHVkZSA8bGludXgvcmVndWxhdG9yL2NvbnN1bWVyLmg+CiAj aW5jbHVkZSA8ZHJtL2RybV9vZi5oPgogI2luY2x1ZGUgPGRybS9kcm1QLmg+CiAjaW5jbHVkZSA8 ZHJtL2RybV9jcnRjX2hlbHBlci5oPgpAQCAtMjQsNiArMjUsOCBAQAogI2RlZmluZSBHUkZfU09D X0NPTjYgICAgICAgICAgICAgICAgICAgIDB4MDI1YwogI2RlZmluZSBIRE1JX1NFTF9WT1BfTElU ICAgICAgICAgICAgICAgICgxIDw8IDQpCiAKKyNkZWZpbmUgSERNSV9OVU1fUkVHVUxBVE9SUyAg ICAgICAgICAgICAyCisKIHN0cnVjdCByb2NrY2hpcF9oZG1pIHsKIAlzdHJ1Y3QgZGV2aWNlICpk ZXY7CiAJc3RydWN0IHJlZ21hcCAqcmVnbWFwOwpAQCAtMjQ4LDYgKzI1MSw3IEBAIHN0YXRpYyBp bnQgZHdfaGRtaV9yb2NrY2hpcF9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmlj ZSAqbWFzdGVyLAogCXN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYgPSB0b19wbGF0Zm9ybV9k ZXZpY2UoZGV2KTsKIAljb25zdCBzdHJ1Y3QgZHdfaGRtaV9wbGF0X2RhdGEgKnBsYXRfZGF0YTsK IAljb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkICptYXRjaDsKKwlzdHJ1Y3QgcmVndWxhdG9yX2J1 bGtfZGF0YSAqc3VwcGxpZXM7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRhdGE7CiAJc3Ry dWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwogCXN0cnVjdCByb2NrY2hpcF9oZG1pICpoZG1pOwpA QCAtMjc1LDYgKzI3OSwxNCBAQCBzdGF0aWMgaW50IGR3X2hkbWlfcm9ja2NoaXBfYmluZChzdHJ1 Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwKIAlpZiAoIWlvcmVzKQogCQly ZXR1cm4gLUVOWElPOwogCisJc3VwcGxpZXMgPSBkZXZtX2tjYWxsb2MoJnBkZXYtPmRldiwgSERN SV9OVU1fUkVHVUxBVE9SUywKKwkJCQlzaXplb2YoKnN1cHBsaWVzKSwgR0ZQX0tFUk5FTCk7CisJ aWYgKCFzdXBwbGllcykKKwkJcmV0dXJuIC1FTk9NRU07CisKKwlzdXBwbGllc1swXS5zdXBwbHkg PSAiYXZkZDF2MCI7CisJc3VwcGxpZXNbMV0uc3VwcGx5ID0gImF2ZGQxdjgiOworCiAJcGxhdGZv cm1fc2V0X2RydmRhdGEocGRldiwgaGRtaSk7CiAKIAllbmNvZGVyLT5wb3NzaWJsZV9jcnRjcyA9 IGRybV9vZl9maW5kX3Bvc3NpYmxlX2NydGNzKGRybSwgZGV2LT5vZl9ub2RlKTsKQEAgLTI5Nyw3 ICszMDksOCBAQCBzdGF0aWMgaW50IGR3X2hkbWlfcm9ja2NoaXBfYmluZChzdHJ1Y3QgZGV2aWNl ICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwKIAlkcm1fZW5jb2Rlcl9pbml0KGRybSwgZW5j b2RlciwgJmR3X2hkbWlfcm9ja2NoaXBfZW5jb2Rlcl9mdW5jcywKIAkJCSBEUk1fTU9ERV9FTkNP REVSX1RNRFMpOwogCi0JcmV0dXJuIGR3X2hkbWlfYmluZChkZXYsIG1hc3RlciwgZGF0YSwgZW5j b2RlciwgaW9yZXMsIGlycSwgcGxhdF9kYXRhKTsKKwlyZXR1cm4gZHdfaGRtaV9iaW5kKGRldiwg bWFzdGVyLCBkYXRhLCBlbmNvZGVyLCBpb3JlcywgaXJxLCBwbGF0X2RhdGEsCisJCQkgICAgc3Vw cGxpZXMsIEhETUlfTlVNX1JFR1VMQVRPUlMpOwogfQogCiBzdGF0aWMgdm9pZCBkd19oZG1pX3Jv Y2tjaGlwX3VuYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2JyaWRnZS9kd19oZG1pLmggYi9pbmNsdWRlL2RybS9i cmlkZ2UvZHdfaGRtaS5oCmluZGV4IDVhNGY0OTAuLjdiMGZhYzUgMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUvZHJtL2JyaWRnZS9kd19oZG1pLmgKKysrIGIvaW5jbHVkZS9kcm0vYnJpZGdlL2R3X2hkbWku aApAQCAtNTcsNSArNTcsNiBAQCB2b2lkIGR3X2hkbWlfdW5iaW5kKHN0cnVjdCBkZXZpY2UgKmRl diwgc3RydWN0IGRldmljZSAqbWFzdGVyLCB2b2lkICpkYXRhKTsKIGludCBkd19oZG1pX2JpbmQo c3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsCiAJCSB2b2lkICpkYXRh LCBzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCiAJCSBzdHJ1Y3QgcmVzb3VyY2UgKmlvcmVz LCBpbnQgaXJxLAotCQkgY29uc3Qgc3RydWN0IGR3X2hkbWlfcGxhdF9kYXRhICpwbGF0X2RhdGEp OworCQkgY29uc3Qgc3RydWN0IGR3X2hkbWlfcGxhdF9kYXRhICpwbGF0X2RhdGEsCisJCSBzdHJ1 Y3QgcmVndWxhdG9yX2J1bGtfZGF0YSAqc3VwcGxpZXMsIGludCBuc3VwcGxpZXMpOwogI2VuZGlm IC8qIF9fSU1YX0hETUlfSF9fICovCi0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752316AbbCIXWv (ORCPT ); Mon, 9 Mar 2015 19:22:51 -0400 Received: from gloria.sntech.de ([95.129.55.99]:36857 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751467AbbCIXWt (ORCPT ); Mon, 9 Mar 2015 19:22:49 -0400 From: Heiko Stuebner To: Philipp Zabel Cc: David Airlie , djkurtz@chromium.org, Yakir Yang , Fabio Estevam , dianders@chromium.org, Andy Yan , Mark Yao , linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, broonie@kernel.org, devicetree@vger.kernel.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] drm/bridge: dw-hdmi: support optional supply regulators Date: Tue, 10 Mar 2015 00:22:49 +0100 Message-ID: <2297963.iMSNqyfSUx@phil> User-Agent: KMail/4.14.1 (Linux/3.19.0+; KDE/4.14.2; x86_64; ; ) In-Reply-To: <1429128.MSqYm0qZ9p@phil> References: <1429128.MSqYm0qZ9p@phil> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At least the Rockchip variant of the dw_hdmi can have controllable power supplies providing 1.0 and 1.8V. Therefore add the possibility for the generic bridge driver to enable supplies provided by the hw-specific drivers. Signed-off-by: Heiko Stuebner --- .../devicetree/bindings/drm/bridge/dw_hdmi.txt | 5 ++++ drivers/gpu/drm/bridge/dw_hdmi.c | 27 +++++++++++++++++++++- drivers/gpu/drm/imx/dw_hdmi-imx.c | 3 ++- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 15 +++++++++++- include/drm/bridge/dw_hdmi.h | 3 ++- 5 files changed, 49 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt b/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt index a905c14..bb74640 100644 --- a/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt +++ b/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt @@ -22,6 +22,11 @@ Optional properties - ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing - clocks, clock-names: phandle to the HDMI CEC clock, name should be "cec" +Supplies: +rockchip,rk3288-dw-hdmi handles two optional power supplies: +- avdd1v0-supply: 1.0V power supply +- avdd1v8-supply: 1.8V power supply + Example: hdmi: hdmi@0120000 { compatible = "fsl,imx6q-hdmi"; diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index cd6a706..9f8999d 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -114,6 +115,9 @@ struct dw_hdmi { struct hdmi_data_info hdmi_data; const struct dw_hdmi_plat_data *plat_data; + struct regulator_bulk_data *supplies; + int nsupplies; + int vic; u8 edid[HDMI_EDID_LEN]; @@ -879,6 +883,12 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi) int i, ret; bool cscon = false; + if (hdmi->nsupplies > 0) { + ret = regulator_bulk_enable(hdmi->nsupplies, hdmi->supplies); + if (ret) + return ret; + } + /*check csc whether needed activated in HDMI mode */ cscon = (is_color_space_conversion(hdmi) && !hdmi->hdmi_data.video_mode.mdvi); @@ -1105,6 +1115,9 @@ static void dw_hdmi_phy_disable(struct dw_hdmi *hdmi) dw_hdmi_phy_enable_tmds(hdmi, 0); dw_hdmi_phy_enable_power(hdmi, 0); + if (hdmi->nsupplies > 0) + regulator_bulk_disable(hdmi->nsupplies, hdmi->supplies); + hdmi->phy_enabled = false; } @@ -1549,7 +1562,8 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) int dw_hdmi_bind(struct device *dev, struct device *master, void *data, struct drm_encoder *encoder, struct resource *iores, int irq, - const struct dw_hdmi_plat_data *plat_data) + const struct dw_hdmi_plat_data *plat_data, + struct regulator_bulk_data *supplies, int nsupplies) { struct drm_device *drm = data; struct device_node *np = dev->of_node; @@ -1602,6 +1616,17 @@ int dw_hdmi_bind(struct device *dev, struct device *master, if (IS_ERR(hdmi->regs)) return PTR_ERR(hdmi->regs); + if (nsupplies > 0) { + ret = devm_regulator_bulk_get(hdmi->dev, nsupplies, supplies); + if (ret == -EPROBE_DEFER) + return ret; + if (ret) + nsupplies = 0; + } + + hdmi->supplies = supplies; + hdmi->nsupplies = nsupplies; + hdmi->isfr_clk = devm_clk_get(hdmi->dev, "isfr"); if (IS_ERR(hdmi->isfr_clk)) { ret = PTR_ERR(hdmi->isfr_clk); diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c index 121d30c..153e259 100644 --- a/drivers/gpu/drm/imx/dw_hdmi-imx.c +++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c @@ -214,7 +214,8 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master, drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs, DRM_MODE_ENCODER_TMDS); - return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); + return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data, + NULL, 0); } static void dw_hdmi_imx_unbind(struct device *dev, struct device *master, diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index d236faa..c085e88 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -24,6 +25,8 @@ #define GRF_SOC_CON6 0x025c #define HDMI_SEL_VOP_LIT (1 << 4) +#define HDMI_NUM_REGULATORS 2 + struct rockchip_hdmi { struct device *dev; struct regmap *regmap; @@ -248,6 +251,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, struct platform_device *pdev = to_platform_device(dev); const struct dw_hdmi_plat_data *plat_data; const struct of_device_id *match; + struct regulator_bulk_data *supplies; struct drm_device *drm = data; struct drm_encoder *encoder; struct rockchip_hdmi *hdmi; @@ -275,6 +279,14 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, if (!iores) return -ENXIO; + supplies = devm_kcalloc(&pdev->dev, HDMI_NUM_REGULATORS, + sizeof(*supplies), GFP_KERNEL); + if (!supplies) + return -ENOMEM; + + supplies[0].supply = "avdd1v0"; + supplies[1].supply = "avdd1v8"; + platform_set_drvdata(pdev, hdmi); encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); @@ -297,7 +309,8 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs, DRM_MODE_ENCODER_TMDS); - return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); + return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data, + supplies, HDMI_NUM_REGULATORS); } static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master, diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index 5a4f490..7b0fac5 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -57,5 +57,6 @@ void dw_hdmi_unbind(struct device *dev, struct device *master, void *data); int dw_hdmi_bind(struct device *dev, struct device *master, void *data, struct drm_encoder *encoder, struct resource *iores, int irq, - const struct dw_hdmi_plat_data *plat_data); + const struct dw_hdmi_plat_data *plat_data, + struct regulator_bulk_data *supplies, int nsupplies); #endif /* __IMX_HDMI_H__ */ -- 2.1.4