From patchwork Sun May 7 20:12:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 679796 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AA03C7EE26 for ; Sun, 7 May 2023 20:12:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229877AbjEGUM0 (ORCPT ); Sun, 7 May 2023 16:12:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231644AbjEGUMY (ORCPT ); Sun, 7 May 2023 16:12:24 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34BC52695 for ; Sun, 7 May 2023 13:12:23 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2ac89e6a5a1so30148981fa.0 for ; Sun, 07 May 2023 13:12:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683490341; x=1686082341; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tN9UmRR6NCVISEJTvLFdwDTdtCjwWI0mPnWcrQiX3S8=; b=rkR2pp1LenpEinbprWUEUTikGmz3SN7P8aDWpYAuvMF/CtGfcQ66Y+qwqC1E+3M2RS i60CuHoGwxmcjzv/spf61Jrd96i6gnXx6Dt+Q7IiY0osBB/AT1jKr0J11bG5OJHwqhDx C83ykONsCjX6a44XXqf58u5UlP9Qffb2dmDF8M41+uaMAUAuvc0Y6XXAhbh6PRBoHICD 9G8W1Y+PUgUvRJqM8zsn4pKRhzbbdMT2bVWeyPL9cJkruppt6qIXs+ReXIEwPPtAgpz6 B2gD0zXkK0VKlDFg3GnfdePNg4QIGgfbmEKRFIh1xDwWV2XNeqga4v0XEkLcBsC3IxHo iazw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683490341; x=1686082341; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tN9UmRR6NCVISEJTvLFdwDTdtCjwWI0mPnWcrQiX3S8=; b=BmMdnemWQ7us7QSiDIWu5oKmZPQCohKXR7ZOwGovXjaQeDSNuZiUBVGeLgPh7xYEsJ UJDFPRZlrsYaiOuw/UmgE1HIU9miGaYuCXSGzDQNkhMvGy2diZ4DZ3C79jEtQr3AGJOi Ot/c9o0hEzQDW+mC8vjojchvgOpqG/V78O5h4qiL/h/PBOIk7R/cOnw6NSBuhi1KgfHG baiX4YhZCazchUnQk8EqW0IlJ0dbZYz4PIKWJQbZfY+V7PBiYxzAn32elxfIi4P3PQSH WeckCrgaOvrJUMlXzHJ020fB6APzY+/F1btHm3rJsnfQVD1/N6YnNaYoxX5WSlHtrFV3 uhgw== X-Gm-Message-State: AC+VfDyiFWkOLqFTxXCqowJ+g45U6nvIAkigPmkhjGogNlFqKN8QLfZV 044Vg/cYvQCoUkm6UiPenlOVqA== X-Google-Smtp-Source: ACHHUZ7h6zvBF64UzZn83MeikvKNCHQJ6AH6QNwDldnHxGpkQFML5mUoLQuSl1k2+w2UBzAtNLYJ7Q== X-Received: by 2002:a2e:8502:0:b0:2ac:7137:5f13 with SMTP id j2-20020a2e8502000000b002ac71375f13mr2141964lji.9.1683490341174; Sun, 07 May 2023 13:12:21 -0700 (PDT) Received: from lothlorien.lan (dzdqv0yyyyyyyyyyybm5y-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::ab2]) by smtp.gmail.com with ESMTPSA id f5-20020a2e3805000000b002ac74f5f022sm916522lja.0.2023.05.07.13.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 May 2023 13:12:20 -0700 (PDT) From: Dmitry Baryshkov To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Rob Herring , Krzysztof Kozlowski Cc: David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 2/3] drm/bridge: display-connector: rename dp_pwr to connector_pwr Date: Sun, 7 May 2023 23:12:17 +0300 Message-Id: <20230507201218.2339014-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507201218.2339014-1-dmitry.baryshkov@linaro.org> References: <20230507201218.2339014-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org In preparation to adding support for the hdmi_pwr supply, rename dp_pwr structure field to the generic connector_pwr. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/bridge/display-connector.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c index 9a12449ad7b8..0d94e6edea50 100644 --- a/drivers/gpu/drm/bridge/display-connector.c +++ b/drivers/gpu/drm/bridge/display-connector.c @@ -24,7 +24,7 @@ struct display_connector { struct gpio_desc *hpd_gpio; int hpd_irq; - struct regulator *dp_pwr; + struct regulator *connector_pwr; struct gpio_desc *ddc_en; }; @@ -319,14 +319,14 @@ static int display_connector_probe(struct platform_device *pdev) if (type == DRM_MODE_CONNECTOR_DisplayPort) { int ret; - conn->dp_pwr = devm_regulator_get_optional(&pdev->dev, "dp-pwr"); + conn->connector_pwr = devm_regulator_get_optional(&pdev->dev, "dp-pwr"); - if (IS_ERR(conn->dp_pwr)) { - ret = PTR_ERR(conn->dp_pwr); + if (IS_ERR(conn->connector_pwr)) { + ret = PTR_ERR(conn->connector_pwr); switch (ret) { case -ENODEV: - conn->dp_pwr = NULL; + conn->connector_pwr = NULL; break; case -EPROBE_DEFER: @@ -338,8 +338,8 @@ static int display_connector_probe(struct platform_device *pdev) } } - if (conn->dp_pwr) { - ret = regulator_enable(conn->dp_pwr); + if (conn->connector_pwr) { + ret = regulator_enable(conn->connector_pwr); if (ret) { dev_err(&pdev->dev, "failed to enable DP PWR regulator: %d\n", ret); return ret; @@ -389,8 +389,8 @@ static int display_connector_remove(struct platform_device *pdev) if (conn->ddc_en) gpiod_set_value(conn->ddc_en, 0); - if (conn->dp_pwr) - regulator_disable(conn->dp_pwr); + if (conn->connector_pwr) + regulator_disable(conn->connector_pwr); drm_bridge_remove(&conn->bridge);