mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
core/linux-aarch64 to 4.18.0-1
This commit is contained in:
parent
c112965fee
commit
9a9ce45ff2
6 changed files with 300 additions and 132 deletions
|
@ -1,14 +1,14 @@
|
||||||
From 8a928056900e2d1172f174c54965744755654612 Mon Sep 17 00:00:00 2001
|
From 0cd8e7546b92dfadcb1cb072e755af05e3bf8a35 Mon Sep 17 00:00:00 2001
|
||||||
From: popcornmix <popcornmix@gmail.com>
|
From: popcornmix <popcornmix@gmail.com>
|
||||||
Date: Tue, 18 Feb 2014 01:43:50 -0300
|
Date: Tue, 18 Feb 2014 01:43:50 -0300
|
||||||
Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter
|
Subject: [PATCH 1/4] net/smsc95xx: Allow mac address to be set as a parameter
|
||||||
|
|
||||||
---
|
---
|
||||||
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
|
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++
|
||||||
1 file changed, 56 insertions(+)
|
1 file changed, 56 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
|
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
|
||||||
index 309b88acd3d0..7bc9feb891a1 100644
|
index 06b4d290784d..3be3b5a4a176 100644
|
||||||
--- a/drivers/net/usb/smsc95xx.c
|
--- a/drivers/net/usb/smsc95xx.c
|
||||||
+++ b/drivers/net/usb/smsc95xx.c
|
+++ b/drivers/net/usb/smsc95xx.c
|
||||||
@@ -60,6 +60,7 @@
|
@@ -60,6 +60,7 @@
|
||||||
|
@ -91,5 +91,5 @@ index 309b88acd3d0..7bc9feb891a1 100644
|
||||||
|
|
||||||
/* maybe the boot loader passed the MAC address in devicetree */
|
/* maybe the boot loader passed the MAC address in devicetree */
|
||||||
--
|
--
|
||||||
2.15.0
|
2.18.0
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From d85e631bc608f1e310143d7c279db2d5cd5344c8 Mon Sep 17 00:00:00 2001
|
From 99984002189abb7822f71cc8844e263bb591f75b Mon Sep 17 00:00:00 2001
|
||||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||||
Date: Mon, 7 Aug 2017 19:34:57 -0600
|
Date: Mon, 7 Aug 2017 19:34:57 -0600
|
||||||
Subject: [PATCH 2/2] arm64: dts: rockchip: disable pwm0 on rk3399-firefly
|
Subject: [PATCH 2/4] arm64: dts: rockchip: disable pwm0 on rk3399-firefly
|
||||||
|
|
||||||
Workaround for intermittent boot hangs due to pwm0 probe disabling the PWM clock.
|
Workaround for intermittent boot hangs due to pwm0 probe disabling the PWM clock.
|
||||||
---
|
---
|
||||||
|
@ -9,7 +9,7 @@ Workaround for intermittent boot hangs due to pwm0 probe disabling the PWM clock
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
|
||||||
index 4f28628aa091..07e5f161958c 100644
|
index 2a352763c848..b986aef1d7fd 100644
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
|
||||||
@@ -630,7 +630,7 @@
|
@@ -630,7 +630,7 @@
|
||||||
|
@ -22,5 +22,5 @@ index 4f28628aa091..07e5f161958c 100644
|
||||||
|
|
||||||
&pwm2 {
|
&pwm2 {
|
||||||
--
|
--
|
||||||
2.15.0
|
2.18.0
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,58 @@
|
||||||
|
From c8c5f3c2bcbc8121ac7f2e2b88bdd5d8672c2c49 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Wu <william.wu@rock-chips.com>
|
||||||
|
Date: Mon, 4 Dec 2017 10:40:39 +0100
|
||||||
|
Subject: [PATCH 3/4] arm64: dts: rockchip: add usb3 controller node for RK3328
|
||||||
|
SoCs
|
||||||
|
|
||||||
|
RK3328 has one USB 3.0 OTG controller which uses DWC_USB3
|
||||||
|
core's general architecture. It can act as static xHCI host
|
||||||
|
controller, static device controller, USB 3.0/2.0 OTG basing
|
||||||
|
on ID of USB3.0 PHY.
|
||||||
|
|
||||||
|
Signed-off-by: William Wu <william.wu@rock-chips.com>
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 27 ++++++++++++++++++++++++
|
||||||
|
1 file changed, 27 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||||
|
index b8e9da15e00c..60b3ed5918e7 100644
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||||
|
@@ -862,6 +862,33 @@
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
+ usbdrd3: usb@ff600000 {
|
||||||
|
+ compatible = "rockchip,rk3328-dwc3", "rockchip,rk3399-dwc3";
|
||||||
|
+ clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>,
|
||||||
|
+ <&cru ACLK_USB3OTG>;
|
||||||
|
+ clock-names = "ref_clk", "suspend_clk",
|
||||||
|
+ "bus_clk";
|
||||||
|
+ #address-cells = <2>;
|
||||||
|
+ #size-cells = <2>;
|
||||||
|
+ ranges;
|
||||||
|
+ status = "disabled";
|
||||||
|
+
|
||||||
|
+ usbdrd_dwc3: dwc3@ff600000 {
|
||||||
|
+ compatible = "snps,dwc3";
|
||||||
|
+ reg = <0x0 0xff600000 0x0 0x100000>;
|
||||||
|
+ interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
+ dr_mode = "otg";
|
||||||
|
+ phy_type = "utmi_wide";
|
||||||
|
+ snps,dis_enblslpm_quirk;
|
||||||
|
+ snps,dis-u2-freeclk-exists-quirk;
|
||||||
|
+ snps,dis_u2_susphy_quirk;
|
||||||
|
+ snps,dis_u3_susphy_quirk;
|
||||||
|
+ snps,dis-del-phy-power-chg-quirk;
|
||||||
|
+ snps,dis-tx-ipgap-linecheck-quirk;
|
||||||
|
+ status = "disabled";
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
gic: interrupt-controller@ff811000 {
|
||||||
|
compatible = "arm,gic-400";
|
||||||
|
#interrupt-cells = <3>;
|
||||||
|
--
|
||||||
|
2.18.0
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
From b772d09de7feaa9b6783fbad461d2d2f5aeb70e1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
Date: Mon, 4 Dec 2017 10:40:41 +0100
|
||||||
|
Subject: [PATCH 4/4] arm64: dts: rockchip: enable usb3 nodes on rk3328-rock64
|
||||||
|
|
||||||
|
Enable the nodes to make the usb3 port usable on that board.
|
||||||
|
|
||||||
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 9 +++++++++
|
||||||
|
1 file changed, 9 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
||||||
|
index 28257724a56e..5c43a61d3178 100644
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
||||||
|
@@ -332,3 +332,12 @@
|
||||||
|
&usb_host0_ohci {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+&usbdrd3 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&usbdrd_dwc3 {
|
||||||
|
+ dr_mode = "host";
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
--
|
||||||
|
2.18.0
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
buildarch=8
|
buildarch=8
|
||||||
|
|
||||||
pkgbase=linux-aarch64
|
pkgbase=linux-aarch64
|
||||||
_srcname=linux-4.17
|
_srcname=linux-4.18
|
||||||
_kernelname=${pkgbase#linux}
|
_kernelname=${pkgbase#linux}
|
||||||
_desc="AArch64 multi-platform"
|
_desc="AArch64 multi-platform"
|
||||||
pkgver=4.17.14
|
pkgver=4.18.0
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=('aarch64')
|
arch=('aarch64')
|
||||||
url="http://www.kernel.org/"
|
url="http://www.kernel.org/"
|
||||||
|
@ -15,20 +15,23 @@ license=('GPL2')
|
||||||
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
|
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
|
||||||
options=('!strip')
|
options=('!strip')
|
||||||
source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
|
source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
|
||||||
"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
|
#"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
|
||||||
'0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
|
'0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
|
||||||
'0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch'
|
'0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch'
|
||||||
|
'0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch'
|
||||||
|
'0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch'
|
||||||
'config'
|
'config'
|
||||||
'kernel.its'
|
'kernel.its'
|
||||||
'kernel.keyblock'
|
'kernel.keyblock'
|
||||||
'kernel_data_key.vbprivk'
|
'kernel_data_key.vbprivk'
|
||||||
'linux.preset'
|
'linux.preset'
|
||||||
'99-linux.hook')
|
'99-linux.hook')
|
||||||
md5sums=('5bb13a03274b66b56c85b26682e407d7'
|
md5sums=('bee5fe53ee1c3142b8f0c12c0d3348f9'
|
||||||
'ad9acd78874e9ad9a5a0cd3c28d9d941'
|
'be4199c685434f12190bb627bb714ff2'
|
||||||
'c656b4169dd6c87f93dfb49edea3ddbf'
|
'b4d613a58a28445ce8363d734be3b971'
|
||||||
'79459eaa00aa5de588c73f3076f0907b'
|
'b9bec2a58df6dff282df758edf8f526e'
|
||||||
'a3ec23f14bbf2c33f0fc53adf5dc59b4'
|
'9915046e15f82e917bc98c7721e63ac4'
|
||||||
|
'0d2fb0d6ad977f104915f757d3f6af04'
|
||||||
'11a4f35c50f0bde59c30182aa7b797b7'
|
'11a4f35c50f0bde59c30182aa7b797b7'
|
||||||
'61c5ff73c136ed07a7aadbf58db3d96a'
|
'61c5ff73c136ed07a7aadbf58db3d96a'
|
||||||
'584777ae88bce2c5659960151b64c7d8'
|
'584777ae88bce2c5659960151b64c7d8'
|
||||||
|
@ -39,11 +42,13 @@ prepare() {
|
||||||
cd "${srcdir}/${_srcname}"
|
cd "${srcdir}/${_srcname}"
|
||||||
|
|
||||||
# add upstream patch
|
# add upstream patch
|
||||||
git apply --whitespace=nowarn ../patch-${pkgver}
|
#git apply --whitespace=nowarn ../patch-${pkgver}
|
||||||
|
|
||||||
# ALARM patches
|
# ALARM patches
|
||||||
git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
|
git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
|
||||||
git apply ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch
|
git apply ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch
|
||||||
|
git apply ../0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch
|
||||||
|
git apply ../0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch
|
||||||
|
|
||||||
cat "${srcdir}/config" > ./.config
|
cat "${srcdir}/config" > ./.config
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue