leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'topic/devnode' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-5.9

Browse Source
This commit is contained in:
Mark Brown 2020-07-08 11:20:59 +01:00
commit 31cf2c3b6f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/base/regmap/regmap-irq.c
View File

@ -541,9 +541,9 @@ static const struct irq_domain_ops regmap_domain_ops = {
}; };
/** /**
* regmap_add_irq_chip_np() - Use standard regmap IRQ controller handling * regmap_add_irq_chip_fwnode() - Use standard regmap IRQ controller handling
* *
* @np: The device_node where the IRQ domain should be added to. * @fwnode: The firmware node where the IRQ domain should be added to.
* @map: The regmap for the device. * @map: The regmap for the device.
* @irq: The IRQ the device uses to signal interrupts. * @irq: The IRQ the device uses to signal interrupts.
* @irq_flags: The IRQF_ flags to use for the primary interrupt. * @irq_flags: The IRQF_ flags to use for the primary interrupt.
@ -557,10 +557,11 @@ static const struct irq_domain_ops regmap_domain_ops = {
* register cache. The chip driver is responsible for restoring the * register cache. The chip driver is responsible for restoring the
* register values used by the IRQ controller over suspend and resume. * register values used by the IRQ controller over suspend and resume.
*/ */
int regmap_add_irq_chip_np(struct device_node *np, struct regmap *map, int irq, int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
int irq_flags, int irq_base, struct regmap *map, int irq,
const struct regmap_irq_chip *chip, int irq_flags, int irq_base,
struct regmap_irq_chip_data **data) const struct regmap_irq_chip *chip,
struct regmap_irq_chip_data **data)
{ {
struct regmap_irq_chip_data *d; struct regmap_irq_chip_data *d;
int i; int i;
@ -771,10 +772,12 @@ int regmap_add_irq_chip_np(struct device_node *np, struct regmap *map, int irq,
} }
if (irq_base) if (irq_base)
d->domain = irq_domain_add_legacy(np, chip->num_irqs, irq_base, d->domain = irq_domain_add_legacy(to_of_node(fwnode),
chip->num_irqs, irq_base,
0, &regmap_domain_ops, d); 0, &regmap_domain_ops, d);
else else
d->domain = irq_domain_add_linear(np, chip->num_irqs, d->domain = irq_domain_add_linear(to_of_node(fwnode),
chip->num_irqs,
&regmap_domain_ops, d); &regmap_domain_ops, d);
if (!d->domain) { if (!d->domain) {
dev_err(map->dev, "Failed to create IRQ domain\n"); dev_err(map->dev, "Failed to create IRQ domain\n");
@ -808,7 +811,7 @@ err_alloc:
kfree(d); kfree(d);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(regmap_add_irq_chip_np); EXPORT_SYMBOL_GPL(regmap_add_irq_chip_fwnode);
/** /**
* regmap_add_irq_chip() - Use standard regmap IRQ controller handling * regmap_add_irq_chip() - Use standard regmap IRQ controller handling
@ -822,15 +825,15 @@ EXPORT_SYMBOL_GPL(regmap_add_irq_chip_np);
* *
* Returns 0 on success or an errno on failure. * Returns 0 on success or an errno on failure.
* *
* This is the same as regmap_add_irq_chip_np, except that the device * This is the same as regmap_add_irq_chip_fwnode, except that the firmware
* node of the regmap is used. * node of the regmap is used.
*/ */
int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
int irq_base, const struct regmap_irq_chip *chip, int irq_base, const struct regmap_irq_chip *chip,
struct regmap_irq_chip_data **data) struct regmap_irq_chip_data **data)
{ {
return regmap_add_irq_chip_np(map->dev->of_node, map, irq, irq_flags, return regmap_add_irq_chip_fwnode(dev_fwnode(map->dev), map, irq,
irq_base, chip, data); irq_flags, irq_base, chip, data);
} }
EXPORT_SYMBOL_GPL(regmap_add_irq_chip); EXPORT_SYMBOL_GPL(regmap_add_irq_chip);
@ -899,10 +902,10 @@ static int devm_regmap_irq_chip_match(struct device *dev, void *res, void *data)
} }
/** /**
* devm_regmap_add_irq_chip_np() - Resource manager regmap_add_irq_chip_np() * devm_regmap_add_irq_chip_fwnode() - Resource managed regmap_add_irq_chip_fwnode()
* *
* @dev: The device pointer on which irq_chip belongs to. * @dev: The device pointer on which irq_chip belongs to.
* @np: The device_node where the IRQ domain should be added to. * @fwnode: The firmware node where the IRQ domain should be added to.
* @map: The regmap for the device. * @map: The regmap for the device.
* @irq: The IRQ the device uses to signal interrupts * @irq: The IRQ the device uses to signal interrupts
* @irq_flags: The IRQF_ flags to use for the primary interrupt. * @irq_flags: The IRQF_ flags to use for the primary interrupt.
@ -915,11 +918,12 @@ static int devm_regmap_irq_chip_match(struct device *dev, void *res, void *data)
* The &regmap_irq_chip_data will be automatically released when the device is * The &regmap_irq_chip_data will be automatically released when the device is
* unbound. * unbound.
*/ */
int devm_regmap_add_irq_chip_np(struct device *dev, struct device_node *np, int devm_regmap_add_irq_chip_fwnode(struct device *dev,
struct regmap *map, int irq, int irq_flags, struct fwnode_handle *fwnode,
int irq_base, struct regmap *map, int irq,
const struct regmap_irq_chip *chip, int irq_flags, int irq_base,
struct regmap_irq_chip_data **data) const struct regmap_irq_chip *chip,
struct regmap_irq_chip_data **data)
{ {
struct regmap_irq_chip_data **ptr, *d; struct regmap_irq_chip_data **ptr, *d;
int ret; int ret;
@ -929,8 +933,8 @@ int devm_regmap_add_irq_chip_np(struct device *dev, struct device_node *np,
if (!ptr) if (!ptr)
return -ENOMEM; return -ENOMEM;
ret = regmap_add_irq_chip_np(np, map, irq, irq_flags, irq_base, ret = regmap_add_irq_chip_fwnode(fwnode, map, irq, irq_flags, irq_base,
chip, &d); chip, &d);
if (ret < 0) { if (ret < 0) {
devres_free(ptr); devres_free(ptr);
return ret; return ret;
@ -941,7 +945,7 @@ int devm_regmap_add_irq_chip_np(struct device *dev, struct device_node *np,
*data = d; *data = d;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(devm_regmap_add_irq_chip_np); EXPORT_SYMBOL_GPL(devm_regmap_add_irq_chip_fwnode);
/** /**
* devm_regmap_add_irq_chip() - Resource manager regmap_add_irq_chip() * devm_regmap_add_irq_chip() - Resource manager regmap_add_irq_chip()
@ -964,8 +968,9 @@ int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
const struct regmap_irq_chip *chip, const struct regmap_irq_chip *chip,
struct regmap_irq_chip_data **data) struct regmap_irq_chip_data **data)
{ {
return devm_regmap_add_irq_chip_np(dev, map->dev->of_node, map, irq, return devm_regmap_add_irq_chip_fwnode(dev, dev_fwnode(map->dev), map,
irq_flags, irq_base, chip, data); irq, irq_flags, irq_base, chip,
data);
} }
EXPORT_SYMBOL_GPL(devm_regmap_add_irq_chip); EXPORT_SYMBOL_GPL(devm_regmap_add_irq_chip);

21
include/linux/regmap.h
View File

@ -18,6 +18,7 @@
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/lockdep.h> #include <linux/lockdep.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/fwnode.h>
struct module; struct module;
struct clk; struct clk;
@ -1376,21 +1377,23 @@ struct regmap_irq_chip_data;
int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
int irq_base, const struct regmap_irq_chip *chip, int irq_base, const struct regmap_irq_chip *chip,
struct regmap_irq_chip_data **data); struct regmap_irq_chip_data **data);
int regmap_add_irq_chip_np(struct device_node *np, struct regmap *map, int irq, int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
int irq_flags, int irq_base, struct regmap *map, int irq,
const struct regmap_irq_chip *chip, int irq_flags, int irq_base,
struct regmap_irq_chip_data **data); 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); 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 devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
int irq_flags, int irq_base, int irq_flags, int irq_base,
const struct regmap_irq_chip *chip, const struct regmap_irq_chip *chip,
struct regmap_irq_chip_data **data); struct regmap_irq_chip_data **data);
int devm_regmap_add_irq_chip_np(struct device *dev, struct device_node *np, int devm_regmap_add_irq_chip_fwnode(struct device *dev,
struct regmap *map, int irq, int irq_flags, struct fwnode_handle *fwnode,
int irq_base, struct regmap *map, int irq,
const struct regmap_irq_chip *chip, int irq_flags, int irq_base,
struct regmap_irq_chip_data **data); const struct regmap_irq_chip *chip,
struct regmap_irq_chip_data **data);
void devm_regmap_del_irq_chip(struct device *dev, int irq, void devm_regmap_del_irq_chip(struct device *dev, int irq,
struct regmap_irq_chip_data *data); struct regmap_irq_chip_data *data);