From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Zhong Subject: Re: [PATCH v3 23/24] drm/rockchip: dw-mipi-dsi: add reset control Date: Wed, 15 Feb 2017 11:38:45 +0800 Message-ID: <58A3CD45.9090309@rock-chips.com> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-24-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170129132444.25251-24-john@metanate.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Keeping , Mark Yao Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org SGkgSm9obgoKT24gMDEvMjkvMjAxNyAwOToyNCBQTSwgSm9obiBLZWVwaW5nIHdyb3RlOgo+IElu IG9yZGVyIHRvIGZ1bGx5IHJlc2V0IHRoZSBzdGF0ZSBvZiB0aGUgTUlQSSBjb250cm9sbGVyIHdl IG11c3QgYXNzZXJ0Cj4gdGhpcyByZXNldC4KPgo+IFRoaXMgaXMgc2xpZ2h0bHkgbW9yZSBjb21w bGljYXRlZCB0aGFuIGl0IGNvdWxkIGJlIGluIG9yZGVyIHRvIG1haW50YWluCj4gY29tcGF0aWJp bGl0eSB3aXRoIGRldmljZSB0cmVlcyB0aGF0IGRvIG5vdCBzcGVjaWZ5IHRoZSByZXNldCBwcm9w ZXJ0eS4KPgo+IFNpZ25lZC1vZmYtYnk6IEpvaG4gS2VlcGluZyA8am9obkBtZXRhbmF0ZS5jb20+ Cj4gUmV2aWV3ZWQtYnk6IENocmlzIFpob25nIDx6eXdAcm9jay1jaGlwcy5jb20+Cj4gLS0tCj4g djM6Cj4gLSBBZGQgQ2hyaXMnIFJldmlld2VkLWJ5Cj4gVW5jaGFuZ2VkIGluIHYyCj4KPiAgIGRy aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jIHwgMzAgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrCj4gICAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKQo+Cj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jIGIvZHJp dmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKPiBpbmRleCA1OGNiOGFjZTJmZTgu LmNmM2NhNmIwY2JkYiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHct bWlwaS1kc2kuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5j Cj4gQEAgLTEzLDYgKzEzLDcgQEAKPiAgICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KPiAgICNp bmNsdWRlIDxsaW51eC9vZl9kZXZpY2UuaD4KPiAgICNpbmNsdWRlIDxsaW51eC9yZWdtYXAuaD4K PiArI2luY2x1ZGUgPGxpbnV4L3Jlc2V0Lmg+Cj4gICAjaW5jbHVkZSA8bGludXgvbWZkL3N5c2Nv bi5oPgo+ICAgI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBlci5oPgo+ICAgI2luY2x1ZGUg PGRybS9kcm1fY3J0Yy5oPgo+IEBAIC0xMTI0LDYgKzExMjUsNyBAQCBzdGF0aWMgaW50IGR3X21p cGlfZHNpX2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsCj4g ICAJCQlvZl9tYXRjaF9kZXZpY2UoZHdfbWlwaV9kc2lfZHRfaWRzLCBkZXYpOwo+ICAgCWNvbnN0 IHN0cnVjdCBkd19taXBpX2RzaV9wbGF0X2RhdGEgKnBkYXRhID0gb2ZfaWQtPmRhdGE7Cj4gICAJ c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiA9IHRvX3BsYXRmb3JtX2RldmljZShkZXYpOwo+ ICsJc3RydWN0IHJlc2V0X2NvbnRyb2wgKmFwYl9yc3Q7Cj4gICAJc3RydWN0IGRybV9kZXZpY2Ug KmRybSA9IGRhdGE7Cj4gICAJc3RydWN0IGR3X21pcGlfZHNpICpkc2k7Cj4gICAJc3RydWN0IHJl c291cmNlICpyZXM7Cj4gQEAgLTExNjIsNiArMTE2NCwzNCBAQCBzdGF0aWMgaW50IGR3X21pcGlf ZHNpX2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsCj4gICAJ CXJldHVybiByZXQ7Cj4gICAJfQo+ICAgCj4gKwkvKgo+ICsJICogTm90ZSB0aGF0IHRoZSByZXNl dCB3YXMgbm90IGRlZmluZWQgaW4gdGhlIGluaXRpYWwgZGV2aWNlIHRyZWUsIHNvCj4gKwkgKiB3 ZSBoYXZlIHRvIGJlIHByZXBhcmVkIGZvciBpdCBub3QgYmVpbmcgZm91bmQuCj4gKwkgKi8KPiAr CWFwYl9yc3QgPSBkZXZtX3Jlc2V0X2NvbnRyb2xfZ2V0KGRldiwgImFwYiIpOwo+ICsJaWYgKElT X0VSUihhcGJfcnN0KSkgewo+ICsJCWlmIChQVFJfRVJSKGFwYl9yc3QpID09IC1FTk9ERVYpIHsK QWNjb3JkaW5nIHRvIFswXSwgSSB0aGluayBpdCBzaG91bGQgYmUgLUVOT0VOVCBoZXJlLgoKWzBd Cmh0dHBzOi8vZ2l0Lmtlcm5lbC5vcmcvY2dpdC9saW51eC9rZXJuZWwvZ2l0L25leHQvbGludXgt bmV4dC5naXQvY29tbWl0Lz9pZD0zZDgxMjE2ZmRlNDY1ZTc2YzVlYWU5OGY2MWQzNjY2MTYzNjM0 Mzk1Cgpjb21taXQgM2Q4MTIxNmZkZTQ2NWU3NmM1ZWFlOThmNjFkMzY2NjE2MzYzNDM5NQpBdXRo b3I6IEFsYmFuIEJlZGVsIDxhbGJldUBmcmVlLmZyPgpEYXRlOiAgIFR1ZSBTZXAgMSAxNzoyODoz MSAyMDE1ICswMjAwCgogICAgIHJlc2V0OiBGaXggb2ZfcmVzZXRfY29udHJvbF9nZXQoKSBmb3Ig Y29uc2lzdGVudCByZXR1cm4gdmFsdWVzCgogICAgIFdoZW4gb2ZfcmVzZXRfY29udHJvbF9nZXQo KSBpcyBjYWxsZWQgd2l0aG91dCBjb25uZWN0aW9uIElEIGl0IHJldHVybnMKICAgICAtRU5PRU5U IHdoZW4gdGhlICdyZXNldHMnIHByb3BlcnR5IGRvZXNuJ3QgZXhpc3RzIG9yIGlzIGFuIGVtcHR5 IGVudHJ5LgogICAgIEhvd2V2ZXIgd2hlbiBhIGNvbm5lY3Rpb24gSUQgaXMgZ2l2ZW4gaXQgcmV0 dXJucyAtRUlOVkFMIHdoZW4gdGhlIAoncmVzZXRzJwogICAgIHByb3BlcnR5IGRvZXNuJ3QgZXhp c3RzIG9yIHRoZSByZXF1ZXN0ZWQgbmFtZSBjYW4ndCBiZSBmb3VuZC4gVGhpcyBpcwogICAgIGJl Y2F1c2UgdGhlIGVycm9yIGNvZGUgcmV0dXJuZWQgYnkgb2ZfcHJvcGVydHlfbWF0Y2hfc3RyaW5n KCkgaXMganVzdAogICAgIHBhc3NlZCBkb3duIGFzIGFuIGluZGV4IHRvIG9mX3BhcnNlX3BoYW5k bGVfd2l0aF9hcmdzKCksIHdoaWNoIHRoZW4KICAgICByZXR1cm5zIC1FSU5WQUwuCgogICAgIFRv IGdldCBhIGNvbnNpc3RlbnQgcmV0dXJuIHZhbHVlIHdpdGggYm90aCBjb2RlIHBhdGhzIHdlIG11 c3QgcmV0dXJuCiAgICAgLUVOT0VOVCB3aGVuIG9mX3Byb3BlcnR5X21hdGNoX3N0cmluZygpIGZh aWxzLgoKICAgICBTaWduZWQtb2ZmLWJ5OiBBbGJhbiBCZWRlbCA8YWxiZXVAZnJlZS5mcj4KICAg ICBTaWduZWQtb2ZmLWJ5OiBQaGlsaXBwIFphYmVsIDxwLnphYmVsQHBlbmd1dHJvbml4LmRlPgoK Cj4gKwkJCWFwYl9yc3QgPSBOVUxMOwo+ICsJCX0gZWxzZSB7Cj4gKwkJCWRldl9lcnIoZGV2LCAi VW5hYmxlIHRvIGdldCByZXNldCBjb250cm9sOiAlZFxuIiwgcmV0KTsKPiArCQkJcmV0dXJuIFBU Ul9FUlIoYXBiX3JzdCk7Cj4gKwkJfQo+ICsJfQo+ICsKPiArCWlmIChhcGJfcnN0KSB7Cj4gKwkJ cmV0ID0gY2xrX3ByZXBhcmVfZW5hYmxlKGRzaS0+cGNsayk7Cj4gKwkJaWYgKHJldCkgewo+ICsJ CQlkZXZfZXJyKGRldiwgIiVzOiBGYWlsZWQgdG8gZW5hYmxlIHBjbGtcbiIsIF9fZnVuY19fKTsK PiArCQkJcmV0dXJuIHJldDsKPiArCQl9Cj4gKwo+ICsJCXJlc2V0X2NvbnRyb2xfYXNzZXJ0KGFw Yl9yc3QpOwo+ICsJCXVzbGVlcF9yYW5nZSgxMCwgMjApOwo+ICsJCXJlc2V0X2NvbnRyb2xfZGVh c3NlcnQoYXBiX3JzdCk7Cj4gKwo+ICsJCWNsa19kaXNhYmxlX3VucHJlcGFyZShkc2ktPnBjbGsp Owo+ICsJfQo+ICsKPiAgIAlyZXQgPSBjbGtfcHJlcGFyZV9lbmFibGUoZHNpLT5wbGxyZWZfY2xr KTsKPiAgIAlpZiAocmV0KSB7Cj4gICAJCWRldl9lcnIoZGV2LCAiJXM6IEZhaWxlZCB0byBlbmFi bGUgcGxscmVmX2Nsa1xuIiwgX19mdW5jX18pOwoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Wed, 15 Feb 2017 11:38:45 +0800 Subject: [PATCH v3 23/24] drm/rockchip: dw-mipi-dsi: add reset control In-Reply-To: <20170129132444.25251-24-john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-24-john@metanate.com> Message-ID: <58A3CD45.9090309@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi John On 01/29/2017 09:24 PM, John Keeping wrote: > In order to fully reset the state of the MIPI controller we must assert > this reset. > > This is slightly more complicated than it could be in order to maintain > compatibility with device trees that do not specify the reset property. > > Signed-off-by: John Keeping > Reviewed-by: Chris Zhong > --- > v3: > - Add Chris' Reviewed-by > Unchanged in v2 > > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index 58cb8ace2fe8..cf3ca6b0cbdb 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1124,6 +1125,7 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, > of_match_device(dw_mipi_dsi_dt_ids, dev); > const struct dw_mipi_dsi_plat_data *pdata = of_id->data; > struct platform_device *pdev = to_platform_device(dev); > + struct reset_control *apb_rst; > struct drm_device *drm = data; > struct dw_mipi_dsi *dsi; > struct resource *res; > @@ -1162,6 +1164,34 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, > return ret; > } > > + /* > + * Note that the reset was not defined in the initial device tree, so > + * we have to be prepared for it not being found. > + */ > + apb_rst = devm_reset_control_get(dev, "apb"); > + if (IS_ERR(apb_rst)) { > + if (PTR_ERR(apb_rst) == -ENODEV) { According to [0], I think it should be -ENOENT here. [0] https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=3d81216fde465e76c5eae98f61d3666163634395 commit 3d81216fde465e76c5eae98f61d3666163634395 Author: Alban Bedel Date: Tue Sep 1 17:28:31 2015 +0200 reset: Fix of_reset_control_get() for consistent return values When of_reset_control_get() is called without connection ID it returns -ENOENT when the 'resets' property doesn't exists or is an empty entry. However when a connection ID is given it returns -EINVAL when the 'resets' property doesn't exists or the requested name can't be found. This is because the error code returned by of_property_match_string() is just passed down as an index to of_parse_phandle_with_args(), which then returns -EINVAL. To get a consistent return value with both code paths we must return -ENOENT when of_property_match_string() fails. Signed-off-by: Alban Bedel Signed-off-by: Philipp Zabel > + apb_rst = NULL; > + } else { > + dev_err(dev, "Unable to get reset control: %d\n", ret); > + return PTR_ERR(apb_rst); > + } > + } > + > + if (apb_rst) { > + ret = clk_prepare_enable(dsi->pclk); > + if (ret) { > + dev_err(dev, "%s: Failed to enable pclk\n", __func__); > + return ret; > + } > + > + reset_control_assert(apb_rst); > + usleep_range(10, 20); > + reset_control_deassert(apb_rst); > + > + clk_disable_unprepare(dsi->pclk); > + } > + > ret = clk_prepare_enable(dsi->pllref_clk); > if (ret) { > dev_err(dev, "%s: Failed to enable pllref_clk\n", __func__); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751842AbdBODjK (ORCPT ); Tue, 14 Feb 2017 22:39:10 -0500 Received: from regular1.263xmail.com ([211.150.99.139]:50287 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751516AbdBODjJ (ORCPT ); Tue, 14 Feb 2017 22:39:09 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: zyw@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 220.128.92.125 X-LOGIN-NAME: zyw@rock-chips.com X-UNIQUE-TAG: <885a52b6e44d87118a77d11c206684ac> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v3 23/24] drm/rockchip: dw-mipi-dsi: add reset control To: John Keeping , Mark Yao References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-24-john@metanate.com> Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org From: Chris Zhong Message-ID: <58A3CD45.9090309@rock-chips.com> Date: Wed, 15 Feb 2017 11:38:45 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20170129132444.25251-24-john@metanate.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi John On 01/29/2017 09:24 PM, John Keeping wrote: > In order to fully reset the state of the MIPI controller we must assert > this reset. > > This is slightly more complicated than it could be in order to maintain > compatibility with device trees that do not specify the reset property. > > Signed-off-by: John Keeping > Reviewed-by: Chris Zhong > --- > v3: > - Add Chris' Reviewed-by > Unchanged in v2 > > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index 58cb8ace2fe8..cf3ca6b0cbdb 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1124,6 +1125,7 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, > of_match_device(dw_mipi_dsi_dt_ids, dev); > const struct dw_mipi_dsi_plat_data *pdata = of_id->data; > struct platform_device *pdev = to_platform_device(dev); > + struct reset_control *apb_rst; > struct drm_device *drm = data; > struct dw_mipi_dsi *dsi; > struct resource *res; > @@ -1162,6 +1164,34 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, > return ret; > } > > + /* > + * Note that the reset was not defined in the initial device tree, so > + * we have to be prepared for it not being found. > + */ > + apb_rst = devm_reset_control_get(dev, "apb"); > + if (IS_ERR(apb_rst)) { > + if (PTR_ERR(apb_rst) == -ENODEV) { According to [0], I think it should be -ENOENT here. [0] https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=3d81216fde465e76c5eae98f61d3666163634395 commit 3d81216fde465e76c5eae98f61d3666163634395 Author: Alban Bedel Date: Tue Sep 1 17:28:31 2015 +0200 reset: Fix of_reset_control_get() for consistent return values When of_reset_control_get() is called without connection ID it returns -ENOENT when the 'resets' property doesn't exists or is an empty entry. However when a connection ID is given it returns -EINVAL when the 'resets' property doesn't exists or the requested name can't be found. This is because the error code returned by of_property_match_string() is just passed down as an index to of_parse_phandle_with_args(), which then returns -EINVAL. To get a consistent return value with both code paths we must return -ENOENT when of_property_match_string() fails. Signed-off-by: Alban Bedel Signed-off-by: Philipp Zabel > + apb_rst = NULL; > + } else { > + dev_err(dev, "Unable to get reset control: %d\n", ret); > + return PTR_ERR(apb_rst); > + } > + } > + > + if (apb_rst) { > + ret = clk_prepare_enable(dsi->pclk); > + if (ret) { > + dev_err(dev, "%s: Failed to enable pclk\n", __func__); > + return ret; > + } > + > + reset_control_assert(apb_rst); > + usleep_range(10, 20); > + reset_control_deassert(apb_rst); > + > + clk_disable_unprepare(dsi->pclk); > + } > + > ret = clk_prepare_enable(dsi->pllref_clk); > if (ret) { > dev_err(dev, "%s: Failed to enable pllref_clk\n", __func__);