Patched in Tegra support.

1 files changed, 21 insertions, 55 deletions

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 0125524c08c..72c33fbe451 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -1,5 +1,4 @@
 
-#include <linux/device.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
@@ -9,13 +8,13 @@
 
 /* Max address size we deal with */
 #define OF_MAX_ADDR_CELLS       4
-#define OF_CHECK_ADDR_COUNT(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS)
-#define OF_CHECK_COUNTS(na, ns) (OF_CHECK_ADDR_COUNT(na) && (ns) > 0)
+#define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \
+                        (ns) > 0)
 
 static struct of_bus *of_match_bus(struct device_node *np);
 static int __of_address_to_resource(struct device_node *dev,
                 const __be32 *addrp, u64 size, unsigned int flags,
-                const char *name, struct resource *r);
+                                    struct resource *r);
 
 /* Debug utility */
 #ifdef DEBUG
@@ -37,9 +36,9 @@ struct of_bus {
         int             (*match)(struct device_node *parent);
         void            (*count_cells)(struct device_node *child,
                                        int *addrc, int *sizec);
-        u64             (*map)(__be32 *addr, const __be32 *range,
+        u64             (*map)(u32 *addr, const __be32 *range,
                                 int na, int ns, int pna);
-        int             (*translate)(__be32 *addr, u64 offset, int na);
+        int             (*translate)(u32 *addr, u64 offset, int na);
         unsigned int    (*get_flags)(const __be32 *addr);
 };
 
@@ -56,7 +55,7 @@ static void of_bus_default_count_cells(struct device_node *dev,
                 *sizec = of_n_size_cells(dev);
 }
 
-static u64 of_bus_default_map(__be32 *addr, const __be32 *range,
+static u64 of_bus_default_map(u32 *addr, const __be32 *range,
                 int na, int ns, int pna)
 {
         u64 cp, s, da;
@@ -69,20 +68,12 @@ static u64 of_bus_default_map(__be32 *addr, const __be32 *range,
                  (unsigned long long)cp, (unsigned long long)s,
                  (unsigned long long)da);
 
-        /*
-         * If the number of address cells is larger than 2 we assume the
-         * mapping doesn't specify a physical address. Rather, the address
-         * specifies an identifier that must match exactly.
-         */
-        if (na > 2 && memcmp(range, addr, na * 4) != 0)
-                return OF_BAD_ADDR;
-
         if (da < cp || da >= (cp + s))
                 return OF_BAD_ADDR;
         return da - cp;
 }
 
-static int of_bus_default_translate(__be32 *addr, u64 offset, int na)
+static int of_bus_default_translate(u32 *addr, u64 offset, int na)
 {
         u64 a = of_read_number(addr, na);
         memset(addr, 0, na * 4);
@@ -138,7 +129,7 @@ static unsigned int of_bus_pci_get_flags(const __be32 *addr)
         return flags;
 }
 
-static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns,
+static u64 of_bus_pci_map(u32 *addr, const __be32 *range, int na, int ns,
                 int pna)
 {
         u64 cp, s, da;
@@ -165,7 +156,7 @@ static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns,
         return da - cp;
 }
 
-static int of_bus_pci_translate(__be32 *addr, u64 offset, int na)
+static int of_bus_pci_translate(u32 *addr, u64 offset, int na)
 {
         return of_bus_default_translate(addr + 1, offset, na - 1);
 }
@@ -190,7 +181,7 @@ const __be32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size,
         }
         bus->count_cells(dev, &na, &ns);
         of_node_put(parent);
-        if (!OF_CHECK_ADDR_COUNT(na))
+        if (!OF_CHECK_COUNTS(na, ns))
                 return NULL;
 
         /* Get "reg" or "assigned-addresses" property */
@@ -224,7 +215,7 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,
         addrp = of_get_pci_address(dev, bar, &size, &flags);
         if (addrp == NULL)
                 return -EINVAL;
-        return __of_address_to_resource(dev, addrp, size, flags, NULL, r);
+        return __of_address_to_resource(dev, addrp, size, flags, r);
 }
 EXPORT_SYMBOL_GPL(of_pci_address_to_resource);
 #endif /* CONFIG_PCI */
@@ -247,7 +238,7 @@ static void of_bus_isa_count_cells(struct device_node *child,
                 *sizec = 1;
 }
 
-static u64 of_bus_isa_map(__be32 *addr, const __be32 *range, int na, int ns,
+static u64 of_bus_isa_map(u32 *addr, const __be32 *range, int na, int ns,
                 int pna)
 {
         u64 cp, s, da;
@@ -270,7 +261,7 @@ static u64 of_bus_isa_map(__be32 *addr, const __be32 *range, int na, int ns,
         return da - cp;
 }
 
-static int of_bus_isa_translate(__be32 *addr, u64 offset, int na)
+static int of_bus_isa_translate(u32 *addr, u64 offset, int na)
 {
         return of_bus_default_translate(addr + 1, offset, na - 1);
 }
@@ -338,7 +329,7 @@ static struct of_bus *of_match_bus(struct device_node *np)
 }
 
 static int of_translate_one(struct device_node *parent, struct of_bus *bus,
-                            struct of_bus *pbus, __be32 *addr,
+                            struct of_bus *pbus, u32 *addr,
                             int na, int ns, int pna, const char *rprop)
 {
         const __be32 *ranges;
@@ -409,12 +400,12 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
  * that can be mapped to a cpu physical address). This is not really specified
  * that way, but this is traditionally the way IBM at least do things
  */
-static u64 __of_translate_address(struct device_node *dev,
-                                  const __be32 *in_addr, const char *rprop)
+u64 __of_translate_address(struct device_node *dev, const __be32 *in_addr,
+                           const char *rprop)
 {
         struct device_node *parent = NULL;
         struct of_bus *bus, *pbus;
-        __be32 addr[OF_MAX_ADDR_CELLS];
+        u32 addr[OF_MAX_ADDR_CELLS];
         int na, ns, pna, pns;
         u64 result = OF_BAD_ADDR;
 
@@ -498,25 +489,6 @@ u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr)
 }
 EXPORT_SYMBOL(of_translate_dma_address);
 
-bool of_can_translate_address(struct device_node *dev)
-{
-        struct device_node *parent;
-        struct of_bus *bus;
-        int na, ns;
-
-        parent = of_get_parent(dev);
-        if (parent == NULL)
-                return false;
-
-        bus = of_match_bus(parent);
-        bus->count_cells(dev, &na, &ns);
-
-        of_node_put(parent);
-
-        return OF_CHECK_COUNTS(na, ns);
-}
-EXPORT_SYMBOL(of_can_translate_address);
-
 const __be32 *of_get_address(struct device_node *dev, int index, u64 *size,
                     unsigned int *flags)
 {
@@ -533,7 +505,7 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size,
         bus = of_match_bus(parent);
         bus->count_cells(dev, &na, &ns);
         of_node_put(parent);
-        if (!OF_CHECK_ADDR_COUNT(na))
+        if (!OF_CHECK_COUNTS(na, ns))
                 return NULL;
 
         /* Get "reg" or "assigned-addresses" property */
@@ -557,7 +529,7 @@ EXPORT_SYMBOL(of_get_address);
 
 static int __of_address_to_resource(struct device_node *dev,
                 const __be32 *addrp, u64 size, unsigned int flags,
-                const char *name, struct resource *r)
+                                    struct resource *r)
 {
         u64 taddr;
 
@@ -579,8 +551,7 @@ static int __of_address_to_resource(struct device_node *dev,
                 r->end = taddr + size - 1;
         }
         r->flags = flags;
-        r->name = name ? name : dev->full_name;
-
+        r->name = dev->full_name;
         return 0;
 }
 
@@ -598,16 +569,11 @@ int of_address_to_resource(struct device_node *dev, int index,
         const __be32    *addrp;
         u64             size;
         unsigned int    flags;
-        const char      *name = NULL;
 
         addrp = of_get_address(dev, index, &size, &flags);
         if (addrp == NULL)
                 return -EINVAL;
-
-        /* Get optional "reg-names" property to add a name to a resource */
-        of_property_read_string_index(dev, "reg-names", index, &name);
-
-        return __of_address_to_resource(dev, addrp, size, flags, name, r);
+        return __of_address_to_resource(dev, addrp, size, flags, r);
 }
 EXPORT_SYMBOL_GPL(of_address_to_resource);