Merge series "Add support for Kontron sl28cpld" from Michael Walle <michael@walle.cc>:
The Kontron sl28cpld is a board management chip providing gpio, pwm, fan monitoring and an interrupt controller. For now this controller is used on the Kontron SMARC-sAL28 board. But because of its flexible nature, it might also be used on other boards in the future. The individual blocks (like gpio, pwm, etc) are kept intentionally small. The MFD core driver then instantiates different (or multiple of the same) blocks. It also provides the register layout so it might be updated in the future without a device tree change; and support other boards with a different layout or functionalities. See also [1] for more information. This is my first take of a MFD driver. I don't know whether the subsystem maintainers should only be CCed on the patches which affect the subsystem or on all patches for this series. I've chosen the latter so you can get a more complete picture. [1] https://lore.kernel.org/linux-devicetree/0e3e8204ab992d75aa07fc36af7e4ab2@walle.cc/ Changes since v1: - use of_match_table in all drivers, needed for automatic module loading, when using OF_MFD_CELL() - add new gpio-regmap.c which adds a generic regmap gpio_chip implemention - new patch for reqmap_irq, so we can reuse its implementation - remove almost any code from gpio-sl28cpld.c, instead use gpio-regmap and regmap-irq - change the handling of the mfd core vs device tree nodes; add a new property "of_reg" to the mfd_cell struct which, when set, is matched to the unit-address of the device tree nodes. - fix sl28cpld watchdog when it is not initialized by the bootloader. Explicitly set the operation mode. - also add support for kontron,assert-wdt-timeout-pin in sl28cpld-wdt. As suggested by Bartosz Golaszewski: - define registers as hex - make gpio enum uppercase - move parent regmap check before memory allocation - use device_property_read_bool() instead of the of_ version - mention the gpio flavors in the bindings documentation As suggested by Guenter Roeck: - cleanup #includes and sort them - use devm_watchdog_register_device() - use watchdog_stop_on_reboot() - provide a Documentation/hwmon/sl28cpld.rst - cleaned up the weird tristate->bool and I2C=y issue. Instead mention that the MFD driver is bool because of the following intc patch - removed the SL28CPLD_IRQ typo As suggested by Rob Herring: - combine all dt bindings docs into one patch - change the node name for all gpio flavors to "gpio" - removed the interrupts-extended rule - cleaned up the unit-address space, see above Michael Walle (16): include/linux/ioport.h: add helper to define REG resource constructs mfd: mfd-core: Don't overwrite the dma_mask of the child device mfd: mfd-core: match device tree node against reg property regmap-irq: make it possible to add irq_chip do a specific device node dt-bindings: mfd: Add bindings for sl28cpld mfd: Add support for Kontron sl28cpld management controller irqchip: add sl28cpld interrupt controller support watchdog: add support for sl28cpld watchdog pwm: add support for sl28cpld PWM controller gpio: add a reusable generic gpio_chip using regmap gpio: add support for the sl28cpld GPIO controller hwmon: add support for the sl28cpld hardware monitoring controller arm64: dts: freescale: sl28: enable sl28cpld arm64: dts: freescale: sl28: map GPIOs to input events arm64: dts: freescale: sl28: enable LED support arm64: dts: freescale: sl28: enable fan support .../bindings/gpio/kontron,sl28cpld-gpio.yaml | 51 +++ .../hwmon/kontron,sl28cpld-hwmon.yaml | 27 ++ .../bindings/mfd/kontron,sl28cpld.yaml | 162 +++++++++ .../bindings/pwm/kontron,sl28cpld-pwm.yaml | 35 ++ .../watchdog/kontron,sl28cpld-wdt.yaml | 35 ++ Documentation/hwmon/sl28cpld.rst | 36 ++ .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 14 + .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 9 + .../freescale/fsl-ls1028a-kontron-sl28.dts | 124 +++++++ drivers/base/regmap/regmap-irq.c | 84 ++++- drivers/gpio/Kconfig | 15 + drivers/gpio/Makefile | 2 + drivers/gpio/gpio-regmap.c | 321 ++++++++++++++++++ drivers/gpio/gpio-sl28cpld.c | 187 ++++++++++ drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/sl28cpld-hwmon.c | 152 +++++++++ drivers/irqchip/Kconfig | 3 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-sl28cpld.c | 99 ++++++ drivers/mfd/Kconfig | 21 ++ drivers/mfd/Makefile | 2 + drivers/mfd/mfd-core.c | 31 +- drivers/mfd/sl28cpld.c | 154 +++++++++ drivers/pwm/Kconfig | 10 + drivers/pwm/Makefile | 1 + drivers/pwm/pwm-sl28cpld.c | 204 +++++++++++ drivers/watchdog/Kconfig | 11 + drivers/watchdog/Makefile | 1 + drivers/watchdog/sl28cpld_wdt.c | 242 +++++++++++++ include/linux/gpio-regmap.h | 88 +++++ include/linux/ioport.h | 5 + include/linux/mfd/core.h | 26 +- include/linux/regmap.h | 10 + 34 files changed, 2142 insertions(+), 32 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml create mode 100644 Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml create mode 100644 Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml create mode 100644 Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml create mode 100644 Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml create mode 100644 Documentation/hwmon/sl28cpld.rst create mode 100644 drivers/gpio/gpio-regmap.c create mode 100644 drivers/gpio/gpio-sl28cpld.c create mode 100644 drivers/hwmon/sl28cpld-hwmon.c create mode 100644 drivers/irqchip/irq-sl28cpld.c create mode 100644 drivers/mfd/sl28cpld.c create mode 100644 drivers/pwm/pwm-sl28cpld.c create mode 100644 drivers/watchdog/sl28cpld_wdt.c create mode 100644 include/linux/gpio-regmap.h -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
This commit is contained in:
commit
3ada1b176e
|
@ -541,8 +541,9 @@ static const struct irq_domain_ops regmap_domain_ops = {
|
|||
};
|
||||
|
||||
/**
|
||||
* regmap_add_irq_chip() - Use standard regmap IRQ controller handling
|
||||
* regmap_add_irq_chip_np() - Use standard regmap IRQ controller handling
|
||||
*
|
||||
* @np: The device_node where the IRQ domain should be added to.
|
||||
* @map: The regmap for the device.
|
||||
* @irq: The IRQ the device uses to signal interrupts.
|
||||
* @irq_flags: The IRQF_ flags to use for the primary interrupt.
|
||||
|
@ -556,9 +557,10 @@ static const struct irq_domain_ops regmap_domain_ops = {
|
|||
* register cache. The chip driver is responsible for restoring the
|
||||
* register values used by the IRQ controller over suspend and resume.
|
||||
*/
|
||||
int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
|
||||
int irq_base, const struct regmap_irq_chip *chip,
|
||||
struct regmap_irq_chip_data **data)
|
||||
int regmap_add_irq_chip_np(struct device_node *np, struct regmap *map, int irq,
|
||||
int irq_flags, int irq_base,
|
||||
const struct regmap_irq_chip *chip,
|
||||
struct regmap_irq_chip_data **data)
|
||||
{
|
||||
struct regmap_irq_chip_data *d;
|
||||
int i;
|
||||
|
@ -769,12 +771,10 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
|
|||
}
|
||||
|
||||
if (irq_base)
|
||||
d->domain = irq_domain_add_legacy(map->dev->of_node,
|
||||
chip->num_irqs, irq_base, 0,
|
||||
®map_domain_ops, d);
|
||||
d->domain = irq_domain_add_legacy(np, chip->num_irqs, irq_base,
|
||||
0, ®map_domain_ops, d);
|
||||
else
|
||||
d->domain = irq_domain_add_linear(map->dev->of_node,
|
||||
chip->num_irqs,
|
||||
d->domain = irq_domain_add_linear(np, chip->num_irqs,
|
||||
®map_domain_ops, d);
|
||||
if (!d->domain) {
|
||||
dev_err(map->dev, "Failed to create IRQ domain\n");
|
||||
|
@ -808,6 +808,30 @@ err_alloc:
|
|||
kfree(d);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(regmap_add_irq_chip_np);
|
||||
|
||||
/**
|
||||
* regmap_add_irq_chip() - Use standard regmap IRQ controller handling
|
||||
*
|
||||
* @map: The regmap for the device.
|
||||
* @irq: The IRQ the device uses to signal interrupts.
|
||||
* @irq_flags: The IRQF_ flags to use for the primary interrupt.
|
||||
* @irq_base: Allocate at specific IRQ number if irq_base > 0.
|
||||
* @chip: Configuration for the interrupt controller.
|
||||
* @data: Runtime data structure for the controller, allocated on success.
|
||||
*
|
||||
* Returns 0 on success or an errno on failure.
|
||||
*
|
||||
* This is the same as regmap_add_irq_chip_np, except that the device
|
||||
* node of the regmap is used.
|
||||
*/
|
||||
int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
|
||||
int irq_base, const struct regmap_irq_chip *chip,
|
||||
struct regmap_irq_chip_data **data)
|
||||
{
|
||||
return regmap_add_irq_chip_np(map->dev->of_node, map, irq, irq_flags,
|
||||
irq_base, chip, data);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(regmap_add_irq_chip);
|
||||
|
||||
/**
|
||||
|
@ -874,6 +898,51 @@ static int devm_regmap_irq_chip_match(struct device *dev, void *res, void *data)
|
|||
return *r == data;
|
||||
}
|
||||
|
||||
/**
|
||||
* devm_regmap_add_irq_chip_np() - Resource manager regmap_add_irq_chip_np()
|
||||
*
|
||||
* @dev: The device pointer on which irq_chip belongs to.
|
||||
* @np: The device_node where the IRQ domain should be added to.
|
||||
* @map: The regmap for the device.
|
||||
* @irq: The IRQ the device uses to signal interrupts
|
||||
* @irq_flags: The IRQF_ flags to use for the primary interrupt.
|
||||
* @irq_base: Allocate at specific IRQ number if irq_base > 0.
|
||||
* @chip: Configuration for the interrupt controller.
|
||||
* @data: Runtime data structure for the controller, allocated on success
|
||||
*
|
||||
* Returns 0 on success or an errno on failure.
|
||||
*
|
||||
* The ®map_irq_chip_data will be automatically released when the device is
|
||||
* unbound.
|
||||
*/
|
||||
int devm_regmap_add_irq_chip_np(struct device *dev, struct device_node *np,
|
||||
struct regmap *map, int irq, int irq_flags,
|
||||
int irq_base,
|
||||
const struct regmap_irq_chip *chip,
|
||||
struct regmap_irq_chip_data **data)
|
||||
{
|
||||
struct regmap_irq_chip_data **ptr, *d;
|
||||
int ret;
|
||||
|
||||
ptr = devres_alloc(devm_regmap_irq_chip_release, sizeof(*ptr),
|
||||
GFP_KERNEL);
|
||||
if (!ptr)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = regmap_add_irq_chip_np(np, map, irq, irq_flags, irq_base,
|
||||
chip, &d);
|
||||
if (ret < 0) {
|
||||
devres_free(ptr);
|
||||
return ret;
|
||||
}
|
||||
|
||||
*ptr = d;
|
||||
devres_add(dev, ptr);
|
||||
*data = d;
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(devm_regmap_add_irq_chip_np);
|
||||
|
||||
/**
|
||||
* devm_regmap_add_irq_chip() - Resource manager regmap_add_irq_chip()
|
||||
*
|
||||
|
@ -895,25 +964,8 @@ int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
|
|||
const struct regmap_irq_chip *chip,
|
||||
struct regmap_irq_chip_data **data)
|
||||
{
|
||||
struct regmap_irq_chip_data **ptr, *d;
|
||||
int ret;
|
||||
|
||||
ptr = devres_alloc(devm_regmap_irq_chip_release, sizeof(*ptr),
|
||||
GFP_KERNEL);
|
||||
if (!ptr)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = regmap_add_irq_chip(map, irq, irq_flags, irq_base,
|
||||
chip, &d);
|
||||
if (ret < 0) {
|
||||
devres_free(ptr);
|
||||
return ret;
|
||||
}
|
||||
|
||||
*ptr = d;
|
||||
devres_add(dev, ptr);
|
||||
*data = d;
|
||||
return 0;
|
||||
return devm_regmap_add_irq_chip_np(dev, map->dev->of_node, map, irq,
|
||||
irq_flags, irq_base, chip, data);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(devm_regmap_add_irq_chip);
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
struct module;
|
||||
struct clk;
|
||||
struct device;
|
||||
struct device_node;
|
||||
struct i2c_client;
|
||||
struct i3c_device;
|
||||
struct irq_domain;
|
||||
|
@ -1317,12 +1318,21 @@ struct regmap_irq_chip_data;
|
|||
int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
|
||||
int irq_base, const struct regmap_irq_chip *chip,
|
||||
struct regmap_irq_chip_data **data);
|
||||
int regmap_add_irq_chip_np(struct device_node *np, struct regmap *map, int irq,
|
||||
int irq_flags, int irq_base,
|
||||
const struct regmap_irq_chip *chip,
|
||||
struct regmap_irq_chip_data **data);
|
||||
void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data);
|
||||
|
||||
int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
|
||||
int irq_flags, int irq_base,
|
||||
const struct regmap_irq_chip *chip,
|
||||
struct regmap_irq_chip_data **data);
|
||||
int devm_regmap_add_irq_chip_np(struct device *dev, struct device_node *np,
|
||||
struct regmap *map, int irq, int irq_flags,
|
||||
int irq_base,
|
||||
const struct regmap_irq_chip *chip,
|
||||
struct regmap_irq_chip_data **data);
|
||||
void devm_regmap_del_irq_chip(struct device *dev, int irq,
|
||||
struct regmap_irq_chip_data *data);
|
||||
|
||||
|
|
Loading…
Reference in a new issue