Merge branch 'for-next/misc'

8 files changed, 24 insertions, 8 deletions

diff --git a/include/console_countdown.h b/include/console_countdown.h
new file mode 100644
index 0000000000..cb46964bc4
--- /dev/null
+++ b/include/console_countdown.h
@@ -0,0 +1,11 @@
+#ifndef __CONSOLE_COUNTDOWN_H
+#define __CONSOLE_COUNTDOWN_H
+
+#define CONSOLE_COUNTDOWN_SILENT (1 << 0)
+#define CONSOLE_COUNTDOWN_ANYKEY (1 << 1)
+#define CONSOLE_COUNTDOWN_RETURN (1 << 3)
+#define CONSOLE_COUNTDOWN_CTRLC (1 << 4)
+
+int console_countdown(int timeout_s, unsigned flags, char *out_key);
+
+#endif /* __CONSOLE_COUNTDOWN_H */
diff --git a/include/driver.h b/include/driver.h
index 0ee3b4554f..1745717315 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -77,7 +77,7 @@ struct device_d {
 
 	struct list_head cdevs;
 
-	struct platform_device_id *id_entry;
+	const struct platform_device_id *id_entry;
 	struct device_node *device_node;
 
 	const struct of_device_id *of_id_entry;
@@ -107,8 +107,8 @@ struct driver_d {
 
 	struct bus_type *bus;
 
-	struct platform_device_id *id_table;
-	struct of_device_id *of_compatible;
+	const struct platform_device_id *id_table;
+	const struct of_device_id *of_compatible;
 };
 
 /*@}*/	/* do not delete, doxygen relevant */
diff --git a/include/fdt.h b/include/fdt.h
index 35278e3030..1ccd4c6734 100644
--- a/include/fdt.h
+++ b/include/fdt.h
@@ -1,6 +1,8 @@
 #ifndef _FDT_H
 #define _FDT_H
 
+#include <linux/types.h>
+
 #ifndef __ASSEMBLY__
 
 #define _B(n)	((unsigned long long)((uint8_t *)&x)[n])
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index a7bbae0bd6..2ecef35a40 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -60,9 +60,6 @@ extern struct bus_type amba_bustype;
 
 #define to_amba_device(d)	container_of(d, struct amba_device, dev)
 
-#define amba_get_drvdata(d)	dev_get_drvdata(&d->dev)
-#define amba_set_drvdata(d,p)	dev_set_drvdata(&d->dev, p)
-
 int amba_driver_register(struct amba_driver *);
 void amba_driver_unregister(struct amba_driver *);
 struct amba_device *amba_device_alloc(const char *, int id, resource_size_t, size_t);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index e422055baa..152ba10a04 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -92,6 +92,7 @@ struct pci_dev {
 	struct pci_bus	*bus;		/* bus this device is on */
 	struct pci_bus	*subordinate;	/* bus this device bridges to */
 	struct pci_slot	*slot;		/* Physical slot this device is in */
+	const struct pci_device_id *id;	/* the id this device matches */
 
 	struct device_d dev;
 
diff --git a/include/of.h b/include/of.h
index 764a2e5939..2dcb613a77 100644
--- a/include/of.h
+++ b/include/of.h
@@ -3,6 +3,8 @@
 
 #include <fdt.h>
 #include <errno.h>
+#include <linux/types.h>
+#include <linux/list.h>
 #include <asm/byteorder.h>
 
 /* Default string compare functions */
@@ -238,7 +240,8 @@ int of_add_memory(struct device_node *node, bool dump);
 void of_add_memory_bank(struct device_node *node, bool dump, int r,
 		u64 base, u64 size);
 struct device_d *of_find_device_by_node_path(const char *path);
-int of_find_path(struct device_node *node, const char *propname, char **outpath);
+#define OF_FIND_PATH_FLAGS_BB 1		/* return .bb device if available */
+int of_find_path(struct device_node *node, const char *propname, char **outpath, unsigned flags);
 int of_register_fixup(int (*fixup)(struct device_node *, void *), void *context);
 struct device_node *of_find_node_by_alias(struct device_node *root,
 		const char *alias);
diff --git a/include/state.h b/include/state.h
index 95bf8d263b..e96d3bfb2e 100644
--- a/include/state.h
+++ b/include/state.h
@@ -1,6 +1,8 @@
 #ifndef __STATE_H
 #define __STATE_H
 
+#include <of.h>
+
 struct state;
 
 int state_backend_dtb_file(struct state *state, const char *path);
diff --git a/include/usb/usb.h b/include/usb/usb.h
index 991f3d7dd1..8f3ce2aeff 100644
--- a/include/usb/usb.h
+++ b/include/usb/usb.h
@@ -39,7 +39,7 @@
 #define USB_MAXCHILDREN			8	/* This is arbitrary */
 #define USB_MAX_HUB			16
 
-#define USB_CNTL_TIMEOUT 100 /* 100ms timeout */
+#define USB_CNTL_TIMEOUT 5000 /* 5000ms timeout */
 
 /* device request (setup) */
 struct devrequest {