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

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

usb: dwc2: Add params.c file 



Add a params.c file and move all driver parameter code there, including
all the static parameter definitions.

Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent d4c0cf2d

drivers/usb/dwc2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG 


obj-$(CONFIG_USB_DWC2)			+= dwc2.o

dwc2-y					:= core.o core_intr.o platform.o

dwc2-y					+= params.o



ifneq ($(filter y,$(CONFIG_USB_DWC2_HOST) $(CONFIG_USB_DWC2_DUAL_ROLE)),)

	dwc2-y				+= hcd.o hcd_intr.o

drivers/usb/dwc2/core.c

+2 −916

File changed.

Preview size limit exceeded, changes collapsed.

drivers/usb/dwc2/core.h

+5 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,8 @@ extern int dwc2_core_reset_and_force_dr_mode(struct dwc2_hsotg *hsotg); 
extern int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg);

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



bool dwc2_force_mode_if_needed(struct dwc2_hsotg *hsotg, bool host);

void dwc2_clear_force_mode(struct dwc2_hsotg *hsotg);

void dwc2_force_dr_mode(struct dwc2_hsotg *hsotg);



extern bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg);
@@ -1043,6 +1045,9 @@ extern void dwc2_disable_global_interrupts(struct dwc2_hsotg *hcd); 
/* This function should be called on every hardware interrupt. */

extern irqreturn_t dwc2_handle_common_intr(int irq, void *dev);



/* The device ID match table */

extern const struct of_device_id dwc2_of_match_table[];



/* OTG Core Parameters */



/*

drivers/usb/dwc2/params.c

0 → 100644
+1125 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/usb/dwc2/platform.c

+0 −173
Original line number Diff line number Diff line
@@ -55,165 +55,6 @@ 


static const char dwc2_driver_name[] = "dwc2";



static const struct dwc2_core_params params_hi6220 = {

	.otg_cap			= 2,	/* No HNP/SRP capable */

	.otg_ver			= 0,	/* 1.3 */

	.dma_enable			= 1,

	.dma_desc_enable		= 0,

	.dma_desc_fs_enable		= 0,

	.speed				= 0,	/* High Speed */

	.enable_dynamic_fifo		= 1,

	.en_multiple_tx_fifo		= 1,

	.host_rx_fifo_size		= 512,

	.host_nperio_tx_fifo_size	= 512,

	.host_perio_tx_fifo_size	= 512,

	.max_transfer_size		= 65535,

	.max_packet_count		= 511,

	.host_channels			= 16,

	.phy_type			= 1,	/* UTMI */

	.phy_utmi_width			= 8,

	.phy_ulpi_ddr			= 0,	/* Single */

	.phy_ulpi_ext_vbus		= 0,

	.i2c_enable			= 0,

	.ulpi_fs_ls			= 0,

	.host_support_fs_ls_low_power	= 0,

	.host_ls_low_power_phy_clk	= 0,	/* 48 MHz */

	.ts_dline			= 0,

	.reload_ctl			= 0,

	.ahbcfg				= GAHBCFG_HBSTLEN_INCR16 <<

					  GAHBCFG_HBSTLEN_SHIFT,

	.uframe_sched			= 0,

	.external_id_pin_ctl		= -1,

	.hibernation			= -1,

};



static const struct dwc2_core_params params_bcm2835 = {

	.otg_cap			= 0,	/* HNP/SRP capable */

	.otg_ver			= 0,	/* 1.3 */

	.dma_enable			= 1,

	.dma_desc_enable		= 0,

	.dma_desc_fs_enable		= 0,

	.speed				= 0,	/* High Speed */

	.enable_dynamic_fifo		= 1,

	.en_multiple_tx_fifo		= 1,

	.host_rx_fifo_size		= 774,	/* 774 DWORDs */

	.host_nperio_tx_fifo_size	= 256,	/* 256 DWORDs */

	.host_perio_tx_fifo_size	= 512,	/* 512 DWORDs */

	.max_transfer_size		= 65535,

	.max_packet_count		= 511,

	.host_channels			= 8,

	.phy_type			= 1,	/* UTMI */

	.phy_utmi_width			= 8,	/* 8 bits */

	.phy_ulpi_ddr			= 0,	/* Single */

	.phy_ulpi_ext_vbus		= 0,

	.i2c_enable			= 0,

	.ulpi_fs_ls			= 0,

	.host_support_fs_ls_low_power	= 0,

	.host_ls_low_power_phy_clk	= 0,	/* 48 MHz */

	.ts_dline			= 0,

	.reload_ctl			= 0,

	.ahbcfg				= 0x10,

	.uframe_sched			= 0,

	.external_id_pin_ctl		= -1,

	.hibernation			= -1,

};



static const struct dwc2_core_params params_rk3066 = {

	.otg_cap			= 2,	/* non-HNP/non-SRP */

	.otg_ver			= -1,

	.dma_enable			= -1,

	.dma_desc_enable		= 0,

	.dma_desc_fs_enable		= 0,

	.speed				= -1,

	.enable_dynamic_fifo		= 1,

	.en_multiple_tx_fifo		= -1,

	.host_rx_fifo_size		= 525,	/* 525 DWORDs */

	.host_nperio_tx_fifo_size	= 128,	/* 128 DWORDs */

	.host_perio_tx_fifo_size	= 256,	/* 256 DWORDs */

	.max_transfer_size		= -1,

	.max_packet_count		= -1,

	.host_channels			= -1,

	.phy_type			= -1,

	.phy_utmi_width			= -1,

	.phy_ulpi_ddr			= -1,

	.phy_ulpi_ext_vbus		= -1,

	.i2c_enable			= -1,

	.ulpi_fs_ls			= -1,

	.host_support_fs_ls_low_power	= -1,

	.host_ls_low_power_phy_clk	= -1,

	.ts_dline			= -1,

	.reload_ctl			= -1,

	.ahbcfg				= GAHBCFG_HBSTLEN_INCR16 <<

					  GAHBCFG_HBSTLEN_SHIFT,

	.uframe_sched			= -1,

	.external_id_pin_ctl		= -1,

	.hibernation			= -1,

};



static const struct dwc2_core_params params_ltq = {

	.otg_cap			= 2,	/* non-HNP/non-SRP */

	.otg_ver			= -1,

	.dma_enable			= -1,

	.dma_desc_enable		= -1,

	.dma_desc_fs_enable		= -1,

	.speed				= -1,

	.enable_dynamic_fifo		= -1,

	.en_multiple_tx_fifo		= -1,

	.host_rx_fifo_size		= 288,	/* 288 DWORDs */

	.host_nperio_tx_fifo_size	= 128,	/* 128 DWORDs */

	.host_perio_tx_fifo_size	= 96,	/* 96 DWORDs */

	.max_transfer_size		= 65535,

	.max_packet_count		= 511,

	.host_channels			= -1,

	.phy_type			= -1,

	.phy_utmi_width			= -1,

	.phy_ulpi_ddr			= -1,

	.phy_ulpi_ext_vbus		= -1,

	.i2c_enable			= -1,

	.ulpi_fs_ls			= -1,

	.host_support_fs_ls_low_power	= -1,

	.host_ls_low_power_phy_clk	= -1,

	.ts_dline			= -1,

	.reload_ctl			= -1,

	.ahbcfg				= GAHBCFG_HBSTLEN_INCR16 <<

					  GAHBCFG_HBSTLEN_SHIFT,

	.uframe_sched			= -1,

	.external_id_pin_ctl		= -1,

	.hibernation			= -1,

};



static const struct dwc2_core_params params_amlogic = {

	.otg_cap			= DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE,

	.otg_ver			= -1,

	.dma_enable			= 1,

	.dma_desc_enable		= 0,

	.dma_desc_fs_enable		= 0,

	.speed				= DWC2_SPEED_PARAM_HIGH,

	.enable_dynamic_fifo		= 1,

	.en_multiple_tx_fifo		= -1,

	.host_rx_fifo_size		= 512,

	.host_nperio_tx_fifo_size	= 500,

	.host_perio_tx_fifo_size	= 500,

	.max_transfer_size		= -1,

	.max_packet_count		= -1,

	.host_channels			= 16,

	.phy_type			= DWC2_PHY_TYPE_PARAM_UTMI,

	.phy_utmi_width			= -1,

	.phy_ulpi_ddr			= -1,

	.phy_ulpi_ext_vbus		= -1,

	.i2c_enable			= -1,

	.ulpi_fs_ls			= -1,

	.host_support_fs_ls_low_power	= -1,

	.host_ls_low_power_phy_clk	= -1,

	.ts_dline			= -1,

	.reload_ctl			= 1,

	.ahbcfg				= GAHBCFG_HBSTLEN_INCR8 <<

					  GAHBCFG_HBSTLEN_SHIFT,

	.uframe_sched			= 0,

	.external_id_pin_ctl		= -1,

	.hibernation			= -1,

};



/*

 * Check the dr_mode against the module configuration and hardware

 * capabilities.
@@ -510,20 +351,6 @@ static void dwc2_driver_shutdown(struct platform_device *dev) 
	disable_irq(hsotg->irq);

}



static const struct of_device_id dwc2_of_match_table[] = {

	{ .compatible = "brcm,bcm2835-usb", .data = &params_bcm2835 },

	{ .compatible = "hisilicon,hi6220-usb", .data = &params_hi6220 },

	{ .compatible = "rockchip,rk3066-usb", .data = &params_rk3066 },

	{ .compatible = "lantiq,arx100-usb", .data = &params_ltq },

	{ .compatible = "lantiq,xrx200-usb", .data = &params_ltq },

	{ .compatible = "snps,dwc2", .data = NULL },

	{ .compatible = "samsung,s3c6400-hsotg", .data = NULL},

	{ .compatible = "amlogic,meson8b-usb", .data = &params_amlogic },

	{ .compatible = "amlogic,meson-gxbb-usb", .data = &params_amlogic },

	{},

};

MODULE_DEVICE_TABLE(of, dwc2_of_match_table);



/**

 * dwc2_driver_probe() - Called when the DWC_otg core is bound to the DWC_otg

 * driver