aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch123
1 files changed, 123 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch b/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch
new file mode 100644
index 0000000000..47e4bfc7ed
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch
@@ -0,0 +1,123 @@
+From d408e9c29dd580cb94e39da2b0eef81061d22061 Mon Sep 17 00:00:00 2001
+From: Ran Wang <ran.wang_1@nxp.com>
+Date: Thu, 19 Dec 2019 17:02:36 +0800
+Subject: [PATCH] LF-387-1 Revert "usb: dwc3: Add cache type configuration
+ support"
+
+This reverts commit ebceaf435cc96892d22b334b2a6517374c0d6a6e.
+Will use next version patch to replace this.
+
+Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
+---
+ drivers/usb/dwc3/core.c | 61 +++++--------------------------------------------
+ drivers/usb/dwc3/core.h | 15 ------------
+ 2 files changed, 6 insertions(+), 70 deletions(-)
+
+--- a/drivers/usb/dwc3/core.c
++++ b/drivers/usb/dwc3/core.c
+@@ -913,54 +913,6 @@ static void dwc3_set_power_down_clk_scal
+ dwc3_writel(dwc->regs, DWC3_GCTL, reg);
+ }
+
+-#ifdef CONFIG_OF
+-struct dwc3_cache_type {
+- u8 transfer_type_datard;
+- u8 transfer_type_descrd;
+- u8 transfer_type_datawr;
+- u8 transfer_type_descwr;
+-};
+-
+-static const struct dwc3_cache_type layerscape_dwc3_cache_type = {
+- .transfer_type_datard = 2,
+- .transfer_type_descrd = 2,
+- .transfer_type_datawr = 2,
+- .transfer_type_descwr = 2,
+-};
+-
+-/**
+- * dwc3_set_cache_type - Configure cache type registers
+- * @dwc: Pointer to our controller context structure
+- */
+-static void dwc3_set_cache_type(struct dwc3 *dwc)
+-{
+- u32 tmp, reg;
+- const struct dwc3_cache_type *cache_type =
+- device_get_match_data(dwc->dev);
+-
+- if (cache_type) {
+- reg = dwc3_readl(dwc->regs, DWC3_GSBUSCFG0);
+- tmp = reg;
+-
+- reg &= ~DWC3_GSBUSCFG0_DATARD(~0);
+- reg |= DWC3_GSBUSCFG0_DATARD(cache_type->transfer_type_datard);
+-
+- reg &= ~DWC3_GSBUSCFG0_DESCRD(~0);
+- reg |= DWC3_GSBUSCFG0_DESCRD(cache_type->transfer_type_descrd);
+-
+- reg &= ~DWC3_GSBUSCFG0_DATAWR(~0);
+- reg |= DWC3_GSBUSCFG0_DATAWR(cache_type->transfer_type_datawr);
+-
+- reg &= ~DWC3_GSBUSCFG0_DESCWR(~0);
+- reg |= DWC3_GSBUSCFG0_DESCWR(cache_type->transfer_type_descwr);
+-
+- if (tmp != reg)
+- dwc3_writel(dwc->regs, DWC3_GSBUSCFG0, reg);
+- }
+-}
+-#endif
+-
+-
+ /**
+ * dwc3_core_init - Low-level initialization of DWC3 Core
+ * @dwc: Pointer to our controller context structure
+@@ -1021,10 +973,6 @@ static int dwc3_core_init(struct dwc3 *d
+
+ dwc3_set_incr_burst_type(dwc);
+
+-#ifdef CONFIG_OF
+- dwc3_set_cache_type(dwc);
+-#endif
+-
+ usb_phy_set_suspend(dwc->usb2_phy, 0);
+ usb_phy_set_suspend(dwc->usb3_phy, 0);
+ ret = phy_power_on(dwc->usb2_generic_phy);
+@@ -1942,9 +1890,12 @@ static const struct dev_pm_ops dwc3_dev_
+
+ #ifdef CONFIG_OF
+ static const struct of_device_id of_dwc3_match[] = {
+- { .compatible = "fsl,layerscape-dwc3", .data = &layerscape_dwc3_cache_type, },
+- { .compatible = "snps,dwc3" },
+- { .compatible = "synopsys,dwc3" },
++ {
++ .compatible = "snps,dwc3"
++ },
++ {
++ .compatible = "synopsys,dwc3"
++ },
+ { },
+ };
+ MODULE_DEVICE_TABLE(of, of_dwc3_match);
+--- a/drivers/usb/dwc3/core.h
++++ b/drivers/usb/dwc3/core.h
+@@ -166,21 +166,6 @@
+ /* Bit fields */
+
+ /* Global SoC Bus Configuration INCRx Register 0 */
+-#ifdef CONFIG_OF
+-#define DWC3_GSBUSCFG0_DATARD_SHIFT 28
+-#define DWC3_GSBUSCFG0_DATARD(n) (((n) & 0xf) \
+- << DWC3_GSBUSCFG0_DATARD_SHIFT)
+-#define DWC3_GSBUSCFG0_DESCRD_SHIFT 24
+-#define DWC3_GSBUSCFG0_DESCRD(n) (((n) & 0xf) \
+- << DWC3_GSBUSCFG0_DESCRD_SHIFT)
+-#define DWC3_GSBUSCFG0_DATAWR_SHIFT 20
+-#define DWC3_GSBUSCFG0_DATAWR(n) (((n) & 0xf) \
+- << DWC3_GSBUSCFG0_DATAWR_SHIFT)
+-#define DWC3_GSBUSCFG0_DESCWR_SHIFT 16
+-#define DWC3_GSBUSCFG0_DESCWR(n) (((n) & 0xf) \
+- << DWC3_GSBUSCFG0_DESCWR_SHIFT)
+-#endif
+-
+ #define DWC3_GSBUSCFG0_INCR256BRSTENA (1 << 7) /* INCR256 burst */
+ #define DWC3_GSBUSCFG0_INCR128BRSTENA (1 << 6) /* INCR128 burst */
+ #define DWC3_GSBUSCFG0_INCR64BRSTENA (1 << 5) /* INCR64 burst */