diff options
| -rw-r--r-- | arch/arm/boards/at91sam9x5ek/hw_version.c | 31 | ||||
| -rw-r--r-- | arch/arm/boards/highbank/init.c | 33 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc5xxx/cpu.c | 26 | ||||
| -rw-r--r-- | common/memory.c | 48 | ||||
| -rw-r--r-- | common/oftree.c | 70 | ||||
| -rw-r--r-- | include/of.h | 6 |
6 files changed, 94 insertions, 120 deletions
diff --git a/arch/arm/boards/at91sam9x5ek/hw_version.c b/arch/arm/boards/at91sam9x5ek/hw_version.c index 47c640a35f..2695faa973 100644 --- a/arch/arm/boards/at91sam9x5ek/hw_version.c +++ b/arch/arm/boards/at91sam9x5ek/hw_version.c @@ -232,26 +232,25 @@ static void at91sam9x5ek_devices_detect_one(const char *name) #define NODE_NAME_LEN 128 -static int cm_cogent_fixup(struct fdt_header *fdt) +static int cm_cogent_fixup(struct device_node *root) { - int off, ret; - char node_name[NODE_NAME_LEN]; + int ret; + struct device_node *node; - off = fdt_node_offset_by_compatible(fdt, -1, "atmel,hsmci"); + of_tree_for_each_node(node, root) { + struct device_node *slotnode; - while (off != -FDT_ERR_NOTFOUND) { - off = fdt_subnode_offset(fdt, off, "slot"); - fdt_get_path(fdt, off, node_name, NODE_NAME_LEN); - ret = fdt_setprop(fdt, off, "broken-cd", NULL, 0); - if (ret < 0) { - pr_err("error %d while adding broken-cd property to node %s\n", - ret, node_name); - return ret; - } else { - pr_debug("add broken-cd property to node %s\n", node_name); - } + if (!of_device_is_compatible(node, "atmel,hsmci")) + continue; - off = fdt_node_offset_by_compatible(fdt, off, "atmel,hsmci"); + slotnode = of_find_child_by_name(node, "slot"); + if (!slotnode) + continue; + + ret = of_set_property(slotnode, "broken-cd", NULL, 0, 1); + if (ret) + pr_err("error %d while adding broken-cd property to node %s\n", + ret, slotnode->name); } return 0; diff --git a/arch/arm/boards/highbank/init.c b/arch/arm/boards/highbank/init.c index a689b6a102..bd32c1d7f9 100644 --- a/arch/arm/boards/highbank/init.c +++ b/arch/arm/boards/highbank/init.c @@ -25,8 +25,9 @@ struct fdt_header *fdt = NULL; -static int hb_fixup(struct fdt_header *fdt) +static int hb_fixup(struct device_node *root) { + struct device_node *node; u32 reg = readl(sregs_base + HB_SREG_A9_PWRDOM_DATA); u32 *opp_table = (u32 *)HB_SYSRAM_OPP_TABLE_BASE; u32 dtb_table[2*10]; @@ -34,17 +35,29 @@ static int hb_fixup(struct fdt_header *fdt) u32 num_opps; __be32 latency; - if (!(reg & HB_PWRDOM_STAT_SATA)) - do_fixup_by_compatible_string(fdt, "calxeda,hb-ahci", "status", - "disabled", 1); + if (!(reg & HB_PWRDOM_STAT_SATA)) { + of_tree_for_each_node(node, root) { + if (of_device_is_compatible(node, "calxeda,hb-ahci")) + of_set_property(node, "status", "disabled", + sizeof("disabled"), 1); + } + } - if (!(reg & HB_PWRDOM_STAT_EMMC)) - do_fixup_by_compatible_string(fdt, "calxeda,hb-sdhci", "status", - "disabled", 1); + if (!(reg & HB_PWRDOM_STAT_EMMC)) { + of_tree_for_each_node(node, root) { + if (of_device_is_compatible(node, "calxeda,hb-sdhci")) + of_set_property(node, "status", "disabled", + sizeof("disabled"), 1); + } + } if ((opp_table[0] >> 16) != HB_OPP_VERSION) return 0; + node = of_find_node_by_path(root, "/cpus/cpu@0"); + if (!node) + return 0; + num_opps = opp_table[0] & 0xff; for (i = 0; i < num_opps; i++) { @@ -54,10 +67,8 @@ static int hb_fixup(struct fdt_header *fdt) latency = cpu_to_be32(opp_table[1]); - fdt_find_and_setprop(fdt, "/cpus/cpu@0", "transition-latency", - &latency, 4, 1); - fdt_find_and_setprop(fdt, "/cpus/cpu@0", "operating-points", - dtb_table, 8 * num_opps, 1); + of_set_property(node, "transition-latency", &latency, 4, 1); + of_set_property(node, "operating-points", dtb_table, 8 * num_opps, 1); return 0; } diff --git a/arch/ppc/mach-mpc5xxx/cpu.c b/arch/ppc/mach-mpc5xxx/cpu.c index 5bbd49ab9f..99f16ebf1d 100644 --- a/arch/ppc/mach-mpc5xxx/cpu.c +++ b/arch/ppc/mach-mpc5xxx/cpu.c @@ -77,17 +77,27 @@ void __noreturn reset_cpu (unsigned long addr) /* ------------------------------------------------------------------------- */ #ifdef CONFIG_OFTREE -static int of_mpc5200_fixup(struct fdt_header *fdt) +static int of_mpc5200_fixup(struct device_node *root) { - char *cpu_path = "/cpus/PowerPC,5200@0"; + struct device_node *node; + int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4; - do_fixup_by_path_u32(fdt, cpu_path, "timebase-frequency", get_timebase_clock(), 1); - do_fixup_by_path_u32(fdt, cpu_path, "bus-frequency", get_bus_clock(), 1); - do_fixup_by_path_u32(fdt, cpu_path, "clock-frequency", get_cpu_clock(), 1); - do_fixup_by_path_u32(fdt, "/soc5200@f0000000", "bus-frequency", get_ipb_clock(), 1); - do_fixup_by_path_u32(fdt, "/soc5200@f0000000", "system-frequency", - get_bus_clock() * div, 1); + node = of_find_node_by_path(root, "/cpus/PowerPC,5200@0"); + if (!node) + return -EINVAL; + + of_property_write_u32(node, "timebase-frequency", get_timebase_clock()); + of_property_write_u32(node, "bus-frequency", get_bus_clock()); + of_property_write_u32(node, "clock-frequency", get_cpu_clock()); + + node = of_find_node_by_path(root, "/soc5200@f0000000"); + if (!node) + return -EINVAL; + + of_property_write_u32(node, "bus-frequency", get_ipb_clock()); + of_property_write_u32(node, "system-frequency", get_bus_clock() * div); + return 0; } diff --git a/common/memory.c b/common/memory.c index 81641f0527..1d2e3a322c 100644 --- a/common/memory.c +++ b/common/memory.c @@ -165,22 +165,6 @@ int release_sdram_region(struct resource *res) #ifdef CONFIG_OFTREE /* - * Get cells len in bytes - * if #NNNN-cells property is 2 then len is 8 - * otherwise len is 4 - */ -static int get_cells_len(struct fdt_header *fdt, char *nr_cells_name) -{ - const u32 *cell; - - cell = fdt_getprop(fdt, 0, nr_cells_name, NULL); - if (cell && *cell == 2) - return 8; - - return 4; -} - -/* * Write a 4 or 8 byte big endian cell */ static void write_cell(u8 *addr, u64 val, int size) @@ -193,28 +177,24 @@ static void write_cell(u8 *addr, u64 val, int size) } } -static int of_memory_fixup(struct fdt_header *fdt) +static int of_memory_fixup(struct device_node *node) { struct memory_bank *bank; - int err, nodeoffset; + int err; int addr_cell_len, size_cell_len, len = 0; + struct device_node *memnode; u8 tmp[16 * 16]; /* Up to 64-bit address + 64-bit size */ - /* update, or add and update /memory node */ - nodeoffset = fdt_get_path_or_create(fdt, "/memory"); - if (nodeoffset < 0) - return nodeoffset; + memnode = of_create_node(node, "/memory"); + if (!memnode) + return -ENOMEM; - err = fdt_setprop(fdt, nodeoffset, "device_type", "memory", - sizeof("memory")); - if (err < 0) { - printf("WARNING: could not set %s %s.\n", "device_type", - fdt_strerror(err)); + err = of_set_property(memnode, "device_type", "memory", sizeof("memory"), 1); + if (err) return err; - } - addr_cell_len = get_cells_len(fdt, "#address-cells"); - size_cell_len = get_cells_len(fdt, "#size-cells"); + addr_cell_len = of_n_addr_cells(memnode) * 4; + size_cell_len = of_n_size_cells(memnode) * 4; for_each_memory_bank(bank) { write_cell(tmp + len, bank->start, addr_cell_len); @@ -223,12 +203,12 @@ static int of_memory_fixup(struct fdt_header *fdt) len += size_cell_len; } - err = fdt_setprop(fdt, nodeoffset, "reg", tmp, len); - if (err < 0) { - printf("WARNING: could not set %s %s.\n", - "reg", fdt_strerror(err)); + err = of_set_property(memnode, "reg", tmp, len, 1); + if (err) { + pr_err("could not set reg %s.\n", strerror(-err)); return err; } + return 0; } diff --git a/common/oftree.c b/common/oftree.c index be9eb28b63..44ffadec3f 100644 --- a/common/oftree.c +++ b/common/oftree.c @@ -339,26 +339,24 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force) return 0; } -static int of_fixup_bootargs(struct fdt_header *fdt) +static int of_fixup_bootargs(struct device_node *root) { - int nodeoffset; + struct device_node *node; const char *str; int err; - nodeoffset = fdt_get_path_or_create(fdt, "/chosen"); - if (nodeoffset < 0) - return nodeoffset; - str = linux_bootargs_get(); - if (str) { - err = fdt_setprop(fdt, nodeoffset, - "bootargs", str, strlen(str)+1); - if (err < 0) - printf("WARNING: could not set bootargs %s.\n", - fdt_strerror(err)); - } + if (!str) + return 0; - return 0; + node = of_create_node(root, "/chosen"); + if (!node) + return -ENOMEM; + + + err = of_set_property(node, "bootargs", str, strlen(str) + 1, 1); + + return err; } static int of_register_bootargs_fixup(void) @@ -368,13 +366,13 @@ static int of_register_bootargs_fixup(void) late_initcall(of_register_bootargs_fixup); struct of_fixup { - int (*fixup)(struct fdt_header *); + int (*fixup)(struct device_node *); struct list_head list; }; static LIST_HEAD(of_fixup_list); -int of_register_fixup(int (*fixup)(struct fdt_header *)) +int of_register_fixup(int (*fixup)(struct device_node *)) { struct of_fixup *of_fixup = xzalloc(sizeof(*of_fixup)); @@ -389,13 +387,13 @@ int of_register_fixup(int (*fixup)(struct fdt_header *)) * Apply registered fixups for the given fdt. The fdt must have * enough free space to apply the fixups. */ -int of_fix_tree(struct fdt_header *fdt) +int of_fix_tree(struct device_node *node) { struct of_fixup *of_fixup; int ret; list_for_each_entry(of_fixup, &of_fixup_list, list) { - ret = of_fixup->fixup(fdt); + ret = of_fixup->fixup(node); if (ret) return ret; } @@ -418,8 +416,6 @@ int of_fix_tree(struct fdt_header *fdt) struct fdt_header *of_get_fixed_tree(struct device_node *node) { int ret; - void *fixfdt, *internalfdt = NULL; - int size, align; struct fdt_header *fdt; if (!node) { @@ -428,35 +424,13 @@ struct fdt_header *of_get_fixed_tree(struct device_node *node) return NULL; } - fdt = internalfdt = of_flatten_dtb(node); - if (!fdt) - return NULL; - - size = fdt_totalsize(fdt); - - /* - * ARM Linux uses a single 1MiB section (with 1MiB alignment) - * for mapping the devicetree, so we are not allowed to cross - * 1MiB boundaries. - */ - align = 1 << fls(size + OFTREE_SIZE_INCREASE - 1); - - fixfdt = xmemalign(align, size + OFTREE_SIZE_INCREASE); - ret = fdt_open_into(fdt, fixfdt, size + OFTREE_SIZE_INCREASE); - - free(internalfdt); - + ret = of_fix_tree(node); if (ret) - goto out_free; - - ret = of_fix_tree(fixfdt); - if (ret) - goto out_free; - - return fixfdt; + return NULL; -out_free: - free(fixfdt); + fdt = of_flatten_dtb(node); + if (!fdt) + return NULL; - return NULL; + return fdt; } diff --git a/include/of.h b/include/of.h index 85adc80a97..ef6a4ce058 100644 --- a/include/of.h +++ b/include/of.h @@ -7,9 +7,6 @@ int fdt_print(struct fdt_header *working_fdt, const char *pathp); -int of_fix_tree(struct fdt_header *fdt); -int of_register_fixup(int (*fixup)(struct fdt_header *)); - int fdt_find_and_setprop(struct fdt_header *fdt, const char *node, const char *prop, const void *val, int len, int create); void do_fixup_by_path(struct fdt_header *fdt, const char *path, const char *prop, @@ -67,6 +64,9 @@ struct of_device_id { struct driver_d; +int of_fix_tree(struct device_node *); +int of_register_fixup(int (*fixup)(struct device_node *)); + int of_match(struct device_d *dev, struct driver_d *drv); int of_add_initrd(struct device_node *root, resource_size_t start, |