diff options
| author | John Audia <graysky@archlinux.us> | 2021-07-19 05:17:10 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-25 13:52:38 +0200 |
| commit | 5408e811b29643e3fd5f2cd227f17263daa45a74 (patch) | |
| tree | c41b5db75482b8a16c092183206a60c13b2e1173 /target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch | |
| parent | 2b2ac841e022054ff3390f25fa41336467530a91 (diff) | |
| download | upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.tar.gz upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.tar.bz2 upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.zip | |
kernel: bump 5.4 to 5.4.133
Manually rebased:
pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch')
| -rw-r--r-- | target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch b/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch index 640e4eb57c..edff5c4a9c 100644 --- a/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch +++ b/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch @@ -56,7 +56,7 @@ Cc: Miquèl Raynal <miquel.raynal@bootlin.com> #define PCIE_MSG_LOG_REG (CONTROL_BASE_ADDR + 0x30) #define PCIE_ISR0_REG (CONTROL_BASE_ADDR + 0x40) #define PCIE_MSG_PM_PME_MASK BIT(7) -@@ -207,6 +210,7 @@ struct advk_pcie { +@@ -208,6 +211,7 @@ struct advk_pcie { int link_gen; struct pci_bridge_emul bridge; struct gpio_desc *reset_gpio; @@ -64,7 +64,7 @@ Cc: Miquèl Raynal <miquel.raynal@bootlin.com> }; static inline void advk_writel(struct advk_pcie *pcie, u32 val, u64 reg) -@@ -358,6 +362,11 @@ static void advk_pcie_setup_hw(struct ad +@@ -359,6 +363,11 @@ static void advk_pcie_setup_hw(struct ad advk_pcie_issue_perst(pcie); @@ -76,7 +76,7 @@ Cc: Miquèl Raynal <miquel.raynal@bootlin.com> /* Set to Direct mode */ reg = advk_readl(pcie, CTRL_CONFIG_REG); reg &= ~(CTRL_MODE_MASK << CTRL_MODE_SHIFT); -@@ -1114,6 +1123,62 @@ out_release_res: +@@ -1125,6 +1134,62 @@ out_release_res: return err; } @@ -139,7 +139,7 @@ Cc: Miquèl Raynal <miquel.raynal@bootlin.com> static int advk_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -1171,6 +1236,10 @@ static int advk_pcie_probe(struct platfo +@@ -1182,6 +1247,10 @@ static int advk_pcie_probe(struct platfo else pcie->link_gen = ret; |