linux: stable: sync Armbian ROCK Pi S patches

Fixes #59
radxa-repo · Oct 20, 2023 · 777b6b6 · 777b6b6
1 parent 76220aa
commit 777b6b6
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 58 deletions.
diff --git a/linux/stable/0023-armbian-rockpi-s/PKGBUILD b/linux/stable/0023-armbian-rockpi-s/PKGBUILD
@@ -0,0 +1,17 @@
+source=(
+    "board-rockpis-0001-arm64-dts.patch"
+    "board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch"
+    "board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch"
+    "board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch"
+    "board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch"
+    "board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch"
+    "board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch"
+    "board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch"
+    "board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch"
+    "board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch"
+    "board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch"
+    "board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch"
+    "rk3308-0001-pinctrl-slew-mux.patch"
+    "rk3308-0002-iodomains.patch"
+    "rk3308-0003-pinctrl-io-voltage-domains.patch"
+)
diff --git a/linux/stable/0023-armbian-rockpi-s/board-rockpis-0001-arm64-dts.patch b/linux/stable/0023-armbian-rockpi-s/board-rockpis-0001-arm64-dts.patch
@@ -1,12 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: bsp <[email protected]>
-Date: Tue, 25 Apr 2023 21:18:48 +0800
-Subject: [PATCH] Imported from Armbian rockchip64-6.1
-
----
- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 +
- 1 file changed, 1 insertion(+)
-
 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts	2022-12-19 16:47:52.770160260 -0800
 +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts	2022-12-19 17:53:42.503756590 -0800
 @@ -2,6 +2,7 @@

diff --git a/.../0023-armbian-rockpi-s/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch b/.../0023-armbian-rockpi-s/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch
@@ -12,7 +12,7 @@ index d2613ec774c1..37ffedb99a2d 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 @@ -605,6 +605,109 @@ dmac1: dma-controller@ff2d0000 {
- 		#dma-cells = <1>;
+ 		};
  	};
 
 +	i2s_8ch_0: i2s@ff300000 {

diff --git a/...23-armbian-rockpi-s/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch b/...23-armbian-rockpi-s/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch
@@ -26,8 +26,8 @@ index 030f500f3bc8..1f4675a59014 100644
  	imply SND_SOC_PCM512x_SPI
 +	imply SND_SOC_RK3308
  	imply SND_SOC_RK3328
- 	imply SND_SOC_RK817
  	imply SND_SOC_RT274
+ 	imply SND_SOC_RT286
 @@ -931,6 +932,10 @@ config SND_SOC_PCM512x_SPI
  	select SND_SOC_PCM512x
  	select REGMAP_SPI
@@ -49,16 +49,16 @@ index ddfd07071925..9a35df4862dc 100644
  snd-soc-pcm512x-spi-objs := pcm512x-spi.o
 +snd-soc-rk3308-objs := rk3308_codec.o
  snd-soc-rk3328-objs := rk3328_codec.o
- snd-soc-rk817-objs := rk817_codec.o
  snd-soc-rl6231-objs := rl6231.o
+ snd-soc-rl6347a-objs := rl6347a.o
 @@ -437,6 +438,7 @@ obj-$(CONFIG_SND_SOC_PCM5102A)	+= snd-soc-pcm5102a.o
  obj-$(CONFIG_SND_SOC_PCM512x)	+= snd-soc-pcm512x.o
  obj-$(CONFIG_SND_SOC_PCM512x_I2C)	+= snd-soc-pcm512x-i2c.o
  obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o
 +obj-$(CONFIG_SND_SOC_RK3308)	+= snd-soc-rk3308.o
  obj-$(CONFIG_SND_SOC_RK3328)	+= snd-soc-rk3328.o
- obj-$(CONFIG_SND_SOC_RK817)	+= snd-soc-rk817.o
  obj-$(CONFIG_SND_SOC_RL6231)	+= snd-soc-rl6231.o
+ obj-$(CONFIG_SND_SOC_RL6347A)	+= snd-soc-rl6347a.o
 diff --git a/sound/soc/codecs/rk3308_codec.c b/sound/soc/codecs/rk3308_codec.c
 new file mode 100644
 index 000000000000..106f09738dd0

diff --git a/linux/stable/0023-armbian-rockpi-s/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch b/linux/stable/0023-armbian-rockpi-s/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch
@@ -1,12 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: bsp <[email protected]>
-Date: Tue, 25 Apr 2023 21:18:48 +0800
-Subject: [PATCH] Imported from Armbian rockchip64-6.1
-
----
- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 +
- 1 file changed, 1 insertion(+)
-
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi	2020-12-26 18:07:15.666727654 +0200
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi	2020-12-26 18:35:42.115701024 +0200
 @@ -139,6 +151,12 @@

diff --git a/...23-armbian-rockpi-s/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch b/...23-armbian-rockpi-s/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch
@@ -1,12 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: bsp <[email protected]>
-Date: Tue, 25 Apr 2023 21:18:48 +0800
-Subject: [PATCH] Imported from Armbian rockchip64-6.1
-
----
- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 +
- 1 file changed, 1 insertion(+)
-
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi	2020-12-26 18:07:15.666727654 +0200
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi	2020-12-26 18:13:13.061143555 +0200
 @@ -148,6 +148,26 @@

diff --git a/linux/stable/0023-armbian-rockpi-s/rk3308-0001-pinctrl-slew-mux.patch b/linux/stable/0023-armbian-rockpi-s/rk3308-0001-pinctrl-slew-mux.patch
@@ -1,12 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: bsp <[email protected]>
-Date: Tue, 25 Apr 2023 21:18:48 +0800
-Subject: [PATCH] Imported from Armbian rockchip64-6.1
-
----
- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 +
- 1 file changed, 1 insertion(+)
-
 diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
 index 2422211d6..a8b9b6c2b 100644
 --- a/include/linux/pinctrl/pinconf-generic.h

diff --git a/linux/stable/0023-armbian-rockpi-s/rk3308-0002-iodomains.patch b/linux/stable/0023-armbian-rockpi-s/rk3308-0002-iodomains.patch
@@ -1,12 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: bsp <[email protected]>
-Date: Tue, 25 Apr 2023 21:18:48 +0800
-Subject: [PATCH] Imported from Armbian rockchip64-6.1
-
----
- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 +
- 1 file changed, 1 insertion(+)
-
 diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c
 index 9df513d12..83f5354ba 100644
 --- a/drivers/soc/rockchip/io-domain.c

diff --git a/linux/stable/0023-armbian-rockpi-s/rk3308-0003-pinctrl-io-voltage-domains.patch b/linux/stable/0023-armbian-rockpi-s/rk3308-0003-pinctrl-io-voltage-domains.patch
@@ -1,12 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: bsp <[email protected]>
-Date: Tue, 25 Apr 2023 21:18:48 +0800
-Subject: [PATCH] Imported from Armbian rockchip64-6.1
-
----
- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 +
- 1 file changed, 1 insertion(+)
-
 diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
 index f1fed12c4..36ff5827d 100644
 --- a/drivers/pinctrl/pinctrl-rockchip.c