From patchwork Tue Jul 17 23:14:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10531049 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6FAC560247 for ; Tue, 17 Jul 2018 23:15:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 602762936A for ; Tue, 17 Jul 2018 23:15:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 519642936F; Tue, 17 Jul 2018 23:15:44 +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=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E2A192936A for ; Tue, 17 Jul 2018 23:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=dhavcIIUZi9Y5a4x6OmIDuUCpODmmsX3iJKKjCdaW7U=; b=KLt1G0D9yuSx9eKz71qVU4LoMf 3JfdkmproI6mGZuMmMeq8M4sQFo/T1B8Jy68zejEzEhBJw8UlIUtOllm6UwCcCldLxTNoL/nujbA8 zQooak4fVXKltbzVZ9vQ1tsIn1m/HEOo32JbbM3w4RRi7c6yndX3mLyJhpdY8XLaQdmUHpyk7CB8f B1hZyPzLSrn1uYqpVtafI9J30GmcHVIH0sYKKr34VrMSunttx+2xIn+hIuGsMmKZSj2B9aSjMrns5 WtJqRXRwinp7UuXSZOQ61aqSgGotqjUMHSKYVDOEJ1BWZIsT0T8jPBQw8CBIsxC0lzRLB2lh3p5Hi OJ8pkC+w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ffZBx-0006vQ-Ri; Tue, 17 Jul 2018 23:15:37 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ffZBf-0005xC-Is; Tue, 17 Jul 2018 23:15:26 +0000 Received: by mail-lj1-x242.google.com with SMTP id j19-v6so2398755ljc.7; Tue, 17 Jul 2018 16:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qxJYpWidCfKa9iYVekeWO6dAh9gWrR/YyGHbbCX1psE=; b=QSouMoJ0fwCnnqNWTVH8yd3iJe6MGFsb5IdKbOnw/5eUTbh9p4qWM8nCLanrrGmqld s7tvqhpPNch90Z9V7SZJUU4LcF5UqLdNn6Ea+CpxKSzY9BWBZgwHWGZljeutg+6+O1sB 3qy2Q7ac0VHg51HnCQjeQd0KAfD9wEteynDec/4CqXR/uK8SYbpdPoyYWc5eDwc5L8Ij vvMnV10YYgGmVrh1UolmAo8E6y0G1O0Pg6AwhoHSMjqxSaPxOAG5QixEDbnAEQAqEP9H Fqy2mL7qLtkVfxtl0ZI05r2zypqlSjV5+WRTuHBBTDJOIN5G/DusGibSLll6h7PpoYrZ 9mMQ== 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:in-reply-to :references; bh=qxJYpWidCfKa9iYVekeWO6dAh9gWrR/YyGHbbCX1psE=; b=hMDY6L439o5ZlwdIcB8wSLSsTDJZKrwJSb3DJpo7yGiKOmvNlb6jYfUt854Vu/rlI3 cKXTyqDQuSXjbcsCEBE4H5p4xTX00rHDtItHkiJ7UtnYCCSVq5mSIgS3qEUeeI7y6gED BjcBSRmL9lve9moLdIjPS6sTrnZo/xifw4bCMDgUr4QomdF06QlIQmlRV+sA8/EtnXPT wRu/6YkYHhVa3OfwnmC1/10DHttDu/jY7MxsQNMLCAKOXMXsq046RrKUrKGA8Dd2PDlr PzCfTgn2PGuPgUfb4Zr9uhlm5P1H5+sIES6ya9+s9mYPqFuyE7sn9W+il8fLyn/Rgxuv t8zQ== X-Gm-Message-State: AOUpUlFnx+u4AJAkFbli5SYe4KeX8Mxpd3vo3yWCP1rn3TE4VRC/vdvJ GD9SbqFPmdV4JTuQSsTWgBU= X-Google-Smtp-Source: AAOMgpfpRbQVTAxkk+8MxMp5mbBaWh7aJhRee/Ubtb0OfGpX9uZazXx/ALbAkpId+Yvq1ObEPq0lGw== X-Received: by 2002:a2e:998e:: with SMTP id w14-v6mr1434604lji.7.1531869306199; Tue, 17 Jul 2018 16:15:06 -0700 (PDT) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id n24-v6sm350827ljc.7.2018.07.17.16.15.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 16:15:05 -0700 (PDT) From: Janusz Krzysztofik To: Tony Lindgren Subject: [PATCH v2 1/3 v2] video: fbdev: omapfb: lcd_ams_delta: use GPIO lookup table Date: Wed, 18 Jul 2018 01:14:46 +0200 Message-Id: <20180717231448.14958-2-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180717231448.14958-1-jmkrzyszt@gmail.com> References: <20180518210954.29044-1-jmkrzyszt@gmail.com> <20180717231448.14958-1-jmkrzyszt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180717_161520_108713_219DA87D X-CRM114-Status: GOOD ( 18.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mtd@lists.infradead.org, Miquel Raynal , Aaro Koskinen , Richard Weinberger , Gregory CLEMENT , Janusz Krzysztofik , Marek Vasut , Andy Shevchenko , Tomi Valkeinen , Shreeya Patel , Arvind Yadav , Arnd Bergmann , Bartlomiej Zolnierkiewicz , Boris Brezillon , Krzysztof Halasa , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Now as Amstrad Delta board - the only user of this driver - provides GPIO lookup tables, switch from GPIO numbers to GPIO descriptors and use the table to locate required GPIO pins. Declare static variables for storing GPIO descriptors and replace gpio_ function calls with their gpiod_ equivalents. Move GPIO lookup to the driver probe function so device initialization can be deferred instead of aborted if a GPIO pin is not yet available. Pin naming used by the driver should be followed while respective GPIO lookup table is initialized by a board init code. Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Janusz Krzysztofik --- Changelog: v2: Remove problematic error code conversion no longer needed if used on top of commit d08605a64e67 ("ARM: OMAP1: ams-delta: move late devices back to init_machine") already in linux-omap and commit 8853daf3b4ac ("gpiolib: Defer on non-DT find_chip_by_name() failure") already in linux-next Dependency on commit 8853daf3b4ac ("gpiolib: Defer on non-DT find_chip_by_name() failure") is not critical for clean build or run, it only prevents from unexpected future changes to driver initialization order durin device_initall. drivers/video/fbdev/omap/lcd_ams_delta.c | 55 +++++++++++++------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/drivers/video/fbdev/omap/lcd_ams_delta.c b/drivers/video/fbdev/omap/lcd_ams_delta.c index e8c748a0dfe2..cddbd00cbf9f 100644 --- a/drivers/video/fbdev/omap/lcd_ams_delta.c +++ b/drivers/video/fbdev/omap/lcd_ams_delta.c @@ -24,11 +24,10 @@ #include #include #include +#include #include -#include #include -#include #include "omapfb.h" @@ -41,6 +40,8 @@ /* LCD class device section */ static int ams_delta_lcd; +static struct gpio_desc *gpiod_vblen; +static struct gpio_desc *gpiod_ndisp; static int ams_delta_lcd_set_power(struct lcd_device *dev, int power) { @@ -99,41 +100,17 @@ static struct lcd_ops ams_delta_lcd_ops = { /* omapfb panel section */ -static const struct gpio _gpios[] = { - { - .gpio = AMS_DELTA_GPIO_PIN_LCD_VBLEN, - .flags = GPIOF_OUT_INIT_LOW, - .label = "lcd_vblen", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_LCD_NDISP, - .flags = GPIOF_OUT_INIT_LOW, - .label = "lcd_ndisp", - }, -}; - -static int ams_delta_panel_init(struct lcd_panel *panel, - struct omapfb_device *fbdev) -{ - return gpio_request_array(_gpios, ARRAY_SIZE(_gpios)); -} - -static void ams_delta_panel_cleanup(struct lcd_panel *panel) -{ - gpio_free_array(_gpios, ARRAY_SIZE(_gpios)); -} - static int ams_delta_panel_enable(struct lcd_panel *panel) { - gpio_set_value(AMS_DELTA_GPIO_PIN_LCD_NDISP, 1); - gpio_set_value(AMS_DELTA_GPIO_PIN_LCD_VBLEN, 1); + gpiod_set_value(gpiod_ndisp, 1); + gpiod_set_value(gpiod_vblen, 1); return 0; } static void ams_delta_panel_disable(struct lcd_panel *panel) { - gpio_set_value(AMS_DELTA_GPIO_PIN_LCD_VBLEN, 0); - gpio_set_value(AMS_DELTA_GPIO_PIN_LCD_NDISP, 0); + gpiod_set_value(gpiod_vblen, 0); + gpiod_set_value(gpiod_ndisp, 0); } static struct lcd_panel ams_delta_panel = { @@ -154,8 +131,6 @@ static struct lcd_panel ams_delta_panel = { .pcd = 0, .acb = 37, - .init = ams_delta_panel_init, - .cleanup = ams_delta_panel_cleanup, .enable = ams_delta_panel_enable, .disable = ams_delta_panel_disable, }; @@ -166,9 +141,23 @@ static struct lcd_panel ams_delta_panel = { static int ams_delta_panel_probe(struct platform_device *pdev) { struct lcd_device *lcd_device = NULL; -#ifdef CONFIG_LCD_CLASS_DEVICE int ret; + gpiod_vblen = devm_gpiod_get(&pdev->dev, "vblen", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_vblen)) { + ret = PTR_ERR(gpiod_vblen); + dev_err(&pdev->dev, "VBLEN GPIO request failed (%d)\n", ret); + return ret; + } + + gpiod_ndisp = devm_gpiod_get(&pdev->dev, "ndisp", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_ndisp)) { + ret = PTR_ERR(gpiod_ndisp); + dev_err(&pdev->dev, "NDISP GPIO request failed (%d)\n", ret); + return ret; + } + +#ifdef CONFIG_LCD_CLASS_DEVICE lcd_device = lcd_device_register("omapfb", &pdev->dev, NULL, &ams_delta_lcd_ops);