[U-Boot] [u-boot 11/40] usb: dwc3: fix dwc3 header files

Lukasz Majewski
2015-02-16T10:25:18Z

Hi Kishon,

> Changed the header files included in core.h and io.h to the u-boot
> header files so that these files can be included in other dwc3 source
> files and be compiled in uboot. Also added otg.h which has the
> defines for dr_mode.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
> drivers/usb/dwc3/core.h | 13 ++-----------
> drivers/usb/dwc3/io.h | 4 +---
> include/linux/usb/otg.h | 20 ++++++++++++++++++++
> 3 files changed, 23 insertions(+), 14 deletions(-)
> create mode 100644 include/linux/usb/otg.h
>
> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
> index 09cec53..a7a7082 100644
> --- a/drivers/usb/dwc3/core.h
> +++ b/drivers/usb/dwc3/core.h
> @@ -18,20 +18,11 @@
> #ifndef __DRIVERS_USB_DWC3_CORE_H
> #define __DRIVERS_USB_DWC3_CORE_H
>
> -#include <linux/device.h>
> -#include <linux/spinlock.h>
> #include <linux/ioport.h>
> -#include <linux/list.h>
> -#include <linux/dma-mapping.h>
> -#include <linux/mm.h>
> -#include <linux/debugfs.h>
>
> #include <linux/usb/ch9.h>
> -#include <linux/usb/gadget.h>
> #include <linux/usb/otg.h>
>
> -#include <linux/phy/phy.h>
> -
> #define DWC3_MSG_MAX 500
>
> /* Global constants */
> @@ -981,7 +972,7 @@ struct dwc3_gadget_ep_cmd_params {
> void dwc3_set_mode(struct dwc3 *dwc, u32 mode);
> int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc);
>
> -#if IS_ENABLED(CONFIG_USB_DWC3_HOST) ||
> IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) +#ifdef CONFIG_USB_DWC3_HOST
> int dwc3_host_init(struct dwc3 *dwc);
> void dwc3_host_exit(struct dwc3 *dwc);
> #else
> @@ -991,7 +982,7 @@ static inline void dwc3_host_exit(struct dwc3
> *dwc) { }
> #endif
>
> -#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) ||
> IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) +#ifdef CONFIG_USB_DWC3_GADGET
> int dwc3_gadget_init(struct dwc3 *dwc);
> void dwc3_gadget_exit(struct dwc3 *dwc);
> int dwc3_gadget_set_test_mode(struct dwc3 *dwc, int mode);
> diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
> index f9f22b0..b6da135 100644
> --- a/drivers/usb/dwc3/io.h
> +++ b/drivers/usb/dwc3/io.h
> @@ -18,9 +18,7 @@
> #ifndef __DRIVERS_USB_DWC3_IO_H
> #define __DRIVERS_USB_DWC3_IO_H
>
> -#include <linux/io.h>
> -#include "debug.h"
> -#include "core.h"
> +#include <asm/io.h>
>
> static inline u32 dwc3_readl(void __iomem *base, u32 offset)
> {
> diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
> new file mode 100644
> index 0000000..7ec5550
> --- /dev/null
> +++ b/include/linux/usb/otg.h
> @@ -0,0 +1,20 @@
> +/* include/linux/usb/otg.h
> + *
> + * Copyright (c) 2015 Texas Instruments Incorporated -
> http://www.ti.com
> + *
> + * USB OTG (On The Go) defines
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#ifndef __LINUX_USB_OTG_H
> +#define __LINUX_USB_OTG_H
> +
> +enum usb_dr_mode {
> + USB_DR_MODE_UNKNOWN,
> + USB_DR_MODE_HOST,
> + USB_DR_MODE_PERIPHERAL,
> + USB_DR_MODE_OTG,
> +};
> +
> +#endif /* __LINUX_USB_OTG_H */

Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>

--
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group