From patchwork Sun Jun 9 23:13:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10983897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DCCDA1398 for ; Sun, 9 Jun 2019 23:13:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C59CD28712 for ; Sun, 9 Jun 2019 23:13:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B67DF2877E; Sun, 9 Jun 2019 23:13:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1982228712 for ; Sun, 9 Jun 2019 23:13:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5FECA892DB; Sun, 9 Jun 2019 23:13:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 912568936E for ; Sun, 9 Jun 2019 23:13:42 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id m3so7309063wrv.2 for ; Sun, 09 Jun 2019 16:13:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=R+TZ5hB66RnFRdTZGhl6RXXQRgHxnuPRrE/3Hd+I2Qk=; b=lfxsEjY8upT8FJM9ZR8rIqKPZ/mGnY3iNo/qDn0k2N2VlrllGvCUxhlcyCM0iTwqk5 N4dCAtcbK+HD63ZsZd+xEDpDQeedyaOTDSb45+F2FFrlzwabfJfICIPlOW5urfcBM1s2 qLAs3pM6Y6y5UJ+Vvbr3XeWkmVVjROGm/uXHyhds6KYMxrAEavz0vSqETdzvuvoNdWGk DQBGHVNEbY1s3fpV3oLRvXKGGBkkm55yytl2YJBzyj4LTJPZLg5S0eytZRs+5IFbGK0z i6YfVBcyMB+WHu93aGuMhU4XSjf/tYFzmKHlKfOUyKAIaFTDQBDRSzuWhLr3Py7OFepu BSmg== X-Gm-Message-State: APjAAAVH6TL6M6KGKV6wWKbhNaq6eeRoXuBt1PSxtYmmAjzE0DVjDoy3 T7K3OwBVdZNPgTlnIqkYqepXKuCoStc= X-Google-Smtp-Source: APXvYqwJ5kH5oE2AtY9wNEf4xP2Hl4yNQh+o0ObwEyO71J4+cSrApDy6vfGqql2vWi5wgawIMS0cvg== X-Received: by 2002:adf:8385:: with SMTP id 5mr15514180wre.194.1560122021228; Sun, 09 Jun 2019 16:13:41 -0700 (PDT) Received: from localhost.localdomain (catv-89-135-96-219.catv.broadband.hu. [89.135.96.219]) by smtp.gmail.com with ESMTPSA id w23sm6262591wmi.45.2019.06.09.16.13.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 09 Jun 2019 16:13:39 -0700 (PDT) From: Linus Walleij To: Andrzej Hajda , Laurent Pinchart Subject: [PATCH] drm/bridge: analogix_dp: Convert to GPIO descriptors Date: Mon, 10 Jun 2019 01:13:39 +0200 Message-Id: <20190609231339.22136-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Original-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=R+TZ5hB66RnFRdTZGhl6RXXQRgHxnuPRrE/3Hd+I2Qk=; b=pp+rwPRQzT3klaA8H22NpVE5AIqRm9TEq1eCc8ulFbG/hSdsz98Vby3H82lLPd/MyT wdCwvY18cdJkiwCc2zT2UZuGo0cgI1UCQq+z8r9auYPaTBw81y8z7kwkmRgZJ029tgLd JzYMWXXQWdO2SppUEe3KhuvsI759w1ls6ZThOMR8LVDU7EBNP/3IBbcQYq8H54gtkVVC ekbpT3MWiTce9AMYv/eujZSd7kpgboZAy4WW3OIkT/ZrhzK/6SqTxM41iGdaM21wkiav 8O3/OyyBc3isnROrp2xCe8GeM+SGb47twS2I/dFSgpMWbWdJ4Ql9mACgXVMlF5II6+sn IR/g== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Douglas Anderson , dri-devel@lists.freedesktop.org, Sean Paul , Enric Balletbo i Serra , Marek Szyprowski Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This converts the Analogix display port to use GPIO descriptors instead of DT-extracted numbers. Cc: Douglas Anderson Cc: Sean Paul Cc: Marek Szyprowski Cc: Enric Balletbo i Serra Signed-off-by: Linus Walleij Reviewed-by: Enric Balletbo i Serra Tested-by: Marek Szyprowski Reviewed-by: Andrzej Hajda --- .../drm/bridge/analogix/analogix_dp_core.c | 28 +++++++++---------- .../drm/bridge/analogix/analogix_dp_core.h | 4 ++- .../gpu/drm/bridge/analogix/analogix_dp_reg.c | 14 +++++----- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 225f5e5dd69b..64842bbb2f3d 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -18,8 +18,7 @@ #include #include #include -#include -#include +#include #include #include @@ -1585,12 +1584,18 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, dp->force_hpd = of_property_read_bool(dev->of_node, "force-hpd"); - dp->hpd_gpio = of_get_named_gpio(dev->of_node, "hpd-gpios", 0); - if (!gpio_is_valid(dp->hpd_gpio)) - dp->hpd_gpio = of_get_named_gpio(dev->of_node, - "samsung,hpd-gpio", 0); + /* Try two different names */ + dp->hpd_gpiod = devm_gpiod_get_optional(dev, "hpd", GPIOD_IN); + if (!dp->hpd_gpiod) + dp->hpd_gpiod = devm_gpiod_get_optional(dev, "samsung,hpd", + GPIOD_IN); + if (IS_ERR(dp->hpd_gpiod)) { + dev_err(dev, "error getting HDP GPIO: %ld\n", + PTR_ERR(dp->hpd_gpiod)); + return ERR_CAST(dp->hpd_gpiod); + } - if (gpio_is_valid(dp->hpd_gpio)) { + if (dp->hpd_gpiod) { /* * Set up the hotplug GPIO from the device tree as an interrupt. * Simply specifying a different interrupt in the device tree @@ -1598,16 +1603,9 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, * using a GPIO. We also need the actual GPIO specifier so * that we can get the current state of the GPIO. */ - ret = devm_gpio_request_one(&pdev->dev, dp->hpd_gpio, GPIOF_IN, - "hpd_gpio"); - if (ret) { - dev_err(&pdev->dev, "failed to get hpd gpio\n"); - return ERR_PTR(ret); - } - dp->irq = gpio_to_irq(dp->hpd_gpio); + dp->irq = gpiod_to_irq(dp->hpd_gpiod); irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING; } else { - dp->hpd_gpio = -ENODEV; dp->irq = platform_get_irq(pdev, 0); irq_flags = 0; } diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h index 769255dc6e99..dc65c2bafa63 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h @@ -38,6 +38,8 @@ #define DPCD_VOLTAGE_SWING_SET(x) (((x) & 0x3) << 0) #define DPCD_VOLTAGE_SWING_GET(x) (((x) >> 0) & 0x3) +struct gpio_desc; + enum link_lane_count_type { LANE_COUNT1 = 1, LANE_COUNT2 = 2, @@ -171,7 +173,7 @@ struct analogix_dp_device { struct link_train link_train; struct phy *phy; int dpms_mode; - int hpd_gpio; + struct gpio_desc *hpd_gpiod; bool force_hpd; bool psr_enable; bool fast_train_enable; diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c index a5f2763d72e4..7aab2d6d710c 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include @@ -397,7 +397,7 @@ void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp) { u32 reg; - if (gpio_is_valid(dp->hpd_gpio)) + if (dp->hpd_gpiod) return; reg = HOTPLUG_CHG | HPD_LOST | PLUG; @@ -411,7 +411,7 @@ void analogix_dp_init_hpd(struct analogix_dp_device *dp) { u32 reg; - if (gpio_is_valid(dp->hpd_gpio)) + if (dp->hpd_gpiod) return; analogix_dp_clear_hotplug_interrupts(dp); @@ -434,8 +434,8 @@ enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp) { u32 reg; - if (gpio_is_valid(dp->hpd_gpio)) { - reg = gpio_get_value(dp->hpd_gpio); + if (dp->hpd_gpiod) { + reg = gpiod_get_value(dp->hpd_gpiod); if (reg) return DP_IRQ_TYPE_HP_CABLE_IN; else @@ -507,8 +507,8 @@ int analogix_dp_get_plug_in_status(struct analogix_dp_device *dp) { u32 reg; - if (gpio_is_valid(dp->hpd_gpio)) { - if (gpio_get_value(dp->hpd_gpio)) + if (dp->hpd_gpiod) { + if (gpiod_get_value(dp->hpd_gpiod)) return 0; } else { reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);