mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +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>
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From d870db86f12a69361472fc86bc516b89d9bf468c Mon Sep 17 00:00:00 2001
|
|
From: Kuldeep Singh <kuldeep.singh@nxp.com>
|
|
Date: Wed, 8 Jan 2020 15:50:44 +0530
|
|
Subject: [PATCH] arm64: dts: ls1012ardb: Update qspi node property
|
|
|
|
Use generic node name and specific label name.
|
|
Add m25p,fast-read.
|
|
|
|
Use dt-bindings constants in interrupts instead of using numbers.
|
|
|
|
Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
|
|
---
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 3 ++-
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
|
|
@@ -89,11 +89,12 @@
|
|
&qspi {
|
|
status = "okay";
|
|
|
|
- qflash0: s25fs512s@0 {
|
|
+ s25fs512s0: flash@0 {
|
|
compatible = "jedec,spi-nor";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
spi-max-frequency = <20000000>;
|
|
+ m25p,fast-read;
|
|
reg = <0>;
|
|
spi-rx-bus-width = <1>;
|
|
spi-tx-bus-width = <1>;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
@@ -392,7 +392,7 @@
|
|
reg = <0x0 0x1550000 0x0 0x10000>,
|
|
<0x0 0x40000000 0x0 0x10000000>;
|
|
reg-names = "QuadSPI", "QuadSPI-memory";
|
|
- interrupts = <0 99 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
|
|
clock-names = "qspi_en", "qspi";
|
|
clocks = <&clockgen 4 0>, <&clockgen 4 0>;
|
|
status = "disabled";
|