kernel: bump 5.4 to 5.4.79

Manually rebased patches:
  ath79/patches-5.4/910-unaligned_access_hacks.patch
  bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
  bcm27xx/patches-5.4/950-0414-SQUASH-Fix-spi-driver-compiler-warnings.patch
  ipq806x/patches-5.4/093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch

Removed since could be reverse-applied by quilt and found to be included upstream:
  ipq806x/patches-5.4/096-PCI-qcom-Make-sure-PCIe-is-reset-before-init-for-rev.patch

All modifications made by update_kernel.sh

Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711
Run-tested: ipq806x/R7800

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>
[refresh altered targets after rebase]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 96daf1b105b5cfc2dc711910ef1e392a427f207d..dfffb5c0ce093c3d3435ae6e45bc36d0535cde96 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-5.4 = .77
+LINUX_VERSION-5.4 = .79
 
-LINUX_KERNEL_HASH-5.4.77 = a3e03e6970240dddc8174bf9f49b56d774c40125eabe1582d2ebe85b01addbf7
+LINUX_KERNEL_HASH-5.4.79 = a59091fb08ff66a344a7842b7c891f36cef609eed1d2944edf475cca8d91ce25
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
index e77289dc5633a047d1181b5363db09f7613c1f0a..e5aa9dccc6bc5b101f1f232f7b71ad5d128db9ba 100644 (file)
--- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
@@ -864,6 +864,6 @@
             ipv6_hdr(skb)->hop_limit != hop_limit ||
 -           flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) {
 +           flowlabel != net_hdr_word(ipv6_hdr(skb)))) {
-               err = ip6_route_me_harder(state->net, skb);
+               err = ip6_route_me_harder(state->net, state->sk, skb);
                if (err < 0)
                        ret = NF_DROP_ERR(err);

diff --git a/target/linux/bcm27xx/patches-5.4/950-0134-spi-spi-bcm2835-Re-enable-HW-CS.patch b/target/linux/bcm27xx/patches-5.4/950-0134-spi-spi-bcm2835-Re-enable-HW-CS.patch
index 06928cb19e57d27f6407122695c879a3dca5b998..13dd356f930b187845bcf310bd3c56f248651d9b 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0134-spi-spi-bcm2835-Re-enable-HW-CS.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0134-spi-spi-bcm2835-Re-enable-HW-CS.patch
@@ -70,7 +70,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  }
  
  static int bcm2835_spi_setup(struct spi_device *spi)
-@@ -1277,6 +1325,7 @@ static int bcm2835_spi_probe(struct plat
+@@ -1276,6 +1324,7 @@ static int bcm2835_spi_probe(struct plat
        ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
        ctlr->num_chipselect = BCM2835_SPI_NUM_CS;
        ctlr->setup = bcm2835_spi_setup;

diff --git a/target/linux/bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch b/target/linux/bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
index ce44eed0c820d88fae4c784408e9eb594260780e..752464087f7b44f1bc5a18089448ec6ee88feffb 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
@@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/spi/spi-bcm2835.c
 +++ b/drivers/spi/spi-bcm2835.c
-@@ -1279,31 +1279,6 @@ static int bcm2835_spi_setup(struct spi_
+@@ -1278,31 +1278,6 @@ static int bcm2835_spi_setup(struct spi_
                return -EINVAL;
        }
  
@@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 -
 -      spi->cs_gpiod = gpiochip_request_own_desc(chip, 8 - spi->chip_select,
 -                                                DRV_NAME,
--                                                lflags,
+-                                                GPIO_LOOKUP_FLAGS_DEFAULT,
 -                                                GPIOD_OUT_LOW);
 -      if (IS_ERR(spi->cs_gpiod))
 -              return PTR_ERR(spi->cs_gpiod);

diff --git a/target/linux/bcm27xx/patches-5.4/950-0215-spi-bcm2835-enable-shared-interrupt-support.patch b/target/linux/bcm27xx/patches-5.4/950-0215-spi-bcm2835-enable-shared-interrupt-support.patch
index 5e2a3677506be6aecaaceddde1d98483f408c94a..fb0a0699cd2583dd814c3fbc3663076d2634a72d 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0215-spi-bcm2835-enable-shared-interrupt-support.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0215-spi-bcm2835-enable-shared-interrupt-support.patch
@@ -23,7 +23,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
        /* Read as many bytes as possible from FIFO */
        bcm2835_rd_fifo(bs);
        /* Write as many bytes as possible to FIFO */
-@@ -1335,7 +1339,8 @@ static int bcm2835_spi_probe(struct plat
+@@ -1334,7 +1338,8 @@ static int bcm2835_spi_probe(struct plat
        bcm2835_wr(bs, BCM2835_SPI_CS,
                   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
  

diff --git a/target/linux/bcm27xx/patches-5.4/950-0414-SQUASH-Fix-spi-driver-compiler-warnings.patch b/target/linux/bcm27xx/patches-5.4/950-0414-SQUASH-Fix-spi-driver-compiler-warnings.patch
index bccf74b4105020213f3a8a7d2e2facfbc20412dd..f233c4aedcf4940a6dd5aeb9eda6073b4eb04ab9 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0414-SQUASH-Fix-spi-driver-compiler-warnings.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0414-SQUASH-Fix-spi-driver-compiler-warnings.patch
@@ -12,12 +12,11 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/spi/spi-bcm2835.c
 +++ b/drivers/spi/spi-bcm2835.c
-@@ -1230,8 +1230,6 @@ static int bcm2835_spi_setup(struct spi_
+@@ -1230,7 +1230,6 @@ static int bcm2835_spi_setup(struct spi_
  {
        struct spi_controller *ctlr = spi->controller;
        struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);
 -      struct gpio_chip *chip;
--      enum gpio_lookup_flags lflags;
        u32 cs;
  
        /*

diff --git a/target/linux/bcm27xx/patches-5.4/950-0436-of-address-Follow-DMA-parent-for-dma-coherent.patch b/target/linux/bcm27xx/patches-5.4/950-0436-of-address-Follow-DMA-parent-for-dma-coherent.patch
index dbfb1025cd31ddd494b1792a63a46524c10d225a..76af58a126d05ee84afa56e77225f5d0079c2c4c 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0436-of-address-Follow-DMA-parent-for-dma-coherent.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0436-of-address-Follow-DMA-parent-for-dma-coherent.patch
@@ -19,7 +19,7 @@ Signed-off-by: Rob Herring <robh@kernel.org>
 
 --- a/drivers/of/address.c
 +++ b/drivers/of/address.c
-@@ -1023,7 +1023,7 @@ bool of_dma_is_coherent(struct device_no
+@@ -1025,7 +1025,7 @@ bool of_dma_is_coherent(struct device_no
                        of_node_put(node);
                        return true;
                }

diff --git a/target/linux/bcm27xx/patches-5.4/950-0450-dma-direct-exclude-dma_direct_map_resource-from-the-.patch b/target/linux/bcm27xx/patches-5.4/950-0450-dma-direct-exclude-dma_direct_map_resource-from-the-.patch
index bb6b4055172689ff4ae7d1ca08d9b7bc73e6df68..2534b71b7368a3b8b1cfc0dd257dbb246319c9d3 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0450-dma-direct-exclude-dma_direct_map_resource-from-the-.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0450-dma-direct-exclude-dma_direct_map_resource-from-the-.patch
@@ -104,7 +104,7 @@ Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
        }
 --- a/kernel/dma/swiotlb.c
 +++ b/kernel/dma/swiotlb.c
-@@ -678,7 +678,7 @@ bool swiotlb_map(struct device *dev, phy
+@@ -682,7 +682,7 @@ bool swiotlb_map(struct device *dev, phy
  
        /* Ensure that the address returned is DMA'ble */
        *dma_addr = __phys_to_dma(dev, *phys);

diff --git a/target/linux/generic/backport-5.4/789-net-usb-qmi_wwan-Set-DTR-quirk-for-MR400.patch b/target/linux/generic/backport-5.4/789-net-usb-qmi_wwan-Set-DTR-quirk-for-MR400.patch
index 91c95573f6be3d445cb7f91f4945bf21b89868c8..e3581c5a0d44c4afbfe13e9e0a7a7a542842c2aa 100644 (file)
--- a/target/linux/generic/backport-5.4/789-net-usb-qmi_wwan-Set-DTR-quirk-for-MR400.patch
+++ b/target/linux/generic/backport-5.4/789-net-usb-qmi_wwan-Set-DTR-quirk-for-MR400.patch
@@ -16,11 +16,9 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  drivers/net/usb/qmi_wwan.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
-index 581ed51abb532..fc378ff56775b 100644
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1070,7 +1070,7 @@ static const struct usb_device_id products[] = {
+@@ -1092,7 +1092,7 @@ static const struct usb_device_id produc
        {QMI_FIXED_INTF(0x05c6, 0x9011, 4)},
        {QMI_FIXED_INTF(0x05c6, 0x9021, 1)},
        {QMI_FIXED_INTF(0x05c6, 0x9022, 2)},
@@ -29,6 +27,3 @@ index 581ed51abb532..fc378ff56775b 100644
        {QMI_FIXED_INTF(0x05c6, 0x9026, 3)},
        {QMI_FIXED_INTF(0x05c6, 0x902e, 5)},
        {QMI_FIXED_INTF(0x05c6, 0x9031, 5)},
--- 
-cgit 1.2.3-1.el7
-

diff --git a/target/linux/generic/pending-5.4/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch b/target/linux/generic/pending-5.4/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch
index 33b7ee3cfe7552e4fb4df376fa2bffba5f9cdd3d..8724c1b7d3ce82d51d70f66b9a345cffbd2261f9 100644 (file)
--- a/target/linux/generic/pending-5.4/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch
+++ b/target/linux/generic/pending-5.4/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch
@@ -23,8 +23,6 @@ Forwarded: https://patchwork.ozlabs.org/project/linux-mtd/patch/20201122001533.9
 Fixes: eb13fa022741 ("mtd: parser: cmdline: Support MTD names containing one or more colons")
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
-diff --git a/drivers/mtd/parsers/cmdlinepart.c b/drivers/mtd/parsers/cmdlinepart.c
-index 0625b25620ca766318ea4646a6e3761ff4d3a4cc..22881ea4c132ea5a5ba7aebd025d91bf1cd023af 100644
 --- a/drivers/mtd/parsers/cmdlinepart.c
 +++ b/drivers/mtd/parsers/cmdlinepart.c
 @@ -218,7 +218,7 @@ static int mtdpart_setup_real(char *s)

diff --git a/target/linux/ipq806x/patches-5.4/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch b/target/linux/ipq806x/patches-5.4/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch
index 204d6e62d96784758c144b9f9c3ba55342d39543..9efbd583b43ca6505693c4b7ac7f0bc5e989fb08 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch
+++ b/target/linux/ipq806x/patches-5.4/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch
@@ -39,7 +39,7 @@ Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
 
 --- a/drivers/opp/core.c
 +++ b/drivers/opp/core.c
-@@ -2101,6 +2101,75 @@ put_table:
+@@ -2102,6 +2102,75 @@ put_table:
  }
  
  /**

diff --git a/target/linux/ipq806x/patches-5.4/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch b/target/linux/ipq806x/patches-5.4/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch
index 122511e4635c210e56cf8c3efedabf015fe147c2..8498a0b6dfc425c72ccb0efcce8a2a9c94b44f0a 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch
+++ b/target/linux/ipq806x/patches-5.4/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch
@@ -17,7 +17,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
 
 --- a/drivers/opp/core.c
 +++ b/drivers/opp/core.c
-@@ -2141,6 +2141,7 @@ int dev_pm_opp_adjust_voltage(struct dev
+@@ -2142,6 +2142,7 @@ int dev_pm_opp_adjust_voltage(struct dev
        struct opp_table *opp_table;
        struct dev_pm_opp *tmp_opp, *opp = ERR_PTR(-ENODEV);
        int r = 0;
@@ -25,7 +25,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
  
        /* Find the opp_table */
        opp_table = _find_opp_table(dev);
-@@ -2170,8 +2171,17 @@ int dev_pm_opp_adjust_voltage(struct dev
+@@ -2171,8 +2172,17 @@ int dev_pm_opp_adjust_voltage(struct dev
                goto adjust_unlock;
  
        opp->supplies->u_volt = u_volt;

diff --git a/target/linux/ipq806x/patches-5.4/093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch b/target/linux/ipq806x/patches-5.4/093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch
index 32fc297fe0c80fc65397b7e095aac2366d3299ea..95531508b6ea0aefff92140de9efbd527b1e7139 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch
+++ b/target/linux/ipq806x/patches-5.4/093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch
@@ -89,10 +89,10 @@ Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>
 -      clk_disable_unprepare(res->core_clk);
 -      clk_disable_unprepare(res->aux_clk);
 -      clk_disable_unprepare(res->ref_clk);
-       regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
- }
  
-@@ -321,47 +310,45 @@ static int qcom_pcie_init_2_1_0(struct q
+       writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL);
+ 
+@@ -334,47 +323,45 @@ static int qcom_pcie_init_2_1_0(struct q
                return ret;
        }
  
@@ -161,7 +161,7 @@ Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>
  
        /* enable PCIe clocks and resets */
        val = readl(pcie->parf + PCIE20_PARF_PHY_CTRL);
-@@ -393,36 +380,6 @@ static int qcom_pcie_init_2_1_0(struct q
+@@ -406,36 +393,6 @@ static int qcom_pcie_init_2_1_0(struct q
        val |= PHY_REFCLK_SSP_EN;
        writel(val, pcie->parf + PCIE20_PARF_PHY_REFCLK);
  
@@ -198,7 +198,7 @@ Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>
        /* wait for clock acquisition */
        usleep_range(1000, 1500);
  
-@@ -435,15 +392,19 @@ static int qcom_pcie_init_2_1_0(struct q
+@@ -448,15 +405,19 @@ static int qcom_pcie_init_2_1_0(struct q
  
        return 0;
  

diff --git a/target/linux/ipq806x/patches-5.4/093-7-v5.8-ipq806x-PCI-qcom-Add-ipq8064-rev2-variant.patch b/target/linux/ipq806x/patches-5.4/093-7-v5.8-ipq806x-PCI-qcom-Add-ipq8064-rev2-variant.patch
index 4e8fa41f35d56b2b5e530d0f08308ed1746b1c13..c3d61f164c44787dcc1b91e4a1c2917fafaaedd0 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/093-7-v5.8-ipq806x-PCI-qcom-Add-ipq8064-rev2-variant.patch
+++ b/target/linux/ipq806x/patches-5.4/093-7-v5.8-ipq806x-PCI-qcom-Add-ipq8064-rev2-variant.patch
@@ -16,7 +16,7 @@ Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>
 
 --- a/drivers/pci/controller/dwc/pcie-qcom.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom.c
-@@ -355,7 +355,8 @@ static int qcom_pcie_init_2_1_0(struct q
+@@ -368,7 +368,8 @@ static int qcom_pcie_init_2_1_0(struct q
        val &= ~BIT(0);
        writel(val, pcie->parf + PCIE20_PARF_PHY_CTRL);
  
@@ -26,7 +26,7 @@ Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>
                writel(PCS_DEEMPH_TX_DEEMPH_GEN1(24) |
                               PCS_DEEMPH_TX_DEEMPH_GEN2_3_5DB(24) |
                               PCS_DEEMPH_TX_DEEMPH_GEN2_6DB(34),
-@@ -1315,6 +1316,7 @@ err_pm_runtime_put:
+@@ -1328,6 +1329,7 @@ err_pm_runtime_put:
  static const struct of_device_id qcom_pcie_match[] = {
        { .compatible = "qcom,pcie-apq8084", .data = &ops_1_0_0 },
        { .compatible = "qcom,pcie-ipq8064", .data = &ops_2_1_0 },

diff --git a/target/linux/ipq806x/patches-5.4/093-8-v5.8-ipq806x-PCI-qcom-Support-pci-speed-set-for-ipq806x.patch b/target/linux/ipq806x/patches-5.4/093-8-v5.8-ipq806x-PCI-qcom-Support-pci-speed-set-for-ipq806x.patch
index 9f60f1461911598d7de03690c6e9d9ed828045b2..02ac7460e8911b158c55ed68a66a72b0e7a6642e 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/093-8-v5.8-ipq806x-PCI-qcom-Support-pci-speed-set-for-ipq806x.patch
+++ b/target/linux/ipq806x/patches-5.4/093-8-v5.8-ipq806x-PCI-qcom-Support-pci-speed-set-for-ipq806x.patch
@@ -49,7 +49,7 @@ Backported with light changes:
  };
  
  #define to_qcom_pcie(x)               dev_get_drvdata((x)->dev)
-@@ -384,6 +388,11 @@ static int qcom_pcie_init_2_1_0(struct q
+@@ -397,6 +401,11 @@ static int qcom_pcie_init_2_1_0(struct q
        /* wait for clock acquisition */
        usleep_range(1000, 1500);
  
@@ -61,7 +61,7 @@ Backported with light changes:
  
        /* Set the Max TLP size to 2K, instead of using default of 4K */
        writel(CFG_REMOTE_RD_REQ_BRIDGE_SIZE_2K,
-@@ -1248,6 +1257,10 @@ static int qcom_pcie_probe(struct platfo
+@@ -1261,6 +1270,10 @@ static int qcom_pcie_probe(struct platfo
                goto err_pm_runtime_put;
        }
  

diff --git a/target/linux/ipq806x/patches-5.4/094-v5.7-ipq806x-net-mdio-add-ipq8064-mdio-driver.patch b/target/linux/ipq806x/patches-5.4/094-v5.7-ipq806x-net-mdio-add-ipq8064-mdio-driver.patch
index fb8c827d651dd69243b906c180590dd872ff32d0..328942dad915a33347db305f54e337c142bd3f03 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/094-v5.7-ipq806x-net-mdio-add-ipq8064-mdio-driver.patch
+++ b/target/linux/ipq806x/patches-5.4/094-v5.7-ipq806x-net-mdio-add-ipq8064-mdio-driver.patch
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        depends on ARCH_MOXART || COMPILE_TEST
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -51,6 +51,7 @@ obj-$(CONFIG_MDIO_CAVIUM)    += mdio-cavium
+@@ -50,6 +50,7 @@ obj-$(CONFIG_MDIO_CAVIUM)    += mdio-cavium
  obj-$(CONFIG_MDIO_GPIO)               += mdio-gpio.o
  obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o
  obj-$(CONFIG_MDIO_I2C)                += mdio-i2c.o

diff --git a/target/linux/ipq806x/patches-5.4/096-PCI-qcom-Make-sure-PCIe-is-reset-before-init-for-rev.patch b/target/linux/ipq806x/patches-5.4/096-PCI-qcom-Make-sure-PCIe-is-reset-before-init-for-rev.patch
deleted file mode 100644 (file)
index 2ca336b..0000000
--- a/target/linux/ipq806x/patches-5.4/096-PCI-qcom-Make-sure-PCIe-is-reset-before-init-for-rev.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1960d75e3251659be8276529e4d01cf6993d9f4a Mon Sep 17 00:00:00 2001
-From: Ansuel Smith <ansuelsmth@gmail.com>
-Date: Tue, 1 Sep 2020 14:21:44 +0200
-Subject: [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0
-
-Qsdk U-Boot can incorrectly leave the PCIe interface in an undefined
-state if bootm command is used instead of bootipq. This is caused by the
-not deinit of PCIe when bootm is called. Reset the PCIe before init
-anyway to fix this U-Boot bug.
-
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
-Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver")
-Cc: stable@vger.kernel.org # v4.19+
----
- drivers/pci/controller/dwc/pcie-qcom.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/drivers/pci/controller/dwc/pcie-qcom.c
-+++ b/drivers/pci/controller/dwc/pcie-qcom.c
-@@ -296,6 +296,9 @@ static void qcom_pcie_deinit_2_1_0(struc
-       reset_control_assert(res->por_reset);
-       reset_control_assert(res->ext_reset);
-       reset_control_assert(res->phy_reset);
-+
-+      writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL);
-+
-       regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
- }
- 
-@@ -308,6 +311,16 @@ static int qcom_pcie_init_2_1_0(struct q
-       u32 val;
-       int ret;
- 
-+      /* reset the PCIe interface as uboot can leave it undefined state */
-+      reset_control_assert(res->pci_reset);
-+      reset_control_assert(res->axi_reset);
-+      reset_control_assert(res->ahb_reset);
-+      reset_control_assert(res->por_reset);
-+      reset_control_assert(res->ext_reset);
-+      reset_control_assert(res->phy_reset);
-+
-+      writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL);
-+
-       ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies);
-       if (ret < 0) {
-               dev_err(dev, "cannot enable regulators\n");

diff --git a/target/linux/layerscape/patches-5.4/701-net-0327-at803x-Address-packet-drops-at-low-traffic-rate-due-.patch b/target/linux/layerscape/patches-5.4/701-net-0327-at803x-Address-packet-drops-at-low-traffic-rate-due-.patch
index 36c393f2d0c3d0d5edd7a04789342c8f1410f708..303d122459e8bf0234cd9e8e0de19e20053e5e01 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0327-at803x-Address-packet-drops-at-low-traffic-rate-due-.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0327-at803x-Address-packet-drops-at-low-traffic-rate-due-.patch
@@ -22,7 +22,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -371,6 +371,16 @@ config AT803X_PHY
+@@ -367,6 +367,16 @@ config AT803X_PHY
        ---help---
          Currently supports the AT8030 and AT8035 model
  

diff --git a/target/linux/layerscape/patches-5.4/701-net-0328-net-phy-Inphi-IN112525_s03-retimer-support.patch b/target/linux/layerscape/patches-5.4/701-net-0328-net-phy-Inphi-IN112525_s03-retimer-support.patch
index a074c719d6b4e26d3d2716d628a87f3122ee1d31..68a0bc4eaa1066cebf60bc333655e2ccf2cdf0f5 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0328-net-phy-Inphi-IN112525_s03-retimer-support.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0328-net-phy-Inphi-IN112525_s03-retimer-support.patch
@@ -15,7 +15,7 @@ Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -479,6 +479,11 @@ config ICPLUS_PHY
+@@ -475,6 +475,11 @@ config ICPLUS_PHY
        ---help---
          Currently supports the IP175C and IP1001 PHYs.
  
@@ -29,7 +29,7 @@ Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
        ---help---
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -88,6 +88,7 @@ obj-$(CONFIG_DP83848_PHY)    += dp83848.o
+@@ -87,6 +87,7 @@ obj-$(CONFIG_DP83848_PHY)    += dp83848.o
  obj-$(CONFIG_DP83867_PHY)     += dp83867.o
  obj-$(CONFIG_FIXED_PHY)               += fixed_phy.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o

diff --git a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
index 30b9e4b10c4a40c10a11aef617831cb62a2b2487..890c9a9991d87dee446b74251d2588aefe354437 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
@@ -25,7 +25,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -784,16 +784,23 @@ static inline struct flexcan_priv *rx_of
+@@ -783,16 +783,23 @@ static inline struct flexcan_priv *rx_of
        return container_of(offload, struct flexcan_priv, offload);
  }
  
@@ -52,7 +52,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        mb = flexcan_get_mb(priv, n);
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
-@@ -807,7 +814,7 @@ static unsigned int flexcan_mailbox_read
+@@ -806,7 +813,7 @@ static unsigned int flexcan_mailbox_read
                code = reg_ctrl & FLEXCAN_MB_CODE_MASK;
                if ((code != FLEXCAN_MB_CODE_RX_FULL) &&
                    (code != FLEXCAN_MB_CODE_RX_OVERRUN))
@@ -61,7 +61,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
                if (code == FLEXCAN_MB_CODE_RX_OVERRUN) {
                        /* This MB was overrun, we lost data */
-@@ -817,11 +824,17 @@ static unsigned int flexcan_mailbox_read
+@@ -816,11 +823,17 @@ static unsigned int flexcan_mailbox_read
        } else {
                reg_iflag1 = priv->read(&regs->iflag1);
                if (!(reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_AVAILABLE))
@@ -80,7 +80,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        /* increase timstamp to full 32 bit */
        *timestamp = reg_ctrl << 16;
  
-@@ -840,7 +853,7 @@ static unsigned int flexcan_mailbox_read
+@@ -839,7 +852,7 @@ static unsigned int flexcan_mailbox_read
                *(__be32 *)(cf->data + i) = data;
        }
  
@@ -89,7 +89,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
                /* Clear IRQ */
                if (n < 32)
-@@ -857,7 +870,7 @@ static unsigned int flexcan_mailbox_read
+@@ -856,7 +869,7 @@ static unsigned int flexcan_mailbox_read
         */
        priv->read(&regs->timer);
  

diff --git a/target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch b/target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
index b576cec2f404544f2d77a380e78a2f4ac8ff1f9d..a080c6f6c40984ff31e093e0a8255945c4d08ff7 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
@@ -17,7 +17,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -1570,7 +1570,6 @@ static int flexcan_probe(struct platform
+@@ -1569,7 +1569,6 @@ static int flexcan_probe(struct platform
        struct net_device *dev;
        struct flexcan_priv *priv;
        struct regulator *reg_xceiver;
@@ -25,7 +25,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        struct clk *clk_ipg = NULL, *clk_per = NULL;
        struct flexcan_regs __iomem *regs;
        int err, irq;
-@@ -1605,12 +1604,11 @@ static int flexcan_probe(struct platform
+@@ -1604,12 +1603,11 @@ static int flexcan_probe(struct platform
                clock_freq = clk_get_rate(clk_per);
        }
  

diff --git a/target/linux/layerscape/patches-5.4/802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch b/target/linux/layerscape/patches-5.4/802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch
index bc84f5f907db76826e3b8b5be21c8029a44be192..9c2dde99a96096ae48e152499620a15d664e839f 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch
@@ -18,7 +18,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -744,8 +744,6 @@ static void flexcan_irq_state(struct net
+@@ -743,8 +743,6 @@ static void flexcan_irq_state(struct net
        u32 timestamp;
        int err;
  
@@ -27,7 +27,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        flt = reg_esr & FLEXCAN_ESR_FLT_CONF_MASK;
        if (likely(flt == FLEXCAN_ESR_FLT_CONF_ACTIVE)) {
                tx_state = unlikely(reg_esr & FLEXCAN_ESR_TX_WRN) ?
-@@ -765,6 +763,8 @@ static void flexcan_irq_state(struct net
+@@ -764,6 +762,8 @@ static void flexcan_irq_state(struct net
        if (likely(new_state == priv->can.state))
                return;
  

diff --git a/target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch b/target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch
index c6960bace1842cf18ca9a7f22df09b99c772a970..6926a57f4a76ba16a16cc6445e1819446d1e380d 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch
@@ -23,7 +23,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  #define FLEXCAN_IFLAG_RX_FIFO_OVERFLOW        BIT(7)
  #define FLEXCAN_IFLAG_RX_FIFO_WARN    BIT(6)
  #define FLEXCAN_IFLAG_RX_FIFO_AVAILABLE       BIT(5)
-@@ -880,7 +880,7 @@ static inline u64 flexcan_read_reg_iflag
+@@ -879,7 +879,7 @@ static inline u64 flexcan_read_reg_iflag
        u32 iflag1, iflag2;
  
        iflag2 = priv->read(&regs->iflag2) & priv->reg_imask2_default &
@@ -32,7 +32,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        iflag1 = priv->read(&regs->iflag1) & priv->reg_imask1_default;
  
        return (u64)iflag2 << 32 | iflag1;
-@@ -930,7 +930,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -929,7 +929,7 @@ static irqreturn_t flexcan_irq(int irq,
        reg_iflag2 = priv->read(&regs->iflag2);
  
        /* transmission complete interrupt */
@@ -41,7 +41,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                u32 reg_ctrl = priv->read(&priv->tx_mb->can_ctrl);
  
                handled = IRQ_HANDLED;
-@@ -942,7 +942,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -941,7 +941,7 @@ static irqreturn_t flexcan_irq(int irq,
                /* after sending a RTR frame MB is in RX mode */
                priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
                            &priv->tx_mb->can_ctrl);
@@ -50,7 +50,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                netif_wake_queue(dev);
        }
  
-@@ -1321,7 +1321,7 @@ static int flexcan_open(struct net_devic
+@@ -1320,7 +1320,7 @@ static int flexcan_open(struct net_devic
        priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
  
        priv->reg_imask1_default = 0;

diff --git a/target/linux/layerscape/patches-5.4/802-can-0010-can-flexcan-flexcan_irq-rename-variable-reg_iflag-re.patch b/target/linux/layerscape/patches-5.4/802-can-0010-can-flexcan-flexcan_irq-rename-variable-reg_iflag-re.patch
index e2086b74b3a2a08b34253954acf64c7db5dc8d8f..8f24e12ef9acec8a0380954d50f996102e39be0a 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0010-can-flexcan-flexcan_irq-rename-variable-reg_iflag-re.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0010-can-flexcan-flexcan_irq-rename-variable-reg_iflag-re.patch
@@ -16,7 +16,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -898,13 +898,13 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -897,13 +897,13 @@ static irqreturn_t flexcan_irq(int irq,
  
        /* reception interrupt */
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {

diff --git a/target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch b/target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch
index f8ea7255122d681b496348b5db3867668ff87fe1..e032c850ba52a0f4c7068ef7c57474c248a97370 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch
@@ -49,7 +49,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        struct clk *clk_ipg;
        struct clk *clk_per;
-@@ -879,9 +879,9 @@ static inline u64 flexcan_read_reg_iflag
+@@ -878,9 +878,9 @@ static inline u64 flexcan_read_reg_iflag
        struct flexcan_regs __iomem *regs = priv->regs;
        u32 iflag1, iflag2;
  
@@ -61,7 +61,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        return (u64)iflag2 << 32 | iflag1;
  }
-@@ -1228,8 +1228,8 @@ static int flexcan_chip_start(struct net
+@@ -1227,8 +1227,8 @@ static int flexcan_chip_start(struct net
        /* enable interrupts atomically */
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
@@ -72,7 +72,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enable_irq(dev->irq);
  
        /* print chip status */
-@@ -1320,8 +1320,8 @@ static int flexcan_open(struct net_devic
+@@ -1319,8 +1319,8 @@ static int flexcan_open(struct net_devic
        priv->tx_mb_idx = priv->mb_count - 1;
        priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
  
@@ -83,7 +83,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        priv->offload.mailbox_read = flexcan_mailbox_read;
  
-@@ -1333,12 +1333,12 @@ static int flexcan_open(struct net_devic
+@@ -1332,12 +1332,12 @@ static int flexcan_open(struct net_devic
  
                imask = GENMASK_ULL(priv->offload.mb_last,
                                    priv->offload.mb_first);

diff --git a/target/linux/layerscape/patches-5.4/802-can-0012-can-flexcan-remove-TX-mailbox-bit-from-struct-flexca.patch b/target/linux/layerscape/patches-5.4/802-can-0012-can-flexcan-remove-TX-mailbox-bit-from-struct-flexca.patch
index ef8fd9d837cf08fcd58a011b26e9a9e1527b17a8..d253c9ff3dbe13412b3e72c512200941e39bb6ab 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0012-can-flexcan-remove-TX-mailbox-bit-from-struct-flexca.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0012-can-flexcan-remove-TX-mailbox-bit-from-struct-flexca.patch
@@ -24,7 +24,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -879,8 +879,7 @@ static inline u64 flexcan_read_reg_iflag
+@@ -878,8 +878,7 @@ static inline u64 flexcan_read_reg_iflag
        struct flexcan_regs __iomem *regs = priv->regs;
        u32 iflag1, iflag2;
  
@@ -34,7 +34,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        iflag1 = priv->read(&regs->iflag1) & priv->rx_mask1;
  
        return (u64)iflag2 << 32 | iflag1;
-@@ -1229,7 +1228,7 @@ static int flexcan_chip_start(struct net
+@@ -1228,7 +1227,7 @@ static int flexcan_chip_start(struct net
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
        priv->write(priv->rx_mask1, &regs->imask1);
@@ -43,7 +43,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enable_irq(dev->irq);
  
        /* print chip status */
-@@ -1320,9 +1319,6 @@ static int flexcan_open(struct net_devic
+@@ -1319,9 +1318,6 @@ static int flexcan_open(struct net_devic
        priv->tx_mb_idx = priv->mb_count - 1;
        priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
  
@@ -53,7 +53,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        priv->offload.mailbox_read = flexcan_mailbox_read;
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
-@@ -1333,12 +1329,12 @@ static int flexcan_open(struct net_devic
+@@ -1332,12 +1328,12 @@ static int flexcan_open(struct net_devic
  
                imask = GENMASK_ULL(priv->offload.mb_last,
                                    priv->offload.mb_first);

diff --git a/target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch b/target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch
index c52da3a14397445743ae39538644f5eeeb7bec8f..e98cc4ca7a810afbd9542fa80fd28d494ec8bb2d 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch
@@ -41,7 +41,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        struct clk *clk_ipg;
        struct clk *clk_per;
-@@ -873,16 +873,15 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -872,16 +872,15 @@ static struct sk_buff *flexcan_mailbox_r
        return skb;
  }
  
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  }
  
  static irqreturn_t flexcan_irq(int irq, void *dev_id)
-@@ -1053,6 +1052,7 @@ static int flexcan_chip_start(struct net
+@@ -1052,6 +1051,7 @@ static int flexcan_chip_start(struct net
        struct flexcan_priv *priv = netdev_priv(dev);
        struct flexcan_regs __iomem *regs = priv->regs;
        u32 reg_mcr, reg_ctrl, reg_ctrl2, reg_mecr;
@@ -70,7 +70,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        int err, i;
        struct flexcan_mb __iomem *mb;
  
-@@ -1227,8 +1227,9 @@ static int flexcan_chip_start(struct net
+@@ -1226,8 +1226,9 @@ static int flexcan_chip_start(struct net
        /* enable interrupts atomically */
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
@@ -82,7 +82,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enable_irq(dev->irq);
  
        /* print chip status */
-@@ -1322,19 +1323,14 @@ static int flexcan_open(struct net_devic
+@@ -1321,19 +1322,14 @@ static int flexcan_open(struct net_devic
        priv->offload.mailbox_read = flexcan_mailbox_read;
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {

diff --git a/target/linux/layerscape/patches-5.4/802-can-0014-can-flexcan-introduce-struct-flexcan_priv-tx_mask-an.patch b/target/linux/layerscape/patches-5.4/802-can-0014-can-flexcan-introduce-struct-flexcan_priv-tx_mask-an.patch
index b724dc435c1944bdcc67f47c576945743dd9014e..f20557fbfc24b836acb487f328cd3b4b1ef6e149 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0014-can-flexcan-introduce-struct-flexcan_priv-tx_mask-an.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0014-can-flexcan-introduce-struct-flexcan_priv-tx_mask-an.patch
@@ -39,7 +39,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        u32 reg_ctrl_default;
  
        struct clk *clk_ipg;
-@@ -891,7 +891,8 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -890,7 +890,8 @@ static irqreturn_t flexcan_irq(int irq,
        struct flexcan_priv *priv = netdev_priv(dev);
        struct flexcan_regs __iomem *regs = priv->regs;
        irqreturn_t handled = IRQ_NONE;
@@ -49,7 +49,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enum can_state last_state = priv->can.state;
  
        /* reception interrupt */
-@@ -925,10 +926,10 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -924,10 +925,10 @@ static irqreturn_t flexcan_irq(int irq,
                }
        }
  
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                u32 reg_ctrl = priv->read(&priv->tx_mb->can_ctrl);
  
                handled = IRQ_HANDLED;
-@@ -940,7 +941,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -939,7 +940,7 @@ static irqreturn_t flexcan_irq(int irq,
                /* after sending a RTR frame MB is in RX mode */
                priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
                            &priv->tx_mb->can_ctrl);
@@ -71,7 +71,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                netif_wake_queue(dev);
        }
  
-@@ -1227,7 +1228,7 @@ static int flexcan_chip_start(struct net
+@@ -1226,7 +1227,7 @@ static int flexcan_chip_start(struct net
        /* enable interrupts atomically */
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
@@ -80,7 +80,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        priv->write(upper_32_bits(reg_imask), &regs->imask2);
        priv->write(lower_32_bits(reg_imask), &regs->imask1);
        enable_irq(dev->irq);
-@@ -1319,6 +1320,7 @@ static int flexcan_open(struct net_devic
+@@ -1318,6 +1319,7 @@ static int flexcan_open(struct net_devic
                        flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_FIFO);
        priv->tx_mb_idx = priv->mb_count - 1;
        priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);

diff --git a/target/linux/layerscape/patches-5.4/802-can-0015-can-flexcan-flexcan_read_reg_iflag_rx-optimize-readi.patch b/target/linux/layerscape/patches-5.4/802-can-0015-can-flexcan-flexcan_read_reg_iflag_rx-optimize-readi.patch
index cf7a6fdcbe177a57aff6b736f3291d3df3c3feac..466c70ecbdf865ae355cff075c985dd9253c0e8f 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0015-can-flexcan-flexcan_read_reg_iflag_rx-optimize-readi.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0015-can-flexcan-flexcan_read_reg_iflag_rx-optimize-readi.patch
@@ -24,7 +24,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -779,6 +779,23 @@ static void flexcan_irq_state(struct net
+@@ -778,6 +778,23 @@ static void flexcan_irq_state(struct net
                dev->stats.rx_fifo_errors++;
  }
  
@@ -48,7 +48,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
  {
        return container_of(offload, struct flexcan_priv, offload);
-@@ -873,17 +890,6 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -872,17 +889,6 @@ static struct sk_buff *flexcan_mailbox_r
        return skb;
  }
  

diff --git a/target/linux/layerscape/patches-5.4/802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch b/target/linux/layerscape/patches-5.4/802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch
index 5fb96f4512eb59e08511744b565868abb4a415e8..5286e4b11b41335d0ec6c42fae5b3905514663ce 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch
@@ -28,7 +28,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -791,11 +791,24 @@ static inline u64 flexcan_read64_mask(st
+@@ -790,11 +790,24 @@ static inline u64 flexcan_read64_mask(st
        return reg & mask;
  }
  
@@ -53,7 +53,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
  {
        return container_of(offload, struct flexcan_priv, offload);
-@@ -932,7 +945,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -931,7 +944,7 @@ static irqreturn_t flexcan_irq(int irq,
                }
        }
  
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        /* transmission complete interrupt */
        if (reg_iflag_tx & priv->tx_mask) {
-@@ -947,7 +960,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -946,7 +959,7 @@ static irqreturn_t flexcan_irq(int irq,
                /* after sending a RTR frame MB is in RX mode */
                priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
                            &priv->tx_mb->can_ctrl);

diff --git a/target/linux/layerscape/patches-5.4/802-can-0017-can-flexcan-flexcan_mailbox_read-make-use-of-flexcan.patch b/target/linux/layerscape/patches-5.4/802-can-0017-can-flexcan-flexcan_mailbox_read-make-use-of-flexcan.patch
index 37c2ed3cf947582a283a621dc89fb1fa7e52b435..29ad52f2260d2ebf7397df4a02567f776bfe9dbb 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0017-can-flexcan-flexcan_mailbox_read-make-use-of-flexcan.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0017-can-flexcan-flexcan_mailbox_read-make-use-of-flexcan.patch
@@ -16,7 +16,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -884,15 +884,10 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -883,15 +883,10 @@ static struct sk_buff *flexcan_mailbox_r
        }
  
   mark_as_read:

diff --git a/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch b/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
index 968bc11d5109978afea1b1b01c748969cf5fe43c..0e229ee5d101d0da07aaef38b5276fdf06437326 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
@@ -15,7 +15,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -628,10 +628,10 @@ static int flexcan_get_berr_counter(cons
+@@ -627,10 +627,10 @@ static int flexcan_get_berr_counter(cons
  static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
        const struct flexcan_priv *priv = netdev_priv(dev);
@@ -28,7 +28,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        int i;
  
        if (can_dropped_invalid_skb(dev, skb))
-@@ -639,18 +639,18 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -638,18 +638,18 @@ static netdev_tx_t flexcan_start_xmit(st
  
        netif_stop_queue(dev);
  
@@ -53,7 +53,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
        }
  
-@@ -822,7 +822,7 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -821,7 +821,7 @@ static struct sk_buff *flexcan_mailbox_r
        struct flexcan_regs __iomem *regs = priv->regs;
        struct flexcan_mb __iomem *mb;
        struct sk_buff *skb;
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        u32 reg_ctrl, reg_id, reg_iflag1;
        int i;
  
-@@ -859,8 +859,8 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -858,8 +858,8 @@ static struct sk_buff *flexcan_mailbox_r
                reg_ctrl = priv->read(&mb->can_ctrl);
        }
  
@@ -73,7 +73,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                skb = ERR_PTR(-ENOMEM);
                goto mark_as_read;
        }
-@@ -870,17 +870,17 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -869,17 +869,17 @@ static struct sk_buff *flexcan_mailbox_r
  
        reg_id = priv->read(&mb->can_id);
        if (reg_ctrl & FLEXCAN_MB_CNT_IDE)

diff --git a/target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch b/target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch
index e9c8740e6b1e163d7c9eb630fe18ce5668678a7a..b6f8a3a3cf5ec194ee61be71a82356d6640de404 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch
@@ -93,7 +93,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  };
  
  struct flexcan_devtype_data {
-@@ -337,6 +367,30 @@ static const struct can_bittiming_const
+@@ -336,6 +366,30 @@ static const struct can_bittiming_const
        .brp_inc = 1,
  };
  
@@ -124,7 +124,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  /* FlexCAN module is essentially modelled as a little-endian IP in most
   * SoCs, i.e the registers as well as the message buffer areas are
   * implemented in a little-endian fashion.
-@@ -631,7 +685,7 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -630,7 +684,7 @@ static netdev_tx_t flexcan_start_xmit(st
        struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
        u32 can_id;
        u32 data;
@@ -133,7 +133,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        int i;
  
        if (can_dropped_invalid_skb(dev, skb))
-@@ -649,6 +703,9 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -648,6 +702,9 @@ static netdev_tx_t flexcan_start_xmit(st
        if (cfd->can_id & CAN_RTR_FLAG)
                ctrl |= FLEXCAN_MB_CNT_RTR;
  
@@ -143,7 +143,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        for (i = 0; i < cfd->len; i += sizeof(u32)) {
                data = be32_to_cpup((__be32 *)&cfd->data[i]);
                priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
-@@ -859,7 +916,10 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -858,7 +915,10 @@ static struct sk_buff *flexcan_mailbox_r
                reg_ctrl = priv->read(&mb->can_ctrl);
        }
  
@@ -155,7 +155,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        if (unlikely(!skb)) {
                skb = ERR_PTR(-ENOMEM);
                goto mark_as_read;
-@@ -874,9 +934,17 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -873,9 +933,17 @@ static struct sk_buff *flexcan_mailbox_r
        else
                cfd->can_id = (reg_id >> 18) & CAN_SFF_MASK;
  
@@ -176,7 +176,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        for (i = 0; i < cfd->len; i += sizeof(u32)) {
                __be32 data = cpu_to_be32(priv->read(&mb->data[i / sizeof(u32)]));
-@@ -1021,27 +1089,14 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -1020,27 +1088,14 @@ static irqreturn_t flexcan_irq(int irq,
  
  static void flexcan_set_bittiming(struct net_device *dev)
  {
@@ -209,7 +209,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)
                reg |= FLEXCAN_CTRL_LPB;
        if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
-@@ -1052,9 +1107,102 @@ static void flexcan_set_bittiming(struct
+@@ -1051,9 +1106,102 @@ static void flexcan_set_bittiming(struct
        netdev_dbg(dev, "writing ctrl=0x%08x\n", reg);
        priv->write(reg, &regs->ctrl);
  
@@ -315,7 +315,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  }
  
  /* flexcan_chip_start
-@@ -1066,7 +1214,7 @@ static int flexcan_chip_start(struct net
+@@ -1065,7 +1213,7 @@ static int flexcan_chip_start(struct net
  {
        struct flexcan_priv *priv = netdev_priv(dev);
        struct flexcan_regs __iomem *regs = priv->regs;
@@ -324,7 +324,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        u64 reg_imask;
        int err, i;
        struct flexcan_mb __iomem *mb;
-@@ -1163,6 +1311,26 @@ static int flexcan_chip_start(struct net
+@@ -1162,6 +1310,26 @@ static int flexcan_chip_start(struct net
        netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
        priv->write(reg_ctrl, &regs->ctrl);
  
@@ -351,7 +351,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
                reg_ctrl2 = priv->read(&regs->ctrl2);
                reg_ctrl2 |= FLEXCAN_CTRL2_EACEN | FLEXCAN_CTRL2_RRS;
-@@ -1310,6 +1478,12 @@ static int flexcan_open(struct net_devic
+@@ -1309,6 +1477,12 @@ static int flexcan_open(struct net_devic
        struct flexcan_priv *priv = netdev_priv(dev);
        int err;
  
@@ -364,7 +364,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        err = pm_runtime_get_sync(priv->dev);
        if (err < 0)
                return err;
-@@ -1322,7 +1496,10 @@ static int flexcan_open(struct net_devic
+@@ -1321,7 +1495,10 @@ static int flexcan_open(struct net_devic
        if (err)
                goto out_close;
  
@@ -376,7 +376,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        priv->mb_count = (sizeof(priv->regs->mb[0]) / priv->mb_size) +
                         (sizeof(priv->regs->mb[1]) / priv->mb_size);
  
-@@ -1667,6 +1844,18 @@ static int flexcan_probe(struct platform
+@@ -1666,6 +1843,18 @@ static int flexcan_probe(struct platform
        priv->devtype_data = devtype_data;
        priv->reg_xceiver = reg_xceiver;
  

diff --git a/target/linux/layerscape/patches-5.4/802-can-0020-can-flexcan-add-CAN-FD-BRS-support.patch b/target/linux/layerscape/patches-5.4/802-can-0020-can-flexcan-add-CAN-FD-BRS-support.patch
index d569c7fbb72e13a2b8a4632f0ea4677bc8b263db..9ddc6b029cd7bca18dc6da5e972b0dfa8b3e42dd 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0020-can-flexcan-add-CAN-FD-BRS-support.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0020-can-flexcan-add-CAN-FD-BRS-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -703,9 +703,13 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -702,9 +702,13 @@ static netdev_tx_t flexcan_start_xmit(st
        if (cfd->can_id & CAN_RTR_FLAG)
                ctrl |= FLEXCAN_MB_CNT_RTR;
  
@@ -28,7 +28,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        for (i = 0; i < cfd->len; i += sizeof(u32)) {
                data = be32_to_cpup((__be32 *)&cfd->data[i]);
                priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
-@@ -936,6 +940,9 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -935,6 +939,9 @@ static struct sk_buff *flexcan_mailbox_r
  
        if (reg_ctrl & FLEXCAN_MB_CNT_EDL) {
                cfd->len = can_dlc2len(get_canfd_dlc((reg_ctrl >> 16) & 0xf));

diff --git a/target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch b/target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch
index 2c3452b0d129565809bc95feb3686fd644284ad2..0b987bb5e306008111076c5dd2a4df9fe28dd58f 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch
@@ -31,7 +31,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
  /* FLEXCAN memory error control register (MECR) bits */
  #define FLEXCAN_MECR_ECRWRDIS         BIT(31)
-@@ -1323,6 +1324,7 @@ static int flexcan_chip_start(struct net
+@@ -1322,6 +1323,7 @@ static int flexcan_chip_start(struct net
                reg_fdctrl = priv->read(&regs->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;
                reg_fdctrl &= ~(FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3));
                reg_mcr = priv->read(&regs->mcr) & ~FLEXCAN_MCR_FDEN;
@@ -39,7 +39,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
                /* support BRS when set CAN FD mode
                 * 64 bytes payload per MB and 7 MBs per RAM block by default
-@@ -1332,10 +1334,14 @@ static int flexcan_chip_start(struct net
+@@ -1331,10 +1333,14 @@ static int flexcan_chip_start(struct net
                        reg_fdctrl |= FLEXCAN_FDCTRL_FDRATE;
                        reg_fdctrl |= FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3);
                        reg_mcr |= FLEXCAN_MCR_FDEN;
@@ -54,7 +54,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        }
  
        if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
-@@ -1853,7 +1859,7 @@ static int flexcan_probe(struct platform
+@@ -1852,7 +1858,7 @@ static int flexcan_probe(struct platform
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_TIMESTAMP_SUPPORT_FD) {
                if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {

diff --git a/target/linux/layerscape/patches-5.4/802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch b/target/linux/layerscape/patches-5.4/802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch
index ee00ddb5acb39d9e74968f68dea0c52c1aeab7fd..dcdc1647aab51583fcc23d0ec6f1c77a8ffb81a8 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch
@@ -31,7 +31,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
  /* FLEXCAN FD Bit Timing register (FDCBT) bits */
  #define FLEXCAN_FDCBT_FPRESDIV(x)     (((x) & 0x3ff) << 20)
-@@ -1101,7 +1104,7 @@ static void flexcan_set_bittiming(struct
+@@ -1100,7 +1103,7 @@ static void flexcan_set_bittiming(struct
        struct can_bittiming *bt = &priv->can.bittiming;
        struct can_bittiming *dbt = &priv->can.data_bittiming;
        struct flexcan_regs __iomem *regs = priv->regs;
@@ -40,7 +40,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        reg = priv->read(&regs->ctrl);
        reg &= ~(FLEXCAN_CTRL_LPB | FLEXCAN_CTRL_SMP | FLEXCAN_CTRL_LOM);
-@@ -1173,6 +1176,19 @@ static void flexcan_set_bittiming(struct
+@@ -1172,6 +1175,19 @@ static void flexcan_set_bittiming(struct
                                        FLEXCAN_FDCBT_FPROPSEG(dbt->prop_seg);
                        priv->write(reg_fdcbt, &regs->fdcbt);
  
@@ -60,7 +60,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                        if (bt->brp != dbt->brp)
                                netdev_warn(dev, "Warning!! data brp = %d and brp = %d don't match.\n"
                                            "flexcan may not work. consider using different bitrate or data bitrate\n",
-@@ -1322,6 +1338,7 @@ static int flexcan_chip_start(struct net
+@@ -1321,6 +1337,7 @@ static int flexcan_chip_start(struct net
        /* FDCTRL */
        if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
                reg_fdctrl = priv->read(&regs->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;

diff --git a/target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch b/target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch
index 3c86456922f609b7812f4190d4ac097a384be73b..333cbf5563505bf7d96ae7555e509c89a81521d9 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch
@@ -52,7 +52,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
        .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
                FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |
-@@ -1760,6 +1767,7 @@ out_put_node:
+@@ -1759,6 +1766,7 @@ out_put_node:
  }
  
  static const struct of_device_id flexcan_of_match[] = {

diff --git a/target/linux/layerscape/patches-5.4/802-can-0024-can-flexcan-add-lx2160ar1-support.patch b/target/linux/layerscape/patches-5.4/802-can-0024-can-flexcan-add-lx2160ar1-support.patch
index 0c9dc7d14291e67d9ccdc560cd33bbae755d103c..1758cc68d37ef8bf2b1d9dc22e12efb552ad4bd1 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0024-can-flexcan-add-lx2160ar1-support.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0024-can-flexcan-add-lx2160ar1-support.patch
@@ -34,8 +34,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 +
  static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {
        .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
-               FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |
-@@ -1776,6 +1783,7 @@ static const struct of_device_id flexcan
+               FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
+@@ -1775,6 +1782,7 @@ static const struct of_device_id flexcan
        { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
        { .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
        { .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },

diff --git a/target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch b/target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
index 806a020303130f2a7b802c7cd010bae0229ca848..6a6e068deec5fa558593d42c576b281cc5bdfe13 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
@@ -28,7 +28,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  #include <linux/regmap.h>
  
  #define DRV_NAME                      "flexcan"
-@@ -1954,9 +1955,7 @@ static int __maybe_unused flexcan_suspen
+@@ -1955,9 +1956,7 @@ static int __maybe_unused flexcan_suspen
                        if (err)
                                return err;
                } else {
@@ -39,7 +39,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
                }
                netif_stop_queue(dev);
                netif_device_detach(dev);
-@@ -1982,7 +1981,9 @@ static int __maybe_unused flexcan_resume
+@@ -1983,7 +1982,9 @@ static int __maybe_unused flexcan_resume
                        if (err)
                                return err;
                } else {

diff --git a/target/linux/layerscape/patches-5.4/802-can-0026-can-flexcan-fix-deadlock-when-using-self-wakeup.patch b/target/linux/layerscape/patches-5.4/802-can-0026-can-flexcan-fix-deadlock-when-using-self-wakeup.patch
index a7713957012dd3cb4d4e8b7167f185f2fa11ec19..da8a40630175dbed009c7cc14e7a4f16e30beb98 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0026-can-flexcan-fix-deadlock-when-using-self-wakeup.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0026-can-flexcan-fix-deadlock-when-using-self-wakeup.patch
@@ -47,7 +47,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  
  /* FLEXCAN Bit Timing register (CBT) bits */
  #define FLEXCAN_CBT_BTF                       BIT(31)
-@@ -1055,6 +1054,12 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -1054,6 +1053,12 @@ static irqreturn_t flexcan_irq(int irq,
  
        reg_esr = priv->read(&regs->esr);
  

diff --git a/target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch b/target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch
index 06fd55aaa894b76dd139e40bed7a5ed8ee25e591..d7e40d5463b8a59731ca4d17b004e40c0f5627fb 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch
@@ -63,7 +63,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  };
  
  static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
-@@ -504,6 +516,32 @@ static void flexcan_enable_wakeup_irq(st
+@@ -503,6 +515,32 @@ static void flexcan_enable_wakeup_irq(st
        priv->write(reg_mcr, &regs->mcr);
  }
  
@@ -96,7 +96,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  static inline int flexcan_enter_stop_mode(struct flexcan_priv *priv)
  {
        struct flexcan_regs __iomem *regs = priv->regs;
-@@ -513,9 +551,12 @@ static inline int flexcan_enter_stop_mod
+@@ -512,9 +550,12 @@ static inline int flexcan_enter_stop_mod
        reg_mcr |= FLEXCAN_MCR_SLF_WAK;
        priv->write(reg_mcr, &regs->mcr);
  
@@ -112,7 +112,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  
        return flexcan_low_power_enter_ack(priv);
  }
-@@ -526,8 +567,11 @@ static inline int flexcan_exit_stop_mode
+@@ -525,8 +566,11 @@ static inline int flexcan_exit_stop_mode
        u32 reg_mcr;
  
        /* remove stop request */
@@ -126,7 +126,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  
  
        reg_mcr = priv->read(&regs->mcr);
-@@ -1767,11 +1811,6 @@ static int flexcan_setup_stop_mode(struc
+@@ -1766,11 +1810,6 @@ static int flexcan_setup_stop_mode(struc
                gpr_np->full_name, priv->stm.req_gpr, priv->stm.req_bit,
                priv->stm.ack_gpr, priv->stm.ack_bit);
  
@@ -138,7 +138,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
        return 0;
  
  out_put_node:
-@@ -1779,6 +1818,30 @@ out_put_node:
+@@ -1778,6 +1817,30 @@ out_put_node:
        return ret;
  }
  
@@ -169,7 +169,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  static const struct of_device_id flexcan_of_match[] = {
        { .compatible = "fsl,imx8qm-flexcan", .data = &fsl_imx8qm_devtype_data, },
        { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
-@@ -1921,9 +1984,19 @@ static int flexcan_probe(struct platform
+@@ -1920,9 +1983,19 @@ static int flexcan_probe(struct platform
        devm_can_led_init(dev);
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) {

diff --git a/target/linux/layerscape/patches-5.4/802-can-0028-can-flexcan-Add-S32V234-support-to-FlexCAN-driver.patch b/target/linux/layerscape/patches-5.4/802-can-0028-can-flexcan-Add-S32V234-support-to-FlexCAN-driver.patch
index 0c631356f76077bf7446f0f9d8a1f2a44956ea9b..6bfeec9ee3d5bcc9ac6b2b625d34c9818d3d1778 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0028-can-flexcan-Add-S32V234-support-to-FlexCAN-driver.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0028-can-flexcan-Add-S32V234-support-to-FlexCAN-driver.patch
@@ -25,8 +25,8 @@ Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
  //
  // Based on code originally by Andrey Volkov <avolkov@varma-el.com>
  
-@@ -385,6 +386,10 @@ static const struct flexcan_devtype_data
-               FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
+@@ -384,6 +385,10 @@ static const struct flexcan_devtype_data
+               FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
  };
  
 +static struct flexcan_devtype_data fsl_s32v234_devtype_data = {
@@ -36,7 +36,7 @@ Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
  static const struct can_bittiming_const flexcan_bittiming_const = {
        .name = DRV_NAME,
        .tseg1_min = 4,
-@@ -1853,6 +1858,8 @@ static const struct of_device_id flexcan
+@@ -1852,6 +1857,8 @@ static const struct of_device_id flexcan
        { .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
        { .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
        { .compatible = "fsl,lx2160ar1-flexcan", .data = &fsl_lx2160a_r1_devtype_data, },

diff --git a/target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch b/target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch
index bdc8725399a8bc3e10e5106f95eed4118562b2b7..0a2ca6465ac2af273ac4875c854127f8857434e0 100644 (file)
--- a/target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch
+++ b/target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch
@@ -64,7 +64,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
  
                if (writable)
                        pte = kvm_s2pte_mkwrite(pte);
-@@ -2361,7 +2363,7 @@ int kvm_arch_prepare_memory_region(struc
+@@ -2362,7 +2364,7 @@ int kvm_arch_prepare_memory_region(struc
  
                        ret = kvm_phys_addr_ioremap(kvm, gpa, pa,
                                                    vm_end - vm_start,

diff --git a/target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch b/target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch
index 1b36b61e6200d33e77a22ac873c2cfb8f6adf5e2..91f48a78bcb8c0fc42d6e6e2b6159df4fb9bea3f 100644 (file)
--- a/target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch
+++ b/target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch
@@ -105,7 +105,7 @@ Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
        if (kvm_is_device_pfn(pfn)) {
                mem_type = PAGE_S2_DEVICE;
                flags |= KVM_S2PTE_FLAG_IS_IOMAP;
-@@ -2351,6 +2395,9 @@ int kvm_arch_prepare_memory_region(struc
+@@ -2352,6 +2396,9 @@ int kvm_arch_prepare_memory_region(struc
                        gpa_t gpa = mem->guest_phys_addr +
                                    (vm_start - mem->userspace_addr);
                        phys_addr_t pa;
@@ -115,7 +115,7 @@ Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
  
                        pa = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT;
                        pa += vm_start - vma->vm_start;
-@@ -2361,9 +2408,13 @@ int kvm_arch_prepare_memory_region(struc
+@@ -2362,9 +2409,13 @@ int kvm_arch_prepare_memory_region(struc
                                goto out;
                        }
  

diff --git a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch
index 8a8486b36fa47d16866f4a93d80d6efc35dbd2ea..95f8af1eea2f6157744108ad4efbd4217bd4a82c 100644 (file)
--- a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch
@@ -54,7 +54,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
         * All 3.1 IP version constants are greater than the 3.0 IP
 --- a/drivers/usb/dwc3/gadget.c
 +++ b/drivers/usb/dwc3/gadget.c
-@@ -3525,6 +3525,10 @@ int dwc3_gadget_init(struct dwc3 *dwc)
+@@ -3543,6 +3543,10 @@ int dwc3_gadget_init(struct dwc3 *dwc)
        dwc->gadget.sg_supported        = true;
        dwc->gadget.name                = "dwc3-gadget";
        dwc->gadget.lpm_capable         = true;

diff --git a/target/linux/ramips/patches-5.4/991-at803x.patch b/target/linux/ramips/patches-5.4/991-at803x.patch
index 64bc48fe7a489cd3acea026645571ab862dd6e42..af0132f8f7ed452cc205b121e9230581009175ee 100644 (file)
--- a/target/linux/ramips/patches-5.4/991-at803x.patch
+++ b/target/linux/ramips/patches-5.4/991-at803x.patch
@@ -12,8 +12,6 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
  drivers/net/phy/at803x.c | 91 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 91 insertions(+)
 
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
-index 31cd7d8a5a1b5..134c894ccf800 100644
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
 @@ -14,6 +14,8 @@
@@ -44,7 +42,7 @@ index 31cd7d8a5a1b5..134c894ccf800 100644
  
  #define AT803X_DEBUG_REG_0                    0x00
  #define AT803X_DEBUG_RX_CLK_DLY_EN            BIT(15)
-@@ -243,10 +254,72 @@ static int at803x_resume(struct phy_device *phydev)
+@@ -243,10 +254,72 @@ static int at803x_resume(struct phy_devi
        return phy_modify(phydev, MII_BMCR, BMCR_PDOWN | BMCR_ISOLATE, 0);
  }
  
@@ -117,7 +115,7 @@ index 31cd7d8a5a1b5..134c894ccf800 100644
  
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
-@@ -394,6 +467,10 @@ static int at803x_read_status(struct phy_device *phydev)
+@@ -394,6 +467,10 @@ static int at803x_read_status(struct phy
  {
        int ss, err, old_link = phydev->link;
  
@@ -128,7 +126,7 @@ index 31cd7d8a5a1b5..134c894ccf800 100644
        /* Update the link, but return if there was an error */
        err = genphy_update_link(phydev);
        if (err)
-@@ -448,6 +525,19 @@ static int at803x_read_status(struct phy_device *phydev)
+@@ -448,6 +525,19 @@ static int at803x_read_status(struct phy
        return 0;
  }
  
@@ -148,7 +146,7 @@ index 31cd7d8a5a1b5..134c894ccf800 100644
  static struct phy_driver at803x_driver[] = {
  {
        /* ATHEROS 8035 */
-@@ -491,6 +581,7 @@ static struct phy_driver at803x_driver[] = {
+@@ -491,6 +581,7 @@ static struct phy_driver at803x_driver[]
        .suspend                = at803x_suspend,
        .resume                 = at803x_resume,
        /* PHY_GBIT_FEATURES */