mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
ec6293febc
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased:
pending-5.4/611-netfilter_match_bypass_default_table.patch
The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].
Build system: x86_64
Build-tested: ipq806x/R7800
[1] 9b1b89229f ("kernel: bump 5.4 to 5.4.86")
Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
From 4a7dcac3fd18b182f882b65161267612713f72dc Mon Sep 17 00:00:00 2001
|
|
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
Date: Tue, 11 Dec 2018 13:32:31 +0200
|
|
Subject: [PATCH] arm64: dts: ls104x: constrain sata dma address size
|
|
|
|
Limit the dma mask size for sata to 40 bits to match the actual address
|
|
size generated towards the interconnect. Re-use the already existing
|
|
auxiliary simple bus meant for usb but drop the usb reference from the
|
|
node name.
|
|
|
|
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
---
|
|
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 18 +++++++++---------
|
|
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 18 +++++++++---------
|
|
2 files changed, 18 insertions(+), 18 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
|
|
@@ -696,7 +696,7 @@
|
|
<&clockgen 4 0>;
|
|
};
|
|
|
|
- usb_aux_bus: usb_aux_bus {
|
|
+ aux_bus: aux_bus {
|
|
#address-cells = <2>;
|
|
#size-cells = <2>;
|
|
compatible = "simple-bus";
|
|
@@ -741,15 +741,15 @@
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
configure-gfladj;
|
|
};
|
|
- };
|
|
|
|
- sata: sata@3200000 {
|
|
- compatible = "fsl,ls1043a-ahci";
|
|
- reg = <0x0 0x3200000 0x0 0x10000>,
|
|
- <0x0 0x20140520 0x0 0x4>;
|
|
- reg-names = "ahci", "sata-ecc";
|
|
- interrupts = <0 69 0x4>;
|
|
- clocks = <&clockgen 4 0>;
|
|
+ sata: sata@3200000 {
|
|
+ compatible = "fsl,ls1043a-ahci";
|
|
+ reg = <0x0 0x3200000 0x0 0x10000>,
|
|
+ <0x0 0x20140520 0x0 0x4>;
|
|
+ reg-names = "ahci", "sata-ecc";
|
|
+ interrupts = <0 69 0x4>;
|
|
+ clocks = <&clockgen 4 0>;
|
|
+ };
|
|
};
|
|
|
|
msi1: msi-controller1@1571000 {
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
|
|
@@ -594,7 +594,7 @@
|
|
<&clockgen 4 1>;
|
|
};
|
|
|
|
- usb_aux_bus: usb_aux_bus {
|
|
+ aux_bus: aux_bus {
|
|
#address-cells = <2>;
|
|
#size-cells = <2>;
|
|
compatible = "simple-bus";
|
|
@@ -636,15 +636,15 @@
|
|
usb3-lpm-capable;
|
|
snps,dis-u1u2-when-u3-quirk;
|
|
};
|
|
- };
|
|
|
|
- sata: sata@3200000 {
|
|
- compatible = "fsl,ls1046a-ahci";
|
|
- reg = <0x0 0x3200000 0x0 0x10000>,
|
|
- <0x0 0x20140520 0x0 0x4>;
|
|
- reg-names = "ahci", "sata-ecc";
|
|
- interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
|
|
- clocks = <&clockgen 4 1>;
|
|
+ sata: sata@3200000 {
|
|
+ compatible = "fsl,ls1046a-ahci";
|
|
+ reg = <0x0 0x3200000 0x0 0x10000>,
|
|
+ <0x0 0x20140520 0x0 0x4>;
|
|
+ reg-names = "ahci", "sata-ecc";
|
|
+ interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ clocks = <&clockgen 4 1>;
|
|
+ };
|
|
};
|
|
|
|
msi1: msi-controller@1580000 {
|