Merge tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux

Pull devicetree updates from Rob Herring:
 - Import of latest upstream device tree compiler (dtc)
 - New function of_get_child_by_name
 - Support for #size-cells of 0 and #addr-cells of >2
 - Couple of DT binding documentation updates

Fix up trivial conflicts due to of_get_child_by_name() having been added
next to the new of_get_next_available_child().

* tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux:
  MAINTAINERS: add scripts/dtc under Devicetree maintainers
  dtc: import latest upstream dtc
  dt: Document general interrupt controller bindings
  dt/s3c64xx/spi: Use of_get_child_by_name to get a named child
  dt: introduce of_get_child_by_name to get child node by name
  of: i2c: add support for wakeup-source property
  of/address: Handle #address-cells > 2 specially
  DT: export of_irq_to_resource_table()
  devicetree: serial: Add documentation for imx serial
  devicetree: pwm: mxs-pwm.txt: Fix reg field annotation
  of: Allow busses with #size-cells=0

30 files changed, 3847 insertions, 701 deletions

diff --git a/scripts/dtc/Makefile.dtc b/scripts/dtc/Makefile.dtc
index 6ddf9ecac669..bece49b35535 100644
--- a/scripts/dtc/Makefile.dtc
+++ b/scripts/dtc/Makefile.dtc
@@ -3,7 +3,16 @@
 # This is not a complete Makefile of itself.  Instead, it is designed to
 # be easily embeddable into other systems of Makefiles.
 #
-DTC_SRCS = dtc.c flattree.c fstree.c data.c livetree.c treesource.c srcpos.c \
-        checks.c
+DTC_SRCS = \
+        checks.c \
+        data.c \
+        dtc.c \
+        flattree.c \
+        fstree.c \
+        livetree.c \
+        srcpos.c \
+        treesource.c \
+        util.c
+
 DTC_GEN_SRCS = dtc-lexer.lex.c dtc-parser.tab.c
 DTC_OBJS = $(DTC_SRCS:%.c=%.o) $(DTC_GEN_SRCS:%.c=%.o)
diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
index a662a0044798..ee96a2519eff 100644
--- a/scripts/dtc/checks.c
+++ b/scripts/dtc/checks.c
@@ -31,12 +31,6 @@
 #define TRACE(c, fmt, ...)      do { } while (0)
 #endif
 
-enum checklevel {
-        IGNORE = 0,
-        WARN = 1,
-        ERROR = 2,
-};
-
 enum checkstatus {
         UNCHECKED = 0,
         PREREQ,
@@ -57,14 +51,14 @@ struct check {
         node_check_fn node_fn;
         prop_check_fn prop_fn;
         void *data;
-        enum checklevel level;
+        bool warn, error;
         enum checkstatus status;
         int inprogress;
         int num_prereqs;
         struct check **prereq;
 };
 
-#define CHECK(nm, tfn, nfn, pfn, d, lvl, ...) \
+#define CHECK_ENTRY(nm, tfn, nfn, pfn, d, w, e, ...)           \
         static struct check *nm##_prereqs[] = { __VA_ARGS__ }; \
         static struct check nm = { \
                 .name = #nm, \
@@ -72,20 +66,37 @@ struct check {
                 .node_fn = (nfn), \
                 .prop_fn = (pfn), \
                 .data = (d), \
-                .level = (lvl), \
+                .warn = (w), \
+                .error = (e), \
                 .status = UNCHECKED, \
                 .num_prereqs = ARRAY_SIZE(nm##_prereqs), \
                 .prereq = nm##_prereqs, \
         };
-
-#define TREE_CHECK(nm, d, lvl, ...) \
-        CHECK(nm, check_##nm, NULL, NULL, d, lvl, __VA_ARGS__)
-#define NODE_CHECK(nm, d, lvl, ...) \
-        CHECK(nm, NULL, check_##nm, NULL, d, lvl, __VA_ARGS__)
-#define PROP_CHECK(nm, d, lvl, ...) \
-        CHECK(nm, NULL, NULL, check_##nm, d, lvl, __VA_ARGS__)
-#define BATCH_CHECK(nm, lvl, ...) \
-        CHECK(nm, NULL, NULL, NULL, NULL, lvl, __VA_ARGS__)
+#define WARNING(nm, tfn, nfn, pfn, d, ...) \
+        CHECK_ENTRY(nm, tfn, nfn, pfn, d, true, false, __VA_ARGS__)
+#define ERROR(nm, tfn, nfn, pfn, d, ...) \
+        CHECK_ENTRY(nm, tfn, nfn, pfn, d, false, true, __VA_ARGS__)
+#define CHECK(nm, tfn, nfn, pfn, d, ...) \
+        CHECK_ENTRY(nm, tfn, nfn, pfn, d, false, false, __VA_ARGS__)
+
+#define TREE_WARNING(nm, d, ...) \
+        WARNING(nm, check_##nm, NULL, NULL, d, __VA_ARGS__)
+#define TREE_ERROR(nm, d, ...) \
+        ERROR(nm, check_##nm, NULL, NULL, d, __VA_ARGS__)
+#define TREE_CHECK(nm, d, ...) \
+        CHECK(nm, check_##nm, NULL, NULL, d, __VA_ARGS__)
+#define NODE_WARNING(nm, d, ...) \
+        WARNING(nm, NULL, check_##nm, NULL, d,  __VA_ARGS__)
+#define NODE_ERROR(nm, d, ...) \
+        ERROR(nm, NULL, check_##nm, NULL, d, __VA_ARGS__)
+#define NODE_CHECK(nm, d, ...) \
+        CHECK(nm, NULL, check_##nm, NULL, d, __VA_ARGS__)
+#define PROP_WARNING(nm, d, ...) \
+        WARNING(nm, NULL, NULL, check_##nm, d, __VA_ARGS__)
+#define PROP_ERROR(nm, d, ...) \
+        ERROR(nm, NULL, NULL, check_##nm, d, __VA_ARGS__)
+#define PROP_CHECK(nm, d, ...) \
+        CHECK(nm, NULL, NULL, check_##nm, d, __VA_ARGS__)
 
 #ifdef __GNUC__
 static inline void check_msg(struct check *c, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
@@ -95,13 +106,13 @@ static inline void check_msg(struct check *c, const char *fmt, ...)
         va_list ap;
         va_start(ap, fmt);
 
-        if ((c->level < WARN) || (c->level <= quiet))
-                return; /* Suppress message */
-
-        fprintf(stderr, "%s (%s): ",
-                (c->level == ERROR) ? "ERROR" : "Warning", c->name);
-        vfprintf(stderr, fmt, ap);
-        fprintf(stderr, "\n");
+        if ((c->warn && (quiet < 1))
+            || (c->error && (quiet < 2))) {
+                fprintf(stderr, "%s (%s): ",
+                        (c->error) ? "ERROR" : "Warning", c->name);
+                vfprintf(stderr, fmt, ap);
+                fprintf(stderr, "\n");
+        }
 }
 
 #define FAIL(c, ...) \
@@ -167,7 +178,7 @@ static int run_check(struct check *c, struct node *dt)
 
 out:
         c->inprogress = 0;
-        if ((c->status != PASSED) && (c->level == ERROR))
+        if ((c->status != PASSED) && (c->error))
                 error = 1;
         return error;
 }