Merge tag 'armsoc-platforms' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux.git] / scripts / dtc / dtc.h

diff --git a/scripts/dtc/dtc.h b/scripts/dtc/dtc.h
index c6f125c68ba8d100e7f1250f18462d5affd67e1d..fc24e17510fde472ebf10d88c7fb008b4eb1aab6 100644 (file)
--- a/scripts/dtc/dtc.h
+++ b/scripts/dtc/dtc.h
@@ -43,7 +43,6 @@
 #define debug(...)
 #endif
 
-
 #define DEFAULT_FDT_VERSION    17
 
 /*
@@ -114,7 +113,7 @@ struct data data_insert_at_marker(struct data d, struct marker *m,
 struct data data_merge(struct data d1, struct data d2);
 struct data data_append_cell(struct data d, cell_t word);
 struct data data_append_integer(struct data d, uint64_t word, int bits);
-struct data data_append_re(struct data d, const struct fdt_reserve_entry *re);
+struct data data_append_re(struct data d, uint64_t address, uint64_t size);
 struct data data_append_addr(struct data d, uint64_t addr);
 struct data data_append_byte(struct data d, uint8_t byte);
 struct data data_append_zeroes(struct data d, int len);
@@ -136,6 +135,10 @@ struct label {
        struct label *next;
 };
 
+struct bus_type {
+       const char *name;
+};
+
 struct property {
        bool deleted;
        char *name;
@@ -162,6 +165,7 @@ struct node {
        int addr_cells, size_cells;
 
        struct label *labels;
+       const struct bus_type *bus;
 };
 
 #define for_each_label_withdel(l0, l) \
@@ -227,7 +231,7 @@ uint32_t guess_boot_cpuid(struct node *tree);
 /* Boot info (tree plus memreserve information */
 
 struct reserve_info {
-       struct fdt_reserve_entry re;
+       uint64_t address, size;
 
        struct reserve_info *next;
 
@@ -246,6 +250,7 @@ struct dt_info {
        struct reserve_info *reservelist;
        uint32_t boot_cpuid_phys;
        struct node *dt;                /* the device tree */
+       const char *outname;            /* filename being written to, "-" for stdout */
 };
 
 /* DTS version flags definitions */