From patchwork Tue Sep 21 16:22:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 514422 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp3246091jao; Tue, 21 Sep 2021 09:22:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbmRfctNugIyjTK4+fPlU++0VXnATopiFIQCCBqTXg//vH/swaXaTDP+pFbWUUfi4aIi44 X-Received: by 2002:a17:90a:ac05:: with SMTP id o5mr6233545pjq.205.1632241377788; Tue, 21 Sep 2021 09:22:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632241377; cv=none; d=google.com; s=arc-20160816; b=0HgWmHOWW4LBafcQWQItbzpa020JiXRXRn/bhg5xdlVv/Tglcd1N5oo8uGvjeyHDSE XUgCax17EJj2T1GyIyMgnCibeflIjH+M0zi1Nt8Y/+3vKeoZIRfAZlIRUFD7Hvp/rdQU t2GHhJv48rR6uiDUS2Khfv42Q+ELsZvUuO4EPjmb1TkmXn+OwUq2e454mO1tfdfAKX6f 7649aMYS1ekOh0BaYN2IdQVXrTj+XtygkHOf+9yF4sm81jLYnDBYUads9p1ERsHR9RJC I4wSMI63OPM3zZuhzGXZwgJxYdGhsQUdizHRxmTJHtAGKTXtrZDY0NYcTE9/O2mhjDIP cwwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :delivered-to; bh=PvMNvv3sYbU3IT6mahg4mt0FldiKwEFahBq/kmBwdgg=; b=bekvFKaOKL3/qka/UIIZbdXahy+IEtiYj/QDFH5sswnQGWcMujl/cc/5giDwy5hI9A OsZYbsUmN65jAbLwe68jtqqjvQ2fjecUBildKiz8zD90FXm/gMMKIo6pKQuuI5hDdqKH 5kgxQMIrmYmKUi5pvuM2dwDTpPIsWipV+gVWM203szH9VyHTaS/1HcdWg0dUTecnk20k BIgx5vqdpV9B5x428c7MKHBaPhJE7t/HewLQSJ6uYiGrkZmaEth7Pcn81ulnPdt1Q+q7 9z5YnWZDhIHVDt+9fkFPBUYq1j7gi2+YBVftwVJGGngj8OFlCIadhorbK+Ec37N3T0vo lWjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="g3Bp/l36"; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id m1si24864819pfh.352.2021.09.21.09.22.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 09:22:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="g3Bp/l36"; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DBDB16E98E; Tue, 21 Sep 2021 16:22:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 586916E98E for ; Tue, 21 Sep 2021 16:22:52 +0000 (UTC) Received: by mail-lf1-x12b.google.com with SMTP id p29so82800074lfa.11 for ; Tue, 21 Sep 2021 09:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PvMNvv3sYbU3IT6mahg4mt0FldiKwEFahBq/kmBwdgg=; b=g3Bp/l36yCXsaJDwrsykQTfOkJXTOU8gKVlNQbOv9S8KMhOHJ2WaPkIabsknTtxZ0X mN2tdJbCtgPrB4D129z/TFLWz0GZR583FE1Nh+qCRIAuo5UtzfrQ9na/etPLuQbssJ1z h/ioHUFgE8uQWHX2AH5mQTSIDdhBvafu6rHt0tPZnn7sCRNgXqW3zhR06IlJJsaoTykz Jn9mtJIL7LFfkJ2s1GwyD56dmP1oHJBgVh/TqRHKI81O8zUOh73and4beFJFS3uy2hXt EnxHPryNwbl3gPT/a/U7U089X08MOz2KkCXZWRsebR22PT3nKiIfemblRuALNWGrD0gP 9ahw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PvMNvv3sYbU3IT6mahg4mt0FldiKwEFahBq/kmBwdgg=; b=tumqd9+F2CUtBOMAsP6Yiay6JCp/YVgGepAaKWQkqSAraKSd6FR5GEdfVw2m1rw7up 5oeVDcpHxUUG7kqzEIVvydiGqmhyEfxTDRvjwACpNadca6pYIW3uWjLVZLN+dWK+YUsT 4aOMtvuUrBMMym7D/tf7RrFH0HaqJPEqyKOGn7P6J3yiQKlHJa/4lqTwBcerePGcRbhk 7Z+jwzW8yQKND483JLghFI4p2G/YYEF8ZCR3WxPWNRxXTyBFtfqpqiYltxJ670GbFNcZ tNhhHOWjQm+ny1ezeiUl8rmmX5+WWQlKXghwCZ5znXPDZFzSLQd4GcmUtOBRml6KslDo MuqA== X-Gm-Message-State: AOAM532sY3SJlcmLRW/dTmMMFFPGD207XalSp50ZrpG3FpGyvXHhy0Mf zTWx4daqEd5PkULtYx1cRXUb3w== X-Received: by 2002:a2e:5046:: with SMTP id v6mr9094222ljd.368.1632241366609; Tue, 21 Sep 2021 09:22:46 -0700 (PDT) Received: from umbar.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id v77sm1559567lfa.93.2021.09.21.09.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 09:22:46 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Cc: Jonathan Marek , Stephen Boyd , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, David Heidelberg Subject: [PATCH] drm/msm/dsi/phy: fix clock names in 28nm_8960 phy Date: Tue, 21 Sep 2021 19:22:45 +0300 Message-Id: <20210921162245.1858118-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The commit 9f91f22aafcd ("drm/msm/dsi: remove duplicate fields from dsi_pll_Nnm instances") mistakenly changed registered clock names. While the platform is in progress of migration to using clock properties in the dts rather than the global clock names, we should provide backwards compatibility. Thus restore registerd global clock names. Fixes: 9f91f22aafcd ("drm/msm/dsi: remove duplicate fields from dsi_pll_Nnm instances") Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c index aaa37456f4ee..71ed4aa0dc67 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c @@ -428,7 +428,7 @@ static int pll_28nm_register(struct dsi_pll_28nm *pll_28nm, struct clk_hw **prov bytediv->reg = pll_28nm->phy->pll_base + REG_DSI_28nm_8960_PHY_PLL_CTRL_9; snprintf(parent_name, 32, "dsi%dvco_clk", pll_28nm->phy->id); - snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->phy->id); + snprintf(clk_name, 32, "dsi%dpllbyte", pll_28nm->phy->id + 1); bytediv_init.name = clk_name; bytediv_init.ops = &clk_bytediv_ops; @@ -442,7 +442,7 @@ static int pll_28nm_register(struct dsi_pll_28nm *pll_28nm, struct clk_hw **prov return ret; provided_clocks[DSI_BYTE_PLL_CLK] = &bytediv->hw; - snprintf(clk_name, 32, "dsi%dpll", pll_28nm->phy->id); + snprintf(clk_name, 32, "dsi%dpll", pll_28nm->phy->id + 1); /* DIV3 */ hw = devm_clk_hw_register_divider(dev, clk_name, parent_name, 0, pll_28nm->phy->pll_base +