From 2f1140edb1078b4a6a3e73466df942aa36194c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Tue, 20 Sep 2022 08:50:23 +0200 Subject: [PATCH] Re-enable Neo3 in the EDGE kernel (#4193) --- config/kernel/linux-rockchip64-edge.config | 13 ++++++++++--- ...rd-nanopi-neo3-with-enabled-I2S-and-spdif.patch} | 7 +------ .../add-boards-to-dts-makefile.patch | 3 ++- 3 files changed, 13 insertions(+), 10 deletions(-) rename patch/kernel/archive/rockchip64-5.19/{add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch => add-board-nanopi-neo3-with-enabled-I2S-and-spdif.patch} (94%) diff --git a/config/kernel/linux-rockchip64-edge.config b/config/kernel/linux-rockchip64-edge.config index 49974d4222..e56c2fec9f 100644 --- a/config/kernel/linux-rockchip64-edge.config +++ b/config/kernel/linux-rockchip64-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.19.6 Kernel Configuration +# Linux/arm64 5.19.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -371,6 +371,8 @@ CONFIG_ARM64_ERRATUM_2077057=y CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y CONFIG_ARM64_ERRATUM_2054223=y CONFIG_ARM64_ERRATUM_2067961=y +CONFIG_ARM64_ERRATUM_2441009=y +CONFIG_ARM64_ERRATUM_2457168=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -1666,7 +1668,9 @@ CONFIG_NET_NSH=m CONFIG_HSR=m CONFIG_NET_SWITCHDEV=y CONFIG_NET_L3_MASTER_DEV=y -# CONFIG_QRTR is not set +CONFIG_QRTR=m +CONFIG_QRTR_TUN=m +CONFIG_QRTR_MHI=m # CONFIG_NET_NCSI is not set CONFIG_PCPU_DEV_REFCNT=y CONFIG_RPS=y @@ -3276,6 +3280,8 @@ CONFIG_ATH10K_USB=m # CONFIG_WCN36XX is not set CONFIG_ATH11K=m CONFIG_ATH11K_PCI=m +# CONFIG_ATH11K_DEBUG is not set +# CONFIG_ATH11K_TRACING is not set CONFIG_WLAN_VENDOR_ATMEL=y CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m @@ -6156,10 +6162,10 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set -CONFIG_BOOTSPLASH=y # end of Console display driver support CONFIG_LOGO=y @@ -7917,6 +7923,7 @@ CONFIG_LITEX_SOC_CONTROLLER=m # # Qualcomm SoC drivers # +CONFIG_QCOM_QMI_HELPERS=m # end of Qualcomm SoC drivers CONFIG_ROCKCHIP_GRF=y diff --git a/patch/kernel/archive/rockchip64-5.19/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch b/patch/kernel/archive/rockchip64-5.19/add-board-nanopi-neo3-with-enabled-I2S-and-spdif.patch similarity index 94% rename from patch/kernel/archive/rockchip64-5.19/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch rename to patch/kernel/archive/rockchip64-5.19/add-board-nanopi-neo3-with-enabled-I2S-and-spdif.patch index 60c49c9e51..413bd008f2 100644 --- a/patch/kernel/archive/rockchip64-5.19/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch +++ b/patch/kernel/archive/rockchip64-5.19/add-board-nanopi-neo3-with-enabled-I2S-and-spdif.patch @@ -5,11 +5,6 @@ Subject: [PATCH] Add Nanopi Neo3 with enabled I2S and spdif Signed-off-by: Igor Pecovnik --- - arch/arm64/boot/dts/rockchip/Makefile | 1 + - .../dts/rockchip/rk3328-nanopi-neo3-rev02.dts | 195 ++++++++++++++++++ - 2 files changed, 196 insertions(+) - create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3-rev02.dts - diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3-rev02.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3-rev02.dts new file mode 100644 index 000000000..bf0a625fe @@ -211,6 +206,6 @@ index 000000000..bf0a625fe + pinctl-0 = <&uart1_xfer>; +}; + --- +-- Created with Armbian build tools https://github.com/armbian/build diff --git a/patch/kernel/archive/rockchip64-5.19/add-boards-to-dts-makefile.patch b/patch/kernel/archive/rockchip64-5.19/add-boards-to-dts-makefile.patch index a5021a05e2..940e3cffc1 100644 --- a/patch/kernel/archive/rockchip64-5.19/add-boards-to-dts-makefile.patch +++ b/patch/kernel/archive/rockchip64-5.19/add-boards-to-dts-makefile.patch @@ -2,12 +2,13 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi index 26661c7b7..1462ed38b 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -1,4 +1,22 @@ +@@ -1,4 +1,23 @@ # SPDX-License-Identifier: GPL-2.0 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-pc.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-box.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-neo3-rev02.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev00.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev06.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev20.dtb