Message ID | 20230717141845.41415-1-andriy.shevchenko@linux.intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1158561vqt; Mon, 17 Jul 2023 07:50:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlHa6GRndXQ5rG0hnhJ1RTeGaVNdBXs2Ii1DghpvkgmU+TyI7S/0mZ+iV/KUi+SpCAXGNZDk X-Received: by 2002:a5d:50d1:0:b0:316:e04a:29e8 with SMTP id f17-20020a5d50d1000000b00316e04a29e8mr10955089wrt.54.1689605426646; Mon, 17 Jul 2023 07:50:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689605426; cv=none; d=google.com; s=arc-20160816; b=LiigA+sD9Z9oYTWyFJrPjmPCFuqRMz3oM7ROrzEsyWTRqfGJNgyhccuAe8PE82eU9W 3YPOlernh9eapQgbVnNx5mQnW2jV4kA+7i2exIRKSNxyBFEXnOjZV45ojNYq/2sTmCqo Kwr7UI8VPQRiUtfGSw+3GVZxj5dnMDhdF3OSgv4t+s5mSIu5vIuzt7JMj1RS4VXAW6dk bwQpwjunP0+b98osii7jD3qW7dKEMWPaWlARx9jyiChc7ESe54GUcq7RWr3m3FKCkvV0 gKm+hqWyTXNS9uVRVGWTexag43ajFefiRBZDwEC5Ziv/HdSBR3v5Mqu9QFxN6ZdncSdr q6Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=pK7hNceFmBBKlHB83m2VlB/ZPGTF1nBV95EmjtW3fME=; fh=uwKSrd2+wgcT5Wk+7Sw7v62ZvHxsuHiESBbYGTU7eRQ=; b=vfr6FIb7BPb5wJn/RledosvkNfdYSnYxDaWJlGTz74QAMV0vFViSr/tAY01U2/LK1f etj0/eUTiCBPNmsiJa8lMEJlXac6fz8YmYhm5RFHQ2+oLXaDasRkSXqp8DqlAgGM//Me AO6rJCydjDmV89ev07ZDq2In3O6lUbZHxdAB6G7K+2aO9dEY8qpWudrIuZ36aa88/AY3 b7xZtPFtvrzDO2YtoyM87odNS+XtmTLj3YSfcDvkpyQWkG9ROCoL7ApSYRIfrco0N2HO z0GTbDpYI62hWXt80qAs0CJEPsbVG6m5tmrisfBBeIIGyt+txLiYU4oNrY/cULYDsWrK hJRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CS0ddeF4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id op19-20020a170906bcf300b00988d6a7cdefsi13609972ejb.212.2023.07.17.07.50.02; Mon, 17 Jul 2023 07:50:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CS0ddeF4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230352AbjGQOV5 (ORCPT <rfc822;hadasmailinglist@gmail.com> + 99 others); Mon, 17 Jul 2023 10:21:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229630AbjGQOVx (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 17 Jul 2023 10:21:53 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23013A1; Mon, 17 Jul 2023 07:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689603712; x=1721139712; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=cSbqnQ+KJlnBJR+x/ss6MxnkaW9bhGHE3u8QWcW2wjY=; b=CS0ddeF4vbH1kCi0ztTsm4tGGaobb5vbJ4pmqXnuFPUACdszBpCJB/uc DB5XsNRYrHRSZWCpysil1VsUxYQP/5ZzxzLlu6WvkUYsGS9Or/WWolwsa fCSA5zM7eZq7B1xa+YO1d0WlqvWoWws1ZS66rS7gsf2GTP6USj6Go8CuY +EaNIoMVrHRogyZZJJWoe/bJbhFRr5qg38z7MOXqevE7IsY82w3AIRFEY Khe8q3xR8K47kY7Ok3ET9vPQCQFAZW2PARfUYDLA1OEB07mn0kn15pF44 9vkPs3XaBO8il7ypTJzocx1I07Jvev57xSSlQpbcDT0q2kVQXj4fGO5b7 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="432112874" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="432112874" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2023 07:18:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="717257682" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="717257682" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 17 Jul 2023 07:18:40 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 20C72256; Mon, 17 Jul 2023 17:18:47 +0300 (EEST) From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij <linus.walleij@linaro.org>, Bartosz Golaszewski <brgl@bgdev.pl>, Andy Shevchenko <andy@kernel.org>, Ray Jui <rjui@broadcom.com>, Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>, Florian Fainelli <florian.fainelli@broadcom.com>, Scott Branden <sbranden@broadcom.com> Subject: [PATCH v2 1/3] gpio: bcm-kona: Make driver OF-independent Date: Mon, 17 Jul 2023 17:18:43 +0300 Message-Id: <20230717141845.41415-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771679699516655986 X-GMAIL-MSGID: 1771679699516655986 |
Series |
[v2,1/3] gpio: bcm-kona: Make driver OF-independent
|
|
Commit Message
Andy Shevchenko
July 17, 2023, 2:18 p.m. UTC
There is nothing in the driver that requires OF APIs,
make the driver OF independent.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: new patch
drivers/gpio/Kconfig | 2 +-
drivers/gpio/gpio-bcm-kona.c | 20 +++++++-------------
2 files changed, 8 insertions(+), 14 deletions(-)
Comments
Hi Andy, kernel test robot noticed the following build errors: [auto build test ERROR on brgl/gpio/for-next] [also build test ERROR on linus/master v6.5-rc2 next-20230718] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/gpio-bcm-kona-remove-unneeded-platform_set_drvdata-call/20230718-174129 base: https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio/for-next patch link: https://lore.kernel.org/r/20230717141845.41415-1-andriy.shevchenko%40linux.intel.com patch subject: [PATCH v2 1/3] gpio: bcm-kona: Make driver OF-independent config: arm-allmodconfig (https://download.01.org/0day-ci/archive/20230718/202307182321.w0jEsUc4-lkp@intel.com/config) compiler: arm-linux-gnueabi-gcc (GCC) 12.3.0 reproduce: (https://download.01.org/0day-ci/archive/20230718/202307182321.w0jEsUc4-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202307182321.w0jEsUc4-lkp@intel.com/ All error/warnings (new ones prefixed by >>): drivers/gpio/gpio-bcm-kona.c: In function 'bcm_kona_gpio_set_debounce': >> drivers/gpio/gpio-bcm-kona.c:266:17: error: implicit declaration of function 'dev_err' [-Werror=implicit-function-declaration] 266 | dev_err(chip->parent, "Debounce value %u not in range\n", | ^~~~~~~ drivers/gpio/gpio-bcm-kona.c: In function 'bcm_kona_gpio_probe': >> drivers/gpio/gpio-bcm-kona.c:559:35: error: invalid use of undefined type 'struct platform_device' 559 | struct device *dev = &pdev->dev; | ^~ >> drivers/gpio/gpio-bcm-kona.c:566:21: error: implicit declaration of function 'devm_kzalloc' [-Werror=implicit-function-declaration] 566 | kona_gpio = devm_kzalloc(dev, sizeof(*kona_gpio), GFP_KERNEL); | ^~~~~~~~~~~~ >> drivers/gpio/gpio-bcm-kona.c:566:19: warning: assignment to 'struct bcm_kona_gpio *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 566 | kona_gpio = devm_kzalloc(dev, sizeof(*kona_gpio), GFP_KERNEL); | ^ >> drivers/gpio/gpio-bcm-kona.c:572:15: error: implicit declaration of function 'platform_irq_count' [-Werror=implicit-function-declaration] 572 | ret = platform_irq_count(pdev); | ^~~~~~~~~~~~~~~~~~ >> drivers/gpio/gpio-bcm-kona.c:577:24: error: implicit declaration of function 'dev_err_probe' [-Werror=implicit-function-declaration] 577 | return dev_err_probe(dev, ret, "Couldn't determine GPIO banks\n"); | ^~~~~~~~~~~~~ >> drivers/gpio/gpio-bcm-kona.c:586:28: error: implicit declaration of function 'devm_kcalloc' [-Werror=implicit-function-declaration] 586 | kona_gpio->banks = devm_kcalloc(dev, | ^~~~~~~~~~~~ >> drivers/gpio/gpio-bcm-kona.c:586:26: warning: assignment to 'struct bcm_kona_gpio_bank *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 586 | kona_gpio->banks = devm_kcalloc(dev, | ^ drivers/gpio/gpio-bcm-kona.c:594:9: error: implicit declaration of function 'platform_set_drvdata' [-Werror=implicit-function-declaration] 594 | platform_set_drvdata(pdev, kona_gpio); | ^~~~~~~~~~~~~~~~~~~~ >> drivers/gpio/gpio-bcm-kona.c:607:31: error: implicit declaration of function 'devm_platform_ioremap_resource' [-Werror=implicit-function-declaration] 607 | kona_gpio->reg_base = devm_platform_ioremap_resource(pdev, 0); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> drivers/gpio/gpio-bcm-kona.c:607:29: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 607 | kona_gpio->reg_base = devm_platform_ioremap_resource(pdev, 0); | ^ >> drivers/gpio/gpio-bcm-kona.c:616:29: error: implicit declaration of function 'platform_get_irq' [-Werror=implicit-function-declaration] 616 | bank->irq = platform_get_irq(pdev, i); | ^~~~~~~~~~~~~~~~ >> drivers/gpio/gpio-bcm-kona.c:625:9: error: implicit declaration of function 'dev_info' [-Werror=implicit-function-declaration] 625 | dev_info(&pdev->dev, "Setting up Kona GPIO\n"); | ^~~~~~~~ drivers/gpio/gpio-bcm-kona.c:625:23: error: invalid use of undefined type 'struct platform_device' 625 | dev_info(&pdev->dev, "Setting up Kona GPIO\n"); | ^~ drivers/gpio/gpio-bcm-kona.c: At top level: >> drivers/gpio/gpio-bcm-kona.c:651:15: error: variable 'bcm_kona_gpio_driver' has initializer but incomplete type 651 | static struct platform_driver bcm_kona_gpio_driver = { | ^~~~~~~~~~~~~~~ >> drivers/gpio/gpio-bcm-kona.c:652:10: error: 'struct platform_driver' has no member named 'driver' 652 | .driver = { | ^~~~~~ >> drivers/gpio/gpio-bcm-kona.c:652:19: error: extra brace group at end of initializer 652 | .driver = { | ^ drivers/gpio/gpio-bcm-kona.c:652:19: note: (near initialization for 'bcm_kona_gpio_driver') >> drivers/gpio/gpio-bcm-kona.c:652:19: warning: excess elements in struct initializer drivers/gpio/gpio-bcm-kona.c:652:19: note: (near initialization for 'bcm_kona_gpio_driver') >> drivers/gpio/gpio-bcm-kona.c:656:10: error: 'struct platform_driver' has no member named 'probe' 656 | .probe = bcm_kona_gpio_probe, | ^~~~~ drivers/gpio/gpio-bcm-kona.c:656:18: warning: excess elements in struct initializer 656 | .probe = bcm_kona_gpio_probe, | ^~~~~~~~~~~~~~~~~~~ drivers/gpio/gpio-bcm-kona.c:656:18: note: (near initialization for 'bcm_kona_gpio_driver') >> drivers/gpio/gpio-bcm-kona.c:658:1: warning: data definition has no type or storage class 658 | builtin_platform_driver(bcm_kona_gpio_driver); | ^~~~~~~~~~~~~~~~~~~~~~~ >> drivers/gpio/gpio-bcm-kona.c:658:1: error: type defaults to 'int' in declaration of 'builtin_platform_driver' [-Werror=implicit-int] >> drivers/gpio/gpio-bcm-kona.c:658:1: warning: parameter names (without types) in function declaration drivers/gpio/gpio-bcm-kona.c:651:31: error: storage size of 'bcm_kona_gpio_driver' isn't known 651 | static struct platform_driver bcm_kona_gpio_driver = { | ^~~~~~~~~~~~~~~~~~~~ drivers/gpio/gpio-bcm-kona.c:651:31: warning: 'bcm_kona_gpio_driver' defined but not used [-Wunused-variable] cc1: some warnings being treated as errors Kconfig warnings: (for reference only) WARNING: unmet direct dependencies detected for SM_GCC_8350 Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_QCOM [=m] && (ARM64 || COMPILE_TEST [=n]) Selected by [m]: - SM_VIDEOCC_8350 [=m] && COMMON_CLK [=y] && COMMON_CLK_QCOM [=m] WARNING: unmet direct dependencies detected for SM_GCC_8450 Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_QCOM [=m] && (ARM64 || COMPILE_TEST [=n]) Selected by [m]: - SM_GPUCC_8450 [=m] && COMMON_CLK [=y] && COMMON_CLK_QCOM [=m] - SM_VIDEOCC_8450 [=m] && COMMON_CLK [=y] && COMMON_CLK_QCOM [=m] WARNING: unmet direct dependencies detected for SM_GCC_8550 Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_QCOM [=m] && (ARM64 || COMPILE_TEST [=n]) Selected by [m]: - SM_GPUCC_8550 [=m] && COMMON_CLK [=y] && COMMON_CLK_QCOM [=m] - SM_VIDEOCC_8550 [=m] && COMMON_CLK [=y] && COMMON_CLK_QCOM [=m] vim +/dev_err +266 drivers/gpio/gpio-bcm-kona.c 757651e3d60e5b Markus Mayer 2013-09-10 253 757651e3d60e5b Markus Mayer 2013-09-10 254 static int bcm_kona_gpio_set_debounce(struct gpio_chip *chip, unsigned gpio, 757651e3d60e5b Markus Mayer 2013-09-10 255 unsigned debounce) 757651e3d60e5b Markus Mayer 2013-09-10 256 { 757651e3d60e5b Markus Mayer 2013-09-10 257 struct bcm_kona_gpio *kona_gpio; 757651e3d60e5b Markus Mayer 2013-09-10 258 void __iomem *reg_base; 757651e3d60e5b Markus Mayer 2013-09-10 259 u32 val, res; 757651e3d60e5b Markus Mayer 2013-09-10 260 unsigned long flags; 757651e3d60e5b Markus Mayer 2013-09-10 261 ba4a74485a32c1 Linus Walleij 2015-12-04 262 kona_gpio = gpiochip_get_data(chip); 757651e3d60e5b Markus Mayer 2013-09-10 263 reg_base = kona_gpio->reg_base; 757651e3d60e5b Markus Mayer 2013-09-10 264 /* debounce must be 1-128ms (or 0) */ 757651e3d60e5b Markus Mayer 2013-09-10 265 if ((debounce > 0 && debounce < 1000) || debounce > 128000) { 58383c78425e4e Linus Walleij 2015-11-04 @266 dev_err(chip->parent, "Debounce value %u not in range\n", 757651e3d60e5b Markus Mayer 2013-09-10 267 debounce); 757651e3d60e5b Markus Mayer 2013-09-10 268 return -EINVAL; 757651e3d60e5b Markus Mayer 2013-09-10 269 } 757651e3d60e5b Markus Mayer 2013-09-10 270 757651e3d60e5b Markus Mayer 2013-09-10 271 /* calculate debounce bit value */ 757651e3d60e5b Markus Mayer 2013-09-10 272 if (debounce != 0) { 757651e3d60e5b Markus Mayer 2013-09-10 273 /* Convert to ms */ 757651e3d60e5b Markus Mayer 2013-09-10 274 debounce /= 1000; 757651e3d60e5b Markus Mayer 2013-09-10 275 /* find the MSB */ 757651e3d60e5b Markus Mayer 2013-09-10 276 res = fls(debounce) - 1; 757651e3d60e5b Markus Mayer 2013-09-10 277 /* Check if MSB-1 is set (round up or down) */ 757651e3d60e5b Markus Mayer 2013-09-10 278 if (res > 0 && (debounce & BIT(res - 1))) 757651e3d60e5b Markus Mayer 2013-09-10 279 res++; 757651e3d60e5b Markus Mayer 2013-09-10 280 } 757651e3d60e5b Markus Mayer 2013-09-10 281 757651e3d60e5b Markus Mayer 2013-09-10 282 /* spin lock for read-modify-write of the GPIO register */ c69fcea57e9d2b Julia Cartwright 2017-03-09 283 raw_spin_lock_irqsave(&kona_gpio->lock, flags); 757651e3d60e5b Markus Mayer 2013-09-10 284 757651e3d60e5b Markus Mayer 2013-09-10 285 val = readl(reg_base + GPIO_CONTROL(gpio)); 757651e3d60e5b Markus Mayer 2013-09-10 286 val &= ~GPIO_GPCTR0_DBR_MASK; 757651e3d60e5b Markus Mayer 2013-09-10 287 757651e3d60e5b Markus Mayer 2013-09-10 288 if (debounce == 0) { 757651e3d60e5b Markus Mayer 2013-09-10 289 /* disable debounce */ 757651e3d60e5b Markus Mayer 2013-09-10 290 val &= ~GPIO_GPCTR0_DB_ENABLE_MASK; 757651e3d60e5b Markus Mayer 2013-09-10 291 } else { 757651e3d60e5b Markus Mayer 2013-09-10 292 val |= GPIO_GPCTR0_DB_ENABLE_MASK | 757651e3d60e5b Markus Mayer 2013-09-10 293 (res << GPIO_GPCTR0_DBR_SHIFT); 757651e3d60e5b Markus Mayer 2013-09-10 294 } 757651e3d60e5b Markus Mayer 2013-09-10 295 757651e3d60e5b Markus Mayer 2013-09-10 296 writel(val, reg_base + GPIO_CONTROL(gpio)); 757651e3d60e5b Markus Mayer 2013-09-10 297 c69fcea57e9d2b Julia Cartwright 2017-03-09 298 raw_spin_unlock_irqrestore(&kona_gpio->lock, flags); 757651e3d60e5b Markus Mayer 2013-09-10 299 757651e3d60e5b Markus Mayer 2013-09-10 300 return 0; 757651e3d60e5b Markus Mayer 2013-09-10 301 } 757651e3d60e5b Markus Mayer 2013-09-10 302
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 638f0e771105..a70622d32a3b 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -191,7 +191,7 @@ config GPIO_RASPBERRYPI_EXP config GPIO_BCM_KONA bool "Broadcom Kona GPIO" - depends on OF_GPIO && (ARCH_BCM_MOBILE || COMPILE_TEST) + depends on ARCH_BCM_MOBILE || COMPILE_TEST help Turn on GPIO support for Broadcom "Kona" chips. diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index 70770429ba48..0aa7d710509d 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c @@ -8,12 +8,13 @@ #include <linux/bitops.h> #include <linux/err.h> -#include <linux/io.h> #include <linux/gpio/driver.h> -#include <linux/of_device.h> #include <linux/init.h> +#include <linux/io.h> #include <linux/irqdomain.h> #include <linux/irqchip/chained_irq.h> +#include <linux/mod_devicetable.h> +#include <linux/property.h> #define BCM_GPIO_PASSWD 0x00a5a501 #define GPIO_PER_BANK 32 @@ -556,19 +557,12 @@ static void bcm_kona_gpio_reset(struct bcm_kona_gpio *kona_gpio) static int bcm_kona_gpio_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - const struct of_device_id *match; struct bcm_kona_gpio_bank *bank; struct bcm_kona_gpio *kona_gpio; struct gpio_chip *chip; int ret; int i; - match = of_match_device(bcm_kona_gpio_of_match, dev); - if (!match) { - dev_err(dev, "Failed to find gpio controller\n"); - return -ENODEV; - } - kona_gpio = devm_kzalloc(dev, sizeof(*kona_gpio), GFP_KERNEL); if (!kona_gpio) return -ENOMEM; @@ -601,10 +595,10 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) chip->parent = dev; chip->ngpio = kona_gpio->num_bank * GPIO_PER_BANK; - kona_gpio->irq_domain = irq_domain_add_linear(dev->of_node, - chip->ngpio, - &bcm_kona_irq_ops, - kona_gpio); + kona_gpio->irq_domain = irq_domain_create_linear(dev_fwnode(dev), + chip->ngpio, + &bcm_kona_irq_ops, + kona_gpio); if (!kona_gpio->irq_domain) { dev_err(dev, "Couldn't allocate IRQ domain\n"); return -ENXIO;