[v1,13/17] pinctrl: cy8c95x0: Make use of device properties

Message ID	20220902182650.83098-13-andriy.shevchenko@linux.intel.com
State	Accepted
Commit	8586466e4f11a5879a7c0df5d25da6c6a7d7c672
Headers	show Return-Path: <linux-gpio-owner@kernel.org> From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: Linus Walleij <linus.walleij@linaro.org>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Patrick Rudolph <patrick.rudolph@9elements.com>, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 13/17] pinctrl: cy8c95x0: Make use of device properties Date: Fri, 2 Sep 2022 21:26:46 +0300 Message-Id: <20220902182650.83098-13-andriy.shevchenko@linux.intel.com> In-Reply-To: <20220902182650.83098-1-andriy.shevchenko@linux.intel.com> References: <20220902182650.83098-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[v1,01/17] pinctrl: cy8c95x0: make irq_chip immutable \| expand [v1,01/17] pinctrl: cy8c95x0: make irq_chip immutable [v1,02/17] pinctrl: cy8c95x0: Allow IRQ chip core to handle numbering [v1,03/17] pinctrl: cy8c95x0: Allow most of the registers to be cached [v1,04/17] pinctrl: cy8c95x0: Fix return value in cy8c95x0_detect() [v1,05/17] pinctrl: cy8c95x0: Fix pin control name to enable more than one [v1,06/17] pinctrl: cy8c95x0: Drop unneeded npins assignment [v1,07/17] pinctrl: cy8c95x0: Enable GPIO range [v1,08/17] pinctrl: cy8c95x0: Remove device initialization [v1,09/17] pinctrl: cy8c95x0: Remove useless conditionals [v1,10/17] pinctrl: cy8c95x0: Remove custom ->set_config() [v1,11/17] pinctrl: cy8c95x0: Use 'default' in all switch-cases [v1,12/17] pinctrl: cy8c95x0: Implement ->pin_dbg_show() [v1,13/17] pinctrl: cy8c95x0: Make use of device properties [v1,14/17] pinctrl: cy8c95x0: support ACPI device found on Galileo Gen1 [v1,15/17] pinctrl: cy8c95x0: Override IRQ for one of the expanders on Galileo Gen 1 [v1,16/17] pinctrl: cy8c95x0: use bits.h macros for all masks [v1,17/17] pinctrl: cy8c95x0: Correct comment style

Message ID

20220902182650.83098-13-andriy.shevchenko@linux.intel.com

State

Accepted

Commit

8586466e4f11a5879a7c0df5d25da6c6a7d7c672

Headers

From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Patrick Rudolph <patrick.rudolph@9elements.com>,
        linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 13/17] pinctrl: cy8c95x0: Make use of device properties
Date: Fri,  2 Sep 2022 21:26:46 +0300
Message-Id: <20220902182650.83098-13-andriy.shevchenko@linux.intel.com>
In-Reply-To: <20220902182650.83098-1-andriy.shevchenko@linux.intel.com>
References: <20220902182650.83098-1-andriy.shevchenko@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[v1,01/17] pinctrl: cy8c95x0: make irq_chip immutable | expand

Commit Message

Andy Shevchenko Sept. 2, 2022, 6:26 p.m. UTC

Convert the module to be property provider agnostic and allow
it to be used on non-OF platforms.

Add mod_devicetable.h include.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/pinctrl/Kconfig            |  2 +-
 drivers/pinctrl/pinctrl-cy8c95x0.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index fc0e529e633f..c09562fbb1b7 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -137,7 +137,7 @@  config PINCTRL_BM1880
 
 config PINCTRL_CY8C95X0
 	tristate "Cypress CY8C95X0 I2C pinctrl and GPIO driver"
-	depends on I2C && OF
+	depends on I2C
 	select GPIOLIB
 	select GPIOLIB_IRQCHIP
 	select PINMUX
diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c
index ea81b5ae27a6..699da63d9c39 100644
--- a/drivers/pinctrl/pinctrl-cy8c95x0.c
+++ b/drivers/pinctrl/pinctrl-cy8c95x0.c
@@ -13,15 +13,16 @@ 
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
+#include <linux/property.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinmux.h>
-#include <linux/regmap.h>
-#include <linux/regulator/consumer.h>
 
 /* Fast access registers */
 #define CY8C95X0_INPUT		0x00
@@ -1040,8 +1041,10 @@  static const struct pinctrl_ops cy8c95x0_pinctrl_ops = {
 	.get_groups_count = cy8c95x0_pinctrl_get_groups_count,
 	.get_group_name = cy8c95x0_pinctrl_get_group_name,
 	.get_group_pins = cy8c95x0_pinctrl_get_group_pins,
+#ifdef CONFIG_OF
 	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
 	.dt_free_map = pinconf_generic_dt_free_map,
+#endif
 	.pin_dbg_show = cy8c95x0_pin_dbg_show,
 };
 
@@ -1245,9 +1248,8 @@  static int cy8c95x0_probe(struct i2c_client *client)
 	chip->dev = &client->dev;
 
 	/* Set the device type */
-	if (client->dev.of_node)
-		chip->driver_data = (unsigned long)of_device_get_match_data(&client->dev);
-	else
+	chip->driver_data = (unsigned long)device_get_match_data(&client->dev);
+	if (!chip->driver_data)
 		chip->driver_data = i2c_match_id(cy8c95x0_id, client)->driver_data;
 
 	if (!chip->driver_data)

[v1,13/17] pinctrl: cy8c95x0: Make use of device properties

Commit Message

Patch