Commit 13776ebb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devprop-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull device properties code update from Rafael Wysocki:
 "This is based on new i2c material for 5.18-rc1 and simply reorganizes
  the code on top of it so as to group similar functions together (Andy
  Shevchenko)"

* tag 'devprop-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  device property: Don't split fwnode_get_irq*() APIs in the code
parents 1d59c3b6 b2638e56

drivers/base/property.c

+16 −16
Original line number Diff line number Diff line
@@ -895,6 +895,22 @@ int device_get_phy_mode(struct device *dev) 
}

EXPORT_SYMBOL_GPL(device_get_phy_mode);



/**

 * 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 - Get IRQ directly from a fwnode

 * @fwnode:	Pointer to the firmware node
@@ -919,22 +935,6 @@ int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index) 
}

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

include/linux/property.h

+3 −3
Original line number Diff line number Diff line
@@ -123,8 +123,6 @@ void fwnode_handle_put(struct fwnode_handle *fwnode); 
int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index);

int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name);



void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index);



unsigned int device_get_child_node_count(struct device *dev);



static inline bool device_property_read_bool(struct device *dev,
@@ -388,8 +386,10 @@ enum dev_dma_attr device_get_dma_attr(struct device *dev); 
const void *device_get_match_data(struct device *dev);



int device_get_phy_mode(struct device *dev);



int fwnode_get_phy_mode(struct fwnode_handle *fwnode);



void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index);



struct fwnode_handle *fwnode_graph_get_next_endpoint(

	const struct fwnode_handle *fwnode, struct fwnode_handle *prev);

struct fwnode_handle *