linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the pm tree got a conflict in:

  drivers/base/property.c

between commit:

  ca0acb511c21 ("device property: Add fwnode_irq_get_byname")

from the i2c tree and commit:

  ffa743d3f33b ("device property: Don't split fwnode_get_irq*() APIs in the code")

from the pm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/base/property.c
index fc59e0f7f9cc,ad97d23ddbe6..000000000000
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@@ -919,51 -935,6 +935,35 @@@ int fwnode_irq_get(const struct fwnode_
  }
  EXPORT_SYMBOL(fwnode_irq_get);
  
- /**
-  * fwnode_iomap - Maps the memory mapped IO for a given fwnode
-  * @fwnode:	Pointer to the firmware node
-  * @index:	Index of the IO range
-  *
-  * Returns a pointer to the mapped memory.
-  */
- void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index)
- {
- 	if (IS_ENABLED(CONFIG_OF_ADDRESS) && is_of_node(fwnode))
- 		return of_iomap(to_of_node(fwnode), index);
- 
- 	return NULL;
- }
- EXPORT_SYMBOL(fwnode_iomap);
- 
 +/**
 + * fwnode_irq_get_byname - Get IRQ from a fwnode using its name
 + * @fwnode:	Pointer to the firmware node
 + * @name:	IRQ name
 + *
 + * Description:
 + * Find a match to the string @name in the 'interrupt-names' string array
 + * in _DSD for ACPI, or of_node for Device Tree. Then get the Linux IRQ
 + * number of the IRQ resource corresponding to the index of the matched
 + * string.
 + *
 + * Return:
 + * Linux IRQ number on success, or negative errno otherwise.
 + */
 +int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name)
 +{
 +	int index;
 +
 +	if (!name)
 +		return -EINVAL;
 +
 +	index = fwnode_property_match_string(fwnode, "interrupt-names",  name);
 +	if (index < 0)
 +		return index;
 +
 +	return fwnode_irq_get(fwnode, index);
 +}
 +EXPORT_SYMBOL(fwnode_irq_get_byname);
 +
  /**
   * fwnode_graph_get_next_endpoint - Get next endpoint firmware node
   * @fwnode: Pointer to the parent firmware node

Attachment: pgpDD9rc_7Y3X.pgp
Description: OpenPGP digital signature