{"id":816228,"url":"http://patchwork.ozlabs.org/api/patches/816228/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-gpio/patch/20170920133927.17390-2-jbrunet@baylibre.com/","project":{"id":42,"url":"http://patchwork.ozlabs.org/api/projects/42/?format=json","name":"Linux GPIO development","link_name":"linux-gpio","list_id":"linux-gpio.vger.kernel.org","list_email":"linux-gpio@vger.kernel.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920133927.17390-2-jbrunet@baylibre.com>","list_archive_url":null,"date":"2017-09-20T13:39:20","name":"[1/8] pinctrl: meson: remove offset from pinctrl","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"71350c5809540110958d4247ca3b10c3b701ffce","submitter":{"id":69839,"url":"http://patchwork.ozlabs.org/api/people/69839/?format=json","name":"Jerome Brunet","email":"jbrunet@baylibre.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-gpio/patch/20170920133927.17390-2-jbrunet@baylibre.com/mbox/","series":[{"id":4115,"url":"http://patchwork.ozlabs.org/api/series/4115/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-gpio/list/?series=4115","date":"2017-09-20T13:39:19","name":"pinctrl: meson: clean pin offsets","version":1,"mbox":"http://patchwork.ozlabs.org/series/4115/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816228/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816228/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-gpio-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=baylibre-com.20150623.gappssmtp.com\n\theader.i=@baylibre-com.20150623.gappssmtp.com\n\theader.b=\"QRPa5vk3\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xy1B805y7z9s7c\n\tfor ;\n\tWed, 20 Sep 2017 23:41:52 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751670AbdITNlu (ORCPT );\n\tWed, 20 Sep 2017 09:41:50 -0400","from mail-wr0-f172.google.com ([209.85.128.172]:53701 \"EHLO\n\tmail-wr0-f172.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751306AbdITNji (ORCPT\n\t); Wed, 20 Sep 2017 09:39:38 -0400","by mail-wr0-f172.google.com with SMTP id l22so2210784wrc.10\n\tfor ;\n\tWed, 20 Sep 2017 06:39:37 -0700 (PDT)","from localhost.localdomain ([90.63.244.31])\n\tby smtp.googlemail.com with ESMTPSA id\n\ta39sm1938888wrc.48.2017.09.20.06.39.35\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 20 Sep 2017 06:39:36 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=baylibre-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=4pL8lYlIG0VE/UHKe/eSABGAGTxykr6LtJmjM1gqqR8=;\n\tb=QRPa5vk39Yg3zvU1FNnH0wA0BvsI8ltaFPVCPuih5eCTmN20afYcx4RfJSkleXH72Y\n\taynRVdSPsExsxDR8J96j9Z3hpXRRLs5Wocu63ZfwaO60tF+aj88WHIVDLdE5jM6uJGyG\n\tYICgOTV8d6n672z+yNcK1tZqMyLsIdmUsFZkRh6BdX9Os742phc1F2Qly6n19M6u7xa3\n\t1EXs6hFfKA6qP9WzlnZQbZ6oWhaiZsjUIw4xGYJEedwZOLhYVnQxjsnTfWKfA/sG1yQB\n\ti4ybmYS+mx53O7v04nZTdZUlw16YH6iJ9v2OqDjGyow7WJIOYzLeNbZpMovzzGAzvuw1\n\tNFFA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=4pL8lYlIG0VE/UHKe/eSABGAGTxykr6LtJmjM1gqqR8=;\n\tb=RvfTCSqiKpJMaYQOwrInRoOGjwN5oU1Td/vqV8YpDo9kPnH0z0r1r3NkZf/Dwgz7CX\n\trr+OYI8c5ID02HBeFrJH9+UT8aMVOVXr+DkUI5BvAROBal6fuNI30ElqQXo5gjmV/qjd\n\tcRud+dG8mw0VVQy4EJrmavLkLHF/RwRTV0ONlt9k6/gMboZgxkrwE/RukWH7UX7weya0\n\tsEpj5tay/A0dhhw+lWouvoLsmIXTzOALvy1sb4twH8r7CJSlvD3Esei9zH20MCFNgN2z\n\tNXpt+S8z/Gc0V6F/cx6T1FtOu+B9XIheFc3AHQ6mbN80bKofGye26k5AHtW3yb9d9R2p\n\tZpbg==","X-Gm-Message-State":"AHPjjUh4LgFaqg8FPqnG/I4foTpym934wihw2fEaE/IB4du3KNn0DWW3\n\tonC/nZsyNsMVAPcpgV96E0/aWQ==","X-Google-Smtp-Source":"AOwi7QDEwdBYoou/Mn0vbwv5Lw+reKBdniHzwkuTjIHX3Ce75Lpn7Rfi/A/g841MS8LgSoQdIKjuEA==","X-Received":"by 10.223.167.79 with SMTP id e15mr4901433wrd.92.1505914776795; \n\tWed, 20 Sep 2017 06:39:36 -0700 (PDT)","From":"Jerome Brunet ","To":"Linus Walleij ,\n\tKevin Hilman , Carlo Caione ","Cc":"Jerome Brunet , linux-gpio@vger.kernel.org,\n\tlinux-arm-kernel@lists.infradead.org,\n\tlinux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org,\n\tdevicetree@vger.kernel.org,\n\tMartin Blumenstingl ","Subject":"[PATCH 1/8] pinctrl: meson: remove offset from pinctrl","Date":"Wed, 20 Sep 2017 15:39:20 +0200","Message-Id":"<20170920133927.17390-2-jbrunet@baylibre.com>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170920133927.17390-1-jbrunet@baylibre.com>","References":"<20170920133927.17390-1-jbrunet@baylibre.com>","Sender":"linux-gpio-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-gpio@vger.kernel.org"},"content":"Offset on meson pinctrl and gpios is something that was carried from the\nvendor driver, where there is a weird link between the 2\ncontrollers. Since these 2 controllers are independent, this offset adds\nan unnecessary complexity.\n\nThis patch remove this manually set offset and rely on pinctrl to figure\nout the gpio base offset\n\nTested-by: Martin Blumenstingl \nSigned-off-by: Jerome Brunet \n---\n drivers/pinctrl/meson/pinctrl-meson.c | 18 +++---------------\n drivers/pinctrl/meson/pinctrl-meson.h | 8 +++-----\n 2 files changed, 6 insertions(+), 20 deletions(-)","diff":"diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c\nindex 66ed70c12733..247208150b19 100644\n--- a/drivers/pinctrl/meson/pinctrl-meson.c\n+++ b/drivers/pinctrl/meson/pinctrl-meson.c\n@@ -410,18 +410,6 @@ static const struct pinconf_ops meson_pinconf_ops = {\n \t.is_generic\t\t= true,\n };\n \n-static int meson_gpio_request(struct gpio_chip *chip, unsigned gpio)\n-{\n-\treturn pinctrl_request_gpio(chip->base + gpio);\n-}\n-\n-static void meson_gpio_free(struct gpio_chip *chip, unsigned gpio)\n-{\n-\tstruct meson_pinctrl *pc = gpiochip_get_data(chip);\n-\n-\tpinctrl_free_gpio(pc->data->pin_base + gpio);\n-}\n-\n static int meson_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)\n {\n \tstruct meson_pinctrl *pc = gpiochip_get_data(chip);\n@@ -539,13 +527,13 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc)\n \n \tpc->chip.label = pc->data->name;\n \tpc->chip.parent = pc->dev;\n-\tpc->chip.request = meson_gpio_request;\n-\tpc->chip.free = meson_gpio_free;\n+\tpc->chip.request = gpiochip_generic_request;\n+\tpc->chip.free = gpiochip_generic_free;\n \tpc->chip.direction_input = meson_gpio_direction_input;\n \tpc->chip.direction_output = meson_gpio_direction_output;\n \tpc->chip.get = meson_gpio_get;\n \tpc->chip.set = meson_gpio_set;\n-\tpc->chip.base = pc->data->pin_base;\n+\tpc->chip.base = -1;\n \tpc->chip.ngpio = pc->data->num_pins;\n \tpc->chip.can_sleep = false;\n \tpc->chip.of_node = pc->of_node;\ndiff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h\nindex 890f296f5840..227b72a60c22 100644\n--- a/drivers/pinctrl/meson/pinctrl-meson.h\n+++ b/drivers/pinctrl/meson/pinctrl-meson.h\n@@ -124,8 +124,6 @@ struct meson_pinctrl {\n \tstruct device_node *of_node;\n };\n \n-#define PIN(x, b)\t(b + x)\n-\n #define GROUP(grp, r, b)\t\t\t\t\t\t\\\n \t{\t\t\t\t\t\t\t\t\\\n \t\t.name = #grp,\t\t\t\t\t\t\\\n@@ -135,10 +133,10 @@ struct meson_pinctrl {\n \t\t.bit = b,\t\t\t\t\t\t\\\n \t }\n \n-#define GPIO_GROUP(gpio, b)\t\t\t\t\t\t\\\n+#define GPIO_GROUP(gpio)\t\t\t\t\t\t\\\n \t{\t\t\t\t\t\t\t\t\\\n \t\t.name = #gpio,\t\t\t\t\t\t\\\n-\t\t.pins = (const unsigned int[]){ PIN(gpio, b) },\t\t\\\n+\t\t.pins = (const unsigned int[]){ gpio },\t\t\t\\\n \t\t.num_pins = 1,\t\t\t\t\t\t\\\n \t\t.is_gpio = true,\t\t\t\t\t\\\n \t }\n@@ -166,7 +164,7 @@ struct meson_pinctrl {\n \t\t},\t\t\t\t\t\t\t\\\n \t }\n \n-#define MESON_PIN(x, b) PINCTRL_PIN(PIN(x, b), #x)\n+#define MESON_PIN(x) PINCTRL_PIN(x, #x)\n \n extern struct meson_pinctrl_data meson8_cbus_pinctrl_data;\n extern struct meson_pinctrl_data meson8_aobus_pinctrl_data;\n","prefixes":["1/8"]}