From patchwork Wed May 26 06:10:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12280671 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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 2826FC2B9F7 for ; Wed, 26 May 2021 06:12:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E00D9613B0 for ; Wed, 26 May 2021 06:11:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E00D9613B0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=fi.rohmeurope.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: In-Reply-To:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sR2XBF2016fNgjyrkDqKq3VtEK950hND9vQp0OcgpKo=; b=acMHiL+MaGSQEQh8VM6psMDSIo jSBvgdyxw98PIzDW1rK4vQkN6Xhp/oAfxaQjfZZD0clp6/DIJrylj5SmYbBWu8dnqyDTfZPN+j2ZJ ll1J0YBlmPB7bPR3xxg9M3ZPp6byn0YYiz99nJdinL2kX3y4TxFR1Eq6ciSYSpfc6aSsR1oYwNvob 8dxQ6zFa8n2hw3UxEKhvxazvnNPLB2I+2wEMQ2pGNiVb3jXQEmSKBjTsGBFHQMaXw4aeKhpCokaI+ tb+AdNTZxaVdJM05xPgeg7CGXn2pZK5FZHDBqXE+XMQWMqrNgheeUEnKTI4YUr6t6eM4Tq6vo+HKn 9ZRicnYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llmkE-00BTCT-FY; Wed, 26 May 2021 06:10:18 +0000 Received: from mail-lj1-f170.google.com ([209.85.208.170]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1llmk8-00BT8x-M6 for linux-arm-kernel@lists.infradead.org; Wed, 26 May 2021 06:10:15 +0000 Received: by mail-lj1-f170.google.com with SMTP id v5so98733ljg.12 for ; Tue, 25 May 2021 23:10:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=enetnFFCYJauCTn/bQJ5U/lWFyablHWpK/ldzuejNOs=; b=VdX8lsdKC0R+8yzVqP6P5AYdDa2mR1X9wOLucfAxfmJQIrHpwEm4UeK/iA5R8m6R+G PcyjedfkdkskADuN4xwG4As0hEiIvRJYMOBLUN0HYOxYjfkijEXhzl0/LgXKHp/WlcTE lhDtjt4GFb6KHGvXFrTC/KzPar7nLrSr2IcPaNkweKXK6ABkj+fdO3YVA2XQ6bQtaBVW CxPCtga2aVWgkDQP6otC3bFQSE90244qfDt4GxMC6vFEKayX7JqAF7bgqFf8Q9mnNaLO 5iwdpeUoAU+tX0imeMNaZt42MPdUlgKhNyeCPgi33OpnOJJ+LuN46bhrgWbxGXLGJT8g fjZw== X-Gm-Message-State: AOAM5335B39OApRfFclySNFzKm1OGCKLeIYfH+KQTLSnmd2YqTcs9LUn TxIsv1WGoEZGq5JWAdVPGNA= X-Google-Smtp-Source: ABdhPJy6KtXnhEsPcSo9y9lUSeCmFibRcBodauhnzbOggOPoEiNWK2syjUBy+rgGjBLyCj4Y1/hjNg== X-Received: by 2002:a05:651c:1049:: with SMTP id x9mr930358ljm.467.1622009410728; Tue, 25 May 2021 23:10:10 -0700 (PDT) Received: from localhost.localdomain (dc7vkhyyyyyyyyyyyyycy-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::4]) by smtp.gmail.com with ESMTPSA id m13sm1931148lfu.36.2021.05.25.23.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 23:10:10 -0700 (PDT) Date: Wed, 26 May 2021 09:10:03 +0300 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Linus Walleij , Bartosz Golaszewski , Matti Vaittinen , Michael Walle , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Jonas Gorski , =?iso-8859-1?q?=C1lvaro_Fern=E1ndez?= Rojas , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-power@fi.rohmeurope.com, linux-arm-kernel@lists.infradead.org, Andy Shevchenko Subject: [PATCH v4 1/3] gpio: regmap: Support few IC specific operations Message-ID: <01b57e20b128a876912f04a41f61edc92ad5cb7e.1622008846.git.matti.vaittinen@fi.rohmeurope.com> References: MIME-Version: 1.0 In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210525_231012_803474_DFD09506 X-CRM114-Status: GOOD ( 33.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The set_config and init_valid_mask GPIO operations are usually very IC specific. Allow IC drivers to provide these custom operations at gpio-regmap registration. Signed-off-by: Matti Vaittinen --- Changelog v4: - Convert also the existing gpio_regmap users. Changelog v3: IC drivers which need to implement some own GPIO operations are likely to need data that is provided in gpio-regmap config. Divide gpio-regmap in GPIO core specific (gpio_chip, ops and internal book-keeping if any) and public configurations which can be given (as read-only data) to IC drivers. Re-use the gpio_regmap_config struct and pass it as such to IC driver call-backs to avoid polluting interface and IC drivers with small getter functions. Changelog v2: (based on suggestions by Michael Walle) - drop gpio_regmap_set_drvdata() - drop checks and WARN() for pretty much impossible cases convert existing regmap users --- Regarding the bcm63xx_reg_mask_xlate - I might go one step further and get the BCM63XX_BANK_GPIOS value from the gpio_regmap_config just to make it a tiny bit simpler to support another variant with different BANK_GPIOS value. I have no idea if such variant would ever come or if it is a sane thing so I'll leave it as it was. But this is just one case worth pointing when considering if it is a good idea to give the gpio_regmap_config as a parameter to driver callbacks. drivers/gpio/gpio-regmap.c | 189 +++++++++++++++----------- drivers/gpio/gpio-sl28cpld.c | 3 +- drivers/pinctrl/bcm/pinctrl-bcm63xx.c | 8 +- include/linux/gpio/regmap.h | 51 ++++--- 4 files changed, 152 insertions(+), 99 deletions(-) diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c index 134cedf151a7..4f0903d1acd5 100644 --- a/drivers/gpio/gpio-regmap.c +++ b/drivers/gpio/gpio-regmap.c @@ -12,23 +12,13 @@ #include struct gpio_regmap { - struct device *parent; - struct regmap *regmap; + struct gpio_regmap_config config; + struct gpio_regmap_ops *ops; struct gpio_chip gpio_chip; - int reg_stride; - int ngpio_per_reg; - unsigned int reg_dat_base; - unsigned int reg_set_base; - unsigned int reg_clr_base; - unsigned int reg_dir_in_base; - unsigned int reg_dir_out_base; - - int (*reg_mask_xlate)(struct gpio_regmap *gpio, unsigned int base, - unsigned int offset, unsigned int *reg, - unsigned int *mask); - - void *driver_data; + int (*reg_mask_xlate)(const struct gpio_regmap_config *config, + unsigned int base, unsigned int offset, + unsigned int *reg, unsigned int *mask); }; static unsigned int gpio_regmap_addr(unsigned int addr) @@ -39,14 +29,35 @@ static unsigned int gpio_regmap_addr(unsigned int addr) return addr; } -static int gpio_regmap_simple_xlate(struct gpio_regmap *gpio, +static int regmap_gpio_init_valid_mask(struct gpio_chip *gc, + unsigned long *valid_mask, + unsigned int ngpios) +{ + struct gpio_regmap *gpio; + + gpio = gpiochip_get_data(gc); + + return gpio->ops->init_valid_mask(&gpio->config, valid_mask, ngpios); +} + +static int gpio_regmap_set_config(struct gpio_chip *gc, unsigned int offset, + unsigned long config) +{ + struct gpio_regmap *gpio; + + gpio = gpiochip_get_data(gc); + + return gpio->ops->set_config(&gpio->config, offset, config); +} + +static int gpio_regmap_simple_xlate(const struct gpio_regmap_config *config, unsigned int base, unsigned int offset, unsigned int *reg, unsigned int *mask) { - unsigned int line = offset % gpio->ngpio_per_reg; - unsigned int stride = offset / gpio->ngpio_per_reg; + unsigned int line = offset % config->ngpio_per_reg; + unsigned int stride = offset / config->ngpio_per_reg; - *reg = base + stride * gpio->reg_stride; + *reg = base + stride * config->reg_stride; *mask = BIT(line); return 0; @@ -55,20 +66,21 @@ static int gpio_regmap_simple_xlate(struct gpio_regmap *gpio, static int gpio_regmap_get(struct gpio_chip *chip, unsigned int offset) { struct gpio_regmap *gpio = gpiochip_get_data(chip); + struct gpio_regmap_config *config = &gpio->config; unsigned int base, val, reg, mask; int ret; /* we might not have an output register if we are input only */ - if (gpio->reg_dat_base) - base = gpio_regmap_addr(gpio->reg_dat_base); + if (config->reg_dat_base) + base = gpio_regmap_addr(config->reg_dat_base); else - base = gpio_regmap_addr(gpio->reg_set_base); + base = gpio_regmap_addr(config->reg_set_base); - ret = gpio->reg_mask_xlate(gpio, base, offset, ®, &mask); + ret = gpio->reg_mask_xlate(config, base, offset, ®, &mask); if (ret) return ret; - ret = regmap_read(gpio->regmap, reg, &val); + ret = regmap_read(config->regmap, reg, &val); if (ret) return ret; @@ -79,53 +91,56 @@ static void gpio_regmap_set(struct gpio_chip *chip, unsigned int offset, int val) { struct gpio_regmap *gpio = gpiochip_get_data(chip); - unsigned int base = gpio_regmap_addr(gpio->reg_set_base); + struct gpio_regmap_config *config = &gpio->config; + unsigned int base = gpio_regmap_addr(config->reg_set_base); unsigned int reg, mask; - gpio->reg_mask_xlate(gpio, base, offset, ®, &mask); + gpio->reg_mask_xlate(config, base, offset, ®, &mask); if (val) - regmap_update_bits(gpio->regmap, reg, mask, mask); + regmap_update_bits(config->regmap, reg, mask, mask); else - regmap_update_bits(gpio->regmap, reg, mask, 0); + regmap_update_bits(config->regmap, reg, mask, 0); } static void gpio_regmap_set_with_clear(struct gpio_chip *chip, unsigned int offset, int val) { struct gpio_regmap *gpio = gpiochip_get_data(chip); + struct gpio_regmap_config *config = &gpio->config; unsigned int base, reg, mask; if (val) - base = gpio_regmap_addr(gpio->reg_set_base); + base = gpio_regmap_addr(config->reg_set_base); else - base = gpio_regmap_addr(gpio->reg_clr_base); + base = gpio_regmap_addr(config->reg_clr_base); - gpio->reg_mask_xlate(gpio, base, offset, ®, &mask); - regmap_write(gpio->regmap, reg, mask); + gpio->reg_mask_xlate(config, base, offset, ®, &mask); + regmap_write(config->regmap, reg, mask); } static int gpio_regmap_get_direction(struct gpio_chip *chip, unsigned int offset) { struct gpio_regmap *gpio = gpiochip_get_data(chip); + struct gpio_regmap_config *config = &gpio->config; unsigned int base, val, reg, mask; int invert, ret; - if (gpio->reg_dir_out_base) { - base = gpio_regmap_addr(gpio->reg_dir_out_base); + if (config->reg_dir_out_base) { + base = gpio_regmap_addr(config->reg_dir_out_base); invert = 0; - } else if (gpio->reg_dir_in_base) { - base = gpio_regmap_addr(gpio->reg_dir_in_base); + } else if (config->reg_dir_in_base) { + base = gpio_regmap_addr(config->reg_dir_in_base); invert = 1; } else { return -EOPNOTSUPP; } - ret = gpio->reg_mask_xlate(gpio, base, offset, ®, &mask); + ret = gpio->reg_mask_xlate(config, base, offset, ®, &mask); if (ret) return ret; - ret = regmap_read(gpio->regmap, reg, &val); + ret = regmap_read(config->regmap, reg, &val); if (ret) return ret; @@ -139,20 +154,21 @@ static int gpio_regmap_set_direction(struct gpio_chip *chip, unsigned int offset, bool output) { struct gpio_regmap *gpio = gpiochip_get_data(chip); + struct gpio_regmap_config *config = &gpio->config; unsigned int base, val, reg, mask; int invert, ret; - if (gpio->reg_dir_out_base) { - base = gpio_regmap_addr(gpio->reg_dir_out_base); + if (config->reg_dir_out_base) { + base = gpio_regmap_addr(config->reg_dir_out_base); invert = 0; - } else if (gpio->reg_dir_in_base) { - base = gpio_regmap_addr(gpio->reg_dir_in_base); + } else if (config->reg_dir_in_base) { + base = gpio_regmap_addr(config->reg_dir_in_base); invert = 1; } else { return -EOPNOTSUPP; } - ret = gpio->reg_mask_xlate(gpio, base, offset, ®, &mask); + ret = gpio->reg_mask_xlate(config, base, offset, ®, &mask); if (ret) return ret; @@ -161,7 +177,7 @@ static int gpio_regmap_set_direction(struct gpio_chip *chip, else val = output ? mask : 0; - return regmap_update_bits(gpio->regmap, reg, mask, val); + return regmap_update_bits(config->regmap, reg, mask, val); } static int gpio_regmap_direction_input(struct gpio_chip *chip, @@ -178,25 +194,18 @@ static int gpio_regmap_direction_output(struct gpio_chip *chip, return gpio_regmap_set_direction(chip, offset, true); } -void gpio_regmap_set_drvdata(struct gpio_regmap *gpio, void *data) -{ - gpio->driver_data = data; -} -EXPORT_SYMBOL_GPL(gpio_regmap_set_drvdata); - -void *gpio_regmap_get_drvdata(struct gpio_regmap *gpio) -{ - return gpio->driver_data; -} -EXPORT_SYMBOL_GPL(gpio_regmap_get_drvdata); - /** * gpio_regmap_register() - Register a generic regmap GPIO controller - * @config: configuration for gpio_regmap + * @config: configuration for gpio_regmap + * @ops: Provide pointer IC specific functions to handle needs where + * the standard gpio_regmap does not provide generic functions + * or provided functions do not fit the IC. Can be set NULL if + * no IC specific operations are required. * * Return: A pointer to the registered gpio_regmap or ERR_PTR error value. */ -struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config) +struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config, + const struct gpio_regmap_ops *ops) { struct gpio_regmap *gpio; struct gpio_chip *chip; @@ -225,26 +234,40 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config if (!gpio) return ERR_PTR(-ENOMEM); - gpio->parent = config->parent; - gpio->regmap = config->regmap; - gpio->ngpio_per_reg = config->ngpio_per_reg; - gpio->reg_stride = config->reg_stride; - gpio->reg_mask_xlate = config->reg_mask_xlate; - gpio->reg_dat_base = config->reg_dat_base; - gpio->reg_set_base = config->reg_set_base; - gpio->reg_clr_base = config->reg_clr_base; - gpio->reg_dir_in_base = config->reg_dir_in_base; - gpio->reg_dir_out_base = config->reg_dir_out_base; + gpio->config = *config; + if (ops) { + /* + * We could avoid ops struct allocation if just the + * xlate is given as it is used directly from gpio_regmap. + * I don't think that optimization is worth the hassle as + * there may not be many cases with custom xlate and no other + * ops. We can change this if I am wrong. + */ + gpio->ops = kzalloc(sizeof(*ops), GFP_KERNEL); + if (!gpio->ops) { + ret = -ENOMEM; + goto err_free_gpio; + } + *gpio->ops = *ops; + } /* if not set, assume there is only one register */ - if (!gpio->ngpio_per_reg) - gpio->ngpio_per_reg = config->ngpio; + if (!gpio->config.ngpio_per_reg) + gpio->config.ngpio_per_reg = config->ngpio; /* if not set, assume they are consecutive */ - if (!gpio->reg_stride) - gpio->reg_stride = 1; + if (!gpio->config.reg_stride) + gpio->config.reg_stride = 1; - if (!gpio->reg_mask_xlate) + /* + * Dublicate the reg_mask_xlate to gpio_regmap so we don't need to + * always check if ops is populated and reg_mask_xlate is given + * - or allocate whole ops struct just for unconditional + * reg_mask_xlate if no ops are required. + */ + if (ops && ops->reg_mask_xlate) + gpio->reg_mask_xlate = ops->reg_mask_xlate; + else gpio->reg_mask_xlate = gpio_regmap_simple_xlate; chip = &gpio->gpio_chip; @@ -253,7 +276,12 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config chip->ngpio = config->ngpio; chip->names = config->names; chip->label = config->label ?: dev_name(config->parent); - + if (gpio->ops) { + if (gpio->ops->set_config) + chip->set_config = gpio_regmap_set_config; + if (gpio->ops->init_valid_mask) + chip->init_valid_mask = regmap_gpio_init_valid_mask; + } #if defined(CONFIG_OF_GPIO) /* gpiolib will use of_node of the parent if chip->of_node is NULL */ chip->of_node = to_of_node(config->fwnode); @@ -269,12 +297,12 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config chip->can_sleep = true; chip->get = gpio_regmap_get; - if (gpio->reg_set_base && gpio->reg_clr_base) + if (gpio->config.reg_set_base && gpio->config.reg_clr_base) chip->set = gpio_regmap_set_with_clear; - else if (gpio->reg_set_base) + else if (gpio->config.reg_set_base) chip->set = gpio_regmap_set; - if (gpio->reg_dir_in_base || gpio->reg_dir_out_base) { + if (gpio->config.reg_dir_in_base || gpio->config.reg_dir_out_base) { chip->get_direction = gpio_regmap_get_direction; chip->direction_input = gpio_regmap_direction_input; chip->direction_output = gpio_regmap_direction_output; @@ -295,6 +323,7 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config err_remove_gpiochip: gpiochip_remove(chip); err_free_gpio: + kfree(gpio->ops); kfree(gpio); return ERR_PTR(ret); } @@ -307,6 +336,7 @@ EXPORT_SYMBOL_GPL(gpio_regmap_register); void gpio_regmap_unregister(struct gpio_regmap *gpio) { gpiochip_remove(&gpio->gpio_chip); + kfree(gpio->ops); kfree(gpio); } EXPORT_SYMBOL_GPL(gpio_regmap_unregister); @@ -328,7 +358,8 @@ static void devm_gpio_regmap_unregister(struct device *dev, void *res) * Return: A pointer to the registered gpio_regmap or ERR_PTR error value. */ struct gpio_regmap *devm_gpio_regmap_register(struct device *dev, - const struct gpio_regmap_config *config) + const struct gpio_regmap_config *config, + const struct gpio_regmap_ops *ops) { struct gpio_regmap **ptr, *gpio; @@ -337,7 +368,7 @@ struct gpio_regmap *devm_gpio_regmap_register(struct device *dev, if (!ptr) return ERR_PTR(-ENOMEM); - gpio = gpio_regmap_register(config); + gpio = gpio_regmap_register(config, ops); if (!IS_ERR(gpio)) { *ptr = gpio; devres_add(dev, ptr); diff --git a/drivers/gpio/gpio-sl28cpld.c b/drivers/gpio/gpio-sl28cpld.c index 52404736ac86..56095763da9b 100644 --- a/drivers/gpio/gpio-sl28cpld.c +++ b/drivers/gpio/gpio-sl28cpld.c @@ -136,7 +136,8 @@ static int sl28cpld_gpio_probe(struct platform_device *pdev) return -ENODEV; } - return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(&pdev->dev, &config)); + return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(&pdev->dev, &config, + NULL)); } static const struct of_device_id sl28cpld_gpio_of_match[] = { diff --git a/drivers/pinctrl/bcm/pinctrl-bcm63xx.c b/drivers/pinctrl/bcm/pinctrl-bcm63xx.c index e1285fe2fbc0..46dea6d245ec 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm63xx.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm63xx.c @@ -19,7 +19,7 @@ #define BCM63XX_DIROUT_REG 0x04 #define BCM63XX_DATA_REG 0x0c -static int bcm63xx_reg_mask_xlate(struct gpio_regmap *gpio, +static int bcm63xx_reg_mask_xlate(const struct gpio_regmap_config *cfg, unsigned int base, unsigned int offset, unsigned int *reg, unsigned int *mask) { @@ -47,6 +47,9 @@ static int bcm63xx_gpio_probe(struct device *dev, struct device_node *node, struct bcm63xx_pinctrl *pc) { struct gpio_regmap_config grc = {0}; + struct gpio_regmap_ops ops = { + .reg_mask_xlate = bcm63xx_reg_mask_xlate, + }; grc.parent = dev; grc.fwnode = &node->fwnode; @@ -56,9 +59,8 @@ static int bcm63xx_gpio_probe(struct device *dev, struct device_node *node, grc.reg_dat_base = BCM63XX_DATA_REG; grc.reg_dir_out_base = BCM63XX_DIROUT_REG; grc.reg_set_base = BCM63XX_DATA_REG; - grc.reg_mask_xlate = bcm63xx_reg_mask_xlate; - return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(dev, &grc)); + return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(dev, &grc, &ops)); } int bcm63xx_pinctrl_probe(struct platform_device *pdev, diff --git a/include/linux/gpio/regmap.h b/include/linux/gpio/regmap.h index 334dd928042b..ba1a4b14969b 100644 --- a/include/linux/gpio/regmap.h +++ b/include/linux/gpio/regmap.h @@ -6,12 +6,39 @@ struct device; struct fwnode_handle; struct gpio_regmap; +struct gpio_regmap_config; struct irq_domain; struct regmap; #define GPIO_REGMAP_ADDR_ZERO ((unsigned int)(-1)) #define GPIO_REGMAP_ADDR(addr) ((addr) ? : GPIO_REGMAP_ADDR_ZERO) +/** + * struct gpio_regmap_ops - Custom operations for regmap_gpio. + * @reg_mask_xlate: Translates base address and GPIO + * offset to a register/bitmask pair. If not given the + * default gpio_regmap_simple_xlate() is used. + * @set_config: Hook for all kinds of settings. Uses the same packed + * config format as generic pinconf. + * @init_valid_mask: Routine to initialize @valid_mask, to be used if not + * all GPIOs are valid. + * + * Provide ustom operations for the regmap_gpio controller where the + * standard regmap_gpio operations are insufficient. + * The ->reg_mask_xlate translates a given base address and GPIO offset to + * register and mask pair. The base address is one of the given register + * base addresses in the gpio_regmap_config structure. + */ +struct gpio_regmap_ops { + int (*reg_mask_xlate)(const struct gpio_regmap_config *config, + unsigned int base, unsigned int offset, + unsigned int *reg, unsigned int *mask); + int (*set_config)(const struct gpio_regmap_config *regmap_config, + unsigned int offset, unsigned long config); + int (*init_valid_mask)(const struct gpio_regmap_config *config, + unsigned long *valid_mask, unsigned int ngpios); +}; + /** * struct gpio_regmap_config - Description of a generic regmap gpio_chip. * @parent: The parent device @@ -33,14 +60,9 @@ struct regmap; * @ngpio_per_reg: Number of GPIOs per register * @irq_domain: (Optional) IRQ domain if the controller is * interrupt-capable - * @reg_mask_xlate: (Optional) Translates base address and GPIO - * offset to a register/bitmask pair. If not - * given the default gpio_regmap_simple_xlate() - * is used. - * - * The ->reg_mask_xlate translates a given base address and GPIO offset to - * register and mask pair. The base address is one of the given register - * base addresses in this structure. + * @drvdata: (Optional) Pointer to IC specific data which is + * not used by gpio-remap but is provided "as is" to + * the driver callback(s). * * Although all register base addresses are marked as optional, there are * several rules: @@ -74,17 +96,14 @@ struct gpio_regmap_config { int reg_stride; int ngpio_per_reg; struct irq_domain *irq_domain; - - int (*reg_mask_xlate)(struct gpio_regmap *gpio, unsigned int base, - unsigned int offset, unsigned int *reg, - unsigned int *mask); + void *drvdata; }; -struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config); +struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config, + const struct gpio_regmap_ops *ops); void gpio_regmap_unregister(struct gpio_regmap *gpio); struct gpio_regmap *devm_gpio_regmap_register(struct device *dev, - const struct gpio_regmap_config *config); -void gpio_regmap_set_drvdata(struct gpio_regmap *gpio, void *data); -void *gpio_regmap_get_drvdata(struct gpio_regmap *gpio); + const struct gpio_regmap_config *config, + const struct gpio_regmap_ops *ops); #endif /* _LINUX_GPIO_REGMAP_H */ From patchwork Wed May 26 06:10:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12280673 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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 B64F2C2B9F7 for ; Wed, 26 May 2021 06:12:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7D718613D3 for ; Wed, 26 May 2021 06:12:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D718613D3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=fi.rohmeurope.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: In-Reply-To:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Gjn2pDCi5/s0f2d0TgEzCZvXu40op/yL8QdSlLNA4Fc=; b=E08L9E0uWy+NbmzMbf64XadItJ ZcTWTsPxlbAzeKnPZ7ZJya0gj7vD+jPooqBW402W0QG/CE5OzILHx80lWRI7HJIccS/9Cx7GxhjAc bMNEJZ+OVNERNVhsAl2jPbdEGgZeLV3w95YYwyBeVNA25csSAOiWBHEX0AdldYe9ecAXE0eFhR9SW qQ7PrnHRP3+LXqyS8q2QQx2Tqe3T4nbuSma6A+i0euERzO3vgQIYsVmk5EhCLHU/pW+aq+v0xzx8N 9wNZzqSQiYuWbcm0OzRGF/4cc0JnTHSy1eUuIFOX/Iq4TLkM4GbLhNMLMkGoFCTMssZN6fuSYIZaQ TCWZJJmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llmkX-00BTN3-Gi; Wed, 26 May 2021 06:10:37 +0000 Received: from mail-lj1-f175.google.com ([209.85.208.175]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1llmkT-00BTKm-9S for linux-arm-kernel@lists.infradead.org; Wed, 26 May 2021 06:10:34 +0000 Received: by mail-lj1-f175.google.com with SMTP id e2so133668ljk.4 for ; Tue, 25 May 2021 23:10:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/52t2gRhW9uzV6QfWt9pJg3Wnm3JFbOqeAJZ2k4RlFU=; b=O45zIuag0d/YRZ/ZzJuFcAvKct/Q9BqB8Gv0/e4ZvUKkef7z7rON0FABOGW2Mtl6bq Fr0VdhJsCvSbuTbMQIYH0XqctqmwYyYZeu6SKG53JMgaNgBIupAZEReKNRHJfaEb/5QX hc8v62miP5WHs/oaBzAbTUzTnMG5fEJiU7z+jnISf5nvXYDU+E5S79sya4AeBL2gSjab GRA5j9oDmnt7d8+9NCeJIDvC9lXrxIZosisjXM31Ae74MssHXvP6JQHbdw2r3oQJKcKM WjqLPAO+L/riXNg0uUqz2++FJQDMQUE13bR30cP1UZVNmdvFJtRSTpHcuS4XvnOPM/zt KjGA== X-Gm-Message-State: AOAM532iT9pIXEzXNcudG0QeZnNJOUmkzyqvpK0SIJif1whs41X86hVX rMPBziuCHJnf0q2XJuj+Ahk= X-Google-Smtp-Source: ABdhPJx209K6PEaaWkfSPVYea7B2lR8PTN7rHrCkUSSG2K5hpD/OAINI9/52pFf6kiYcAtMhXpItvw== X-Received: by 2002:a2e:8e26:: with SMTP id r6mr1012954ljk.472.1622009431450; Tue, 25 May 2021 23:10:31 -0700 (PDT) Received: from localhost.localdomain (dc7vkhyyyyyyyyyyyyycy-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::4]) by smtp.gmail.com with ESMTPSA id o20sm1929505lfu.283.2021.05.25.23.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 23:10:30 -0700 (PDT) Date: Wed, 26 May 2021 09:10:24 +0300 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Linus Walleij , Bartosz Golaszewski , Matti Vaittinen , Michael Walle , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Jonas Gorski , =?iso-8859-1?q?=C1lvaro_Fern=E1ndez?= Rojas , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-power@fi.rohmeurope.com, linux-arm-kernel@lists.infradead.org, Andy Shevchenko Subject: [PATCH v4 2/3] gpio: gpio-regmap: Use devm_add_action_or_reset() Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210525_231033_375911_8D3AAF0F X-CRM114-Status: GOOD ( 16.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Slightly simplify the devm_gpio_regmap_register() by using the devm_add_action_or_reset(). Signed-off-by: Matti Vaittinen Reviewed-by: Michael Walle --- Changelog v3: - gpio-regmap: Use the devm_add_action_or_reset() instead of the devm_add_action() --- drivers/gpio/gpio-regmap.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c index 4f0903d1acd5..ce5bc9e0d684 100644 --- a/drivers/gpio/gpio-regmap.c +++ b/drivers/gpio/gpio-regmap.c @@ -341,9 +341,9 @@ void gpio_regmap_unregister(struct gpio_regmap *gpio) } EXPORT_SYMBOL_GPL(gpio_regmap_unregister); -static void devm_gpio_regmap_unregister(struct device *dev, void *res) +static void devm_gpio_regmap_unregister(void *res) { - gpio_regmap_unregister(*(struct gpio_regmap **)res); + gpio_regmap_unregister(res); } /** @@ -361,20 +361,17 @@ struct gpio_regmap *devm_gpio_regmap_register(struct device *dev, const struct gpio_regmap_config *config, const struct gpio_regmap_ops *ops) { - struct gpio_regmap **ptr, *gpio; - - ptr = devres_alloc(devm_gpio_regmap_unregister, sizeof(*ptr), - GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); + struct gpio_regmap *gpio; + int ret; gpio = gpio_regmap_register(config, ops); - if (!IS_ERR(gpio)) { - *ptr = gpio; - devres_add(dev, ptr); - } else { - devres_free(ptr); - } + + if (IS_ERR(gpio)) + return gpio; + + ret = devm_add_action_or_reset(dev, devm_gpio_regmap_unregister, gpio); + if (ret) + return ERR_PTR(ret); return gpio; } From patchwork Wed May 26 06:10:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12280675 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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 0D252C2B9F7 for ; Wed, 26 May 2021 06:12:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C35E2613BA for ; Wed, 26 May 2021 06:12:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C35E2613BA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=fi.rohmeurope.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: In-Reply-To:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JIlf7mZ3FENjuqliosARas70Vvf8gQGPMCxmiKp9GZI=; b=IS7UHCV0NHqEZgpFS0uEUTDvC6 JfN759MoG5aPTuBqG2H8sUlKFDgeWE/nXcp3LdcBQVjppjrU6Z3+quWifz9AUsDpbwEgPe4inHosi WOHsSJXxaZN0cLzvwgBVLPI7X1N7L4YKqJiGP0Cxb61/FQYISIW4s7I1HbJYvUPjmgzQM5PXWuxq7 +H3iGVW5zbJi+xFeMnaYKJKJ4FHF+1CT8/9+tT85fpgbNtIOOHICgnA6A5QHH9mlJ7bVmflOF22tH sjUFT9DEMqJwcbEIzOfYoUo1NHb1rjsGzWL8cMmREIakVu03FcKoWk49+rMpNKiQdBKptfsXszTj9 KXSgLWLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llmkx-00BTab-Ib; Wed, 26 May 2021 06:11:03 +0000 Received: from mail-lf1-f47.google.com ([209.85.167.47]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1llmkn-00BTW1-1b for linux-arm-kernel@lists.infradead.org; Wed, 26 May 2021 06:10:54 +0000 Received: by mail-lf1-f47.google.com with SMTP id q1so785469lfo.3 for ; Tue, 25 May 2021 23:10:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=7XFftguTcFQmlVkEMCNxVmipWHmtjK7hc0l8K1kFIUo=; b=V0kJc6wsAIGRANTRn1i51V2AQGqfIA6qdBsenr4zO25iFjej/oj06KWOQncllVXvk1 m3DvfIh8lkU0jf5aN21WHAAQY/Wgs0nLQ7LsSHde7A3lXzV6apHLRqgjRF3Qnh4r+GFY MnGsgeLnc9WoLZ6lzZDBFSSLnyReP/5/wClEF5cTRiGiD1/uUeqMsL/nKKDKH2liHRfs 7uPD1h8m7mhe1ESH8ztnMzCe2FCUFcJSJ1Q5ry6sBnhBAUwmrOs3qqcNM5AGjXH4ThDB kcRpzSoDYw97FByLYYkkNrPEmMTLGV+Q0makqByqg8GtnI5Rgdt2sFpWbJ7BCs/k+kJX LJ5Q== X-Gm-Message-State: AOAM531VycqlAZQf5vcmp9DYi1VKBrCUuudvhww1QYrR4mLmSZFuZ9ur 4Y8lgZQoLxEaksjWt0sLoqY= X-Google-Smtp-Source: ABdhPJxapYgCnSiU10EAGd5tm0TnaHp1gKF0IF4Qk7XditaD2JZZTrGgZbGH9PeqaTPuPVDgi2OsAA== X-Received: by 2002:a05:6512:3456:: with SMTP id j22mr1089312lfr.532.1622009451277; Tue, 25 May 2021 23:10:51 -0700 (PDT) Received: from localhost.localdomain (dc7vkhyyyyyyyyyyyyycy-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::4]) by smtp.gmail.com with ESMTPSA id v21sm361009lfe.255.2021.05.25.23.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 23:10:50 -0700 (PDT) Date: Wed, 26 May 2021 09:10:45 +0300 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Linus Walleij , Bartosz Golaszewski , Matti Vaittinen , Michael Walle , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Jonas Gorski , =?iso-8859-1?q?=C1lvaro_Fern=E1ndez?= Rojas , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-power@fi.rohmeurope.com, linux-arm-kernel@lists.infradead.org, Andy Shevchenko Subject: [PATCH v4 3/3] gpio: bd71815: Use gpio-regmap Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210525_231053_145042_5C49EB26 X-CRM114-Status: GOOD ( 28.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Utilize the gpio-regmap helper and drop the custom functions Signed-off-by: Matti Vaittinen --- Changelog v3: - gpio: Adapt to changes in gpio_regmap --- drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-bd71815.c | 121 +++++++++--------------------------- 2 files changed, 32 insertions(+), 90 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 1dd0ec6727fd..97e1348cd410 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1120,6 +1120,7 @@ config GPIO_BD70528 config GPIO_BD71815 tristate "ROHM BD71815 PMIC GPIO support" depends on MFD_ROHM_BD71828 + select GPIO_REGMAP help Support for GPO(s) on ROHM BD71815 PMIC. There are two GPOs available on the ROHM PMIC. diff --git a/drivers/gpio/gpio-bd71815.c b/drivers/gpio/gpio-bd71815.c index 08ff2857256f..45782d376b3d 100644 --- a/drivers/gpio/gpio-bd71815.c +++ b/drivers/gpio/gpio-bd71815.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -17,82 +18,30 @@ /* For the BD71815 register definitions */ #include -struct bd71815_gpio { - /* chip.parent points the MFD which provides DT node and regmap */ - struct gpio_chip chip; - /* dev points to the platform device for devm and prints */ - struct device *dev; - struct regmap *regmap; -}; - -static int bd71815gpo_get(struct gpio_chip *chip, unsigned int offset) +static int bd71815_gpio_set_config(const struct gpio_regmap_config *gr_config, + unsigned int offset, unsigned long config) { - struct bd71815_gpio *bd71815 = gpiochip_get_data(chip); - int ret, val; - - ret = regmap_read(bd71815->regmap, BD71815_REG_GPO, &val); - if (ret) - return ret; - - return (val >> offset) & 1; -} - -static void bd71815gpo_set(struct gpio_chip *chip, unsigned int offset, - int value) -{ - struct bd71815_gpio *bd71815 = gpiochip_get_data(chip); - int ret, bit; - - bit = BIT(offset); - - if (value) - ret = regmap_set_bits(bd71815->regmap, BD71815_REG_GPO, bit); - else - ret = regmap_clear_bits(bd71815->regmap, BD71815_REG_GPO, bit); - - if (ret) - dev_warn(bd71815->dev, "failed to toggle GPO\n"); -} - -static int bd71815_gpio_set_config(struct gpio_chip *chip, unsigned int offset, - unsigned long config) -{ - struct bd71815_gpio *bdgpio = gpiochip_get_data(chip); + struct regmap *regmap = gr_config->regmap; switch (pinconf_to_config_param(config)) { case PIN_CONFIG_DRIVE_OPEN_DRAIN: - return regmap_update_bits(bdgpio->regmap, + return regmap_update_bits(regmap, BD71815_REG_GPO, BD71815_GPIO_DRIVE_MASK << offset, BD71815_GPIO_OPEN_DRAIN << offset); case PIN_CONFIG_DRIVE_PUSH_PULL: - return regmap_update_bits(bdgpio->regmap, + return regmap_update_bits(regmap, BD71815_REG_GPO, BD71815_GPIO_DRIVE_MASK << offset, BD71815_GPIO_CMOS << offset); default: + dev_err(gr_config->parent, "Unsupported config (0x%lx)\n", + config); break; } return -ENOTSUPP; } -/* BD71815 GPIO is actually GPO */ -static int bd71815gpo_direction_get(struct gpio_chip *gc, unsigned int offset) -{ - return GPIO_LINE_DIRECTION_OUT; -} - -/* Template for GPIO chip */ -static const struct gpio_chip bd71815gpo_chip = { - .label = "bd71815", - .owner = THIS_MODULE, - .get = bd71815gpo_get, - .get_direction = bd71815gpo_direction_get, - .set = bd71815gpo_set, - .set_config = bd71815_gpio_set_config, - .can_sleep = true, -}; - #define BD71815_TWO_GPIOS GENMASK(1, 0) #define BD71815_ONE_GPIO BIT(0) @@ -111,15 +60,17 @@ static const struct gpio_chip bd71815gpo_chip = { * but allows using it by providing the DT property * "rohm,enable-hidden-gpo". */ -static int bd71815_init_valid_mask(struct gpio_chip *gc, +static int bd71815_init_valid_mask(const struct gpio_regmap_config *c, unsigned long *valid_mask, unsigned int ngpios) { + if (ngpios != 2) return 0; - if (gc->parent && device_property_present(gc->parent, - "rohm,enable-hidden-gpo")) + /* The property should be in MFD DT node */ + if (c->parent && fwnode_property_present(c->fwnode, + "rohm,enable-hidden-gpo")) *valid_mask = BD71815_TWO_GPIOS; else *valid_mask = BD71815_ONE_GPIO; @@ -127,9 +78,21 @@ static int bd71815_init_valid_mask(struct gpio_chip *gc, return 0; } +/* Template for regmap gpio config */ +static const struct gpio_regmap_config gpio_cfg_template = { + .label = "bd71815", + .reg_set_base = BD71815_REG_GPO, + .ngpio = 2, +}; + +static const struct gpio_regmap_ops ops = { + .set_config = bd71815_gpio_set_config, + .init_valid_mask = bd71815_init_valid_mask, +}; + static int gpo_bd71815_probe(struct platform_device *pdev) { - struct bd71815_gpio *g; + struct gpio_regmap_config cfg; struct device *parent, *dev; /* @@ -140,34 +103,12 @@ static int gpo_bd71815_probe(struct platform_device *pdev) /* The device-tree and regmap come from MFD => use parent for that */ parent = dev->parent; - g = devm_kzalloc(dev, sizeof(*g), GFP_KERNEL); - if (!g) - return -ENOMEM; - - g->chip = bd71815gpo_chip; - - /* - * FIXME: As writing of this the sysfs interface for GPIO control does - * not respect the valid_mask. Do not trust it but rather set the ngpios - * to 1 if "rohm,enable-hidden-gpo" is not given. - * - * This check can be removed later if the sysfs export is fixed and - * if the fix is backported. - * - * For now it is safest to just set the ngpios though. - */ - if (device_property_present(parent, "rohm,enable-hidden-gpo")) - g->chip.ngpio = 2; - else - g->chip.ngpio = 1; - - g->chip.init_valid_mask = bd71815_init_valid_mask; - g->chip.base = -1; - g->chip.parent = parent; - g->regmap = dev_get_regmap(parent, NULL); - g->dev = dev; + cfg = gpio_cfg_template; + cfg.parent = parent; + cfg.regmap = dev_get_regmap(parent, NULL); + cfg.fwnode = dev_fwnode(dev); - return devm_gpiochip_add_data(dev, &g->chip, g); + return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(dev, &cfg, &ops)); } static struct platform_driver gpo_bd71815_driver = {