From: John Keeping <john@metanate.com> To: Mark Yao <mark.yao@rock-chips.com> Cc: Chris Zhong <zyw@rock-chips.com>, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, John Keeping <john@metanate.com> Subject: [PATCH v2 25/26] drm/rockchip: dw-mipi-dsi: add reset control Date: Sat, 21 Jan 2017 16:31:27 +0000 [thread overview] Message-ID: <20170121163128.22240-26-john@metanate.com> (raw) In-Reply-To: <20170121163128.22240-1-john@metanate.com> 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 <john@metanate.com> --- 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 881bb0c62ca5..f780401e8b5e 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/of_device.h> #include <linux/regmap.h> +#include <linux/reset.h> #include <linux/mfd/syscon.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> @@ -1121,6 +1122,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; @@ -1159,6 +1161,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) { + 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__); -- 2.11.0.197.gb556de5.dirty
WARNING: multiple messages have this Message-ID (diff)
From: john@metanate.com (John Keeping) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 25/26] drm/rockchip: dw-mipi-dsi: add reset control Date: Sat, 21 Jan 2017 16:31:27 +0000 [thread overview] Message-ID: <20170121163128.22240-26-john@metanate.com> (raw) In-Reply-To: <20170121163128.22240-1-john@metanate.com> 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 <john@metanate.com> --- 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 881bb0c62ca5..f780401e8b5e 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/of_device.h> #include <linux/regmap.h> +#include <linux/reset.h> #include <linux/mfd/syscon.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> @@ -1121,6 +1122,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; @@ -1159,6 +1161,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) { + 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__); -- 2.11.0.197.gb556de5.dirty
next prev parent reply other threads:[~2017-01-21 16:33 UTC|newest] Thread overview: 143+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-21 16:31 [PATCH v2 00/26] drm/rockchip: MIPI fixes & improvements John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` [PATCH v2 01/26] drm/rockchip: dw-mipi-dsi: don't configure hardware in mode_set for MIPI John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 3:58 ` Chris Zhong 2017-01-22 3:58 ` Chris Zhong 2017-01-22 3:58 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 02/26] drm/rockchip: dw-mipi-dsi: rename commit hook to enable John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` [PATCH v2 03/26] drm/rockchip: dw-mipi-dsi: pass mode in where needed John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 4:00 ` Chris Zhong 2017-01-22 4:00 ` Chris Zhong 2017-01-22 4:00 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 04/26] drm/rockchip: dw-mipi-dsi: remove mode_set hook John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 6:08 ` Chris Zhong 2017-01-22 6:08 ` Chris Zhong 2017-01-22 6:08 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 05/26] drm/rockchip: dw-mipi-dsi: fix command header writes John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` [PATCH v2 06/26] drm/rockchip: dw-mipi-dsi: fix generic packet status check John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 6:24 ` Chris Zhong 2017-01-22 6:24 ` Chris Zhong 2017-01-22 6:24 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 07/26] drm/rockchip: dw-mipi-dsi: avoid out-of-bounds read on tx_buf John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 6:42 ` Chris Zhong 2017-01-22 6:42 ` Chris Zhong 2017-01-22 6:42 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 08/26] drm/rockchip: dw-mipi-dsi: include bad value in error message John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 6:44 ` Chris Zhong 2017-01-22 6:44 ` Chris Zhong 2017-01-22 6:44 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 09/26] drm/rockchip: dw-mipi-dsi: respect message flags John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 7:14 ` Chris Zhong 2017-01-22 7:14 ` Chris Zhong 2017-01-22 7:14 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 10/26] drm/rockchip: dw-mipi-dsi: only request HS clock when required John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 8:10 ` Chris Zhong 2017-01-22 8:10 ` Chris Zhong 2017-01-22 8:10 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 11/26] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 8:16 ` Chris Zhong 2017-01-22 8:16 ` Chris Zhong 2017-01-22 8:16 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 12/26] drm/rockchip: dw-mipi-dsi: prepare panel after phy init John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 8:22 ` Chris Zhong 2017-01-22 8:22 ` Chris Zhong 2017-01-22 8:22 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 13/26] drm/rockchip: dw-mipi-dsi: allow commands in panel_disable John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 8:37 ` Chris Zhong 2017-01-22 8:37 ` Chris Zhong 2017-01-22 8:37 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 14/26] drm/rockchip: dw-mipi-dsi: fix escape clock rate John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 9:37 ` Chris Zhong 2017-01-22 9:37 ` Chris Zhong 2017-01-22 9:37 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 15/26] drm/rockchip: dw-mipi-dsi: ensure PHY is reset John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 9:37 ` Chris Zhong 2017-01-22 9:37 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 16/26] drm/rockchip: dw-mipi-dsi: configure bias and bandgap before enable John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` [PATCH v2 17/26] drm/rockchip: dw-mipi-dsi: don't enable PHY PLL until it's configured John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 10:07 ` Chris Zhong 2017-01-22 10:07 ` Chris Zhong 2017-01-22 10:07 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 18/26] drm/rockchip: dw-mipi-dsi: properly configure PHY timing John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 3:06 ` Chris Zhong 2017-01-22 3:06 ` Chris Zhong 2017-01-22 3:06 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 19/26] drm/rockchip: dw-mipi-dsi: improve PLL configuration John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-23 1:38 ` Chris Zhong 2017-01-23 1:38 ` Chris Zhong 2017-01-23 1:38 ` Chris Zhong 2017-01-23 12:49 ` John Keeping 2017-01-23 12:49 ` John Keeping 2017-01-23 12:49 ` John Keeping 2017-01-24 2:42 ` Chris Zhong 2017-01-24 2:42 ` Chris Zhong 2017-01-24 2:42 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 20/26] drm/rockchip: dw-mipi-dsi: use specific poll helper John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-23 0:49 ` Chris Zhong 2017-01-23 0:49 ` Chris Zhong 2017-01-23 0:49 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 21/26] drm/rockchip: dw-mipi-dsi: use positive check for N{H,V}SYNC John Keeping 2017-01-21 16:31 ` [PATCH v2 21/26] drm/rockchip: dw-mipi-dsi: use positive check for N{H, V}SYNC John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` [PATCH v2 22/26] drm/rockchip: vop: test for P{H,V}SYNC John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-23 7:12 ` Mark yao 2017-01-23 7:12 ` Mark yao 2017-01-21 16:31 ` [PATCH v2 23/26] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` [PATCH v2 24/26] drm/rockchip: dw-mipi-dsi: support non-burst modes John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-23 6:11 ` Chris Zhong 2017-01-23 6:11 ` Chris Zhong 2017-01-23 6:11 ` Chris Zhong 2017-01-21 16:31 ` John Keeping [this message] 2017-01-21 16:31 ` [PATCH v2 25/26] drm/rockchip: dw-mipi-dsi: add reset control John Keeping 2017-01-23 6:12 ` Chris Zhong 2017-01-23 6:12 ` Chris Zhong 2017-01-21 16:31 ` [PATCH v2 26/26] drm/rockchip: dw-mipi-dsi: support read commands John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-21 16:31 ` John Keeping 2017-01-22 3:08 ` Chris Zhong 2017-01-22 3:08 ` Chris Zhong 2017-01-22 3:08 ` Chris Zhong
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=20170121163128.22240-26-john@metanate.com \ --to=john@metanate.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mark.yao@rock-chips.com \ --cc=zyw@rock-chips.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.