From nobody Fri Dec 19 08:06:34 2025 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D38A8192B84 for ; Sun, 9 Feb 2025 05:07:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739077635; cv=none; b=q/c5XDZ7oSpeFbZtGSuGZrsE/vpuSSP3tl9VgHsLxQwl70kzkuSvWfwrTeq0dgSM4RZsLd1NZnIVKV3PhhcaHwYJv2Q2Cx8U2jAw4XvRsN7+SRrZ0TEh39gpCYPFJZ7PT5S4De6oTxoQbDdHhNqxjlpVozi0pDsiPm8zT1z/Kko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739077635; c=relaxed/simple; bh=+WpYll0ay0xnF4O7o5nyBXY9cEIfu8gX+WDGXWRK1Mc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MF0CXJhi4GFlMZ8/G/67FAojxMuQybJcwb8PnFMaiuvY7t3YAefr3VDAV5PPYXMmcGGKqhYYcHCk0lI9IaEGg18TodMnpw+vLAQsQl4KgVN5o9YLjdGNjHy4/huyXgbxaPmr7ciPNG+iTo0lJh058FRithWLgtXefjkjxbIy9as= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=jayohbsV; arc=none smtp.client-ip=209.85.167.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="jayohbsV" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-545074b88aaso562961e87.3 for ; Sat, 08 Feb 2025 21:07:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739077632; x=1739682432; darn=vger.kernel.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=rImDBJcwLqN/bA8K9yZBJSkxES6sl/gp3TQ1UcsOkUQ=; b=jayohbsVHQCL1OJoTXhTc7Ji7N3Iw3f0Vq1mKaEXtqHbC5B1R2DwfQzJ4KzaI4pII1 TGoEuwqfyBIpWsO36jInLM1OwfgMZl3Vk00f2CSNXLoUfndIbgQ0TTiH50/i2sUGp5ex XZTLJpHUv0KsmpjHjKDcfu2J6W1xsl9+lQdkyt7kix4VTc/cm69E+WIlqRJNHijAdZog FrpOOsu/jolP6kjFp6mGqgcQxZ6Cmo97w10pkOMWGMDFf9aXAlZwT+KG9eIG/mhj7WpG w9Q/xt6mE86+wQ0aWT9nr3tDzdjblrZ+bdIboA35e1vA/eFKDAaH7juL7+UCHPItUa+V C1Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739077632; x=1739682432; 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=rImDBJcwLqN/bA8K9yZBJSkxES6sl/gp3TQ1UcsOkUQ=; b=nFoxIEMYjpqC0tRePYnsPlrooPZlYymJs5o5kc7CW+EGLVKFKzMmksF3st0zOjcTXa jFq3uGWQitHzzOuZ1vW3yRnP7QXRhZuXuOdHJdZhTLTp3uPa49I9QI5sizDJ9NULnugy j1sOiIQ4LgXF73XwiqjpxS2aDTMRPNEiMyuy6IuyXGXUUdCXnhczXNVQenRs5adol0Hl Y80FUCYnrt6KO7KU/dBkVuT6wFhcIjmjSz87pSlWrm7XUzeXZutGqpFZguUs4jAw578Z Y5StvtR24vAHZxzd4qow5SHMZVFpei+JQ3coAYOWOzSrb8alM8TrHS5+8OtMQ3cMaLEm fNUw== X-Forwarded-Encrypted: i=1; AJvYcCXbmulJyGlzJXNdmyDvItRLtA7m4LwqhFXgz4Ek33rbXVXNEPcI+xGEshOc8mgrxKFlElzlc1LoIwHaCwc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6A4aPGkFt+qsuBi1agct/JWyimzzfCuBJaFjMDR88LdW8oXDp ggQIRbd3KaqZIHFFGnw4jZTHfXOOiLu+e09rBjsX8IRej3EEqRBR3dNAl5gfZ7A= X-Gm-Gg: ASbGncs7NGWfv4TCVaAKM/5M1hWY8C1L/KxNJBYAzhM1zxvDbovyiuw9LnyvvBu2fHc iUYa1VWgel4e7UKQ/W2eSKBUQqFMaBbuqZDwrGZBCH3Dl11bhGfabYuKLAbGeC1MaTyCBJYz6gy BPBtGFlnxdcgwvlHwpLgBwtoZJK6VB0Kpm273zRyEFRbtsdG4xvaPR9EmaoUUsvp3j5TtNA60ZW +lhlJkxmmMpxmBefSng18jsDqnLuQCTI0p0hP1GN8QhwvvkhQsd7GmmIniyFhZxoQ/brOnuFeKu lmpN0/mfmrdAkG+C1emzhNs= X-Google-Smtp-Source: AGHT+IE2QJZGzfLvREQjZ2Yj5CakhCNV2ut93H8ain0VcaXqhSAifxC/qDGCZKxvSJtMnQOIOHh9hQ== X-Received: by 2002:a19:8c55:0:b0:545:441:52d4 with SMTP id 2adb3069b0e04-5450441553dmr1026473e87.26.1739077631945; Sat, 08 Feb 2025 21:07:11 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54506ef1733sm245576e87.1.2025.02.08.21.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 21:07:10 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 09 Feb 2025 07:04:55 +0200 Subject: [PATCH v4 11/16] drm/msm/hdmi: rename hpd_clks to pwr_clks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250209-fd-hdmi-hpd-v4-11-6224568ed87f@linaro.org> References: <20250209-fd-hdmi-hpd-v4-0-6224568ed87f@linaro.org> In-Reply-To: <20250209-fd-hdmi-hpd-v4-0-6224568ed87f@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Jessica Zhang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4084; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=+WpYll0ay0xnF4O7o5nyBXY9cEIfu8gX+WDGXWRK1Mc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnqDfjf8OBc8uSGwCTBq4PbhEA1GDOaqya+TI2F VrQN8it+xKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6g34wAKCRCLPIo+Aiko 1WmrCACsjaJLkXpv4v5MNIIXG7ds98d+aS/Ra33MbEb/9rTGuEBP8CIdMTldJfwvQfHRoNnJCMI A/j+3tq2UuhxUrLtxzo9NC2I0hI2BTZ55dOQPgn1ou3bqJiXzwaJ37XA9+vu4hAkpZ6L33xB6DE A119TuMSildDZgGfpg6fmxNmZHOIEa6cg1COY+UcpNKOp/QlQU01BMCzifnmBW441EgV+yPufpL AMB2jTVSlke2qeSPU1QkNyhgnOG5X9RIMGQXfOiXhJ/CKUNiUXFLUITYNiVMdjYof8nnLs5xhOf 4P/QTx1Hq89+lFKvj0L9A3arcHDUkAmQQrlf5dcdJSnr+LWB X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A As these clocks are now used in the runtime PM callbacks, they have no connection to 'HPD'. Rename corresponding fields to follow clocks purpose, to power up the HDMI controller. Reviewed-by: Jessica Zhang Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi.c | 26 +++++++++++++------------- drivers/gpu/drm/msm/hdmi/hdmi.h | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdm= i.c index ded20176aa805db98b0599e617eb6ea9bce122d8..8e6e3e6a04bd2d86bcbd23c110f= 3533f56c17887 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -226,19 +226,19 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, .item ## _cnt =3D ARRAY_SIZE(item ## _names_ ## entry) =20 static const char * const pwr_reg_names_8960[] =3D {"core-vdda"}; -static const char * const hpd_clk_names_8960[] =3D {"core", "master_iface"= , "slave_iface"}; +static const char * const pwr_clk_names_8960[] =3D {"core", "master_iface"= , "slave_iface"}; =20 static const struct hdmi_platform_config hdmi_tx_8960_config =3D { HDMI_CFG(pwr_reg, 8960), - HDMI_CFG(hpd_clk, 8960), + HDMI_CFG(pwr_clk, 8960), }; =20 static const char * const pwr_reg_names_8x74[] =3D {"core-vdda", "core-vcc= "}; -static const char * const hpd_clk_names_8x74[] =3D {"iface", "core", "mdp_= core", "alt_iface"}; +static const char * const pwr_clk_names_8x74[] =3D {"iface", "core", "mdp_= core", "alt_iface"}; =20 static const struct hdmi_platform_config hdmi_tx_8974_config =3D { HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_clk, 8x74), + HDMI_CFG(pwr_clk, 8x74), }; =20 static int msm_hdmi_bind(struct device *dev, struct device *master, void *= data) @@ -333,17 +333,17 @@ static int msm_hdmi_dev_probe(struct platform_device = *pdev) if (ret) return dev_err_probe(dev, ret, "failed to get pwr regulators\n"); =20 - hdmi->hpd_clks =3D devm_kcalloc(&pdev->dev, - config->hpd_clk_cnt, - sizeof(hdmi->hpd_clks[0]), + hdmi->pwr_clks =3D devm_kcalloc(&pdev->dev, + config->pwr_clk_cnt, + sizeof(hdmi->pwr_clks[0]), GFP_KERNEL); - if (!hdmi->hpd_clks) + if (!hdmi->pwr_clks) return -ENOMEM; =20 - for (i =3D 0; i < config->hpd_clk_cnt; i++) - hdmi->hpd_clks[i].id =3D config->hpd_clk_names[i]; + for (i =3D 0; i < config->pwr_clk_cnt; i++) + hdmi->pwr_clks[i].id =3D config->pwr_clk_names[i]; =20 - ret =3D devm_clk_bulk_get(&pdev->dev, config->hpd_clk_cnt, hdmi->hpd_clks= ); + ret =3D devm_clk_bulk_get(&pdev->dev, config->pwr_clk_cnt, hdmi->pwr_clks= ); if (ret) return ret; =20 @@ -401,7 +401,7 @@ static int msm_hdmi_runtime_suspend(struct device *dev) struct hdmi *hdmi =3D dev_get_drvdata(dev); const struct hdmi_platform_config *config =3D hdmi->config; =20 - clk_bulk_disable_unprepare(config->hpd_clk_cnt, hdmi->hpd_clks); + clk_bulk_disable_unprepare(config->pwr_clk_cnt, hdmi->pwr_clks); =20 pinctrl_pm_select_sleep_state(dev); =20 @@ -424,7 +424,7 @@ static int msm_hdmi_runtime_resume(struct device *dev) if (ret) goto fail; =20 - ret =3D clk_bulk_prepare_enable(config->hpd_clk_cnt, hdmi->hpd_clks); + ret =3D clk_bulk_prepare_enable(config->pwr_clk_cnt, hdmi->pwr_clks); if (ret) goto fail; =20 diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdm= i.h index 7e3c035cf913d713ed63379a843897fad96b23ab..a28437beb1574553c1dc00a0c69= 3b390389353e0 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -48,7 +48,7 @@ struct hdmi { phys_addr_t mmio_phy_addr; =20 struct regulator_bulk_data *pwr_regs; - struct clk_bulk_data *hpd_clks; + struct clk_bulk_data *pwr_clks; struct clk *extp_clk; =20 struct gpio_desc *hpd_gpiod; @@ -87,8 +87,8 @@ struct hdmi_platform_config { int pwr_reg_cnt; =20 /* clks that need to be on for hpd: */ - const char * const *hpd_clk_names; - int hpd_clk_cnt; + const char * const *pwr_clk_names; + int pwr_clk_cnt; }; =20 struct hdmi_bridge { --=20 2.39.5