Merge git://git.denx.de/u-boot-dm

[people/ms/u-boot.git] / include / dm / root.h

diff --git a/include/dm/root.h b/include/dm/root.h
index 3cf730dcee1cb50e9aa5ba3376ae48fc97603cdb..b075eef2c1a45ce5cca12b690eb11e2a32e9702c 100644 (file)
--- a/include/dm/root.h
+++ b/include/dm/root.h
@@ -56,20 +56,18 @@ int dm_scan_platdata(bool pre_reloc_only);
 int dm_scan_fdt(const void *blob, bool pre_reloc_only);
 
 /**
- * dm_scan_fdt_node() - Scan the device tree and bind drivers for a node
+ * dm_extended_scan_fdt() - Scan the device tree and bind drivers
  *
- * This scans the subnodes of a device tree node and and creates a driver
- * for each one.
+ * This calls dm_scna_dft() which scans the device tree and creates a driver
+ * for each node. the top-level subnodes are examined and also all sub-nodes
+ * of "clocks" node.
  *
- * @parent: Parent device for the devices that will be created
  * @blob: Pointer to device tree blob
- * @offset: Offset of node to scan
  * @pre_reloc_only: If true, bind only drivers with the DM_FLAG_PRE_RELOC
  * flag. If false bind all drivers.
  * @return 0 if OK, -ve on error
  */
-int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset,
-                    bool pre_reloc_only);
+int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only);
 
 /**
  * dm_scan_other() - Scan for other devices
@@ -103,9 +101,10 @@ int dm_init_and_scan(bool pre_reloc_only);
  * This function will initialize roots of driver tree and class tree.
  * This needs to be called before anything uses the DM
  *
+ * @of_live:   Enable live device tree
  * @return 0 if OK, -ve on error
  */
-int dm_init(void);
+int dm_init(bool of_live);
 
 /**
  * dm_uninit - Uninitialise Driver Model structures
@@ -115,4 +114,20 @@ int dm_init(void);
  */
 int dm_uninit(void);
 
+#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
+/**
+ * dm_remove_devices_flags - Call remove function of all drivers with
+ *                           specific removal flags set to selectively
+ *                           remove drivers
+ *
+ * All devices with the matching flags set will be removed
+ *
+ * @flags: Flags for selective device removal
+ * @return 0 if OK, -ve on error
+ */
+int dm_remove_devices_flags(uint flags);
+#else
+static inline int dm_remove_devices_flags(uint flags) { return 0; }
+#endif
+
 #endif