Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b02038fa authored by John Youn's avatar John Youn Committed by Felipe Balbi
Browse files

usb: dwc2: Move host-specific core functions into hcd.c 



Move host core initialization and host channel routines into hcd.c. This
allows these functions to only be compiled in host-enabled driver
configurations (DRD or host-only).

Tested-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent 58e52ff6

drivers/usb/dwc2/core.c

+0 −1776

File changed.

Preview size limit exceeded, changes collapsed.

drivers/usb/dwc2/core.h

+0 −24
Original line number Diff line number Diff line
@@ -989,34 +989,11 @@ enum dwc2_halt_status { 
 */

extern int dwc2_core_reset(struct dwc2_hsotg *hsotg);

extern int dwc2_core_reset_and_force_dr_mode(struct dwc2_hsotg *hsotg);

extern void dwc2_core_host_init(struct dwc2_hsotg *hsotg);

extern int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg);

extern int dwc2_exit_hibernation(struct dwc2_hsotg *hsotg, bool restore);



void dwc2_force_dr_mode(struct dwc2_hsotg *hsotg);



/*

 * Host core Functions.

 * The following functions support managing the DWC_otg controller in host

 * mode.

 */

extern void dwc2_hc_init(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan);

extern void dwc2_hc_halt(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan,

			 enum dwc2_halt_status halt_status);

extern void dwc2_hc_cleanup(struct dwc2_hsotg *hsotg,

			    struct dwc2_host_chan *chan);

extern void dwc2_hc_start_transfer(struct dwc2_hsotg *hsotg,

				   struct dwc2_host_chan *chan);

extern void dwc2_hc_start_transfer_ddma(struct dwc2_hsotg *hsotg,

					struct dwc2_host_chan *chan);

extern int dwc2_hc_continue_transfer(struct dwc2_hsotg *hsotg,

				     struct dwc2_host_chan *chan);

extern void dwc2_hc_do_ping(struct dwc2_hsotg *hsotg,

			    struct dwc2_host_chan *chan);

extern void dwc2_enable_host_interrupts(struct dwc2_hsotg *hsotg);

extern void dwc2_disable_host_interrupts(struct dwc2_hsotg *hsotg);



extern u32 dwc2_calc_frame_interval(struct dwc2_hsotg *hsotg);

extern bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg);



/*
@@ -1028,7 +1005,6 @@ extern void dwc2_read_packet(struct dwc2_hsotg *hsotg, u8 *dest, u16 bytes); 
extern void dwc2_flush_tx_fifo(struct dwc2_hsotg *hsotg, const int num);

extern void dwc2_flush_rx_fifo(struct dwc2_hsotg *hsotg);



extern int dwc2_core_init(struct dwc2_hsotg *hsotg, bool initial_setup);

extern void dwc2_enable_global_interrupts(struct dwc2_hsotg *hcd);

extern void dwc2_disable_global_interrupts(struct dwc2_hsotg *hcd);

drivers/usb/dwc2/hcd.c

+1845 −48

File changed.

Preview size limit exceeded, changes collapsed.

drivers/usb/dwc2/hcd.h

+8 −0
Original line number Diff line number Diff line
@@ -430,6 +430,8 @@ struct hc_xfer_info { 
};

#endif



u32 dwc2_calc_frame_interval(struct dwc2_hsotg *hsotg);



/* Gets the struct usb_hcd that contains a struct dwc2_hsotg */

static inline struct usb_hcd *dwc2_hsotg_to_hcd(struct dwc2_hsotg *hsotg)

{
@@ -451,6 +453,12 @@ static inline void disable_hc_int(struct dwc2_hsotg *hsotg, int chnum, u32 intr) 
	dwc2_writel(mask, hsotg->regs + HCINTMSK(chnum));

}



void dwc2_hc_cleanup(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan);

void dwc2_hc_halt(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan,

		  enum dwc2_halt_status halt_status);

void dwc2_hc_start_transfer_ddma(struct dwc2_hsotg *hsotg,

				 struct dwc2_host_chan *chan);



/*

 * Reads HPRT0 in preparation to modify. It keeps the WC bits 0 so that if they

 * are read as 1, they won't clear when written back.