rockchip-rk3588/6.11: backport Marcin Juszkiewicz's "FriendlyELEC NanoPC-T6 improvements" v6 series to fix non-LTS and split LTS version of NanoPC T6

- Marcin Juszkiewicz's series https://lore.kernel.org/all/20240829-friendlyelec-nanopc-t6-lts-v6-0-edff247e8c02@linaro.org/ has landed upstream
  - see db1dcbe5f7
  - thus we have 2 separate DTs, one for non-LTS, one for LTS; thus also 2 different Armbian boards (see separate commit)
- drop my own patch that added SPI NOR to the T6, as that is now included in the base DT
- this patch shall be dropped when `6.12-rc1` is released
This commit is contained in:
Ricardo Pardini
2024-09-17 12:27:56 +02:00
committed by Igor
parent 74f6c394c3
commit 1ac3f7ca2b
2 changed files with 1551 additions and 38 deletions

View File

@@ -1,38 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Thu, 6 Jun 2024 23:00:05 +0200
Subject: arm64: dts: rockchip: Add NanoPC T6 SPI Flash
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
---
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 14 ++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -576,6 +576,20 @@ &sdmmc {
status = "okay";
};
+&sfc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&fspim1_pins>;
+ status = "okay";
+
+ flash@0 {
+ compatible = "jedec,spi-nor";
+ reg = <0x0>;
+ spi-max-frequency = <50000000>;
+ spi-rx-bus-width = <4>;
+ spi-tx-bus-width = <1>;
+ };
+};
+
&spi2 {
status = "okay";
assigned-clocks = <&cru CLK_SPI2>;
--
Armbian