Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 00:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pinctrl: cy8c95x0: Make use of device properties

Browse Source 
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>
Tested-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Link: https://lore.kernel.org/r/20220902182650.83098-13-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2022-09-02 21:26:46 +03:00 committed by Linus Walleij
parent f12352f334
commit 8586466e4f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/Kconfig
View File

@ -137,7 +137,7 @@ config PINCTRL_BM1880
config PINCTRL_CY8C95X0 config PINCTRL_CY8C95X0
tristate "Cypress CY8C95X0 I2C pinctrl and GPIO driver" tristate "Cypress CY8C95X0 I2C pinctrl and GPIO driver"
depends on I2C && OF depends on I2C
select GPIOLIB select GPIOLIB
select GPIOLIB_IRQCHIP select GPIOLIB_IRQCHIP
select PINMUX select PINMUX

16
drivers/pinctrl/pinctrl-cy8c95x0.c
View File

@ -13,15 +13,16 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/property.h>
#include <linux/of_platform.h> #include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinctrl.h>
#include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinconf.h>
#include <linux/pinctrl/pinconf-generic.h> #include <linux/pinctrl/pinconf-generic.h>
#include <linux/pinctrl/pinmux.h> #include <linux/pinctrl/pinmux.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
/* Fast access registers */ /* Fast access registers */
#define CY8C95X0_INPUT 0x00 #define CY8C95X0_INPUT 0x00
@ -1051,8 +1052,10 @@ static const struct pinctrl_ops cy8c95x0_pinctrl_ops = {
.get_groups_count = cy8c95x0_pinctrl_get_groups_count, .get_groups_count = cy8c95x0_pinctrl_get_groups_count,
.get_group_name = cy8c95x0_pinctrl_get_group_name, .get_group_name = cy8c95x0_pinctrl_get_group_name,
.get_group_pins = cy8c95x0_pinctrl_get_group_pins, .get_group_pins = cy8c95x0_pinctrl_get_group_pins,
#ifdef CONFIG_OF
.dt_node_to_map = pinconf_generic_dt_node_to_map_pin, .dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
.dt_free_map = pinconf_generic_dt_free_map, .dt_free_map = pinconf_generic_dt_free_map,
#endif
.pin_dbg_show = cy8c95x0_pin_dbg_show, .pin_dbg_show = cy8c95x0_pin_dbg_show,
}; };
@ -1256,9 +1259,8 @@ static int cy8c95x0_probe(struct i2c_client *client)
chip->dev = &client->dev; chip->dev = &client->dev;
/* Set the device type */ /* Set the device type */
if (client->dev.of_node) chip->driver_data = (unsigned long)device_get_match_data(&client->dev);
chip->driver_data = (unsigned long)of_device_get_match_data(&client->dev); if (!chip->driver_data)
else
chip->driver_data = i2c_match_id(cy8c95x0_id, client)->driver_data; chip->driver_data = i2c_match_id(cy8c95x0_id, client)->driver_data;
if (!chip->driver_data) if (!chip->driver_data)