diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootm.h | 5 | ||||
| -rw-r--r-- | include/digest.h | 1 | ||||
| -rw-r--r-- | include/linux/libfdt_env.h | 2 | ||||
| -rw-r--r-- | include/machine_id.h | 16 | ||||
| -rw-r--r-- | include/usb/ch9.h | 2 | ||||
| -rw-r--r-- | include/usb/composite.h | 3 | ||||
| -rw-r--r-- | include/usb/gadget.h | 4 | ||||
| -rw-r--r-- | include/usb/musb.h | 8 |
8 files changed, 33 insertions, 8 deletions
diff --git a/include/bootm.h b/include/bootm.h index 5ce3318ecc..a041aa35b9 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -26,6 +26,11 @@ struct bootm_data { * mount the rootfs from the same device as the Kernel comes from. */ bool appendroot; + /* + * provide_machine_id - if true, try to add systemd.machine_id= with + * value of global.machine_id to Kernel. + */ + bool provide_machine_id; unsigned long initrd_address; unsigned long os_address; unsigned long os_entry; diff --git a/include/digest.h b/include/digest.h index 474bdd160a..176084146b 100644 --- a/include/digest.h +++ b/include/digest.h @@ -20,6 +20,7 @@ #define __DIGEST_H__ #include <linux/list.h> +#include <errno.h> struct digest; diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h index edb0f0c309..bac4670d6d 100644 --- a/include/linux/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -16,4 +16,6 @@ typedef __be64 fdt64_t; #define fdt64_to_cpu(x) be64_to_cpu(x) #define cpu_to_fdt64(x) cpu_to_be64(x) +#define INT32_MAX 2147483647 + #endif /* LIBFDT_ENV_H */ diff --git a/include/machine_id.h b/include/machine_id.h new file mode 100644 index 0000000000..31d5e0bb28 --- /dev/null +++ b/include/machine_id.h @@ -0,0 +1,16 @@ +#ifndef __MACHINE_ID_H__ +#define __MACHINE_ID_H__ + +#if IS_ENABLED(CONFIG_MACHINE_ID) + +void machine_id_set_hashable(const void *hashable, size_t len); + +#else + +static inline void machine_id_set_hashable(const void *hashable, size_t len) +{ +} + +#endif /* CONFIG_MACHINE_ID */ + +#endif /* __MACHINE_ID_H__ */ diff --git a/include/usb/ch9.h b/include/usb/ch9.h index 89d83e0d09..85f3e64cac 100644 --- a/include/usb/ch9.h +++ b/include/usb/ch9.h @@ -234,6 +234,8 @@ struct usb_ctrlrequest { #define USB_DT_PIPE_USAGE 0x24 /* From the USB 3.0 spec */ #define USB_DT_SS_ENDPOINT_COMP 0x30 +/* From the USB 3.1 spec */ +#define USB_DT_SSP_ISOC_ENDPOINT_COMP 0x31 /* Conventional codes for class-specific descriptors. The convention is * defined in the USB "Common Class" Spec (3.11). Individual class specs diff --git a/include/usb/composite.h b/include/usb/composite.h index f30568a54f..ec9abe7447 100644 --- a/include/usb/composite.h +++ b/include/usb/composite.h @@ -395,6 +395,9 @@ struct usb_composite_dev { spinlock_t lock; int in_reset_config; + + /* public: */ + unsigned int setup_pending:1; }; extern int usb_string_id(struct usb_composite_dev *c); diff --git a/include/usb/gadget.h b/include/usb/gadget.h index 80418a9cd4..afa11b2d9d 100644 --- a/include/usb/gadget.h +++ b/include/usb/gadget.h @@ -1018,6 +1018,10 @@ extern void usb_gadget_set_state(struct usb_gadget *gadget, /*-------------------------------------------------------------------------*/ +/* utility to tell udc core that the bus reset occurs */ +extern void usb_gadget_udc_reset(struct usb_gadget *gadget, + struct usb_gadget_driver *driver); + /* utility wrapping a simple endpoint selection policy */ extern struct usb_ep *usb_ep_autoconfig(struct usb_gadget *, diff --git a/include/usb/musb.h b/include/usb/musb.h index 13eb9f8aac..fef7dc5f2c 100644 --- a/include/usb/musb.h +++ b/include/usb/musb.h @@ -85,14 +85,6 @@ struct musb_hdrc_config { u8 ram_bits; /* ram address size */ struct musb_hdrc_eps_bits *eps_bits __deprecated; -#ifdef CONFIG_BLACKFIN - /* A GPIO controlling VRSEL in Blackfin */ - unsigned int gpio_vrsel; - unsigned int gpio_vrsel_active; - /* musb CLKIN in Blackfin in MHZ */ - unsigned char clkin; -#endif - }; struct musb_hdrc_platform_data { |