diff options
-rw-r--r-- | commands/of_overlay.c | 43 | ||||
-rw-r--r-- | drivers/i2c/i2c.c | 24 | ||||
-rw-r--r-- | drivers/of/platform.c | 12 | ||||
-rw-r--r-- | drivers/spi/spi.c | 29 | ||||
-rw-r--r-- | include/driver.h | 6 | ||||
-rw-r--r-- | scripts/Makefile.build | 2 | ||||
-rw-r--r-- | scripts/Makefile.lib | 10 | ||||
-rwxr-xr-x | scripts/gen-dtbo-s | 14 |
8 files changed, 108 insertions, 32 deletions
diff --git a/commands/of_overlay.c b/commands/of_overlay.c index b3660b4bf1..37d29b88e5 100644 --- a/commands/of_overlay.c +++ b/commands/of_overlay.c @@ -17,10 +17,25 @@ static int do_of_overlay(int argc, char *argv[]) struct fdt_header *fdt; struct device_node *overlay; size_t size; + bool live_tree = false; + int opt; - if (argc != 2) + while ((opt = getopt(argc, argv, "l")) > 0) { + switch (opt) { + case 'l': + live_tree = true; + break; + } + } + + if (argc != optind + 1) return COMMAND_ERROR_USAGE; + if (live_tree && !IS_ENABLED(CONFIG_OF_OVERLAY_LIVE)) { + printf("Support for live tree overlays is disabled. Enable CONFIG_OF_OVERLAY_LIVE\n"); + return 1; + } + fdt = read_file(argv[optind], &size); if (!fdt) { printf("cannot read %s\n", argv[optind]); @@ -32,7 +47,14 @@ static int do_of_overlay(int argc, char *argv[]) if (IS_ERR(overlay)) return PTR_ERR(overlay); - ret = of_register_overlay(overlay); + if (live_tree) { + ret = of_overlay_apply_tree(of_get_root_node(), overlay); + if (!ret) + ret = of_probe(); + } else { + ret = of_register_overlay(overlay); + } + if (ret) { printf("cannot apply oftree overlay: %s\n", strerror(-ret)); goto err; @@ -45,9 +67,22 @@ err: return ret; } +BAREBOX_CMD_HELP_START(of_overlay) +BAREBOX_CMD_HELP_TEXT("Register a device tree overlay file (dtbo) with barebox.") +BAREBOX_CMD_HELP_TEXT("By default the overlay is registered as a fixup and the") +BAREBOX_CMD_HELP_TEXT("overlay will then be applied to the Linux device tree.") +BAREBOX_CMD_HELP_TEXT("With -l given the overlay is applied to the barebox live") +BAREBOX_CMD_HELP_TEXT("tree instead. This involves probing new devices added in") +BAREBOX_CMD_HELP_TEXT("the overlay file.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-l", "apply to barebox live tree") +BAREBOX_CMD_HELP_END + BAREBOX_CMD_START(of_overlay) .cmd = do_of_overlay, - BAREBOX_CMD_DESC("register device tree overlay as fixup") - BAREBOX_CMD_OPTS("FILE") + BAREBOX_CMD_DESC("register device tree overlay") + BAREBOX_CMD_OPTS("[-l] FILE") BAREBOX_CMD_GROUP(CMD_GRP_MISC) + BAREBOX_CMD_HELP(cmd_of_overlay_help) BAREBOX_CMD_END diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c index efcad29342..4c7b7008ce 100644 --- a/drivers/i2c/i2c.c +++ b/drivers/i2c/i2c.c @@ -420,6 +420,10 @@ static void of_i2c_register_devices(struct i2c_adapter *adap) { struct device_node *n; + /* Only register child devices if the adapter has a node pointer set */ + if (!IS_ENABLED(CONFIG_OFDEVICE) || !adap->dev.of_node) + return; + for_each_available_child_of_node(adap->dev.of_node, n) { struct i2c_board_info info = {}; struct i2c_client *result; @@ -471,15 +475,7 @@ int of_i2c_register_devices_by_node(struct device_node *node) return 0; } -static int i2c_bus_detect(struct device *dev) -{ - struct i2c_adapter *adap = container_of(dev, struct i2c_adapter, dev); - - of_i2c_register_devices(adap); - return 0; -} - -static int i2c_hw_detect(struct device *dev) +static void i2c_hw_rescan(struct device *dev) { struct i2c_adapter *adap; @@ -489,8 +485,6 @@ static int i2c_hw_detect(struct device *dev) of_i2c_register_devices(adap); break; } - - return 0; } /** @@ -720,7 +714,6 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adapter) } adapter->dev.id = adapter->nr; - adapter->dev.detect = i2c_bus_detect; dev_set_name(&adapter->dev, "i2c"); ret = register_device(&adapter->dev); @@ -732,11 +725,12 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adapter) /* populate children from any i2c device tables */ scan_boardinfo(adapter); + of_i2c_register_devices(adapter); + hw_dev = adapter->dev.parent; if (hw_dev && dev_of_node(hw_dev)) { - if (!hw_dev->detect) - hw_dev->detect = i2c_hw_detect; - i2c_hw_detect(hw_dev); + if (!hw_dev->rescan) + hw_dev->rescan = i2c_hw_rescan; } return 0; diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 0982873446..683a7821ad 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -153,8 +153,10 @@ struct device *of_platform_device_create(struct device_node *np, * Linux uses the OF_POPULATED flag to skip already populated/created * devices. */ - if (np->dev) + if (np->dev) { + device_rescan(np->dev); return np->dev; + } /* count the io resources */ if (of_can_translate_address(np)) @@ -414,17 +416,13 @@ static struct device *of_device_create_on_demand(struct device_node *np) { struct device_node *parent; struct device *parent_dev, *dev; - int ret; parent = of_get_parent(np); if (!parent) return of_platform_device_create_root(np); - if (!np->dev && parent->dev) { - ret = device_detect(parent->dev); - if (ret && ret != -ENOSYS) - return ERR_PTR(ret); - } + if (!np->dev && parent->dev) + device_rescan(parent->dev); if (!np->dev) pr_debug("Creating device for %s\n", np->full_name); diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index d6f939e51c..584d4ab777 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -29,6 +29,7 @@ struct boardinfo { }; static LIST_HEAD(board_list); +static LIST_HEAD(spi_controller_list); /** * spi_new_device - instantiate one new SPI device @@ -108,7 +109,6 @@ EXPORT_SYMBOL(spi_new_device); static void spi_of_register_slaves(struct spi_controller *ctrl) { struct device_node *n; - struct spi_board_info chip; struct property *reg; struct device_node *node = ctrl->dev->of_node; @@ -119,7 +119,14 @@ static void spi_of_register_slaves(struct spi_controller *ctrl) return; for_each_available_child_of_node(node, n) { - memset(&chip, 0, sizeof(chip)); + struct spi_board_info chip = {}; + + if (n->dev) { + dev_dbg(ctrl->dev, "skipping already registered %s\n", + dev_name(n->dev)); + continue; + } + chip.name = xstrdup(n->name); chip.bus_num = ctrl->bus_num; /* Mode (clock phase/polarity/etc.) */ @@ -138,7 +145,18 @@ static void spi_of_register_slaves(struct spi_controller *ctrl) continue; chip.chip_select = of_read_number(reg->value, 1); chip.device_node = n; - spi_register_board_info(&chip, 1); + spi_new_device(ctrl, &chip); + } +} + +static void spi_controller_rescan(struct device *dev) +{ + struct spi_controller *ctrl; + + list_for_each_entry(ctrl, &spi_controller_list, list) { + if (ctrl->dev != dev) + continue; + spi_of_register_slaves(ctrl); } } @@ -196,8 +214,6 @@ static void scan_boardinfo(struct spi_controller *ctrl) } } -static LIST_HEAD(spi_controller_list); - static int spi_controller_check_ops(struct spi_controller *ctlr) { /* @@ -274,6 +290,9 @@ int spi_register_controller(struct spi_controller *ctrl) scan_boardinfo(ctrl); status = 0; + if (!ctrl->dev->rescan) + ctrl->dev->rescan = spi_controller_rescan; + return status; } EXPORT_SYMBOL(spi_register_controller); diff --git a/include/driver.h b/include/driver.h index f53668711b..2cf0190699 100644 --- a/include/driver.h +++ b/include/driver.h @@ -91,6 +91,7 @@ struct device { * when the driver should actually detect client devices */ int (*detect) (struct device *); + void (*rescan) (struct device *); /* * if a driver probe is deferred, this stores the last error @@ -158,6 +159,11 @@ static inline void put_device(struct device *dev) {} void free_device_res(struct device *dev); void free_device(struct device *dev); +static inline void device_rescan(struct device *dev) +{ + if (dev->rescan) + dev->rescan(dev); +} /* Iterate over a devices children */ diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 216f03677b..25347eee01 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -258,11 +258,13 @@ intermediate_targets = $(foreach sfx, $(2), \ $(filter %$(strip $(1)), $(targets)))) # %.asn1.o <- %.asn1.[ch] <- %.asn1 # %.dtb.o <- %.dtb.S <- %.dtb <- %.dts +# %.dtbo.o <- %.dtbo.S <- %.dtbo <- %.dtso # %.dtb.pbl.o <- %.dtb.S <- %.dtb <- %.dts (Barebox only) # %.lex.o <- %.lex.c <- %.l # %.tab.o <- %.tab.[ch] <- %.y targets += $(call intermediate_targets, .asn1.o, .asn1.c .asn1.h) \ $(call intermediate_targets, .dtb.o, .dtb.S .dtb.z .dtb) \ + $(call intermediate_targets, .dtbo.o, .dtbo.S .dtbo.z .dtbo) \ $(call intermediate_targets, .dtb.pbl.o, .dtb.S .dtb.z .dtb) \ $(call intermediate_targets, .lex.o, .lex.c) \ $(call intermediate_targets, .tab.o, .tab.c .tab.h) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 4da5bb4ee7..4deaa5dfa7 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -361,13 +361,18 @@ cmd_dt_S_dtb = $(srctree)/scripts/gen-dtb-s $(subst -,_,$(*F)) $< $(CONFIG_IMD) $(obj)/%.dtb.S: $(obj)/%.dtb $(obj)/%.dtb.z $(srctree)/scripts/gen-dtb-s FORCE $(call if_changed,dt_S_dtb) +quiet_cmd_dt_S_dtbo = DTBO $@ +cmd_dt_S_dtbo = $(srctree)/scripts/gen-dtbo-s $(subst -,_,$(*F)) $< > $@ +$(obj)/%.dtbo.S: $(obj)/%.dtbo $(srctree)/scripts/gen-dtbo-s FORCE + $(call if_changed,dt_S_dtbo) + $(obj)/%.dtb.z: $(obj)/%.dtb FORCE $(call if_changed,$(suffix_y)) dts-frags = $(subst $(quote),,$(CONFIG_EXTERNAL_DTS_FRAGMENTS)) quiet_cmd_dtc = DTC $@ # For compatibility between make 4.2 and 4.3 -cmd_dtc = /usr/bin/env echo -e '$(pound)define $(subst -,_,$(*F))_dts 1\n'$(foreach f,$< $(dts-frags),'$(pound)include "$(f)"\n') | \ +cmd_dtc = /usr/bin/env echo -e '$(pound)define $(subst -,_,$(*F))_dts 1\n'$(foreach f,$< $(2),'$(pound)include "$(f)"\n') | \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \ $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \ -i $(srctree)/arch/$(SRCARCH)/dts $(DTC_FLAGS) \ @@ -376,6 +381,9 @@ cmd_dtc = /usr/bin/env echo -e '$(pound)define $(subst -,_,$(*F))_dts 1\n'$(fore cat $(depfile).pre $(depfile).dtc > $(depfile) $(obj)/%.dtb: $(src)/%.dts FORCE + $(call if_changed_dep,dtc,$(dts-frags)) + +$(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE $(call if_changed_dep,dtc) dtc-tmp = $(subst $(comma),_,$(dot-target).dts) diff --git a/scripts/gen-dtbo-s b/scripts/gen-dtbo-s new file mode 100755 index 0000000000..06f78609ed --- /dev/null +++ b/scripts/gen-dtbo-s @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +name=$1 +dtbo=$2 + +echo "#include <asm/barebox.lds.h>" + +echo ".section .dtb.rodata.${name}_dtbo,\"a\"" +echo ".balign STRUCT_ALIGNMENT" +echo ".global __dtbo_${name}_start" +echo "__dtbo_${name}_start:" +echo ".incbin \"$dtbo\"" +echo "__dtbo_${name}_end:" +echo ".global __dtbo_${name}_end" |