From patchwork Mon Aug 20 18:13:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10570597 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 8442C921 for ; Mon, 20 Aug 2018 18:13:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7467B28CEC for ; Mon, 20 Aug 2018 18:13:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6689D28DF4; Mon, 20 Aug 2018 18:13:11 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,HK_RANDOM_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE 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 0C09128CEC for ; Mon, 20 Aug 2018 18:13:11 +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=fRrYP6bJ5WMdDDDO22LpwbXJ/6a9hMhrl5jTtgZa3P4=; b=LLTCmVDMI55MRuK+0KnqBspZKz UJOlKRPA0mcYjvjlKI+w/h0r/l4OZ6+IFbhh/SgE+hRY5Ra4BRE60PxvFNFVYM9rYgqDytAtZE2Vs YUnVU4oEHQpKFWDgZx6gfBIlZmfFE1olSb3ewNvxLX9CJDjU0vR4LfIgvLx5dpuDY5bfkIoqD5Ybw 92bW+NEYgmlpaEhc2+j6RLCZabP55f0s+lDeqQAEcaWA5BPNzsY6bz/DSonL/zd5Cp79HGNHo/l7G g2WnKtTc7EtH2GQCOb48vv7XLpDmIHqgLUn+viuNkUTUN70Wu8qwkfUeR357WUOpMSOBaOgDe2LbG B+pPenlg==; 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 1frofo-0007VD-G1; Mon, 20 Aug 2018 18:13:04 +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 1frofZ-0007Cv-G1 for linux-arm-kernel@lists.infradead.org; Mon, 20 Aug 2018 18:12:51 +0000 Received: by mail-lf1-x144.google.com with SMTP id f135-v6so11590275lfg.10 for ; Mon, 20 Aug 2018 11:12:39 -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=gfupvttg31c1aYTw/7RZmPdZ03ABXSWuZu+liq+qhKI=; b=rhQd+HDk2S+4SX7FJNRZaYhS5JapSnAZNfVkJChLnHKatb4BohrGxJWH+Q4jdcHIoJ iv0OF/KvhAWEMNm1cnnQYdohnRqJ4uv73/7ZGRd7Av+hobJHody6jctCaJ8PTyMJrII7 X9wGulDH1bKBMXVOCn+WBBU+uTNz5dSHAsin7SgdC/XYmf9rG0bI9BdtiBOg7R6Rg1mG aCK5/BPs1Tu97yVGIf4OntqEcXFfvy7E7YdOgzIe69e985f53tYPWqNzRMIm9iwZxkRt Pa5GZ3EZMQr05kT8gYZpPaXxK1kb76hmzinDwJQCCPZ18Eli+8UzWP6fB3lmAw+SM4Kq u5Fw== 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=gfupvttg31c1aYTw/7RZmPdZ03ABXSWuZu+liq+qhKI=; b=T39orTlLeRKzJGP/lc6NknD7hCFPlIpQnwRUF6ceb578PNZYgTHE0F6/u1mr+7OhSQ hPGIj+7MnLsndAIGFnHH5JJ/dP6d/VClcbGCj3TCiyjFHPNV+jHVNclceWttPNGkaChj HDkrKIlFmZbKTPfcsyGqGOgU4kRb/0+AsaU9GMAgQzunKNnEcLfsZPCO78TV0uPGmMsB y8nOFyKB0iq93HHtnk29lyVef3kRixNvWY2zaAX43Ornx9W3RMtnRZOebieSwzznxcLC XWDIyhiLdJsneGlz5uvKUVF0E1+nTposJmN+DYH1uIDtv+NenVja8esR5agUwxPCZ4oc RVtA== X-Gm-Message-State: AOUpUlHvsix3Q9xNq92M5f20B4Qv+cdOr91snwNB0i8JGFgE4zUjWArU u9eTkj7BtWYnuKtVOG1ZVAM= X-Google-Smtp-Source: AA+uWPz5SzY8Uj9T3YclS1cXRXYP1mhXxSq2/wEgCcvh4lMH276VbwBSkOZJG4QJmjcmqyhr08f4YQ== X-Received: by 2002:a19:93d6:: with SMTP id w83-v6mr5260470lfk.63.1534788757432; Mon, 20 Aug 2018 11:12:37 -0700 (PDT) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id g16-v6sm379918lfb.5.2018.08.20.11.12.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Aug 2018 11:12:36 -0700 (PDT) From: Janusz Krzysztofik To: Tony Lindgren Subject: [PATCH 1/3] ARM: OMAP1: ams-delta: assign MODEM IRQ from GPIO descriptor Date: Mon, 20 Aug 2018 20:13:31 +0200 Message-Id: <20180820181333.2527-2-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180820181333.2527-1-jmkrzyszt@gmail.com> References: <20180820181333.2527-1-jmkrzyszt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180820_111249_542695_0CA1929B X-CRM114-Status: GOOD ( 18.18 ) 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: Aaro Koskinen , Greg Kroah-Hartman , Linus Walleij , Janusz Krzysztofik , linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-serial@vger.kernel.org, Jiri Slaby , linux-omap@vger.kernel.org, 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 Don't request MODEM IRQ GPIO by its global number in ams_delta_modem_init(). Instead, obtain its GPIO descriptor and assign related IRQ to the MODEM. Do that from omap_gpio_deps_init(), where the chip is already looked up. Then, in ams_delta_modem_init(), just check for the IRQ number having been already assigned. Signed-off-by: Janusz Krzysztofik Reviewed-by: Linus Walleij --- arch/arm/mach-omap1/board-ams-delta.c | 46 ++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 34cb63ff45b3..b3fe515b6f49 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -630,6 +630,28 @@ static struct gpiod_hog ams_delta_gpio_hogs[] = { {}, }; +static struct plat_serial8250_port ams_delta_modem_ports[]; + +/* + * Obtain MODEM IRQ GPIO descriptor using its hardware pin + * number and assign related IRQ number to the MODEM port. + * Keep the GPIO descriptor open so nobody steps in. + */ +static void __init modem_assign_irq(struct gpio_chip *chip) +{ + struct gpio_desc *gpiod; + + gpiod = gpiochip_request_own_desc(chip, AMS_DELTA_GPIO_PIN_MODEM_IRQ, + "modem_irq"); + if (IS_ERR(gpiod)) { + pr_err("%s: modem IRQ GPIO request failed (%ld)\n", __func__, + PTR_ERR(gpiod)); + } else { + gpiod_direction_input(gpiod); + ams_delta_modem_ports[0].irq = gpiod_to_irq(gpiod); + } +} + /* * The purpose of this function is to take care of proper initialization of * devices and data structures which depend on GPIO lines provided by OMAP GPIO @@ -649,7 +671,13 @@ static void __init omap_gpio_deps_init(void) return; } + /* + * Start with FIQ initialization as it may have to request + * and release successfully each OMAP GPIO pin in turn. + */ ams_delta_init_fiq(chip, &ams_delta_serio_device); + + modem_assign_irq(chip); } static void __init ams_delta_init(void) @@ -844,20 +872,18 @@ static int __init modem_nreset_init(void) } +/* + * This function expects MODEM IRQ number already assigned to the port + * and fails if it's not. + */ static int __init ams_delta_modem_init(void) { int err; - omap_cfg_reg(M14_1510_GPIO2); - ams_delta_modem_ports[0].irq = - gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ); + if (ams_delta_modem_ports[0].irq < 0) + return ams_delta_modem_ports[0].irq; - err = gpio_request(AMS_DELTA_GPIO_PIN_MODEM_IRQ, "modem"); - if (err) { - pr_err("Couldn't request gpio pin for modem\n"); - return err; - } - gpio_direction_input(AMS_DELTA_GPIO_PIN_MODEM_IRQ); + omap_cfg_reg(M14_1510_GPIO2); /* Initialize the modem_nreset regulator consumer before use */ modem_priv.regulator = ERR_PTR(-ENODEV); @@ -866,8 +892,6 @@ static int __init ams_delta_modem_init(void) AMS_DELTA_LATCH2_MODEM_CODEC); err = platform_device_register(&ams_delta_modem_device); - if (err) - gpio_free(AMS_DELTA_GPIO_PIN_MODEM_IRQ); return err; }