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

diff --git a/MAINTAINERS b/MAINTAINERS
index c9c6324..0d2fcda 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>

diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 80baa53..d64c5a4 100644 (file)
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -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>
 

diff --git a/drivers/of/address.c b/drivers/of/address.c
index da1f4b9..72c33fb 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -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);

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 02ed367..3ff22e3 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -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);

diff --git a/include/linux/of.h b/include/linux/of.h
index bd716f8..0085bb0 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -196,12 +196,13 @@ 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,
-                                       const char **out_string);
+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 *);
 extern int of_device_is_available(const struct device_node *device);
@@ -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);