.. | .. |
---|
68 | 68 | p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 << |
---|
69 | 69 | GAHBCFG_HBSTLEN_SHIFT; |
---|
70 | 70 | p->change_speed_quirk = true; |
---|
71 | | - p->power_down = false; |
---|
| 71 | + p->power_down = DWC2_POWER_DOWN_PARAM_NONE; |
---|
72 | 72 | } |
---|
73 | 73 | |
---|
74 | 74 | static void dwc2_set_s3c6400_params(struct dwc2_hsotg *hsotg) |
---|
75 | 75 | { |
---|
76 | 76 | struct dwc2_core_params *p = &hsotg->params; |
---|
77 | 77 | |
---|
78 | | - p->power_down = 0; |
---|
| 78 | + p->power_down = DWC2_POWER_DOWN_PARAM_NONE; |
---|
| 79 | + p->phy_utmi_width = 8; |
---|
79 | 80 | } |
---|
80 | 81 | |
---|
81 | 82 | static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg) |
---|
.. | .. |
---|
88 | 89 | p->host_perio_tx_fifo_size = 256; |
---|
89 | 90 | p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 << |
---|
90 | 91 | GAHBCFG_HBSTLEN_SHIFT; |
---|
| 92 | + p->power_down = DWC2_POWER_DOWN_PARAM_NONE; |
---|
91 | 93 | p->lpm = false; |
---|
92 | 94 | p->g_dma_desc = false; |
---|
93 | | - p->power_down = 0; |
---|
94 | 95 | } |
---|
95 | 96 | |
---|
96 | 97 | static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg) |
---|
.. | .. |
---|
121 | 122 | p->ahbcfg = GAHBCFG_HBSTLEN_INCR8 << |
---|
122 | 123 | GAHBCFG_HBSTLEN_SHIFT; |
---|
123 | 124 | p->power_down = DWC2_POWER_DOWN_PARAM_NONE; |
---|
| 125 | +} |
---|
| 126 | + |
---|
| 127 | +static void dwc2_set_amlogic_g12a_params(struct dwc2_hsotg *hsotg) |
---|
| 128 | +{ |
---|
| 129 | + struct dwc2_core_params *p = &hsotg->params; |
---|
| 130 | + |
---|
| 131 | + p->lpm = false; |
---|
| 132 | + p->lpm_clock_gating = false; |
---|
| 133 | + p->besl = false; |
---|
| 134 | + p->hird_threshold_en = false; |
---|
124 | 135 | } |
---|
125 | 136 | |
---|
126 | 137 | static void dwc2_set_amcc_params(struct dwc2_hsotg *hsotg) |
---|
.. | .. |
---|
154 | 165 | p->host_perio_tx_fifo_size = 256; |
---|
155 | 166 | } |
---|
156 | 167 | |
---|
| 168 | +static void dwc2_set_stm32mp15_fsotg_params(struct dwc2_hsotg *hsotg) |
---|
| 169 | +{ |
---|
| 170 | + struct dwc2_core_params *p = &hsotg->params; |
---|
| 171 | + |
---|
| 172 | + p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE; |
---|
| 173 | + p->speed = DWC2_SPEED_PARAM_FULL; |
---|
| 174 | + p->host_rx_fifo_size = 128; |
---|
| 175 | + p->host_nperio_tx_fifo_size = 96; |
---|
| 176 | + p->host_perio_tx_fifo_size = 96; |
---|
| 177 | + p->max_packet_count = 256; |
---|
| 178 | + p->phy_type = DWC2_PHY_TYPE_PARAM_FS; |
---|
| 179 | + p->i2c_enable = false; |
---|
| 180 | + p->activate_stm_fs_transceiver = true; |
---|
| 181 | + p->activate_stm_id_vb_detection = true; |
---|
| 182 | + p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 << GAHBCFG_HBSTLEN_SHIFT; |
---|
| 183 | + p->power_down = DWC2_POWER_DOWN_PARAM_NONE; |
---|
| 184 | + p->host_support_fs_ls_low_power = true; |
---|
| 185 | + p->host_ls_low_power_phy_clk = true; |
---|
| 186 | +} |
---|
| 187 | + |
---|
| 188 | +static void dwc2_set_stm32mp15_hsotg_params(struct dwc2_hsotg *hsotg) |
---|
| 189 | +{ |
---|
| 190 | + struct dwc2_core_params *p = &hsotg->params; |
---|
| 191 | + |
---|
| 192 | + p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE; |
---|
| 193 | + p->activate_stm_id_vb_detection = !device_property_read_bool(hsotg->dev, "usb-role-switch"); |
---|
| 194 | + p->host_rx_fifo_size = 440; |
---|
| 195 | + p->host_nperio_tx_fifo_size = 256; |
---|
| 196 | + p->host_perio_tx_fifo_size = 256; |
---|
| 197 | + p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 << GAHBCFG_HBSTLEN_SHIFT; |
---|
| 198 | + p->power_down = DWC2_POWER_DOWN_PARAM_NONE; |
---|
| 199 | + p->lpm = false; |
---|
| 200 | + p->lpm_clock_gating = false; |
---|
| 201 | + p->besl = false; |
---|
| 202 | + p->hird_threshold_en = false; |
---|
| 203 | +} |
---|
| 204 | + |
---|
157 | 205 | const struct of_device_id dwc2_of_match_table[] = { |
---|
158 | 206 | { .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params }, |
---|
159 | 207 | { .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params }, |
---|
.. | .. |
---|
169 | 217 | .data = dwc2_set_amlogic_params }, |
---|
170 | 218 | { .compatible = "amlogic,meson-gxbb-usb", |
---|
171 | 219 | .data = dwc2_set_amlogic_params }, |
---|
| 220 | + { .compatible = "amlogic,meson-g12a-usb", |
---|
| 221 | + .data = dwc2_set_amlogic_g12a_params }, |
---|
172 | 222 | { .compatible = "amcc,dwc-otg", .data = dwc2_set_amcc_params }, |
---|
| 223 | + { .compatible = "apm,apm82181-dwc-otg", .data = dwc2_set_amcc_params }, |
---|
173 | 224 | { .compatible = "st,stm32f4x9-fsotg", |
---|
174 | 225 | .data = dwc2_set_stm32f4x9_fsotg_params }, |
---|
175 | 226 | { .compatible = "st,stm32f4x9-hsotg" }, |
---|
176 | 227 | { .compatible = "st,stm32f7-hsotg", |
---|
177 | 228 | .data = dwc2_set_stm32f7_hsotg_params }, |
---|
| 229 | + { .compatible = "st,stm32mp15-fsotg", |
---|
| 230 | + .data = dwc2_set_stm32mp15_fsotg_params }, |
---|
| 231 | + { .compatible = "st,stm32mp15-hsotg", |
---|
| 232 | + .data = dwc2_set_stm32mp15_hsotg_params }, |
---|
178 | 233 | {}, |
---|
179 | 234 | }; |
---|
180 | 235 | MODULE_DEVICE_TABLE(of, dwc2_of_match_table); |
---|
.. | .. |
---|
243 | 298 | val = (hsotg->hw_params.utmi_phy_data_width == |
---|
244 | 299 | GHWCFG4_UTMI_PHY_DATA_WIDTH_8) ? 8 : 16; |
---|
245 | 300 | |
---|
| 301 | + if (hsotg->phy) { |
---|
| 302 | + /* |
---|
| 303 | + * If using the generic PHY framework, check if the PHY bus |
---|
| 304 | + * width is 8-bit and set the phyif appropriately. |
---|
| 305 | + */ |
---|
| 306 | + if (phy_get_bus_width(hsotg->phy) == 8) |
---|
| 307 | + val = 8; |
---|
| 308 | + } |
---|
| 309 | + |
---|
246 | 310 | hsotg->params.phy_utmi_width = val; |
---|
247 | 311 | } |
---|
248 | 312 | |
---|
.. | .. |
---|
266 | 330 | int val; |
---|
267 | 331 | |
---|
268 | 332 | if (hsotg->hw_params.hibernation) |
---|
269 | | - val = 2; |
---|
| 333 | + val = DWC2_POWER_DOWN_PARAM_HIBERNATION; |
---|
270 | 334 | else if (hsotg->hw_params.power_optimized) |
---|
271 | | - val = 1; |
---|
| 335 | + val = DWC2_POWER_DOWN_PARAM_PARTIAL; |
---|
272 | 336 | else |
---|
273 | | - val = 0; |
---|
| 337 | + val = DWC2_POWER_DOWN_PARAM_NONE; |
---|
274 | 338 | |
---|
275 | 339 | hsotg->params.power_down = val; |
---|
| 340 | +} |
---|
| 341 | + |
---|
| 342 | +static void dwc2_set_param_lpm(struct dwc2_hsotg *hsotg) |
---|
| 343 | +{ |
---|
| 344 | + struct dwc2_core_params *p = &hsotg->params; |
---|
| 345 | + |
---|
| 346 | + p->lpm = hsotg->hw_params.lpm_mode; |
---|
| 347 | + if (p->lpm) { |
---|
| 348 | + p->lpm_clock_gating = true; |
---|
| 349 | + p->besl = true; |
---|
| 350 | + p->hird_threshold_en = true; |
---|
| 351 | + p->hird_threshold = 4; |
---|
| 352 | + } else { |
---|
| 353 | + p->lpm_clock_gating = false; |
---|
| 354 | + p->besl = false; |
---|
| 355 | + p->hird_threshold_en = false; |
---|
| 356 | + } |
---|
276 | 357 | } |
---|
277 | 358 | |
---|
278 | 359 | /** |
---|
.. | .. |
---|
293 | 374 | dwc2_set_param_speed(hsotg); |
---|
294 | 375 | dwc2_set_param_phy_utmi_width(hsotg); |
---|
295 | 376 | dwc2_set_param_power_down(hsotg); |
---|
| 377 | + dwc2_set_param_lpm(hsotg); |
---|
296 | 378 | p->phy_ulpi_ddr = false; |
---|
297 | 379 | p->phy_ulpi_ext_vbus = false; |
---|
298 | 380 | |
---|
.. | .. |
---|
305 | 387 | p->reload_ctl = (hw->snpsid >= DWC2_CORE_REV_2_92a); |
---|
306 | 388 | p->uframe_sched = true; |
---|
307 | 389 | p->external_id_pin_ctl = false; |
---|
308 | | - p->lpm = true; |
---|
309 | | - p->lpm_clock_gating = true; |
---|
310 | | - p->besl = true; |
---|
311 | | - p->hird_threshold_en = true; |
---|
312 | | - p->hird_threshold = 4; |
---|
313 | 390 | p->ipg_isoc_en = false; |
---|
| 391 | + p->service_interval = false; |
---|
314 | 392 | p->max_packet_count = hw->max_packet_count; |
---|
315 | 393 | p->max_transfer_size = hw->max_transfer_size; |
---|
316 | 394 | p->ahbcfg = GAHBCFG_HBSTLEN_INCR << GAHBCFG_HBSTLEN_SHIFT; |
---|
| 395 | + p->ref_clk_per = 33333; |
---|
| 396 | + p->sof_cnt_wkup_alert = 100; |
---|
317 | 397 | |
---|
318 | 398 | if ((hsotg->dr_mode == USB_DR_MODE_HOST) || |
---|
319 | 399 | (hsotg->dr_mode == USB_DR_MODE_OTG)) { |
---|
.. | .. |
---|
368 | 448 | device_property_read_u32(hsotg->dev, "g-np-tx-fifo-size", |
---|
369 | 449 | &p->g_np_tx_fifo_size); |
---|
370 | 450 | |
---|
371 | | - num = device_property_read_u32_array(hsotg->dev, |
---|
372 | | - "g-tx-fifo-size", |
---|
373 | | - NULL, 0); |
---|
374 | | - |
---|
| 451 | + num = device_property_count_u32(hsotg->dev, "g-tx-fifo-size"); |
---|
375 | 452 | if (num > 0) { |
---|
376 | 453 | num = min(num, 15); |
---|
377 | 454 | memset(p->g_tx_fifo_size, 0, |
---|
.. | .. |
---|
604 | 681 | CHECK_BOOL(besl, (hsotg->hw_params.snpsid >= DWC2_CORE_REV_3_00a)); |
---|
605 | 682 | CHECK_BOOL(hird_threshold_en, hsotg->params.lpm); |
---|
606 | 683 | CHECK_RANGE(hird_threshold, 0, hsotg->params.besl ? 12 : 7, 0); |
---|
| 684 | + CHECK_BOOL(service_interval, hw->service_interval_mode); |
---|
607 | 685 | CHECK_RANGE(max_packet_count, |
---|
608 | 686 | 15, hw->max_packet_count, |
---|
609 | 687 | hw->max_packet_count); |
---|
.. | .. |
---|
715 | 793 | u32 hwcfg1, hwcfg2, hwcfg3, hwcfg4; |
---|
716 | 794 | u32 grxfsiz; |
---|
717 | 795 | |
---|
718 | | - /* |
---|
719 | | - * Attempt to ensure this device is really a DWC_otg Controller. |
---|
720 | | - * Read and verify the GSNPSID register contents. The value should be |
---|
721 | | - * 0x45f4xxxx, 0x5531xxxx or 0x5532xxxx |
---|
722 | | - */ |
---|
723 | | - |
---|
724 | | - hw->snpsid = dwc2_readl(hsotg, GSNPSID); |
---|
725 | | - if ((hw->snpsid & GSNPSID_ID_MASK) != DWC2_OTG_ID && |
---|
726 | | - (hw->snpsid & GSNPSID_ID_MASK) != DWC2_FS_IOT_ID && |
---|
727 | | - (hw->snpsid & GSNPSID_ID_MASK) != DWC2_HS_IOT_ID) { |
---|
728 | | - dev_err(hsotg->dev, "Bad value for GSNPSID: 0x%08x\n", |
---|
729 | | - hw->snpsid); |
---|
730 | | - return -ENODEV; |
---|
731 | | - } |
---|
732 | | - |
---|
733 | | - dev_dbg(hsotg->dev, "Core Release: %1x.%1x%1x%1x (snpsid=%x)\n", |
---|
734 | | - hw->snpsid >> 12 & 0xf, hw->snpsid >> 8 & 0xf, |
---|
735 | | - hw->snpsid >> 4 & 0xf, hw->snpsid & 0xf, hw->snpsid); |
---|
736 | | - |
---|
737 | 796 | hwcfg1 = dwc2_readl(hsotg, GHWCFG1); |
---|
738 | 797 | hwcfg2 = dwc2_readl(hsotg, GHWCFG2); |
---|
739 | 798 | hwcfg3 = dwc2_readl(hsotg, GHWCFG3); |
---|
.. | .. |
---|
792 | 851 | GHWCFG4_UTMI_PHY_DATA_WIDTH_SHIFT; |
---|
793 | 852 | hw->acg_enable = !!(hwcfg4 & GHWCFG4_ACG_SUPPORTED); |
---|
794 | 853 | hw->ipg_isoc_en = !!(hwcfg4 & GHWCFG4_IPG_ISOC_SUPPORTED); |
---|
| 854 | + hw->service_interval_mode = !!(hwcfg4 & |
---|
| 855 | + GHWCFG4_SERVICE_INTERVAL_SUPPORTED); |
---|
795 | 856 | |
---|
796 | 857 | /* fifo sizes */ |
---|
797 | 858 | hw->rx_fifo_size = (grxfsiz & GRXFSIZ_DEPTH_MASK) >> |
---|