From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 137/258] drm/msm/dsi: fix dsi clock names in DSI 10nm PLL driver Date: Mon, 28 Jan 2019 10:57:23 -0500 Message-ID: <20190128155924.51521-137-sashal@kernel.org> References: <20190128155924.51521-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190128155924.51521-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Rob Clark , Sean Paul , Abhinav Kumar , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org RnJvbTogQWJoaW5hdiBLdW1hciA8YWJoaW5hdmtAY29kZWF1cm9yYS5vcmc+CgpbIFVwc3RyZWFt IGNvbW1pdCBjMTg2NmQ0NGQxNDlhMWVhNWMzMDM2MzIxMTRmYjZhYTA4Y2ZkMjYzIF0KCkZpeCB0 aGUgZHNpIGNsb2NrIG5hbWVzIGluIHRoZSBEU0kgMTBubSBQTEwgZHJpdmVyIHRvCm1hdGNoIHRo ZSBuYW1lcyBpbiB0aGUgZGlzcGNjIGRyaXZlciBhcyB0aG9zZSBhcmUKYWNjb3JkaW5nIHRvIHRo ZSBjbG9jayBwbGFuIG9mIHRoZSBjaGlwc2V0LgoKQ2hhbmdlcyBpbiB2MjoKLSBVcGRhdGUgdGhl IGNsb2NrIGRpYWdyYW0gd2l0aCB0aGUgbmV3IGNsb2NrIG5hbWUKClJldmlld2VkLWJ5OiBTZWFu IFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KU2lnbmVkLW9mZi1ieTogQWJoaW5hdiBLdW1h ciA8YWJoaW5hdmtAY29kZWF1cm9yYS5vcmc+ClNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2Vh bnBhdWxAY2hyb21pdW0ub3JnPgpTaWduZWQtb2ZmLWJ5OiBSb2IgQ2xhcmsgPHJvYmRjbGFya0Bn bWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL2RzaS9wbGwvZHNpX3BsbF8xMG5tLmMgfCA4ICsrKyst LS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZHNpL3BsbC9kc2lfcGxsXzEwbm0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9tc20vZHNpL3BsbC9kc2lfcGxsXzEwbm0uYwppbmRleCA0MWJlYzU3MGM1 MTguLjMxMjA1NjI1YzczNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9kc2kvcGxs L2RzaV9wbGxfMTBubS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZHNpL3BsbC9kc2lfcGxs XzEwbm0uYwpAQCAtMTcsNyArMTcsNyBAQAogICogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8ICAgICAgICAgICAgICAgIHwKICAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg ICAgICAgICAgICAgICB8CiAgKiAgICAgICAgICAgICAgICAgKy0tLS0tLS0tLSsgIHwgICstLS0t LS0tLS0tKyAgfCAgKy0tLS0rCi0gKiAgZHNpMHZjb19jbGsgLS0tfCBvdXRfZGl2IHwtLW8tLXwg ZGl2bF8zXzAgfC0tby0tfCAvOCB8LS0gZHNpMHBsbGJ5dGUKKyAqICBkc2kwdmNvX2NsayAtLS18 IG91dF9kaXYgfC0tby0tfCBkaXZsXzNfMCB8LS1vLS18IC84IHwtLSBkc2kwX3BoeV9wbGxfb3V0 X2J5dGVjbGsKICAqICAgICAgICAgICAgICAgICArLS0tLS0tLS0tKyAgfCAgKy0tLS0tLS0tLS0r ICB8ICArLS0tLSsKICAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAgICAgICAg ICAgICB8CiAgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgICAgICAgICAgICAg fCAgICAgICAgIGRzaTBfcGxsX2J5XzJfYml0X2NsawpAQCAtMjUsNyArMjUsNyBAQAogICogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgICAgICAgICAgICAgIHwgICstLS0tKyAgfCAg fFwgIGRzaTBfcGNsa19tdXgKICAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAg ICAgICAgICAgICB8LS18IC8yIHwtLW8tLXwgXCAgIHwKICAqICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgICAgICAgICAgICAgICB8ICArLS0tLSsgICAgIHwgIFwgIHwgICstLS0tLS0t LS0rCi0gKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgICAgICAgICAgICAgLS0t LS0tLS0tLS0tLS18ICB8LS1vLS18IGRpdl83XzQgfC0tIGRzaTBwbGwKKyAqICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCAgICAgICAgICAgICAgICAtLS0tLS0tLS0tLS0tLXwgIHwtLW8t LXwgZGl2XzdfNCB8LS0gZHNpMF9waHlfcGxsX291dF9kc2ljbGsKICAqICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLXwgIC8gICAgICst LS0tLS0tLS0rCiAgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgICAgICAgKy0t LS0tKyAgICAgICAgICAgICB8IC8KICAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0t LS0tLS0tLS18IC80PyB8LS1vLS0tLS0tLS0tLXwvCkBAIC02OTAsNyArNjkwLDcgQEAgc3RhdGlj IGludCBwbGxfMTBubV9yZWdpc3RlcihzdHJ1Y3QgZHNpX3BsbF8xMG5tICpwbGxfMTBubSkKIAog CWh3c1tudW0rK10gPSBodzsKIAotCXNucHJpbnRmKGNsa19uYW1lLCAzMiwgImRzaSVkcGxsYnl0 ZSIsIHBsbF8xMG5tLT5pZCk7CisJc25wcmludGYoY2xrX25hbWUsIDMyLCAiZHNpJWRfcGh5X3Bs bF9vdXRfYnl0ZWNsayIsIHBsbF8xMG5tLT5pZCk7CiAJc25wcmludGYocGFyZW50LCAzMiwgImRz aSVkX3BsbF9iaXRfY2xrIiwgcGxsXzEwbm0tPmlkKTsKIAogCS8qIERTSSBCeXRlIGNsb2NrID0g VkNPX0NMSyAvIE9VVF9ESVYgLyBCSVRfRElWIC8gOCAqLwpAQCAtNzM5LDcgKzczOSw3IEBAIHN0 YXRpYyBpbnQgcGxsXzEwbm1fcmVnaXN0ZXIoc3RydWN0IGRzaV9wbGxfMTBubSAqcGxsXzEwbm0p CiAKIAlod3NbbnVtKytdID0gaHc7CiAKLQlzbnByaW50ZihjbGtfbmFtZSwgMzIsICJkc2klZHBs bCIsIHBsbF8xMG5tLT5pZCk7CisJc25wcmludGYoY2xrX25hbWUsIDMyLCAiZHNpJWRfcGh5X3Bs bF9vdXRfZHNpY2xrIiwgcGxsXzEwbm0tPmlkKTsKIAlzbnByaW50ZihwYXJlbnQsIDMyLCAiZHNp JWRfcGNsa19tdXgiLCBwbGxfMTBubS0+aWQpOwogCiAJLyogUElYIENMSyBESVYgOiBESVZfQ1RS TF83XzQqLwotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9m cmVlZHJlbm8K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 809C0C282C8 for ; Mon, 28 Jan 2019 16:05:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51A012171F for ; Mon, 28 Jan 2019 16:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691552; bh=erUnjmWMM4EK60WS+qexEeg+GIott08M6ICGnnF2XrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QstHr2dbke3yyI7mvsTe1f9D+wV60qBOAj3VlCXw9uIxNxlAfZj6wBRqrtlDKua7r Hb1OZrTjb60cAb9uegNsEPcp4Dz8SDQWetipFntduKD0sB5kvIBgplZYxBiIJXMvLC 9s5dAoBGfm3ul3kdL1zpXesHZexs6S2PIhHh5oec= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731919AbfA1QFu (ORCPT ); Mon, 28 Jan 2019 11:05:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:53130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731419AbfA1QFr (ORCPT ); Mon, 28 Jan 2019 11:05:47 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CA21F20989; Mon, 28 Jan 2019 16:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691545; bh=erUnjmWMM4EK60WS+qexEeg+GIott08M6ICGnnF2XrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IzJji+dqok7vG7sueEAYUG0xtnWtj1J17siEiWMak3YTTeaC06+o7s+RiUNJZNRZC 7pnPHB/vjLa27mv9UhhmBJL0mUtEGRpFNYqa7w/aqi2wORminV5nZvfzUvMXRw9X1y 3xUBqxGSl/6e+e+P7Ldb32YGV9uU8dNzdJP2OAWc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Abhinav Kumar , Sean Paul , Rob Clark , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 137/258] drm/msm/dsi: fix dsi clock names in DSI 10nm PLL driver Date: Mon, 28 Jan 2019 10:57:23 -0500 Message-Id: <20190128155924.51521-137-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128155924.51521-1-sashal@kernel.org> References: <20190128155924.51521-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Abhinav Kumar [ Upstream commit c1866d44d149a1ea5c303632114fb6aa08cfd263 ] Fix the dsi clock names in the DSI 10nm PLL driver to match the names in the dispcc driver as those are according to the clock plan of the chipset. Changes in v2: - Update the clock diagram with the new clock name Reviewed-by: Sean Paul Signed-off-by: Abhinav Kumar Signed-off-by: Sean Paul Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c index 41bec570c518..31205625c734 100644 --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c @@ -17,7 +17,7 @@ * | | * | | * +---------+ | +----------+ | +----+ - * dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0pllbyte + * dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0_phy_pll_out_byteclk * +---------+ | +----------+ | +----+ * | | * | | dsi0_pll_by_2_bit_clk @@ -25,7 +25,7 @@ * | | +----+ | |\ dsi0_pclk_mux * | |--| /2 |--o--| \ | * | | +----+ | \ | +---------+ - * | --------------| |--o--| div_7_4 |-- dsi0pll + * | --------------| |--o--| div_7_4 |-- dsi0_phy_pll_out_dsiclk * |------------------------------| / +---------+ * | +-----+ | / * -----------| /4? |--o----------|/ @@ -690,7 +690,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm) hws[num++] = hw; - snprintf(clk_name, 32, "dsi%dpllbyte", pll_10nm->id); + snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk", pll_10nm->id); snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->id); /* DSI Byte clock = VCO_CLK / OUT_DIV / BIT_DIV / 8 */ @@ -739,7 +739,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm) hws[num++] = hw; - snprintf(clk_name, 32, "dsi%dpll", pll_10nm->id); + snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk", pll_10nm->id); snprintf(parent, 32, "dsi%d_pclk_mux", pll_10nm->id); /* PIX CLK DIV : DIV_CTRL_7_4*/ -- 2.19.1