Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6b11f53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 

* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
  MAINTAINERS: Add keyword match for of_match_table to device tree section
  of: constify property name parameters for helper functions
  input: xilinx_ps2: Add missing of_address.h header
  of: address: use resource_size helper
parents 73a9fe86 d945fa0d

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4722,6 +4722,7 @@ S: Maintained 
F:	drivers/of

F:	include/linux/of*.h

K:	of_get_property

K:	of_match_table



OPENRISC ARCHITECTURE

M:	Jonas Bonn <jonas@southpole.se>

drivers/input/serio/xilinx_ps2.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/init.h>

#include <linux/list.h>

#include <linux/io.h>



#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

drivers/of/address.c

+1 −1
Original line number Diff line number Diff line
@@ -610,6 +610,6 @@ void __iomem *of_iomap(struct device_node *np, int index) 
	if (of_address_to_resource(np, index, &res))

		return NULL;



	return ioremap(res.start, 1 + res.end - res.start);

	return ioremap(res.start, resource_size(&res));

}

EXPORT_SYMBOL(of_iomap);

drivers/of/base.c

+4 −3
Original line number Diff line number Diff line
@@ -610,8 +610,9 @@ EXPORT_SYMBOL(of_find_node_by_phandle); 
 *

 * The out_value is modified only if a valid u32 value can be decoded.

 */

int of_property_read_u32_array(const struct device_node *np, char *propname,

			       u32 *out_values, size_t sz)

int of_property_read_u32_array(const struct device_node *np,

			       const char *propname, u32 *out_values,

			       size_t sz)

{

	struct property *prop = of_find_property(np, propname, NULL);

	const __be32 *val;
@@ -645,7 +646,7 @@ EXPORT_SYMBOL_GPL(of_property_read_u32_array); 
 *

 * The out_string pointer is modified only if a valid string can be decoded.

 */

int of_property_read_string(struct device_node *np, char *propname,

int of_property_read_string(struct device_node *np, const char *propname,

				const char **out_string)

{

	struct property *prop = of_find_property(np, propname, NULL);

include/linux/of.h

+9 −6
Original line number Diff line number Diff line
@@ -196,11 +196,12 @@ extern struct property *of_find_property(const struct device_node *np, 
					 const char *name,

					 int *lenp);

extern int of_property_read_u32_array(const struct device_node *np,

				      char *propname,

				      const char *propname,

				      u32 *out_values,

				      size_t sz);



extern int of_property_read_string(struct device_node *np, char *propname,

extern int of_property_read_string(struct device_node *np,

				   const char *propname,

				   const char **out_string);

extern int of_device_is_compatible(const struct device_node *device,

				   const char *);
@@ -242,13 +243,15 @@ static inline bool of_have_populated_dt(void) 
}



static inline int of_property_read_u32_array(const struct device_node *np,

				char *propname, u32 *out_values, size_t sz)

					     const char *propname,

					     u32 *out_values, size_t sz)

{

	return -ENOSYS;

}



static inline int of_property_read_string(struct device_node *np,

				char *propname, const char **out_string)

					  const char *propname,

					  const char **out_string)

{

	return -ENOSYS;

}
@@ -256,7 +259,7 @@ static inline int of_property_read_string(struct device_node *np, 
#endif /* CONFIG_OF */



static inline int of_property_read_u32(const struct device_node *np,

				       char *propname,

				       const char *propname,

				       u32 *out_value)

{

	return of_property_read_u32_array(np, propname, out_value, 1);