From patchwork Fri Nov 4 03:16:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 15299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp138560wru; Thu, 3 Nov 2022 20:17:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5OTud8Ie0IJAuAa0lZHiLgTuq5xFZTBMqSxGQJVN2JuF+zdJvcmCoECIPcxl7OdbLxFF6V X-Received: by 2002:a17:902:b708:b0:184:3921:df30 with SMTP id d8-20020a170902b70800b001843921df30mr33873640pls.43.1667531864158; Thu, 03 Nov 2022 20:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667531864; cv=none; d=google.com; s=arc-20160816; b=bJaImamP1pCqC6cKjEYwxJtbv9T+q+PWtkEqCv02xR4aZeX57zb6xZsdbzRTWQyzO6 xDs6kZ+nFWZWSG38GcQK7FixSjU5SDBobPNvY6uagWcq9UAkixWOT/uiaDyTDZBhZeJW 1K/g8BcG4XpNjBJgS980dSM6WVtom0IH2GUeqTEIV3AQyHpKT4lW/Ujic0MxfEkVX2FZ 6JBoPjqep2xA+ii3YAEPn/hVSyROkuIzLW/Gq5Zsk+Vfb2ISYXDJ7HoLqguhaaLJf2iQ LNW+vYpJeUnfdJkcIs28RnVP/rjmUJed32yFoyK0ibn7a8nGpL5yQKVuVMEpUJL4z30Q xueQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kVkDO2KOif2frQeCzecIa3Ot4mR/23B4wTbE/ilmNLI=; b=Ntoh50rmd5xD8ych5NO5/Ic8rIAh9TeYO9r5Aw2U5qpf62jBaHneCzdh0bZLO4p8pz 5vpQM/OC5B4W12k7L530D4I9Sl0ksdf8JdD434PPrjzzlcjfNScmDmwbxPV/AqtNPGvG zODenyyrooWzYgqHR63X/+AoAdpfUv7BETP2xunNw8iR5+hVLZXS5JzGnvmMiL1QIaxp pQrSgPitDq2zmVKEYhlHbrqIpkn1KFpXoTSWAO++NMIldfjilyAZ8Pqk1A601g5stDQn 7fRSTVrRSq8UvvCr1wbRdT/QBYJt28pnDUoGNwmECkehFQBqvaAcuyk2IWVtbY+rALz3 ZBng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ISodEXug; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j125-20020a625583000000b0055fdb74973esi2991191pfb.140.2022.11.03.20.17.31; Thu, 03 Nov 2022 20:17:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ISodEXug; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230396AbiKDDQ5 (ORCPT + 99 others); Thu, 3 Nov 2022 23:16:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229952AbiKDDQu (ORCPT ); Thu, 3 Nov 2022 23:16:50 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A01D822BE9; Thu, 3 Nov 2022 20:16:49 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id v3so3330883pgh.4; Thu, 03 Nov 2022 20:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=kVkDO2KOif2frQeCzecIa3Ot4mR/23B4wTbE/ilmNLI=; b=ISodEXugjsGq/3voQK8yKgdkqR315OB/AgxmhqVqPbmkoX6tYVJxq4Qe1LyWQeOTCL pOXwJlIJrbTSTw52Tmg+tM6gVo9rCHjHV4bniO/FsZX1yHZo68/hRy8G3GP51UZ54w3p YbgidRg7v11OIVoiBVF2BNhAbCSbrPqrSvxocMRm8usjN8IeI27KLtJKKTtcFCtKgrL7 cv8eVSOH+881aWk7/zvyHPjeR6tPC3Rf9YaUFcFEs25De4bia3On/TvBgtGWmvVYAecN U/hJqDZ6J7Ql0/YllMRZczid+nCLjwuJkxJhWyAQP9cEXxaop0I1zTMAiDAxy8EB0iWd ekoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=kVkDO2KOif2frQeCzecIa3Ot4mR/23B4wTbE/ilmNLI=; b=5VobFBQTWf+LwZDEGU7EqWIFR4G+xhCjn7dGQ0zsIFz9qE3hGplC2Kze2vI0NHUD/Q QnYNBAnDzPDn3RGHYA+DQDjN3qOjDGPISrkydbtHh2x3e+FnPM54OpPSGLUOGu6W1MFf 7uYy1CBP8h3GKZUi05zhA1yva/Vx+YK+dAstCoyTcZnk+Eszej06ve4WynxNzQWY8D5h h8ve9os2qNBssilxVYIpJsdhISrbqFLHlQ1K7XcuUSvRFc4T4MguTCONLI5AsfhLwbHr hYj6W+NQQ7n03Ve1nRZr9mhvR6aqlfiqi8+j2N1BhDE3jtF2br0fR3GpGjBgivH2cCAD neHQ== X-Gm-Message-State: ACrzQf2ol3+d6fBPxYmglQrhkZK5Y1kAwTI/EP0LE9Fr+ZeKqTtjPZ8Q o8EziVF0EHZ/w8fWKEZSUf3vooe0ZEA= X-Received: by 2002:a63:2215:0:b0:43b:e00f:7c7b with SMTP id i21-20020a632215000000b0043be00f7c7bmr28818221pgi.511.1667531808949; Thu, 03 Nov 2022 20:16:48 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:9d:2:a6ae:11ff:fe11:fcc3]) by smtp.gmail.com with ESMTPSA id s3-20020a63ff43000000b004702eca61fcsm1078655pgk.36.2022.11.03.20.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:16:48 -0700 (PDT) From: Dmitry Torokhov To: Helge Deller , Tony Lindgren , Tomi Valkeinen , Sebastian Reichel Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: [PATCH RESEND 01/13] omapfb: connector-hdmi: switch to using gpiod API Date: Thu, 3 Nov 2022 20:16:30 -0700 Message-Id: <20221103-omapfb-gpiod-v1-1-cba1fae5a77c@gmail.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog In-Reply-To: <20221103-omapfb-gpiod-v1-0-cba1fae5a77c@gmail.com> References: <20221103-omapfb-gpiod-v1-0-cba1fae5a77c@gmail.com> MIME-Version: 1.0 X-Mailer: b4 0.11.0-dev-28747 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748533892326591160?= X-GMAIL-MSGID: =?utf-8?q?1748533892326591160?= Switch the driver from legacy gpio API that is deprecated to the newer gpiod API that respects line polarities described in ACPI/DT. Signed-off-by: Dmitry Torokhov --- .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 49 +++++++--------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c index 670b9c6eb5a9..8f9ff9fb4ca4 100644 --- a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c +++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c @@ -6,11 +6,12 @@ * Author: Tomi Valkeinen */ +#include +#include #include #include #include #include -#include #include @@ -41,7 +42,7 @@ struct panel_drv_data { struct omap_video_timings timings; - int hpd_gpio; + struct gpio_desc *hpd_gpio; }; #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) @@ -155,8 +156,8 @@ static bool hdmic_detect(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; - if (gpio_is_valid(ddata->hpd_gpio)) - return gpio_get_value_cansleep(ddata->hpd_gpio); + if (ddata->hpd_gpio) + return gpiod_get_value_cansleep(ddata->hpd_gpio); else return in->ops.hdmi->detect(in); } @@ -197,31 +198,6 @@ static struct omap_dss_driver hdmic_driver = { .set_hdmi_infoframe = hdmic_set_infoframe, }; -static int hdmic_probe_of(struct platform_device *pdev) -{ - struct panel_drv_data *ddata = platform_get_drvdata(pdev); - struct device_node *node = pdev->dev.of_node; - struct omap_dss_device *in; - int gpio; - - /* HPD GPIO */ - gpio = of_get_named_gpio(node, "hpd-gpios", 0); - if (gpio_is_valid(gpio)) - ddata->hpd_gpio = gpio; - else - ddata->hpd_gpio = -ENODEV; - - in = omapdss_of_find_source_for_first_ep(node); - if (IS_ERR(in)) { - dev_err(&pdev->dev, "failed to find video source\n"); - return PTR_ERR(in); - } - - ddata->in = in; - - return 0; -} - static int hdmic_probe(struct platform_device *pdev) { struct panel_drv_data *ddata; @@ -238,15 +214,18 @@ static int hdmic_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ddata); ddata->dev = &pdev->dev; - r = hdmic_probe_of(pdev); + ddata->hpd_gpio = devm_gpiod_get_optional(&pdev->dev, "hpd", GPIOD_IN); + r = PTR_ERR_OR_ZERO(ddata->hpd_gpio); if (r) return r; - if (gpio_is_valid(ddata->hpd_gpio)) { - r = devm_gpio_request_one(&pdev->dev, ddata->hpd_gpio, - GPIOF_DIR_IN, "hdmi_hpd"); - if (r) - goto err_reg; + gpiod_set_consumer_name(ddata->hpd_gpio, "hdmi_hpd"); + + ddata->in = omapdss_of_find_source_for_first_ep(pdev->dev.of_node); + r = PTR_ERR_OR_ZERO(ddata->in); + if (r) { + dev_err(&pdev->dev, "failed to find video source\n"); + return r; } ddata->timings = hdmic_default_timings;