Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

usb: dwc2: Remove platform static params

Browse source 
Remove the platform-specific static param structs and set only those
params that are necessary for each platform.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
John Youn 2017-01-23 14:57:04 -08:00 committed by Felipe Balbi
parent d936e666ae
commit 7de1debcd2
1 changed files with 108 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

262
drivers/usb/dwc2/params.c
View file

@ -38,166 +38,111 @@
#include "core.h" #include "core.h"
static const struct dwc2_core_params params_hi6220 = { static void dwc2_set_bcm_params(struct dwc2_hsotg *hsotg)
.otg_cap = 2, /* No HNP/SRP capable */ {
.dma_desc_enable = 0, struct dwc2_core_params *p = &hsotg->params;
.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 = { p->otg_cap = DWC2_CAP_PARAM_HNP_SRP_CAPABLE;
.otg_cap = 0, /* HNP/SRP capable */ p->speed = DWC2_SPEED_PARAM_HIGH;
.dma_desc_enable = 0, p->host_rx_fifo_size = 774;
.dma_desc_fs_enable = 0, p->host_nperio_tx_fifo_size = 256;
.speed = 0, /* High Speed */ p->host_perio_tx_fifo_size = 512;
.enable_dynamic_fifo = 1, p->max_transfer_size = 65535;
.en_multiple_tx_fifo = 1, p->max_packet_count = 511;
.host_rx_fifo_size = 774, /* 774 DWORDs */ p->host_channels = 8;
.host_nperio_tx_fifo_size = 256, /* 256 DWORDs */ p->phy_type = 1;
.host_perio_tx_fifo_size = 512, /* 512 DWORDs */ p->phy_utmi_width = 8;
.max_transfer_size = 65535, p->i2c_enable = false;
.max_packet_count = 511, p->host_ls_low_power_phy_clk = 0;
.host_channels = 8, p->reload_ctl = false;
.phy_type = 1, /* UTMI */ p->ahbcfg = 0x10;
.phy_utmi_width = 8, /* 8 bits */ p->uframe_sched = false;
.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 = { static void dwc2_set_his_params(struct dwc2_hsotg *hsotg)
.otg_cap = 2, /* non-HNP/non-SRP */ {
.dma_desc_enable = 0, struct dwc2_core_params *p = &hsotg->params;
.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 = { p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
.otg_cap = 2, /* non-HNP/non-SRP */ p->speed = DWC2_SPEED_PARAM_HIGH;
.dma_desc_enable = -1, p->host_rx_fifo_size = 512;
.dma_desc_fs_enable = -1, p->host_nperio_tx_fifo_size = 512;
.speed = -1, p->host_perio_tx_fifo_size = 512;
.enable_dynamic_fifo = -1, p->max_transfer_size = 65535;
.en_multiple_tx_fifo = -1, p->max_packet_count = 511;
.host_rx_fifo_size = 288, /* 288 DWORDs */ p->host_channels = 16;
.host_nperio_tx_fifo_size = 128, /* 128 DWORDs */ p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
.host_perio_tx_fifo_size = 96, /* 96 DWORDs */ p->phy_utmi_width = 8;
.max_transfer_size = 65535, p->i2c_enable = false;
.max_packet_count = 511, p->host_ls_low_power_phy_clk = 0;
.host_channels = -1, p->reload_ctl = false;
.phy_type = -1, p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
.phy_utmi_width = -1, GAHBCFG_HBSTLEN_SHIFT;
.phy_ulpi_ddr = -1, p->uframe_sched = false;
.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 = { static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
.otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE, {
.dma_desc_enable = 0, struct dwc2_core_params *p = &hsotg->params;
.dma_desc_fs_enable = 0,
.speed = DWC2_SPEED_PARAM_HIGH, p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
.enable_dynamic_fifo = 1, p->host_rx_fifo_size = 525;
.en_multiple_tx_fifo = -1, p->host_nperio_tx_fifo_size = 128;
.host_rx_fifo_size = 512, p->host_perio_tx_fifo_size = 256;
.host_nperio_tx_fifo_size = 500, p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
.host_perio_tx_fifo_size = 500, GAHBCFG_HBSTLEN_SHIFT;
.max_transfer_size = -1, }
.max_packet_count = -1,
.host_channels = 16, static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
.phy_type = DWC2_PHY_TYPE_PARAM_UTMI, {
.phy_utmi_width = -1, struct dwc2_core_params *p = &hsotg->params;
.phy_ulpi_ddr = -1,
.phy_ulpi_ext_vbus = -1, p->otg_cap = 2;
.i2c_enable = -1, p->host_rx_fifo_size = 288;
.ulpi_fs_ls = -1, p->host_nperio_tx_fifo_size = 128;
.host_support_fs_ls_low_power = -1, p->host_perio_tx_fifo_size = 96;
.host_ls_low_power_phy_clk = -1, p->max_transfer_size = 65535;
.ts_dline = -1, p->max_packet_count = 511;
.reload_ctl = 1, p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
.ahbcfg = GAHBCFG_HBSTLEN_INCR8 << GAHBCFG_HBSTLEN_SHIFT;
GAHBCFG_HBSTLEN_SHIFT, }
.uframe_sched = 0,
.external_id_pin_ctl = -1, static void dwc2_set_amlogic_params(struct dwc2_hsotg *hsotg)
.hibernation = -1, {
}; struct dwc2_core_params *p = &hsotg->params;
p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
p->speed = DWC2_SPEED_PARAM_HIGH;
p->host_rx_fifo_size = 512;
p->host_nperio_tx_fifo_size = 500;
p->host_perio_tx_fifo_size = 500;
p->host_channels = 16;
p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
p->ahbcfg = GAHBCFG_HBSTLEN_INCR8 <<
GAHBCFG_HBSTLEN_SHIFT;
p->uframe_sched = false;
}
static void dwc2_set_amcc_params(struct dwc2_hsotg *hsotg)
{
struct dwc2_core_params *p = &hsotg->params;
p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 << GAHBCFG_HBSTLEN_SHIFT;
}
const struct of_device_id dwc2_of_match_table[] = { const struct of_device_id dwc2_of_match_table[] = {
{ .compatible = "brcm,bcm2835-usb", .data = &params_bcm2835 }, { .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params },
{ .compatible = "hisilicon,hi6220-usb", .data = &params_hi6220 }, { .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params },
{ .compatible = "rockchip,rk3066-usb", .data = &params_rk3066 }, { .compatible = "rockchip,rk3066-usb", .data = dwc2_set_rk_params },
{ .compatible = "lantiq,arx100-usb", .data = &params_ltq }, { .compatible = "lantiq,arx100-usb", .data = dwc2_set_ltq_params },
{ .compatible = "lantiq,xrx200-usb", .data = &params_ltq }, { .compatible = "lantiq,xrx200-usb", .data = dwc2_set_ltq_params },
{ .compatible = "snps,dwc2", .data = NULL }, { .compatible = "snps,dwc2" },
{ .compatible = "samsung,s3c6400-hsotg", .data = NULL}, { .compatible = "samsung,s3c6400-hsotg" },
{ .compatible = "amlogic,meson8b-usb", .data = &params_amlogic }, { .compatible = "amlogic,meson8b-usb",
{ .compatible = "amlogic,meson-gxbb-usb", .data = &params_amlogic }, .data = dwc2_set_amlogic_params },
{ .compatible = "amcc,dwc-otg", .data = NULL }, { .compatible = "amlogic,meson-gxbb-usb",
.data = dwc2_set_amlogic_params },
{ .compatible = "amcc,dwc-otg", .data = dwc2_set_amcc_params },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, dwc2_of_match_table); MODULE_DEVICE_TABLE(of, dwc2_of_match_table);
@ -771,9 +716,18 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)
int dwc2_init_params(struct dwc2_hsotg *hsotg) int dwc2_init_params(struct dwc2_hsotg *hsotg)
{ {
const struct of_device_id *match;
void (*set_params)(void *data);
dwc2_set_default_params(hsotg); dwc2_set_default_params(hsotg);
dwc2_get_device_properties(hsotg); dwc2_get_device_properties(hsotg);
match = of_match_device(dwc2_of_match_table, hsotg->dev);
if (match && match->data) {
set_params = match->data;
set_params(hsotg);
}
dwc2_check_params(hsotg); dwc2_check_params(hsotg);
return 0; return 0;