From patchwork Wed Feb 19 16:23:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13982514 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0E4F5C021AA for ; Wed, 19 Feb 2025 16:23:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFC6D10E854; Wed, 19 Feb 2025 16:23:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="KJAQiBjh"; dkim-atps=neutral Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 883F410E851 for ; Wed, 19 Feb 2025 16:23:45 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-38f20fc478dso766417f8f.0 for ; Wed, 19 Feb 2025 08:23:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739982224; x=1740587024; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=flx79lLhyjNJ1uQQH7Feun8sDQLsABUenRP8+0wgvY4=; b=KJAQiBjhmIto7byRMzrrVvoH7EriHeB3PzV5wpywAzES0DT2UDSVyL2Rc7ykB0vbAF 09eifd+Y0Dd9QuTE+zp6xfFVkeyiiQ6s0+sUZviJFOItwEcjV6IU/Er6utaGojjgJR7w t54MLNUw5CZTaRympfK4evv/KhzclUPEoqc4yn7Gp3ycMLnu/KreVLuQDzDKByiqOjTi aVwPhko4mBqL9m+LadhzCfdah99dSzA5vgteMP0+eJp/voQSR0AmAht1gwVxms61usl+ oTJdiZDqzqdYfeqzQHcIUoHePBRSJNiSX2ixxBvY3sERm4O9eCknN6rIeUYUJDj8Oh1y MAgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739982224; x=1740587024; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=flx79lLhyjNJ1uQQH7Feun8sDQLsABUenRP8+0wgvY4=; b=SMmTiZqUzJMq3ZtlHmFdpJ0vgZtw+1y6IwVD5uJoLeUKimMmZ2n5HIr+94LfsDTWuU dKOFcBe3i/oorohEOOiYZ8hJtsPDKBAzoM8oQCK7mzx8VXPkChuB7tnqpqEgrk/RnLy3 cnNMw7LW289iAp/xkIgxIeEKJc83JKAK4xHwJyqR2XRG5iIwN+JmXRb8Sl9wDkkOt40A 5pJsqzbqOBdO4Ci0EG4LxSI0IgmWiWbqteW0/zVErzlEkfZAaIoIfBdB7bHK2vq+heZ3 gzvyi3UlqNwhYjE5rTfYe4SdaeqZrn9dFK9ywYmZOeXujBA2W0fa+jyTe7M7avPFHdRG WkRA== X-Forwarded-Encrypted: i=1; AJvYcCWkhQxwWIR/lRFShahJR2yCCMrKteclOdP+7fj9oR2KzY8qeaNLxQtajUgwbpjxM/1cC/mCWc+sDow=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwR/Cf14zeVdmI7TG3wp5pb4kJl66RP3okNBR1Meta0demKt8n+ Irttr9eZr+TnM8Ahvq5Xe4wtcgdDNvC5FXv+ek8cCCB2MMlCIBcv+OB7lASGgTU= X-Gm-Gg: ASbGnctEqBe4aoFShZerLRlFfmrJgy/ogxN5ggpJJMzH/s4dUmUHA2NnyTZfx19CZFR hxtp4yCReB+1HSQ5oiWx5qsHVClUSRyJWzUcvB9YiRdYC3xbTF9pc+JU5JHIsyA8e1vK54EMmaU e5HZbgJs+w8Z4bzhzZcwVjOlsngc0rGNuB8s25R9hCo1bhQGKr/zuWpBLSSAaoT2eDNM+X7VRuk WOSO6ce7ECFM+oQbY8ES0IFrfiech0HW3T4dFxKT9w6UQ9a/K1XPz9xzAWT/p2QtydwvHbD/3QR 9J1LXJtKYtLqAMz0vcz2jQjiwg+I9CM= X-Google-Smtp-Source: AGHT+IGKoVneTQvKJC5CNmJtYrFVOs50kNrFcO6oV1uqtn6asl3HDOg8xjQNibJEhGg4neAkUWVmNQ== X-Received: by 2002:a5d:598f:0:b0:38f:20b5:2c80 with SMTP id ffacd0b85a97d-38f33f2cbcdmr6538286f8f.6.1739982223890; Wed, 19 Feb 2025 08:23:43 -0800 (PST) Received: from [127.0.1.1] ([178.197.206.225]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f25a0fe5esm18442417f8f.99.2025.02.19.08.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 08:23:43 -0800 (PST) From: Krzysztof Kozlowski Date: Wed, 19 Feb 2025 17:23:32 +0100 Subject: [PATCH v5 1/2] drm/msm/dsi/phy: Use dsi_pll_cmn_clk_cfg1_update() when registering PLL MIME-Version: 1.0 Message-Id: <20250219-drm-msm-phy-pll-cfg-reg-v5-1-d28973fa513a@linaro.org> References: <20250219-drm-msm-phy-pll-cfg-reg-v5-0-d28973fa513a@linaro.org> In-Reply-To: <20250219-drm-msm-phy-pll-cfg-reg-v5-0-d28973fa513a@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jonathan Marek Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Clark , Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2574; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=HoJJKf2KbkS2X5DYSjb3aYDsagjrOYDoT6ljyujy3rA=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBntgWKtcucSVVrV+JpQB35XSs5L2SAmKtx22d+5 q+mpsfbjMaJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ7YFigAKCRDBN2bmhouD 16gmD/949j1pjmbpzNX0ZwnPqFTYiEuKoDTSR+KqMSaBI88QYFyOIlLcJTY5hCT+xCVAAhqfnk1 vcUGlcvzGISUvAVQGIUiSo/Db8E4CYSgM6PhIvlT1MespJwLYvFxyCUC7qojzNhwhHP6qYJdmyH vBOtk52PjNUMQ+H6+fYw6CoTXDgsGw7vcAu1g8v588Aaw+3pb9mAZvsO8UJDhIeqctuqmUkAE23 V/qy9NvSpcHgknXJo7QbukF9JJABXX66dlxU6MKQ0k9OZ5dhuBZVAF/Me/eS1cokF5OT9LxJDof gxNeclLnZzq7dhGNbmGv1EB46R8j6bvnP0a5e8S6RA9xgf+wVOed7VFpY6GZPLAAE7EHXsQ5A7j +9CJP65N2HHB1Fap3vJC1ffg/Fod1phdQfLGe4ug/5uej5kwZSIZMWxdqmF4HF4JbIwIhcj2aFa 4IIwjbS0cmzT5REOARFcRszKjlKrjohPr/4rC56nNW5DnmqbaAox6jC3u+7z6at4VCy6FGGxbUv ObCQx3xVVW+JKR17q6Uiqfta4vKcL2UhfdX8HKWdDM2UKV5HXXRIOtPDGpfIp9H0qYgOMhcg5mC rN6jplRFeSTYwqenJUHWzaL5i+zSoVdcHVXD9ZhMY9gDbj4l5ukslomn2zApoGQmRl5sLyfZrhO KZ3TrCcPn8mxoAA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B 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" Newly added dsi_pll_cmn_clk_cfg1_update() wrapper protects concurrent updates to PHY_CMN_CLK_CFG1 register between driver and Common Clock Framework. pll_7nm_register() still used in one place previous readl+writel, which can be simplified with this new wrapper. This is purely for readability and simplification and should have no functional impact, because the code touched here is before clock is registered via CCF, so there is no concurrency issue. Suggested-by: Dmitry Baryshkov Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- Changes in v5: 1. New patch --- drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 8 +++----- drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c index 798168180c1ab6c96ec2384f854302720cb27932..2fca469b10b33ac2350de5ab8a606704e84800ea 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c @@ -736,11 +736,9 @@ static int pll_7nm_register(struct dsi_pll_7nm *pll_7nm, struct clk_hw **provide * don't register a pclk_mux clock and just use post_out_div instead */ if (pll_7nm->phy->cphy_mode) { - u32 data; - - data = readl(pll_7nm->phy->base + REG_DSI_7nm_PHY_CMN_CLK_CFG1); - writel(data | 3, pll_7nm->phy->base + REG_DSI_7nm_PHY_CMN_CLK_CFG1); - + dsi_pll_cmn_clk_cfg1_update(pll_7nm, + DSI_7nm_PHY_CMN_CLK_CFG1_DSICLK_SEL__MASK, + DSI_7nm_PHY_CMN_CLK_CFG1_DSICLK_SEL(3)); phy_pll_out_dsi_parent = pll_post_out_div; } else { snprintf(clk_name, sizeof(clk_name), "dsi%d_pclk_mux", pll_7nm->phy->id); diff --git a/drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml b/drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml index 35f7f40e405b7dd9687725eae754522a7136725e..d2c8c46bb04159da6e539bfe80a4b5dc9ffdf367 100644 --- a/drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml +++ b/drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml @@ -17,6 +17,7 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd"> + From patchwork Wed Feb 19 16:23:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13982513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4617EC021B0 for ; Wed, 19 Feb 2025 16:23:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F57D10E853; Wed, 19 Feb 2025 16:23:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Dq4ewieM"; dkim-atps=neutral Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id 38E4D10E854 for ; Wed, 19 Feb 2025 16:23:47 +0000 (UTC) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43989d2afe1so3805195e9.0 for ; Wed, 19 Feb 2025 08:23:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739982226; x=1740587026; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=STDYxeOydJEmeZwWEUJZhgJUaxAx3cfQSyjYXjHJqhE=; b=Dq4ewieMY7sgRcOfc/JbrSHyfWyhfV4pKBINNrpyhr0AbXTPCba/73/Dxdej8DUpp0 Lw8Sk2FNBBJ/VuF3o+oWP7du2hZHWXUJAzs2FyyjfQVmcaXo3dCOXI76hcRyfsyZQ78M 5QWRbb792YjmGsEpXmelhgT5ktlqv2fJSV5XZXRhlGRxcxKFCgC+riRWpmPQp9cnU6mi v8q7N8yqpkqTm7fXEFUmkNAl6lFL8JUhg4GGVg4pe5B+Xk6QoC88bQZwK8qd/ughDcJW /eXdg2cZZn7o2LG2CUiOsIAMyJHnXtg9QIAHoLNGpFADvVtI5PC/cUQiaVWO1MNlsHyh 8SXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739982226; x=1740587026; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=STDYxeOydJEmeZwWEUJZhgJUaxAx3cfQSyjYXjHJqhE=; b=IKGZT1CdcAvFQ6CC3/HRfhUx1i1CPIOMsbAbPt8/SUmw3KsTa+Xqz7VaJPwAbvR6li jOhiWA8lJmYSDklouw/9f/NGAJCU3l9KaP861jS/e7HuE1nF/lgMOsNhLcm2M/fXe0iZ ZptAIG7+qKx1CHQ8/sPZm5Pzy8gshbf+Ba/VLlLssDveEPRHc0vZZkVnY9ghslA9p+XO k978Hroi5gf68jgqnWeJ9mklvpjGTDs0LgNKVs0Vn6r9G/KaLawG5Taw+5Ql+q2c7Dx6 tcabLFtH6B0Xoj9vqiWPiOYp87zvfr6pbaI41IPmFExi8XkKcs5e+o4ganh4qeT9D5N4 +IXA== X-Forwarded-Encrypted: i=1; AJvYcCXv3Mqj5MDkk+5TedKVg75gPFtBzLvX3b2EZEm/Hx/MTQnx3a5+PA+d7F1bsdWXZKrnCo8cxb8w3qY=@lists.freedesktop.org X-Gm-Message-State: AOJu0YyJQpuxQKlLMbA8Y7Lvno5LXdH6TwnBEyWIOGnRcmOzie1xkClf j1blsTFVddyL4sH25IOdsN92qMlC1MbXi/Ura/SO+mtPV+/cnCHMdWAvOX3Ppzk= X-Gm-Gg: ASbGncvOVGg4zCi9+NqRwk3m+BXD7K4rrfABc5mEPRMu+mg8SMNvC9RZS7T4nM7NmOR bX5wXm5UnRJ0AVHh7bVBhseDTnhza/FPB0vYCKCyU4Yl77dnj2EEH2x5+K1C6bzlc5yhrYvhcTR Wuo32g3gNF0Vc/RQy2D7+iK9qRHpnITVpspvRAYRnsPCWwg+6FdzUZQG75YVJNATqJp7wpS/SgN AZmcR23De2rujPQaYEotHLc4g6Z/lg6twvQkmv34jSbl+hpBsE+xQAzsDOa0CkchvVRENcVZyMr bEgjwha32chDHgl2vpBXytEf+SZDEWI= X-Google-Smtp-Source: AGHT+IFCXH6juWXCxM4namsDbJk7fdm7tD4GiYlIZEnzx6Vaog88SCNo/gNggeL5ghgnRcT3Fr5pqw== X-Received: by 2002:a05:600c:1512:b0:439:8b19:fa9a with SMTP id 5b1f17b1804b1-4398b19fc41mr36232625e9.2.1739982225613; Wed, 19 Feb 2025 08:23:45 -0800 (PST) Received: from [127.0.1.1] ([178.197.206.225]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f25a0fe5esm18442417f8f.99.2025.02.19.08.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 08:23:45 -0800 (PST) From: Krzysztof Kozlowski Date: Wed, 19 Feb 2025 17:23:33 +0100 Subject: [PATCH v5 2/2] drm/msm/dsi/phy: Define PHY_CMN_CLK_CFG[01] bitfields and simplify saving MIME-Version: 1.0 Message-Id: <20250219-drm-msm-phy-pll-cfg-reg-v5-2-d28973fa513a@linaro.org> References: <20250219-drm-msm-phy-pll-cfg-reg-v5-0-d28973fa513a@linaro.org> In-Reply-To: <20250219-drm-msm-phy-pll-cfg-reg-v5-0-d28973fa513a@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jonathan Marek Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Clark , Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2560; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=e7uWihHaRuX3l60xcjRDNo7zV9F+Ds60faI4+TOm1Tw=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBntgWLptxlLsDSPuC13zxCb4GjCqFlevEaleizP 796ZuFHIgGJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ7YFiwAKCRDBN2bmhouD 1/uWD/9Tvjr1rRMWsPNMmAYYIaKkacdXn8m5XOmuCW4DbdnsCKrLkiQMbMlWLiy1dY6qPP7IJxt SwAnt2GRPWIxdM8N504hqqx+PG7vc85jOsIh55NAUUFMrHiJbTZ8pTrKat8MOCwb56TVtOLnuKa vHomGZwcGqRCZN2TfJ2YdtZWYVQGG01ylF9AEm3LSZHKYB2ykLLgD8locKlvyGymRkOPnSsIWy+ bXwDv1PkzYSFrSo8CnA5asBzdJHJWEHzGkNbQJCqWuubTtqL1ribeOaYa++cyN/TSWXZMfHBmc0 z5DZAVQn295rzoroUmrFVSoTEegzudPiICE2Y1NhdLMSZpn/8Oqu52C0/nbSbzMqpDjLb4JHtC4 WQJtKv1zSumQI1p1xe+StDtLPCm6upiOEfIm0DA3EJaFcTrZWsxY4AnOiZ/V7+hv7QjmRsOBquM 28PZtgQBdeiW2Uy+2r3y0K7hHb6dJHWEWAdS1DvZDZ15soRKXKJjdZJtaZ21R0z28CeJIBrh2z1 QgOWGlBbqsWdlFyuwc0Naioi03zY4xCOrJP5Yn7SJEOTBDJj5fckmQOzZkUAAPVDPxNmKjHaCLO 7psBxs/jikM6sJz/qX+6QfaItHvskVAmhULu23h45HYbbtZnQHf5mqac+g0KlRwMINhciDKtLyh VHtIGFCovaGZjJg== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B 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" Add bitfields for PHY_CMN_CLK_CFG0 and PHY_CMN_CLK_CFG1 registers to avoid hard-coding bit masks and shifts and make the code a bit more readable. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- Changes in v5: 1. Split part touching pll_7nm_register() to new patch. 2. Update commit msg. Changes in v4: 1. Add mising bitfield.h include 2. One more FIELD_GET and DSI_7nm_PHY_CMN_CLK_CFG1_DSICLK_SEL (Dmitry) Changes in v3: 1. Use FIELD_GET 2. Keep separate bit_clk_div and pix_clk_div 3. Rebase (some things moved to previous patches) Changes in v2: 1. New patch --- drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c index 2fca469b10b33ac2350de5ab8a606704e84800ea..5ef5bc252019486c6f24f256d88d69ad3f6c838b 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c @@ -3,6 +3,7 @@ * Copyright (c) 2018, The Linux Foundation */ +#include #include #include #include @@ -572,11 +573,11 @@ static void dsi_7nm_pll_save_state(struct msm_dsi_phy *phy) cached->pll_out_div &= 0x3; cmn_clk_cfg0 = readl(phy_base + REG_DSI_7nm_PHY_CMN_CLK_CFG0); - cached->bit_clk_div = cmn_clk_cfg0 & 0xf; - cached->pix_clk_div = (cmn_clk_cfg0 & 0xf0) >> 4; + cached->bit_clk_div = FIELD_GET(DSI_7nm_PHY_CMN_CLK_CFG0_DIV_CTRL_3_0__MASK, cmn_clk_cfg0); + cached->pix_clk_div = FIELD_GET(DSI_7nm_PHY_CMN_CLK_CFG0_DIV_CTRL_7_4__MASK, cmn_clk_cfg0); cmn_clk_cfg1 = readl(phy_base + REG_DSI_7nm_PHY_CMN_CLK_CFG1); - cached->pll_mux = cmn_clk_cfg1 & 0x3; + cached->pll_mux = FIELD_GET(DSI_7nm_PHY_CMN_CLK_CFG1_DSICLK_SEL__MASK, cmn_clk_cfg1); DBG("DSI PLL%d outdiv %x bit_clk_div %x pix_clk_div %x pll_mux %x", pll_7nm->phy->id, cached->pll_out_div, cached->bit_clk_div, @@ -598,7 +599,8 @@ static int dsi_7nm_pll_restore_state(struct msm_dsi_phy *phy) dsi_pll_cmn_clk_cfg0_write(pll_7nm, DSI_7nm_PHY_CMN_CLK_CFG0_DIV_CTRL_3_0(cached->bit_clk_div) | DSI_7nm_PHY_CMN_CLK_CFG0_DIV_CTRL_7_4(cached->pix_clk_div)); - dsi_pll_cmn_clk_cfg1_update(pll_7nm, 0x3, cached->pll_mux); + dsi_pll_cmn_clk_cfg1_update(pll_7nm, DSI_7nm_PHY_CMN_CLK_CFG1_DSICLK_SEL__MASK, + cached->pll_mux); ret = dsi_pll_7nm_vco_set_rate(phy->vco_hw, pll_7nm->vco_current_rate,