diff options
Diffstat (limited to 'target/linux/layerscape/patches-4.4')
6 files changed, 5 insertions, 105 deletions
diff --git a/target/linux/layerscape/patches-4.4/7017-fsl_qbman-add-qbman-driver.patch b/target/linux/layerscape/patches-4.4/7017-fsl_qbman-add-qbman-driver.patch index e7e5d311c8..ef9c104b36 100644 --- a/target/linux/layerscape/patches-4.4/7017-fsl_qbman-add-qbman-driver.patch +++ b/target/linux/layerscape/patches-4.4/7017-fsl_qbman-add-qbman-driver.patch @@ -109,7 +109,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> help --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -786,6 +786,11 @@ config FSL_GTM +@@ -787,6 +787,11 @@ config FSL_GTM help Freescale General-purpose Timers support @@ -121,7 +121,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> # Yes MCA RS/6000s exist but Linux-PPC does not currently support any config MCA bool -@@ -918,14 +923,14 @@ config DYNAMIC_MEMSTART +@@ -919,14 +924,14 @@ config DYNAMIC_MEMSTART select NONSTATIC_KERNEL help This option enables the kernel to be loaded at any page aligned diff --git a/target/linux/layerscape/patches-4.4/7031-fsl_qbman-Enable-DPAA1-QBMan-for-ARM64-platforms.patch b/target/linux/layerscape/patches-4.4/7031-fsl_qbman-Enable-DPAA1-QBMan-for-ARM64-platforms.patch index 24f79895da..faa0d7ab0b 100644 --- a/target/linux/layerscape/patches-4.4/7031-fsl_qbman-Enable-DPAA1-QBMan-for-ARM64-platforms.patch +++ b/target/linux/layerscape/patches-4.4/7031-fsl_qbman-Enable-DPAA1-QBMan-for-ARM64-platforms.patch @@ -17,7 +17,7 @@ Integrated-by: Zhao Qiang <qiang.zhao@nxp.com> --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -187,6 +187,11 @@ source "arch/arm64/Kconfig.platforms" +@@ -188,6 +188,11 @@ source "arch/arm64/Kconfig.platforms" menu "Bus support" diff --git a/target/linux/layerscape/patches-4.4/8048-mmc-sdhci-of-esdhc-add-remove-some-quirks-according-.patch b/target/linux/layerscape/patches-4.4/8048-mmc-sdhci-of-esdhc-add-remove-some-quirks-according-.patch index 09afa5e2ac..3391053356 100644 --- a/target/linux/layerscape/patches-4.4/8048-mmc-sdhci-of-esdhc-add-remove-some-quirks-according-.patch +++ b/target/linux/layerscape/patches-4.4/8048-mmc-sdhci-of-esdhc-add-remove-some-quirks-according-.patch @@ -34,16 +34,7 @@ Integrated-by: Zhao Qiang <qiang.zhao@nxp.com> --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c -@@ -584,6 +584,8 @@ static int sdhci_esdhc_probe(struct plat - { - struct sdhci_host *host; - struct device_node *np; -+ struct sdhci_pltfm_host *pltfm_host; -+ struct sdhci_esdhc *esdhc; - int ret; - - np = pdev->dev.of_node; -@@ -611,6 +613,14 @@ static int sdhci_esdhc_probe(struct plat +@@ -621,6 +621,14 @@ static int sdhci_esdhc_probe(struct plat if (of_device_is_compatible(np, "fsl,ls1021a-esdhc")) host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; diff --git a/target/linux/layerscape/patches-4.4/8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch b/target/linux/layerscape/patches-4.4/8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch deleted file mode 100644 index 678da2fc17..0000000000 --- a/target/linux/layerscape/patches-4.4/8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f2d357f86d79141969e29ec1dc1669da5120e022 Mon Sep 17 00:00:00 2001 -From: Yang Shi <yang.shi@linaro.org> -Date: Wed, 27 Jan 2016 09:32:05 -0800 -Subject: [PATCH 49/70] PCI: layerscape: Add "fsl,ls2085a-pcie" compatible ID - -The Layerscape PCI host driver must recognize ls2085a compatible when using -firmware with ls2085a compatible property, otherwise the PCI bus won't be -detected even though ls2085a compatible is included by the dts. - -Signed-off-by: Yang Shi <yang.shi@linaro.org> -Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> ---- - drivers/pci/host/pci-layerscape.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/pci/host/pci-layerscape.c -+++ b/drivers/pci/host/pci-layerscape.c -@@ -203,6 +203,7 @@ static const struct of_device_id ls_pcie - { .compatible = "fsl,ls1021a-pcie", .data = &ls1021_drvdata }, - { .compatible = "fsl,ls1043a-pcie", .data = &ls1043_drvdata }, - { .compatible = "fsl,ls2080a-pcie", .data = &ls2080_drvdata }, -+ { .compatible = "fsl,ls2085a-pcie", .data = &ls2080_drvdata }, - { }, - }; - MODULE_DEVICE_TABLE(of, ls_pcie_of_match); diff --git a/target/linux/layerscape/patches-4.4/8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch b/target/linux/layerscape/patches-4.4/8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch deleted file mode 100644 index 1aa23ab074..0000000000 --- a/target/linux/layerscape/patches-4.4/8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 61959c53020fff0584d88e28d6dae9806184f1a8 Mon Sep 17 00:00:00 2001 -From: Minghuan Lian <Minghuan.Lian@nxp.com> -Date: Mon, 29 Feb 2016 17:24:15 -0600 -Subject: [PATCH 50/70] PCI: layerscape: Fix MSG TLP drop setting - -Some kinds of Layerscape PCIe controllers will forward the received message -TLPs to system application address space, which could corrupt system memory -or lead to a system hang. Enable MSG_DROP to fix this issue. - -Signed-off-by: Minghuan Lian <Minghuan.Lian@nxp.com> -Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> ---- - drivers/pci/host/pci-layerscape.c | 21 +++++++++++++-------- - 1 file changed, 13 insertions(+), 8 deletions(-) - ---- a/drivers/pci/host/pci-layerscape.c -+++ b/drivers/pci/host/pci-layerscape.c -@@ -77,6 +77,16 @@ static void ls_pcie_fix_class(struct ls_ - iowrite16(PCI_CLASS_BRIDGE_PCI, pcie->dbi + PCI_CLASS_DEVICE); - } - -+/* Drop MSG TLP except for Vendor MSG */ -+static void ls_pcie_drop_msg_tlp(struct ls_pcie *pcie) -+{ -+ u32 val; -+ -+ val = ioread32(pcie->dbi + PCIE_STRFMR1); -+ val &= 0xDFFFFFFF; -+ iowrite32(val, pcie->dbi + PCIE_STRFMR1); -+} -+ - static int ls1021_pcie_link_up(struct pcie_port *pp) - { - u32 state; -@@ -97,7 +107,7 @@ static int ls1021_pcie_link_up(struct pc - static void ls1021_pcie_host_init(struct pcie_port *pp) - { - struct ls_pcie *pcie = to_ls_pcie(pp); -- u32 val, index[2]; -+ u32 index[2]; - - pcie->scfg = syscon_regmap_lookup_by_phandle(pp->dev->of_node, - "fsl,pcie-scfg"); -@@ -116,13 +126,7 @@ static void ls1021_pcie_host_init(struct - - dw_pcie_setup_rc(pp); - -- /* -- * LS1021A Workaround for internal TKT228622 -- * to fix the INTx hang issue -- */ -- val = ioread32(pcie->dbi + PCIE_STRFMR1); -- val &= 0xffff; -- iowrite32(val, pcie->dbi + PCIE_STRFMR1); -+ ls_pcie_drop_msg_tlp(pcie); - } - - static int ls_pcie_link_up(struct pcie_port *pp) -@@ -147,6 +151,7 @@ static void ls_pcie_host_init(struct pci - iowrite32(1, pcie->dbi + PCIE_DBI_RO_WR_EN); - ls_pcie_fix_class(pcie); - ls_pcie_clear_multifunction(pcie); -+ ls_pcie_drop_msg_tlp(pcie); - iowrite32(0, pcie->dbi + PCIE_DBI_RO_WR_EN); - } - diff --git a/target/linux/layerscape/patches-4.4/8142-drivers-mmc-Add-compatible-string-for-LS1046A.patch b/target/linux/layerscape/patches-4.4/8142-drivers-mmc-Add-compatible-string-for-LS1046A.patch index 34add83db4..d9b4ecb083 100644 --- a/target/linux/layerscape/patches-4.4/8142-drivers-mmc-Add-compatible-string-for-LS1046A.patch +++ b/target/linux/layerscape/patches-4.4/8142-drivers-mmc-Add-compatible-string-for-LS1046A.patch @@ -10,7 +10,7 @@ Signed-off-by: Yutang Jiang <yutang.jiang@nxp.com> --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c -@@ -607,6 +607,7 @@ static int sdhci_esdhc_probe(struct plat +@@ -615,6 +615,7 @@ static int sdhci_esdhc_probe(struct plat of_device_is_compatible(np, "fsl,p4080-esdhc") || of_device_is_compatible(np, "fsl,p1020-esdhc") || of_device_is_compatible(np, "fsl,t1040-esdhc") || |