diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-07-09 08:21:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-07-09 08:21:06 +0200 |
| commit | 47d229d5c0fc626707101f0ad6c653ee68a65616 (patch) | |
| tree | f893f4b10972f0886d94bea547ed20fc2523246f /include | |
| parent | 0d0e894257392e6d7fbcc03991ee16b334d2f1ed (diff) | |
| parent | 8470a9eeca22e3d169375241424306be9c5e5838 (diff) | |
| download | barebox-47d229d5c0fc626707101f0ad6c653ee68a65616.tar.gz barebox-47d229d5c0fc626707101f0ad6c653ee68a65616.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbu.h | 4 | ||||
| -rw-r--r-- | include/linux/nvmem-consumer.h | 10 | ||||
| -rw-r--r-- | include/usb/ch9.h | 6 | ||||
| -rw-r--r-- | include/usb/chipidea-imx.h | 1 | ||||
| -rw-r--r-- | include/usb/usb.h | 3 |
5 files changed, 24 insertions, 0 deletions
diff --git a/include/bbu.h b/include/bbu.h index def568e498..d1ab9f5638 100644 --- a/include/bbu.h +++ b/include/bbu.h @@ -25,6 +25,10 @@ struct bbu_handler { struct list_head list; #define BBU_HANDLER_FLAG_DEFAULT (1 << 0) #define BBU_HANDLER_CAN_REFRESH (1 << 1) + /* + * The lower 16bit are generic flags, the upper 16bit are reserved + * for handler specific flags. + */ unsigned long flags; /* default device file, can be overwritten on the command line */ diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h index 606cadb498..0ec2f05b97 100644 --- a/include/linux/nvmem-consumer.h +++ b/include/linux/nvmem-consumer.h @@ -32,6 +32,9 @@ struct nvmem_cell_info { struct nvmem_cell *nvmem_cell_get(struct device_d *dev, const char *name); void nvmem_cell_put(struct nvmem_cell *cell); void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len); +void *nvmem_cell_get_and_read(struct device_node *np, const char *cell_name, + size_t bytes); + int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len); /* direct nvmem device read/write interface */ @@ -55,6 +58,13 @@ static inline char *nvmem_cell_read(struct nvmem_cell *cell, size_t *len) return ERR_PTR(-ENOSYS); } +static inline void *nvmem_cell_get_and_read(struct device_node *np, + const char *cell_name, + size_t bytes) +{ + return ERR_PTR(-ENOSYS); +} + static inline int nvmem_cell_write(struct nvmem_cell *cell, const char *buf, size_t len) { diff --git a/include/usb/ch9.h b/include/usb/ch9.h index ab5d531925..b44d41e85f 100644 --- a/include/usb/ch9.h +++ b/include/usb/ch9.h @@ -1004,6 +1004,12 @@ struct usb_set_sel_req { */ const char *usb_speed_string(enum usb_device_speed speed); +/** + * usb_speed_by_string() - Get speed from human readable name. + * @string: The human readable name for the speed. If it is not one of known + * names, USB_SPEED_UNKNOWN will be returned. + */ +enum usb_device_speed usb_speed_by_string(const char *string); /** * usb_state_string - Returns human readable name for the state. diff --git a/include/usb/chipidea-imx.h b/include/usb/chipidea-imx.h index 640ae06944..973aee6a0e 100644 --- a/include/usb/chipidea-imx.h +++ b/include/usb/chipidea-imx.h @@ -13,6 +13,7 @@ #define MXC_EHCI_MODE_ULPI (2 << 30) #define MXC_EHCI_MODE_HSIC (1 << 25) #define MXC_EHCI_MODE_SERIAL (3 << 30) +#define MXC_EHCI_PFSC (1 << 24) /* * USB misc flags diff --git a/include/usb/usb.h b/include/usb/usb.h index 93308cec00..9aab06c87c 100644 --- a/include/usb/usb.h +++ b/include/usb/usb.h @@ -438,6 +438,9 @@ enum usb_dr_mode { enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np, const char *propname); +enum usb_device_speed of_usb_get_maximum_speed(struct device_node *np, + const char *propname); + extern struct list_head usb_device_list; #endif /*_USB_H_ */ |