From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=3.0 tests=DKIM_ADSP_ALL,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FC94C43441 for ; Thu, 22 Nov 2018 09:48:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4465720866 for ; Thu, 22 Nov 2018 09:48:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=aussec.com header.i=@aussec.com header.b="AfyMr4oO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4465720866 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=aussec.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393592AbeKVU13 (ORCPT ); Thu, 22 Nov 2018 15:27:29 -0500 Received: from csm1.csm-office.com.au ([165.228.118.109]:34208 "EHLO sleepy.aussec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731614AbeKVU13 (ORCPT ); Thu, 22 Nov 2018 15:27:29 -0500 X-Virus-Scanned: amavisd-new at aussec.com Received: from hpdv6.aussec.com.com (c110-21-61-29.farfl4.nsw.optusnet.com.au [110.21.61.29]) (authenticated bits=0) by sleepy.aussec.com (8.15.2/8.15.2) with ESMTPSA id wAM9mAdi030201 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 22 Nov 2018 20:48:32 +1100 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=aussec.com; s=2016; t=1542880113; bh=fgLGcidoKj4KpkQHdhPi7Dm0b4yBsxfkO0iYRa/odNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AfyMr4oOK+jPaFlWqQ2BMznYO1c0y4h4VxM0SvCepcAlRmgNEjN99aMLJAa2vSpsW 03IvM/nU4nKRsaZkywGccDP5OjwaRBSRpTD4Nn2v+8U2RyL9hdvgUTz2rqzj77EtYT rKBU4iG7PpD377DRIuf3ChEEg049CQOOqbkMUX6EMVYSTinGUzIr8pg6rAiGfxT+Ry 8CbMl1cAC5tuQ3B6U0T7WU2o4Iig/FTHIyEjNFwaaOy6m61ZW2n6TW3ZHclMHl0ivy norLHStnbrJBCWJPPN0cXJxW4/NDMTs1qyK8cFvOh451iAh6Tddgva7mA/pOBynzmP qelbvPDJNZWEg== From: Tom Burkart To: Linux kernel mailing list Cc: Tom Burkart Subject: [PATCH v9 2/4] pps: descriptor-based gpio, capture-clear addition Date: Thu, 22 Nov 2018 20:46:00 +1100 Message-Id: <20181122094602.5156-3-tom@aussec.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20181122094602.5156-2-tom@aussec.com> References: <20181122094602.5156-1-tom@aussec.com> <20181122094602.5156-2-tom@aussec.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch changes the GPIO access for the pps-gpio driver from the integer based ABI to the descriptor based ABI. It also adds the extraction of the device tree capture-clear option. Signed-off-by: Tom Burkart --- drivers/pps/clients/pps-gpio.c | 80 +++++++++++++++++++++--------------------- include/linux/pps-gpio.h | 3 +- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c index 333ad7d5b45b..d2fbc91dc8fc 100644 --- a/drivers/pps/clients/pps-gpio.c +++ b/drivers/pps/clients/pps-gpio.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,9 +41,9 @@ struct pps_gpio_device_data { int irq; /* IRQ used as PPS source */ struct pps_device *pps; /* PPS source device */ struct pps_source_info info; /* PPS source information */ + struct gpio_desc *gpio_pin; /* GPIO port descriptors */ bool assert_falling_edge; bool capture_clear; - unsigned int gpio_pin; }; /* @@ -61,18 +61,49 @@ static irqreturn_t pps_gpio_irq_handler(int irq, void *data) info = data; - rising_edge = gpio_get_value(info->gpio_pin); + rising_edge = gpiod_get_value(info->gpio_pin); if ((rising_edge && !info->assert_falling_edge) || (!rising_edge && info->assert_falling_edge)) pps_event(info->pps, &ts, PPS_CAPTUREASSERT, NULL); else if (info->capture_clear && ((rising_edge && info->assert_falling_edge) || - (!rising_edge && !info->assert_falling_edge))) + (!rising_edge && !info->assert_falling_edge))) pps_event(info->pps, &ts, PPS_CAPTURECLEAR, NULL); return IRQ_HANDLED; } +static int pps_gpio_setup(struct platform_device *pdev) +{ + struct pps_gpio_device_data *data = platform_get_drvdata(pdev); + const struct pps_gpio_platform_data *pdata = pdev->dev.platform_data; + struct device_node *np = pdev->dev.of_node; + int ret; + + if (pdata) { + data->gpio_pin = pdata->gpio_pin; + + data->assert_falling_edge = pdata->assert_falling_edge; + data->capture_clear = pdata->capture_clear; + } else { + data->gpio_pin = devm_gpiod_get(&pdev->dev, + NULL, /* request "gpios" */ + GPIOD_IN); + if (IS_ERR(data->gpio_pin)) { + dev_err(&pdev->dev, + "failed to request PPS GPIO\n"); + return PTR_ERR(data->gpio_pin); + } + + if (of_get_property(np, "assert-falling-edge", NULL)) + data->assert_falling_edge = true; + + if (of_get_property(np, "capture-clear", NULL)) + data->capture_clear = true; + } + return 0; +} + static unsigned long get_irqf_trigger_flags(const struct pps_gpio_device_data *data) { @@ -90,53 +121,23 @@ get_irqf_trigger_flags(const struct pps_gpio_device_data *data) static int pps_gpio_probe(struct platform_device *pdev) { struct pps_gpio_device_data *data; - const char *gpio_label; int ret; int pps_default_params; - const struct pps_gpio_platform_data *pdata = pdev->dev.platform_data; - struct device_node *np = pdev->dev.of_node; /* allocate space for device info */ data = devm_kzalloc(&pdev->dev, sizeof(struct pps_gpio_device_data), GFP_KERNEL); if (!data) return -ENOMEM; - - if (pdata) { - data->gpio_pin = pdata->gpio_pin; - gpio_label = pdata->gpio_label; - - data->assert_falling_edge = pdata->assert_falling_edge; - data->capture_clear = pdata->capture_clear; - } else { - ret = of_get_gpio(np, 0); - if (ret < 0) { - dev_err(&pdev->dev, "failed to get GPIO from device tree\n"); - return ret; - } - data->gpio_pin = ret; - gpio_label = PPS_GPIO_NAME; - - if (of_get_property(np, "assert-falling-edge", NULL)) - data->assert_falling_edge = true; - } + platform_set_drvdata(pdev, data); /* GPIO setup */ - ret = devm_gpio_request(&pdev->dev, data->gpio_pin, gpio_label); - if (ret) { - dev_err(&pdev->dev, "failed to request GPIO %u\n", - data->gpio_pin); - return ret; - } - - ret = gpio_direction_input(data->gpio_pin); - if (ret) { - dev_err(&pdev->dev, "failed to set pin direction\n"); + ret = pps_gpio_setup(pdev); + if (ret) return -EINVAL; - } /* IRQ setup */ - ret = gpio_to_irq(data->gpio_pin); + ret = gpiod_to_irq(data->gpio_pin); if (ret < 0) { dev_err(&pdev->dev, "failed to map GPIO to IRQ: %d\n", ret); return -EINVAL; @@ -173,7 +174,6 @@ static int pps_gpio_probe(struct platform_device *pdev) return -EINVAL; } - platform_set_drvdata(pdev, data); dev_info(data->pps->dev, "Registered IRQ %d as PPS source\n", data->irq); @@ -209,4 +209,4 @@ MODULE_AUTHOR("Ricardo Martins "); MODULE_AUTHOR("James Nuss "); MODULE_DESCRIPTION("Use GPIO pin as PPS source"); MODULE_LICENSE("GPL"); -MODULE_VERSION("1.0.0"); +MODULE_VERSION("1.1.0"); diff --git a/include/linux/pps-gpio.h b/include/linux/pps-gpio.h index 56f35dd3d01d..f028d2cda6f5 100644 --- a/include/linux/pps-gpio.h +++ b/include/linux/pps-gpio.h @@ -23,10 +23,9 @@ #define _PPS_GPIO_H struct pps_gpio_platform_data { + struct gpio_desc *gpio_pin; bool assert_falling_edge; bool capture_clear; - unsigned int gpio_pin; - const char *gpio_label; }; #endif /* _PPS_GPIO_H */ -- 2.12.3