core/linux-espressobin to 5.7.7-1

This commit is contained in:
Kevin Mihelich 2020-07-05 23:30:26 +00:00
parent a857b68b35
commit 2e0a9f33e4
3 changed files with 8 additions and 52 deletions

View file

@ -1,7 +1,7 @@
From 7d919c5e1e13eb3423b0421dd0960621e008828b Mon Sep 17 00:00:00 2001
From 5a06abc2198fc2ad6b25a4b24f029d454cf4b642 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 4 Jul 2017 19:25:28 -0600
Subject: [PATCH 1/2] arm64: dts: marvell: armada37xx: Add eth0 alias
Subject: [PATCH] arm64: dts: marvell: armada37xx: Add eth0 alias
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
@ -9,10 +9,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index f43c43168b00..0c940f9e39cc 100644
index 7909c146eabf..745ca5ff76da 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -18,6 +18,7 @@
@@ -18,6 +18,7 @@ / {
#size-cells = <2>;
aliases {
@ -21,5 +21,5 @@ index f43c43168b00..0c940f9e39cc 100644
serial1 = &uart1;
};
--
2.21.0
2.26.1

View file

@ -1,41 +0,0 @@
From 8b19baadb9aa168722b61a42e83d9091d226ddb9 Mon Sep 17 00:00:00 2001
From: Victor Gu <xigu@marvell.com>
Date: Fri, 8 Sep 2017 11:53:46 +0200
Subject: [PATCH 2/2] PCI: aardvark: disable LOS state by default
Some PCIe devices do not support LOS, and will cause timeouts if the
root complex forces the LOS state. This patch disables the LOS state
by default.
This is part of fixing bug
https://bugzilla.kernel.org/show_bug.cgi?id=196339, this commit was
reported as the user to be important to get a Intel 7260 mini-PCIe
WiFi card working.
Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver")
Signed-off-by: Victor Gu <xigu@marvell.com>
Reviewed-by: Evan Wang <xswang@marvell.com>
Reviewed-by: Nadav Haklai <nadavh@marvell.com>
[Thomas: tweak commit log.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
drivers/pci/controller/pci-aardvark.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index eb58dfdaba1b..ec4ed3c503f3 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -331,8 +331,7 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
advk_pcie_wait_for_link(pcie);
- reg = PCIE_CORE_LINK_L0S_ENTRY |
- (1 << PCIE_CORE_LINK_WIDTH_SHIFT);
+ reg = (1 << PCIE_CORE_LINK_WIDTH_SHIFT);
advk_writel(pcie, reg, PCIE_CORE_LINK_CTRL_STAT_REG);
reg = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);
--
2.21.0

View file

@ -7,7 +7,7 @@ pkgbase=linux-espressobin
_srcname=linux-5.7
_kernelname=${pkgbase#linux}
_desc="Globalscale ESPRESSOBin"
pkgver=5.7.2
pkgver=5.7.7
pkgrel=1
arch=('aarch64')
url="http://www.kernel.org/"
@ -17,16 +17,14 @@ options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
"http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
'0001-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch'
'0002-PCI-aardvark-disable-LOS-state-by-default.patch'
'config'
'linux.preset'
'60-linux.hook'
'90-linux.hook'
'91-linux.hook')
md5sums=('f63ed18935914e1ee3e04c2a0ce1ba3b'
'7dbd8df264550584e43dfc512c2b9acd'
'0ed4373219f57d869bbadafd49fa9861'
'dac6bb686ddfb26894d4477ba61c901a'
'6103451d140cfb4862b45cde2217543c'
'2b57e90d0515f0558504e3f6f21fad1a'
'0fe7793e37cc769a8a1cf70a4595f3cf'
'86d4a35722b5410e3b29fc92dae15d4b'
'ce6c81ad1ad1f8b333fd6077d47abdaf'
@ -41,7 +39,6 @@ prepare() {
# ALARM patches
git apply ../0001-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch
git apply ../0002-PCI-aardvark-disable-LOS-state-by-default.patch
cat "${srcdir}/config" > ./.config