From patchwork Sun Sep 9 22:56:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10593459 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 8021214E0 for ; Sun, 9 Sep 2018 22:56:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C31428C00 for ; Sun, 9 Sep 2018 22:56:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CAD428D3E; Sun, 9 Sep 2018 22:56:09 +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,RCVD_IN_DNSWL_NONE autolearn=ham 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 0C19028C00 for ; Sun, 9 Sep 2018 22:56:08 +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=r76eWAWxQw2MObPuEbPmxbHJ1IdJEJWNhrwINgCOIcQ=; b=HXq1ZXckAKYsZnXjJjzvRFImQj hHG2HxWZeTPGPaO7H0SXpBXThPXK8Ff63k37OWyI1u5TOp1a+2ltY1b7xiO4c8yoE+9t7vhD1W/5X FniYd/UbCIuZk1fP0IG1ctRnGOuQbwM/w1k4BrJxdZcvVBrN+ZQ0qvXan8ak4TeJL5ismBD2xUhQ7 uTKuV6pI/Xbcg0f+aGjURh0CU4qUsruQaQBMv0IC0D5UFnOUdKzj+KkI3STDrd1WwWYVszPQaPO2Q iUdkIE1CfpTo1HV1rKiJ0Zr1ARSOtRurw7ccjDqTbO2v4BUFyy5NqPbSdHsFPAcvzOtkt7bq05QZR 1Hn6W0uA==; 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 1fz8cS-0002rS-RF; Sun, 09 Sep 2018 22:55:52 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fz8bv-0002Bw-Do; Sun, 09 Sep 2018 22:55:21 +0000 Received: by mail-lf1-x144.google.com with SMTP id m26-v6so15969665lfb.0; Sun, 09 Sep 2018 15:55:08 -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=XoqN39JitX7xZtkRTukcI6J9+V8DE/e1EcuIx9Flh4Y=; b=avzo7uE1j7gj2PvtAGafXmxdWetQfTv9sHM9tsuLYh61cMk+fMFuSX2ZDWCYArw/Im RLvTeMEgLC0i15v5ZBTlT8yMfF13qaC436YECuAjbe0eIgYbHBkEaJq0CYt1cD9tpLik zhH+Kwt/7bo85TbefIwj5Z563fA9n8ly/PPPpH1zqg4+hN8QAMnEmIUq94IxF05lg078 /RrQATfxSHLZCOc0Zm246zuVAlqrvMZ4mt7s9rpAkJW3aNlNY+kl+lAWSUkl9KMoXsya 6w86nh5UTTJjlqS1nrL/Rq5gkljM5OHn7M4Z26YyVMbxvcnA0+2Y0iVZtz3n9aJS5LSR L2SA== 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=XoqN39JitX7xZtkRTukcI6J9+V8DE/e1EcuIx9Flh4Y=; b=Efvsk4eWdo+sAJXQb47HNjmDaCowMJUMC2Mp4LkjqepXydqO5G8GSlMK5KqGcI6R5R 5YbGoQgMBYbGWlq1iUIC4S7+/f3X0UVzL/ObJ6avTD9jTVZ+r5XrSSxEsxcT0UdixJoe 2waqb1VhPv7ZFx+BvXz4azk32JiSHxxht7Cv1muSr2R5jb9QTsiUu2697hIMkkoZ+Ic+ 7GiZMEYPiROdz7LPCWBgDbvI0LNahvDUX5+m8SBA2hfeLpzw69kZEZPN685MQAEOr14y Wc2WCIx7shCaM92xMyfuaaR3jfkikm8abI5SniF/hSHtInneGTQ05fALcR4C8NhUaHP3 JlIQ== X-Gm-Message-State: APzg51CcjvID+y9oPcbXSB1wzUvRl0Vx90B0Vs7dsphsjjhbrvVioS9Y Fc5OOWnbVdwOFQclp9bzM00hEQvxFoU= X-Google-Smtp-Source: ANB0VdZX7F/9IXakAPtwqtyN/6uJXfTZwSPuNxfykEwjhFd4V4g+uS8le0u5DcWySOcx86nOrOGdhg== X-Received: by 2002:a19:944d:: with SMTP id w74-v6mr10386025lfd.10.1536533707266; Sun, 09 Sep 2018 15:55:07 -0700 (PDT) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id v10-v6sm2401574ljg.12.2018.09.09.15.55.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Sep 2018 15:55:06 -0700 (PDT) From: Janusz Krzysztofik To: Tony Lindgren Subject: [PATCH v3 1/3] video: fbdev: omapfb: lcd_ams_delta: use GPIO lookup table Date: Mon, 10 Sep 2018 00:56:03 +0200 Message-Id: <20180909225605.16463-2-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180909225605.16463-1-jmkrzyszt@gmail.com> References: <20180717231448.14958-1-jmkrzyszt@gmail.com> <20180909225605.16463-1-jmkrzyszt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180909_155519_471713_B19DF58C X-CRM114-Status: GOOD ( 17.97 ) 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, linux-omap@vger.kernel.org, Aaro Koskinen , Richard Weinberger , Linus Walleij , Bartlomiej Zolnierkiewicz , Janusz Krzysztofik , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Boris Brezillon , linux-mtd@lists.infradead.org, linux-gpio@vger.kernel.org, Miquel Raynal , Brian Norris , David Woodhouse , Marek Vasut , linux-arm-kernel@lists.infradead.org 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 Reviewed-by: Linus Walleij --- 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); From patchwork Sun Sep 9 22:56:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10593461 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 6AEB6921 for ; Sun, 9 Sep 2018 22:58:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53C6728E13 for ; Sun, 9 Sep 2018 22:58:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 437B428E2B; Sun, 9 Sep 2018 22:58:06 +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,RCVD_IN_DNSWL_NONE autolearn=ham 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 4C01F28E13 for ; Sun, 9 Sep 2018 22:58:05 +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=un9UmFIG6v5pMBjAbSWNKAF0vjcMFB8cCyPhK42Xqpo=; b=BT01cSzIgTzlaefTCMsQaTvp1c 6mOBzVTU8GhEnkNhBl3Xd+Xb1G0WT+5fpLIQjq4Jn0acgev+fiMyQ3mgbH6oXQWT+CjAZFAqj9cXx gTYAjaOVVJi5vsJoxWDLV0NYuc5XdGVdKvslMR1sXryD+4PFy9rUyYjAnBKyg3h9Kt7TAfCHDPqxX pJdtyg72/1Q5DDOOg8KaXuZBq7ALjuI5ftPwkhjy+HnF654zMXlXHzd6UoGge/PexU0IPAn2kZE5k FeMcFfInkxVJFXSP04thTLFuIYBlRhH5R6/avl58MhOmS4dEtzQIXWg8tyvhvFsazO6yNNjo0WyqJ Hic3fl3w==; 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 1fz8eP-0003en-83; Sun, 09 Sep 2018 22:57:53 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fz8bw-0002RI-PG; Sun, 09 Sep 2018 22:55:23 +0000 Received: by mail-lf1-x141.google.com with SMTP id q13-v6so15971491lfc.2; Sun, 09 Sep 2018 15:55:10 -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=6IK8C/3Lmm7EgMtmeJDH4caEbK/r7LRC38GKEdHwXew=; b=XE576iQTwF7+QVhIcDovX9++hRW6/Hu2jAJ2XxTe7JL+vOKwU6yeJsAo344OOC12Qu 8G60F38/Ju5zJ1vrd1ugddHM4Dw8z3jjTYE/lgC0b6I/RD5nrJbIaTuELNP482Jdd5D+ 3shO1XUOkOrgrPJLIBy4tm/Yo20Rh5sz12/S2QW9oa1HEknlx5NzqJ029yTz46X6skiC ryXJMK43YIGQP2ADlhfIiNMDr2d6VP6rUXWhA2YBtYR74yKXpJUa6opCfkj9j22lmucd VqMtz19nMUuAultbODTgJHyrzmUxXR/UPgsC7rReoJbHKLs39MljfypaLjftpLZ9wbAL 64yw== 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=6IK8C/3Lmm7EgMtmeJDH4caEbK/r7LRC38GKEdHwXew=; b=bEd1KTN127IE8AL2rtIEPxlnCrkFPeBUkC/r/rEuqlU6FQfvG+NlN+OYjsxNcrcWEE BKdbCV+UkRx0cX4LGlw9Vty+MdMSKaBrJOi6pVVSNWRzZHbmOEOQ9nzhMMKnroxDw2M3 nrMuNnyWZ3gRVge++MyAZEaitwV2hx+HQP6FPBtRYfg1+Ct7aS5EzMNHsmpw5WzjObvL SwDEmJ5HFN21OHEOgKPd+StwzXcjqikz/oqnsX+CDcBJ16jmw5mA3RJWRMp4Ockq+wpk 72ua3fJTpykhEeXGf+ro2t6MjWo7rmsHNeYa2c/tJAZAorfGu/6IifUz+VV8k+PU2ju7 UR3A== X-Gm-Message-State: APzg51AuI7vkhVmB0SLBhpPUrQmKVAgc5XezFxw8+M370VyG0CDdVefT Tnqjn0n7U4vXl/qUMNhy3qQ= X-Google-Smtp-Source: ANB0VdZHiPguRmXBCW0FSXVwjnK+dGOBiid3h0OgT/4gZG7nb29B6u+o3HWcqwo5j3lkTkBVlNSXLg== X-Received: by 2002:a19:14e6:: with SMTP id 99-v6mr10616482lfu.26.1536533708813; Sun, 09 Sep 2018 15:55:08 -0700 (PDT) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id v10-v6sm2401574ljg.12.2018.09.09.15.55.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Sep 2018 15:55:08 -0700 (PDT) From: Janusz Krzysztofik To: Tony Lindgren Subject: [PATCH v3 2/3] mtd: rawnand: ams-delta: use GPIO lookup table Date: Mon, 10 Sep 2018 00:56:04 +0200 Message-Id: <20180909225605.16463-3-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180909225605.16463-1-jmkrzyszt@gmail.com> References: <20180717231448.14958-1-jmkrzyszt@gmail.com> <20180909225605.16463-1-jmkrzyszt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180909_155520_819968_8D93A548 X-CRM114-Status: GOOD ( 18.97 ) 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, linux-omap@vger.kernel.org, Aaro Koskinen , Richard Weinberger , Linus Walleij , Bartlomiej Zolnierkiewicz , Janusz Krzysztofik , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Boris Brezillon , linux-mtd@lists.infradead.org, linux-gpio@vger.kernel.org, Miquel Raynal , Brian Norris , David Woodhouse , Marek Vasut , linux-arm-kernel@lists.infradead.org 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. Pin naming used by the driver should be followed while respective GPIO lookup table is initialized by a board init code. Signed-off-by: Janusz Krzysztofik Acked-by: Boris Brezillon Acked-by: Miquel Raynal --- drivers/mtd/nand/raw/ams-delta.c | 126 +++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 59 deletions(-) diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c index 37a3cc21c7bc..2a8872ebd14a 100644 --- a/drivers/mtd/nand/raw/ams-delta.c +++ b/drivers/mtd/nand/raw/ams-delta.c @@ -20,23 +20,28 @@ #include #include #include +#include #include #include #include -#include #include #include #include -#include - #include /* * MTD structure for E3 (Delta) */ static struct mtd_info *ams_delta_mtd = NULL; +static struct gpio_desc *gpiod_rdy; +static struct gpio_desc *gpiod_nce; +static struct gpio_desc *gpiod_nre; +static struct gpio_desc *gpiod_nwp; +static struct gpio_desc *gpiod_nwe; +static struct gpio_desc *gpiod_ale; +static struct gpio_desc *gpiod_cle; /* * Define partitions for flash devices @@ -70,9 +75,9 @@ static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte) writew(0, io_base + OMAP_MPUIO_IO_CNTL); writew(byte, this->IO_ADDR_W); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NWE, 0); + gpiod_set_value(gpiod_nwe, 0); ndelay(40); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NWE, 1); + gpiod_set_value(gpiod_nwe, 1); } static u_char ams_delta_read_byte(struct mtd_info *mtd) @@ -81,11 +86,11 @@ static u_char ams_delta_read_byte(struct mtd_info *mtd) struct nand_chip *this = mtd_to_nand(mtd); void __iomem *io_base = (void __iomem *)nand_get_controller_data(this); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 0); + gpiod_set_value(gpiod_nre, 0); ndelay(40); writew(~0, io_base + OMAP_MPUIO_IO_CNTL); res = readw(this->IO_ADDR_R); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 1); + gpiod_set_value(gpiod_nre, 1); return res; } @@ -120,12 +125,9 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd, { if (ctrl & NAND_CTRL_CHANGE) { - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NCE, - (ctrl & NAND_NCE) == 0); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_CLE, - (ctrl & NAND_CLE) != 0); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_ALE, - (ctrl & NAND_ALE) != 0); + gpiod_set_value(gpiod_nce, !(ctrl & NAND_NCE)); + gpiod_set_value(gpiod_cle, !!(ctrl & NAND_CLE)); + gpiod_set_value(gpiod_ale, !!(ctrl & NAND_ALE)); } if (cmd != NAND_CMD_NONE) @@ -134,41 +136,9 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd, static int ams_delta_nand_ready(struct mtd_info *mtd) { - return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB); + return gpiod_get_value(gpiod_rdy); } -static const struct gpio _mandatory_gpio[] = { - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NCE, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nce", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NRE, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nre", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NWP, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nwp", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NWE, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nwe", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_ALE, - .flags = GPIOF_OUT_INIT_LOW, - .label = "nand_ale", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_CLE, - .flags = GPIOF_OUT_INIT_LOW, - .label = "nand_cle", - }, -}; /* * Main initialization routine @@ -216,12 +186,17 @@ static int ams_delta_init(struct platform_device *pdev) this->write_buf = ams_delta_write_buf; this->read_buf = ams_delta_read_buf; this->cmd_ctrl = ams_delta_hwcontrol; - if (gpio_request(AMS_DELTA_GPIO_PIN_NAND_RB, "nand_rdy") == 0) { - this->dev_ready = ams_delta_nand_ready; - } else { - this->dev_ready = NULL; - pr_notice("Couldn't request gpio for Delta NAND ready.\n"); + + gpiod_rdy = devm_gpiod_get_optional(&pdev->dev, "rdy", GPIOD_IN); + if (IS_ERR(gpiod_rdy)) { + err = PTR_ERR(gpiod_rdy); + dev_warn(&pdev->dev, "RDY GPIO request failed (%d)\n", err); + goto out_mtd; } + + if (gpiod_rdy) + this->dev_ready = ams_delta_nand_ready; + /* 25 us command delay time */ this->chip_delay = 30; this->ecc.mode = NAND_ECC_SOFT; @@ -230,9 +205,47 @@ static int ams_delta_init(struct platform_device *pdev) platform_set_drvdata(pdev, io_base); /* Set chip enabled, but */ - err = gpio_request_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); - if (err) - goto out_gpio; + gpiod_nwp = devm_gpiod_get(&pdev->dev, "nwp", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nwp)) { + err = PTR_ERR(gpiod_nwp); + dev_err(&pdev->dev, "NWP GPIO request failed (%d)\n", err); + goto out_mtd; + } + + gpiod_nce = devm_gpiod_get(&pdev->dev, "nce", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nce)) { + err = PTR_ERR(gpiod_nce); + dev_err(&pdev->dev, "NCE GPIO request failed (%d)\n", err); + goto out_mtd; + } + + gpiod_nre = devm_gpiod_get(&pdev->dev, "nre", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nre)) { + err = PTR_ERR(gpiod_nre); + dev_err(&pdev->dev, "NRE GPIO request failed (%d)\n", err); + goto out_mtd; + } + + gpiod_nwe = devm_gpiod_get(&pdev->dev, "nwe", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nwe)) { + err = PTR_ERR(gpiod_nwe); + dev_err(&pdev->dev, "NWE GPIO request failed (%d)\n", err); + goto out_mtd; + } + + gpiod_ale = devm_gpiod_get(&pdev->dev, "ale", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_ale)) { + err = PTR_ERR(gpiod_ale); + dev_err(&pdev->dev, "ALE GPIO request failed (%d)\n", err); + goto out_mtd; + } + + gpiod_cle = devm_gpiod_get(&pdev->dev, "cle", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_cle)) { + err = PTR_ERR(gpiod_cle); + dev_err(&pdev->dev, "CLE GPIO request failed (%d)\n", err); + goto out_mtd; + } /* Scan to find existence of the device */ err = nand_scan(ams_delta_mtd, 1); @@ -246,9 +259,6 @@ static int ams_delta_init(struct platform_device *pdev) goto out; out_mtd: - gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); -out_gpio: - gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB); iounmap(io_base); out_free: kfree(this); @@ -266,8 +276,6 @@ static int ams_delta_cleanup(struct platform_device *pdev) /* Release resources, unregister device */ nand_release(ams_delta_mtd); - gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); - gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB); iounmap(io_base); /* Free the MTD device structure */ From patchwork Sun Sep 9 22:56:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10593463 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 D58BB921 for ; Sun, 9 Sep 2018 22:59:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C40F128E38 for ; Sun, 9 Sep 2018 22:59:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B82DD28E47; Sun, 9 Sep 2018 22:59:26 +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,RCVD_IN_DNSWL_NONE autolearn=ham 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 0CD1E28E38 for ; Sun, 9 Sep 2018 22:59:26 +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=wDERGGtnmWERYtZSY4aDhsJQjvBYzZgZdhODBbHuom8=; b=tyfLXTCicRc522UgSydKbrWJAV /5LFbTTzZNeXfFRTUu+nnAat+eDK6yVYQnTBqSzhS7xl9r/hHRZaffaX3TNSALnPzlX4mkKyHxWPs RUOt6/aXEnaolEvjVDhK+vcxPGsuEr//iEyOf1X21vF1+BB+DOUDoQPyGXzn350zZP/6zD3HtATsL vU4qQmoifdHac0y20WIMNgMoPOYKMgmEWUL2dSqloTM0d4u3yiJnX4JBzc8lvjiUMu9JJq870270r O079iyslG+hkw7n8DHqXQPXkOCSGT9oA9PtAEImgoFPRe+jPtr20yXzVcfbyYc779nj2ZzC41vNIp CW+aSRyw==; 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 1fz8fh-0004BD-W1; Sun, 09 Sep 2018 22:59:14 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fz8by-0002eP-8G; Sun, 09 Sep 2018 22:55:23 +0000 Received: by mail-lj1-x244.google.com with SMTP id u83-v6so16254749lje.12; Sun, 09 Sep 2018 15:55:11 -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=xW2XF0TCmP47kVJFv5etl9djcdcCMkcGG8atr2Hz/P0=; b=UYszDmk7F6LdpYxaVvG44X9QraigSGyx+hPMg3Mt56ueBwJhuwc6JPkTuU3aJjQe5M I+hI85ZgmeDRDhJt9Pj7LrQoVhhc8i4qvAVyqP9+QN17JAapd7IJoO8BfEUZhyYdzarP V/mgZ3hAypIlYUDqKyVQrrwGiARHChz0xkgEyU5ZL7WnkVTqyFeiR/8TdbRwixMmmddp SlEJ/po6IySNDC+NP1Z/fZWb19YmIRKfgdfRPv9OzoR+Xtd++KtAeux8X51pyb6MkVg/ HCRfi5xMKFcnRGMdHevBhTMaQrFnBRs0DyO2h6kasPpZKGqv/x8Lx50lQHG/QazpoDLn 3KOA== 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=xW2XF0TCmP47kVJFv5etl9djcdcCMkcGG8atr2Hz/P0=; b=oQg/x57oAx/16xLtwghsn4K/vh6zklsd66IHzNTEO1cAWcZI5LHnx6wUksdtRiMVcl osChPVGf+H98YMjxUdlDkM/IueAyZncbK5XFEmsoGI26gDWZhOfFmSb/fkAIT6pFs6FF QgexwsVjojKSskFwrwIEjzodKe0RkGpML8Bx1OipQGGQJMSYQO3uCWJ3NDkbKWAzMKCe pNXsfptg67U/oBwgg9Cm0R7HP9Pc8/MUlV1MXuUrEo5sNu4O7+E+Eqo27fI90ohTz7pj 0apsmINvMeXULZmqihW4FQ53YFWGhMPl2Nl37Bcjpi/2qFO+vpBMXNDnwFgv3Kb4yipB nqtw== X-Gm-Message-State: APzg51AXmHeucsuW2Yr4gegbn1JUD4NIXC42QQSFCHncdKKdXZL6apgz vU1JYLZf+F0VTtvGLKTgtIU= X-Google-Smtp-Source: ANB0Vda/t0MDaWSIFwx1izKqB45uPqJndbhA82JW3DvnZLS/F55g+4rxzWPkn1uSEn4L8l0SJrEinw== X-Received: by 2002:a2e:2d2:: with SMTP id y79-v6mr10452509lje.100.1536533710384; Sun, 09 Sep 2018 15:55:10 -0700 (PDT) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id v10-v6sm2401574ljg.12.2018.09.09.15.55.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Sep 2018 15:55:09 -0700 (PDT) From: Janusz Krzysztofik To: Tony Lindgren Subject: [PATCH v3 3/3] ARM: OMAP1: ams-delta: make board header file local to mach-omap1 Date: Mon, 10 Sep 2018 00:56:05 +0200 Message-Id: <20180909225605.16463-4-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180909225605.16463-1-jmkrzyszt@gmail.com> References: <20180717231448.14958-1-jmkrzyszt@gmail.com> <20180909225605.16463-1-jmkrzyszt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180909_155522_320865_216FDA58 X-CRM114-Status: GOOD ( 14.27 ) 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, linux-omap@vger.kernel.org, Aaro Koskinen , Richard Weinberger , Linus Walleij , Bartlomiej Zolnierkiewicz , Janusz Krzysztofik , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Boris Brezillon , linux-mtd@lists.infradead.org, linux-gpio@vger.kernel.org, Miquel Raynal , Brian Norris , David Woodhouse , Marek Vasut , linux-arm-kernel@lists.infradead.org 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 board header file is no longer included by drivers, move it to the root directory of mach-omap1. Signed-off-by: Janusz Krzysztofik --- arch/arm/mach-omap1/ams-delta-fiq-handler.S | 2 +- arch/arm/mach-omap1/ams-delta-fiq.c | 3 +-- arch/arm/mach-omap1/board-ams-delta.c | 2 +- arch/arm/mach-omap1/{include/mach => }/board-ams-delta.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) rename arch/arm/mach-omap1/{include/mach => }/board-ams-delta.h (98%) diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S index ddc27638ba2a..2e2a17364dc9 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S @@ -17,9 +17,9 @@ #include #include -#include #include "ams-delta-fiq.h" +#include "board-ams-delta.h" #include "iomap.h" #include "soc.h" diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c index b0dc7ddf5877..14c3d3f5255e 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq.c +++ b/arch/arm/mach-omap1/ams-delta-fiq.c @@ -22,11 +22,10 @@ #include #include -#include - #include #include "ams-delta-fiq.h" +#include "board-ams-delta.h" static struct fiq_handler fh = { .name = "ams-delta-fiq" diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index dd28d2614d7f..34cb63ff45b3 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -36,7 +36,6 @@ #include #include -#include #include #include @@ -45,6 +44,7 @@ #include #include "ams-delta-fiq.h" +#include "board-ams-delta.h" #include "iomap.h" #include "common.h" diff --git a/arch/arm/mach-omap1/include/mach/board-ams-delta.h b/arch/arm/mach-omap1/board-ams-delta.h similarity index 98% rename from arch/arm/mach-omap1/include/mach/board-ams-delta.h rename to arch/arm/mach-omap1/board-ams-delta.h index ad6f865d1f16..1fbada29431a 100644 --- a/arch/arm/mach-omap1/include/mach/board-ams-delta.h +++ b/arch/arm/mach-omap1/board-ams-delta.h @@ -1,5 +1,5 @@ /* - * arch/arm/plat-omap/include/mach/board-ams-delta.h + * arch/arm/mach-omap1/board-ams-delta.h * * Copyright (C) 2006 Jonathan McDowell *