Skip to content

Commit 9a6ea45

Browse files
committed
rockchip64-7.1: rewrite patches
1 parent 0b208a8 commit 9a6ea45

2 files changed

Lines changed: 71 additions & 48 deletions

File tree

patch/kernel/archive/rockchip64-7.1/board-rgds-01-asoc-aw87391.patch

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
1-
From ef3aaf886966348c7f5955f0e76517158dd667e9 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Noxwell <beebono@yahoo.com>
33
Date: Sat, 10 Jan 2026 14:47:43 +0000
4-
Subject: [PATCH] ASoC: codecs: Add aw87391 amplifier driver
4+
Subject: ASoC: codecs: Add aw87391 amplifier driver
55

66
---
7-
sound/soc/codecs/Kconfig | 12 ++
7+
sound/soc/codecs/Kconfig | 12 +
88
sound/soc/codecs/Makefile | 2 +
9-
sound/soc/codecs/aw87391.c | 271 +++++++++++++++++++++++++++++++++++++
9+
sound/soc/codecs/aw87391.c | 271 ++++++++++
1010
3 files changed, 285 insertions(+)
11-
create mode 100644 sound/soc/codecs/aw87391.c
1211

1312
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
14-
index 061791e61907..75f727854057 100644
13+
index 111111111111..222222222222 100644
1514
--- a/sound/soc/codecs/Kconfig
1615
+++ b/sound/soc/codecs/Kconfig
17-
@@ -56,6 +56,7 @@ config SND_SOC_ALL_CODECS
16+
@@ -55,6 +55,7 @@ config SND_SOC_ALL_CODECS
1817
imply SND_SOC_AUDIO_IIO_AUX
1918
imply SND_SOC_AW8738
2019
imply SND_SOC_AW87390
2120
+ imply SND_SOC_AW87391
2221
imply SND_SOC_AW88395
2322
imply SND_SOC_AW88081
2423
imply SND_SOC_AW88166
25-
@@ -737,6 +738,17 @@ config SND_SOC_AW87390
24+
@@ -722,6 +723,17 @@ config SND_SOC_AW87390
2625
sound quality, which is a new high efficiency, low
2726
noise, constant large volume, 6th Smart K audio amplifier.
2827

@@ -41,18 +40,18 @@ index 061791e61907..75f727854057 100644
4140
tristate "Soc Audio for awinic aw88399"
4241
depends on I2C
4342
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
44-
index d687d4f74363..0d6a66408ddf 100644
43+
index 111111111111..222222222222 100644
4544
--- a/sound/soc/codecs/Makefile
4645
+++ b/sound/soc/codecs/Makefile
47-
@@ -49,6 +49,7 @@ snd-soc-arizona-y := arizona.o arizona-jack.o
46+
@@ -48,6 +48,7 @@ snd-soc-arizona-y := arizona.o arizona-jack.o
4847
snd-soc-audio-iio-aux-y := audio-iio-aux.o
4948
snd-soc-aw8738-y := aw8738.o
5049
snd-soc-aw87390-y := aw87390.o
5150
+snd-soc-aw87391-y := aw87391.o
5251
snd-soc-aw88081-y := aw88081.o
5352
snd-soc-aw88395-lib-y := aw88395/aw88395_lib.o \
5453
aw88395/aw88395_device.o
55-
@@ -483,6 +484,7 @@ obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o
54+
@@ -486,6 +487,7 @@ obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o
5655
obj-$(CONFIG_SND_SOC_AUDIO_IIO_AUX) += snd-soc-audio-iio-aux.o
5756
obj-$(CONFIG_SND_SOC_AW8738) += snd-soc-aw8738.o
5857
obj-$(CONFIG_SND_SOC_AW87390) += snd-soc-aw87390.o
@@ -62,7 +61,7 @@ index d687d4f74363..0d6a66408ddf 100644
6261
obj-$(CONFIG_SND_SOC_AW88395) +=snd-soc-aw88395.o
6362
diff --git a/sound/soc/codecs/aw87391.c b/sound/soc/codecs/aw87391.c
6463
new file mode 100644
65-
index 000000000000..896db15a2c36
64+
index 000000000000..111111111111
6665
--- /dev/null
6766
+++ b/sound/soc/codecs/aw87391.c
6867
@@ -0,0 +1,271 @@
@@ -338,5 +337,5 @@ index 000000000000..896db15a2c36
338337
+MODULE_DESCRIPTION("ASoC AW87391 PA Driver");
339338
+MODULE_LICENSE("GPL v2");
340339
--
341-
2.34.1
340+
Armbian
342341

Lines changed: 59 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,63 @@
1-
From: crackerjacques <jack@supremeoverlordjabs.co>
2-
Subject: [PATCH] input: touchscreen: goodix: add goodix,no-cfg-from-disk DT opt-out (RG DS dual gt911)
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: "J.H." <129548912+crackerjacques@users.noreply.github.com>
3+
Date: Thu, 11 Jun 2026 11:45:33 +0200
4+
Subject: [ARCHEOLOGY] board: add Anbernic RG DS (RK3568 dual 4" 640x480
5+
handheld) as CSC (#9934)
36

4-
The Anbernic RG DS has two gt911 touchscreens (same ID 911, same i2c addr on
5-
separate buses). With load_cfg_from_disk=true the driver requests
6-
goodix_911_cfg.bin asynchronously and sets up the IRQ in the firmware callback;
7-
with two identical chips requesting the same (missing) firmware this leaves one
8-
panel without a working touch IRQ (and incurs a ~60s firmware timeout).
9-
10-
Rather than changing the default for every goodix device, add a
11-
"goodix,no-cfg-from-disk" device-tree property. When present the driver keeps
12-
load_cfg_from_disk off and sets the IRQ up synchronously in probe using the
13-
chip's built-in config. Only the RG DS opts in (both gt911 nodes); all other
14-
boards keep the upstream default. Mirrors ROCKNIX's goodix usability fix.
15-
16-
Signed-off-by: crackerjacques <jack@supremeoverlordjabs.co>
7+
> X-Git-Archeology: > recovered message: > * board: add Anbernic RG DS (RK3568 dual 4" handheld) as CSC
8+
> X-Git-Archeology: > recovered message: > RK3568 clamshell handheld, dual 4" 640x480 MIPI-DSI. Supported by mainline
9+
> X-Git-Archeology: > recovered message: > drivers on edge (7.0) and bleedingedge (7.1): jadard panels, adc-joystick,
10+
> X-Git-Archeology: > recovered message: > goodix touch, rk817 audio, rtw88 wifi, usb. The kernel options for these are
11+
> X-Git-Archeology: > recovered message: > set in the shared rockchip64 edge/bleedingedge configs (not the board file).
12+
> X-Git-Archeology: > recovered message: > Carries the out-of-tree aw87391 speaker-amp driver (plus its DTS wiring on 7.0;
13+
> X-Git-Archeology: > recovered message: > 7.1 already has the amp nodes in the mainline DTS) and a goodix dual-gt911
14+
> X-Git-Archeology: > recovered message: > cfg-from-disk fix. Builds mainline U-Boot v2026.01 (vendor 2017.09 does not
15+
> X-Git-Archeology: > recovered message: > boot this board).
16+
> X-Git-Archeology: > recovered message: > Needs rk3568 DDR v1.23 / BL31 v1.45 from armbian/rkbin (separate PR).
17+
> X-Git-Archeology: > recovered message: > Signed-off-by: crackerjacques <jack@supremeoverlordjabs.co>
18+
> X-Git-Archeology: > recovered message: > * anbernic-rg-ds: drop redundant board name from header comment
19+
> X-Git-Archeology: > recovered message: > BOARD_NAME already carries 'Anbernic RG DS'; keep only the hardware
20+
> X-Git-Archeology: > recovered message: > description on the first-line interactive comment (review: @EvilOlaf).
21+
> X-Git-Archeology: > recovered message: > Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
22+
> X-Git-Archeology: > recovered message: > ---------
23+
> X-Git-Archeology: > recovered message: > Signed-off-by: crackerjacques <jack@supremeoverlordjabs.co>
24+
> X-Git-Archeology: > recovered message: > Co-authored-by: crackerjacques <jack@supremeoverlordjabs.co>
25+
> X-Git-Archeology: > recovered message: > Co-authored-by: jackheinlein <crackerjaxx@yandex.com>
26+
> X-Git-Archeology: - Revision fbfc3ea659f651281d97cfdbf001ca4aa88abeeb: https://github.com/armbian/build/commit/fbfc3ea659f651281d97cfdbf001ca4aa88abeeb
27+
> X-Git-Archeology: Date: Thu, 11 Jun 2026 11:45:33 +0200
28+
> X-Git-Archeology: From: J.H. <129548912+crackerjacques@users.noreply.github.com>
29+
> X-Git-Archeology: Subject: board: add Anbernic RG DS (RK3568 dual 4" 640x480 handheld) as CSC (#9934)
30+
> X-Git-Archeology:
31+
---
32+
arch/arm64/boot/dts/rockchip/rk3568-anbernic-rg-ds.dts | 2 ++
33+
drivers/input/touchscreen/goodix.c | 9 +++++++++
34+
2 files changed, 11 insertions(+)
1735

36+
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-anbernic-rg-ds.dts b/arch/arm64/boot/dts/rockchip/rk3568-anbernic-rg-ds.dts
37+
index 111111111111..222222222222 100644
38+
--- a/arch/arm64/boot/dts/rockchip/rk3568-anbernic-rg-ds.dts
39+
+++ b/arch/arm64/boot/dts/rockchip/rk3568-anbernic-rg-ds.dts
40+
@@ -883,6 +883,7 @@ &i2c3 {
41+
touch1: touchscreen@14 {
42+
compatible = "goodix,gt911";
43+
reg = <0x14>;
44+
+ goodix,no-cfg-from-disk;
45+
AVDD28-supply = <&vcc2v8_dvp>;
46+
interrupt-parent = <&gpio0>;
47+
interrupts = <RK_PC0 IRQ_TYPE_LEVEL_LOW>;
48+
@@ -908,6 +909,7 @@ &i2c5 {
49+
touch0: touchscreen@14 {
50+
compatible = "goodix,gt911";
51+
reg = <0x14>;
52+
+ goodix,no-cfg-from-disk;
53+
AVDD28-supply = <&vcc2v8_dvp>;
54+
interrupt-parent = <&gpio0>;
55+
interrupts = <RK_PB6 IRQ_TYPE_LEVEL_LOW>;
56+
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
57+
index 111111111111..222222222222 100644
1858
--- a/drivers/input/touchscreen/goodix.c
1959
+++ b/drivers/input/touchscreen/goodix.c
20-
@@ -1021,7 +1021,16 @@
21-
default:
60+
@@ -1022,6 +1022,15 @@ static int goodix_get_gpio_config(struct goodix_ts_data *ts)
2261
if (ts->gpiod_int && ts->gpiod_rst) {
2362
ts->reset_controller_at_probe = true;
2463
ts->load_cfg_from_disk = true;
@@ -34,21 +73,6 @@ Signed-off-by: crackerjacques <jack@supremeoverlordjabs.co>
3473
ts->irq_pin_access_method = IRQ_PIN_ACCESS_GPIO;
3574
}
3675
}
37-
--- a/arch/arm64/boot/dts/rockchip/rk3568-anbernic-rg-ds.dts
38-
+++ b/arch/arm64/boot/dts/rockchip/rk3568-anbernic-rg-ds.dts
39-
@@ -920,6 +920,7 @@
40-
touch1: touchscreen@14 {
41-
compatible = "goodix,gt911";
42-
reg = <0x14>;
43-
+ goodix,no-cfg-from-disk;
44-
AVDD28-supply = <&vcc2v8_dvp>;
45-
interrupt-parent = <&gpio0>;
46-
interrupts = <RK_PC0 IRQ_TYPE_LEVEL_LOW>;
47-
@@ -944,6 +945,7 @@
48-
touch0: touchscreen@14 {
49-
compatible = "goodix,gt911";
50-
reg = <0x14>;
51-
+ goodix,no-cfg-from-disk;
52-
AVDD28-supply = <&vcc2v8_dvp>;
53-
interrupt-parent = <&gpio0>;
54-
interrupts = <RK_PB6 IRQ_TYPE_LEVEL_LOW>;
76+
--
77+
Armbian
78+

0 commit comments

Comments
 (0)