Skip to content

Commit 3ada1b1

Browse files
brooniebroonie
committed
Merge series "Add support for Kontron sl28cpld" from Michael Walle <[email protected]>:
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/[email protected]/ 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 [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
2 parents 4475337 + 1247938 commit 3ada1b1

File tree

2 files changed

+78
-16
lines changed

2 files changed

+78
-16
lines changed

‎drivers/base/regmap/regmap-irq.c

Lines changed: 68 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,9 @@ static const struct irq_domain_ops regmap_domain_ops = {
541541
};
542542

543543
/**
544-
* regmap_add_irq_chip() - Use standard regmap IRQ controller handling
544+
* regmap_add_irq_chip_np() - Use standard regmap IRQ controller handling
545545
*
546+
* @np: The device_node where the IRQ domain should be added to.
546547
* @map: The regmap for the device.
547548
* @irq: The IRQ the device uses to signal interrupts.
548549
* @irq_flags: The IRQF_ flags to use for the primary interrupt.
@@ -556,9 +557,10 @@ static const struct irq_domain_ops regmap_domain_ops = {
556557
* register cache. The chip driver is responsible for restoring the
557558
* register values used by the IRQ controller over suspend and resume.
558559
*/
559-
int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
560-
int irq_base, const struct regmap_irq_chip *chip,
561-
struct regmap_irq_chip_data **data)
560+
int regmap_add_irq_chip_np(struct device_node *np, struct regmap *map, int irq,
561+
int irq_flags, int irq_base,
562+
const struct regmap_irq_chip *chip,
563+
struct regmap_irq_chip_data **data)
562564
{
563565
struct regmap_irq_chip_data *d;
564566
int i;
@@ -769,12 +771,10 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
769771
}
770772

771773
if (irq_base)
772-
d->domain = irq_domain_add_legacy(map->dev->of_node,
773-
chip->num_irqs, irq_base, 0,
774-
&regmap_domain_ops, d);
774+
d->domain = irq_domain_add_legacy(np, chip->num_irqs, irq_base,
775+
0, &regmap_domain_ops, d);
775776
else
776-
d->domain = irq_domain_add_linear(map->dev->of_node,
777-
chip->num_irqs,
777+
d->domain = irq_domain_add_linear(np, chip->num_irqs,
778778
&regmap_domain_ops, d);
779779
if (!d->domain) {
780780
dev_err(map->dev, "Failed to create IRQ domain\n");
@@ -808,6 +808,30 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
808808
kfree(d);
809809
return ret;
810810
}
811+
EXPORT_SYMBOL_GPL(regmap_add_irq_chip_np);
812+
813+
/**
814+
* regmap_add_irq_chip() - Use standard regmap IRQ controller handling
815+
*
816+
* @map: The regmap for the device.
817+
* @irq: The IRQ the device uses to signal interrupts.
818+
* @irq_flags: The IRQF_ flags to use for the primary interrupt.
819+
* @irq_base: Allocate at specific IRQ number if irq_base > 0.
820+
* @chip: Configuration for the interrupt controller.
821+
* @data: Runtime data structure for the controller, allocated on success.
822+
*
823+
* Returns 0 on success or an errno on failure.
824+
*
825+
* This is the same as regmap_add_irq_chip_np, except that the device
826+
* node of the regmap is used.
827+
*/
828+
int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
829+
int irq_base, const struct regmap_irq_chip *chip,
830+
struct regmap_irq_chip_data **data)
831+
{
832+
return regmap_add_irq_chip_np(map->dev->of_node, map, irq, irq_flags,
833+
irq_base, chip, data);
834+
}
811835
EXPORT_SYMBOL_GPL(regmap_add_irq_chip);
812836

813837
/**
@@ -875,9 +899,10 @@ static int devm_regmap_irq_chip_match(struct device *dev, void *res, void *data)
875899
}
876900

877901
/**
878-
* devm_regmap_add_irq_chip() - Resource manager regmap_add_irq_chip()
902+
* devm_regmap_add_irq_chip_np() - Resource manager regmap_add_irq_chip_np()
879903
*
880904
* @dev: The device pointer on which irq_chip belongs to.
905+
* @np: The device_node where the IRQ domain should be added to.
881906
* @map: The regmap for the device.
882907
* @irq: The IRQ the device uses to signal interrupts
883908
* @irq_flags: The IRQF_ flags to use for the primary interrupt.
@@ -890,10 +915,11 @@ static int devm_regmap_irq_chip_match(struct device *dev, void *res, void *data)
890915
* The &regmap_irq_chip_data will be automatically released when the device is
891916
* unbound.
892917
*/
893-
int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
894-
int irq_flags, int irq_base,
895-
const struct regmap_irq_chip *chip,
896-
struct regmap_irq_chip_data **data)
918+
int devm_regmap_add_irq_chip_np(struct device *dev, struct device_node *np,
919+
struct regmap *map, int irq, int irq_flags,
920+
int irq_base,
921+
const struct regmap_irq_chip *chip,
922+
struct regmap_irq_chip_data **data)
897923
{
898924
struct regmap_irq_chip_data **ptr, *d;
899925
int ret;
@@ -903,8 +929,8 @@ int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
903929
if (!ptr)
904930
return -ENOMEM;
905931

906-
ret = regmap_add_irq_chip(map, irq, irq_flags, irq_base,
907-
chip, &d);
932+
ret = regmap_add_irq_chip_np(np, map, irq, irq_flags, irq_base,
933+
chip, &d);
908934
if (ret < 0) {
909935
devres_free(ptr);
910936
return ret;
@@ -915,6 +941,32 @@ int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
915941
*data = d;
916942
return 0;
917943
}
944+
EXPORT_SYMBOL_GPL(devm_regmap_add_irq_chip_np);
945+
946+
/**
947+
* devm_regmap_add_irq_chip() - Resource manager regmap_add_irq_chip()
948+
*
949+
* @dev: The device pointer on which irq_chip belongs to.
950+
* @map: The regmap for the device.
951+
* @irq: The IRQ the device uses to signal interrupts
952+
* @irq_flags: The IRQF_ flags to use for the primary interrupt.
953+
* @irq_base: Allocate at specific IRQ number if irq_base > 0.
954+
* @chip: Configuration for the interrupt controller.
955+
* @data: Runtime data structure for the controller, allocated on success
956+
*
957+
* Returns 0 on success or an errno on failure.
958+
*
959+
* The &regmap_irq_chip_data will be automatically released when the device is
960+
* unbound.
961+
*/
962+
int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
963+
int irq_flags, int irq_base,
964+
const struct regmap_irq_chip *chip,
965+
struct regmap_irq_chip_data **data)
966+
{
967+
return devm_regmap_add_irq_chip_np(dev, map->dev->of_node, map, irq,
968+
irq_flags, irq_base, chip, data);
969+
}
918970
EXPORT_SYMBOL_GPL(devm_regmap_add_irq_chip);
919971

920972
/**

‎include/linux/regmap.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
struct module;
2222
struct clk;
2323
struct device;
24+
struct device_node;
2425
struct i2c_client;
2526
struct i3c_device;
2627
struct irq_domain;
@@ -1317,12 +1318,21 @@ struct regmap_irq_chip_data;
13171318
int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
13181319
int irq_base, const struct regmap_irq_chip *chip,
13191320
struct regmap_irq_chip_data **data);
1321+
int regmap_add_irq_chip_np(struct device_node *np, struct regmap *map, int irq,
1322+
int irq_flags, int irq_base,
1323+
const struct regmap_irq_chip *chip,
1324+
struct regmap_irq_chip_data **data);
13201325
void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data);
13211326

13221327
int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
13231328
int irq_flags, int irq_base,
13241329
const struct regmap_irq_chip *chip,
13251330
struct regmap_irq_chip_data **data);
1331+
int devm_regmap_add_irq_chip_np(struct device *dev, struct device_node *np,
1332+
struct regmap *map, int irq, int irq_flags,
1333+
int irq_base,
1334+
const struct regmap_irq_chip *chip,
1335+
struct regmap_irq_chip_data **data);
13261336
void devm_regmap_del_irq_chip(struct device *dev, int irq,
13271337
struct regmap_irq_chip_data *data);
13281338

0 commit comments

Comments
 (0)