mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
863e79f8d5
The following patches were dropped because they are already applied upstream: 0012-pinctrl-lantiq-fix-up-pinmux.patch 0013-MTD-lantiq-xway-fix-invalid-operator.patch 0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch 0015-MTD-lantiq-xway-remove-endless-loop.patch 0016-MTD-lantiq-xway-add-missing-write_buf-and-read_buf-t.patch 0017-MTD-xway-fix-nand-locking.patch 0044-pinctrl-lantiq-introduce-new-dedicated-devicetree-bi.patch 0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch 0046-pinctrl-lantiq-2-pins-have-the-wrong-mux-list.patch 0047-irq-fixes.patch 0047-mtd-plat-nand-pass-of-node.patch 0060-usb-dwc2-Add-support-for-Lantiq-ARX-and-XRX-SoCs.patch 0120-MIPS-lantiq-add-support-for-device-tree-file-from-bo.patch 0121-MIPS-lantiq-make-it-possible-to-build-in-no-device-t.patch 122-MIPS-store-the-appended-dtb-address-in-a-variable.patch The PHY driver was reduced to the code adding the LED configuration, the rest is already upstream: 0023-NET-PHY-adds-driver-for-lantiq-PHY11G.patch The SPI driver was replaced with the version pending for upstream inclusion: New driver: 0090-spi-add-transfer_status-callback.patch 0091-spi-lantiq-ssc-add-support-for-Lantiq-SSC-SPI-controller.patch Old driver: 0100-spi-add-support-for-Lantiq-SPI-controller.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
100 lines
3.6 KiB
Diff
100 lines
3.6 KiB
Diff
From de2cad82c4d0872066f83ce59462603852b47f03 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Fri, 6 Jan 2017 17:55:24 +0100
|
|
Subject: [PATCH 2/2] usb: dwc2: add support for other Lantiq SoCs
|
|
|
|
The size of the internal RAM of the DesignWare USB controller changed
|
|
between the different Lantiq SoCs. We have the following sizes:
|
|
|
|
Amazon + Danube: 8 KByte
|
|
Amazon SE + arx100: 2 KByte
|
|
xrx200 + xrx300: 2.5 KByte
|
|
|
|
For Danube SoC we do not provide the params and let the driver decide
|
|
to use sane defaults, for the Amazon SE and arx100 we use small fifos
|
|
and for the xrx200 and xrx300 SCs a little bit bigger periodic fifo.
|
|
The auto detection of max_transfer_size and max_packet_count should
|
|
work, so remove it.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
drivers/usb/dwc2/platform.c | 46 ++++++++++++++++++++++++++++++++++++++-------
|
|
1 file changed, 39 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/usb/dwc2/platform.c
|
|
+++ b/drivers/usb/dwc2/platform.c
|
|
@@ -151,7 +151,7 @@ static const struct dwc2_core_params par
|
|
.hibernation = -1,
|
|
};
|
|
|
|
-static const struct dwc2_core_params params_ltq = {
|
|
+static const struct dwc2_core_params params_ase = {
|
|
.otg_cap = 2, /* non-HNP/non-SRP */
|
|
.otg_ver = -1,
|
|
.dma_enable = -1,
|
|
@@ -163,8 +163,8 @@ static const struct dwc2_core_params par
|
|
.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,
|
|
+ .max_transfer_size = -1,
|
|
+ .max_packet_count = -1,
|
|
.host_channels = -1,
|
|
.phy_type = -1,
|
|
.phy_utmi_width = -1,
|
|
@@ -176,8 +176,37 @@ static const struct dwc2_core_params par
|
|
.host_ls_low_power_phy_clk = -1,
|
|
.ts_dline = -1,
|
|
.reload_ctl = -1,
|
|
- .ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
|
|
- GAHBCFG_HBSTLEN_SHIFT,
|
|
+ .ahbcfg = -1,
|
|
+ .uframe_sched = -1,
|
|
+ .external_id_pin_ctl = -1,
|
|
+ .hibernation = -1,
|
|
+};
|
|
+
|
|
+static const struct dwc2_core_params params_xrx200 = {
|
|
+ .otg_cap = 2, /* non-HNP/non-SRP */
|
|
+ .otg_ver = -1,
|
|
+ .dma_enable = -1,
|
|
+ .dma_desc_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 = 136, /* 136 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 = -1,
|
|
.uframe_sched = -1,
|
|
.external_id_pin_ctl = -1,
|
|
.hibernation = -1,
|
|
@@ -515,8 +544,11 @@ static const struct of_device_id dwc2_of
|
|
{ .compatible = "brcm,bcm2835-usb", .data = ¶ms_bcm2835 },
|
|
{ .compatible = "hisilicon,hi6220-usb", .data = ¶ms_hi6220 },
|
|
{ .compatible = "rockchip,rk3066-usb", .data = ¶ms_rk3066 },
|
|
- { .compatible = "lantiq,arx100-usb", .data = ¶ms_ltq },
|
|
- { .compatible = "lantiq,xrx200-usb", .data = ¶ms_ltq },
|
|
+ { .compatible = "lantiq,danube-usb", .data = NULL },
|
|
+ { .compatible = "lantiq,ase-usb", .data = ¶ms_ase },
|
|
+ { .compatible = "lantiq,arx100-usb", .data = ¶ms_ase },
|
|
+ { .compatible = "lantiq,xrx200-usb", .data = ¶ms_xrx200 },
|
|
+ { .compatible = "lantiq,xrx300-usb", .data = ¶ms_xrx200 },
|
|
{ .compatible = "snps,dwc2", .data = NULL },
|
|
{ .compatible = "samsung,s3c6400-hsotg", .data = NULL},
|
|
{ .compatible = "amlogic,meson8b-usb", .data = ¶ms_amlogic },
|