wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prep RK3399 for release

Browse source
This commit is contained in:
mason 2023-07-03 19:49:03 +00:00
parent a833869241
commit 173a02e72f
No known key found for this signature in database
GPG key ID: 84D9278A11FA112B
3 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
packages/hardware/quirks/devices/Anbernic RG552/003-audio
View file

@ -38,7 +38,7 @@ state.rockchipes8316c {
control.1 {
iface CARD
name 'Headphones Jack'
value false
value true
comment {
access read
type BOOLEAN
@ -48,8 +48,8 @@ state.rockchipes8316c {
control.2 {
iface MIXER
name 'Headphone Playback Volume'
value.0 3
value.1 3
value.0 2
value.1 2
comment {
access 'read write'
type INTEGER
@ -57,15 +57,15 @@ state.rockchipes8316c {
range '0 - 3'
dbmin -4800
dbmax 0
dbvalue.0 0
dbvalue.1 0
dbvalue.0 -1200
dbvalue.1 -1200
}
}
control.3 {
iface MIXER
name 'Headphone Mixer Volume'
value.0 11
value.1 11
value.0 10
value.1 10
comment {
access 'read write'
type INTEGER
@ -73,8 +73,8 @@ state.rockchipes8316c {
range '0 - 11'
dbmin -1200
dbmax 0
dbvalue.0 0
dbvalue.1 0
dbvalue.0 -150
dbvalue.1 -150
}
}
control.4 {
@ -94,8 +94,8 @@ state.rockchipes8316c {
control.5 {
iface MIXER
name 'DAC Playback Volume'
value.0 93
value.1 93
value.0 165
value.1 165
comment {
access 'read write'
type INTEGER
@ -103,14 +103,14 @@ state.rockchipes8316c {
range '0 - 192'
dbmin -9999999
dbmax 0
dbvalue.0 -4950
dbvalue.1 -4950
dbvalue.0 -1350
dbvalue.1 -1350
}
}
control.6 {
iface MIXER
name 'DAC Soft Ramp Switch'
value true
value false
comment {
access 'read write'
type BOOLEAN
@ -120,7 +120,7 @@ state.rockchipes8316c {
control.7 {
iface MIXER
name 'DAC Soft Ramp Rate'
value 0
value 4
comment {
access 'read write'
type INTEGER
@ -151,7 +151,7 @@ state.rockchipes8316c {
control.10 {
iface MIXER
name 'DAC Stereo Enhancement'
value 0
value 7
comment {
access 'read write'
type INTEGER
@ -285,10 +285,10 @@ state.rockchipes8316c {
access 'read write'
type INTEGER
count 1
range '0 - 10'
range '0 - 11'
dbmin -1650
dbmax -150
dbvalue.0 0
dbvalue.0 -150
}
}
control.22 {

4
packages/virtual/emulators/package.mk
View file

@ -46,9 +46,9 @@ case "${DEVICE}" in
;;
RK3399)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr"
PKG_EMUS+=" aethersx2-sa dolphin-sa drastic-sa duckstation-sa pcsx_rearmed-lr box64 scummvmsa \
PKG_EMUS+=" aethersx2-sa dolphin-sa drastic-sa duckstation-sa mupen64plus-sa box64 scummvmsa \
yabasanshiro-sa portmaster"
LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr dolphin-lr flycast-lr mame-lr"
LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr dolphin-lr flycast-lr mame-lr pcsx_rearmed-lr"
PKG_RETROARCH+=" retropie-shaders"
;;
RK356*)

63
projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch
View file

@ -1,6 +1,6 @@
diff -rupN linux.orig/Makefile linux/Makefile
--- linux.orig/Makefile 2023-06-23 03:53:37.552116029 +0000
+++ linux/Makefile 2023-06-23 03:57:17.715782858 +0000
+++ linux/Makefile 2023-07-02 20:04:12.325801424 +0000
@@ -826,6 +826,8 @@ KBUILD_CFLAGS += $(call cc-disable-warni
KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
@ -21,7 +21,7 @@ diff -rupN linux.orig/Makefile linux/Makefile
KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init)
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boot/dts/rockchip/Makefile
--- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2023-06-23 03:53:36.244094795 +0000
+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-06-23 03:57:55.424426472 +0000
+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-07-02 20:04:12.325801424 +0000
@@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-or
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinephone-pro.dtb
@ -32,8 +32,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boo
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 2023-07-02 03:16:28.952971740 +0000
@@ -0,0 +1,1360 @@
+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 2023-07-02 20:33:29.742070227 +0000
@@ -0,0 +1,1359 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
@ -295,9 +295,11 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/
+ simple-audio-card,mclk-fs = <256>;
+
+ simple-audio-card,widgets =
+ "Microphone", "Mic Jack",
+ "Headphone", "Headphones",
+ "Speaker", "Speaker";
+ simple-audio-card,routing =
+ "MIC1", "Mic Jack",
+ "Headphones", "HPOL",
+ "Headphones", "HPOR",
+ "Speaker Amplifier INL", "HPOL",
@ -320,12 +322,14 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/
+
+ speaker_amp: speaker-amplifier {
+ compatible = "simple-audio-amplifier";
+ pinctrl-names = "default";
+ pinctrl-0 = <&spk_en_pin>;
+ enable-gpios = <&gpio1 RK_PC5 GPIO_ACTIVE_HIGH>;
+ sound-name-prefix = "Speaker Amplifier";
+ VCC-supply = <&vcc5v0_sys>;
+ };
+
+ hdmi-sound {
+ status = "okay";
+ };
+
+ fan: pwm-fan {
+ compatible = "pwm-fan";
@ -1115,9 +1119,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/
+&i2s1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2s_8ch_mclk_pin>, <&i2s1_2ch_bus>;
+ rockchip,i2s-broken-burst-len;
+ rockchip,playback-channels = <8>;
+ rockchip,capture-channels = <8>;
+ rockchip,playback-channels = <8>;
+ status = "okay";
+};
+
@ -1150,13 +1153,9 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/
+ hp_det_pin: hp-det-pin {
+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+
+ spk_en_pin: spk-en-pin {
+ rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+ };
+
+ i2s1 {
+ i2s1 {
+ i2s_8ch_mclk_pin: i2s-8ch-mclk-pin {
+ rockchip,pins = <4 RK_PA0 1 &pcfg_pull_none>;
+ };
@ -1396,7 +1395,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/
+};
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi 2023-07-02 04:51:32.958689071 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi 2023-07-02 20:04:12.325801424 +0000
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -1541,7 +1540,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi linux/a
+};
diff -rupN linux.orig/drivers/gpio/gpio-rockchip.c linux/drivers/gpio/gpio-rockchip.c
--- linux.orig/drivers/gpio/gpio-rockchip.c 2023-07-01 21:03:53.270083135 +0000
+++ linux/drivers/gpio/gpio-rockchip.c 2023-07-01 21:04:55.124201442 +0000
+++ linux/drivers/gpio/gpio-rockchip.c 2023-07-02 20:04:12.325801424 +0000
@@ -335,13 +335,13 @@ static void rockchip_irq_demux(struct ir
unsigned long pending;
unsigned int irq;
@ -1560,7 +1559,7 @@ diff -rupN linux.orig/drivers/gpio/gpio-rockchip.c linux/drivers/gpio/gpio-rockc
* Triggering IRQ on both rising and falling edge
diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/Kconfig
--- linux.orig/drivers/gpu/drm/panel/Kconfig 2023-06-23 03:53:39.968155272 +0000
+++ linux/drivers/gpu/drm/panel/Kconfig 2023-06-23 03:57:17.715782858 +0000
+++ linux/drivers/gpu/drm/panel/Kconfig 2023-07-02 20:04:12.325801424 +0000
@@ -588,6 +588,15 @@ config DRM_PANEL_SHARP_LS043T1LE01
Say Y here if you want to enable support for Sharp LS043T1LE01 qHD
(540x960) DSI panel as found on the Qualcomm APQ8074 Dragonboard
@ -1579,7 +1578,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/
depends on OF
diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel/Makefile
--- linux.orig/drivers/gpu/drm/panel/Makefile 2023-06-23 03:53:39.968155272 +0000
+++ linux/drivers/gpu/drm/panel/Makefile 2023-06-23 03:57:17.715782858 +0000
+++ linux/drivers/gpu/drm/panel/Makefile 2023-07-02 20:04:12.325801424 +0000
@@ -59,6 +59,7 @@ obj-$(CONFIG_DRM_PANEL_SEIKO_43WVF1G) +=
obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o
obj-$(CONFIG_DRM_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
@ -1590,7 +1589,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel
obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7703) += panel-sitronix-st7703.o
diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c
--- linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c 2023-06-23 03:57:17.715782858 +0000
+++ linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c 2023-07-02 20:04:12.325801424 +0000
@@ -0,0 +1,368 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
@ -1962,7 +1961,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv
+MODULE_LICENSE("GPL v2");
diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
--- linux.orig/drivers/input/Kconfig 2023-06-23 03:53:40.600165543 +0000
+++ linux/drivers/input/Kconfig 2023-06-23 03:57:17.715782858 +0000
+++ linux/drivers/input/Kconfig 2023-07-02 20:04:12.325801424 +0000
@@ -51,6 +51,19 @@ config INPUT_FF_MEMLESS
To compile this driver as a module, choose M here: the
module will be called ff-memless.
@ -1985,7 +1984,7 @@ diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
help
diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile
--- linux.orig/drivers/input/Makefile 2023-06-23 03:53:40.600165543 +0000
+++ linux/drivers/input/Makefile 2023-06-23 03:57:17.715782858 +0000
+++ linux/drivers/input/Makefile 2023-07-02 20:04:12.325801424 +0000
@@ -10,6 +10,7 @@ input-core-y := input.o input-compat.o i
input-core-y += touchscreen.o
@ -1996,7 +1995,7 @@ diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile
obj-$(CONFIG_INPUT_VIVALDIFMAP) += vivaldi-fmap.o
diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-polldev.c
--- linux.orig/drivers/input/input-polldev.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/input-polldev.c 2023-06-23 03:57:17.715782858 +0000
+++ linux/drivers/input/input-polldev.c 2023-07-02 20:04:12.325801424 +0000
@@ -0,0 +1,362 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
@ -2362,7 +2361,7 @@ diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-po
+EXPORT_SYMBOL(input_unregister_polled_device);
diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystick/Kconfig
--- linux.orig/drivers/input/joystick/Kconfig 2023-06-23 03:53:40.604165608 +0000
+++ linux/drivers/input/joystick/Kconfig 2023-06-23 03:57:17.715782858 +0000
+++ linux/drivers/input/joystick/Kconfig 2023-07-02 20:04:12.325801424 +0000
@@ -393,6 +393,12 @@ config JOYSTICK_FSIA6B
To compile this driver as a module, choose M here: the
module will be called fsia6b.
@ -2378,7 +2377,7 @@ diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystic
depends on MACH_NINTENDO64
diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joystick/Makefile
--- linux.orig/drivers/input/joystick/Makefile 2023-06-23 03:53:40.604165608 +0000
+++ linux/drivers/input/joystick/Makefile 2023-06-23 03:57:17.715782858 +0000
+++ linux/drivers/input/joystick/Makefile 2023-07-02 20:04:12.325801424 +0000
@@ -30,6 +30,7 @@ obj-$(CONFIG_JOYSTICK_PXRC) += pxrc.o
obj-$(CONFIG_JOYSTICK_QWIIC) += qwiic-joystick.o
obj-$(CONFIG_JOYSTICK_SENSEHAT) += sensehat-joystick.o
@ -2389,7 +2388,7 @@ diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joysti
obj-$(CONFIG_JOYSTICK_STINGER) += stinger.o
diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/joystick/singleadcjoy.c
--- linux.orig/drivers/input/joystick/singleadcjoy.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/input/joystick/singleadcjoy.c 2023-06-23 03:57:17.715782858 +0000
+++ linux/drivers/input/joystick/singleadcjoy.c 2023-07-02 20:04:12.325801424 +0000
@@ -0,0 +1,1416 @@
+/*----------------------------------------------------------------------------*/
+
@ -3809,7 +3808,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/
+module_exit(joypad_exit);
diff -rupN linux.orig/drivers/power/supply/cw2015_battery.c linux/drivers/power/supply/cw2015_battery.c
--- linux.orig/drivers/power/supply/cw2015_battery.c 2023-06-23 03:53:42.860202281 +0000
+++ linux/drivers/power/supply/cw2015_battery.c 2023-06-24 12:55:27.741045953 +0000
+++ linux/drivers/power/supply/cw2015_battery.c 2023-07-02 20:04:12.325801424 +0000
@@ -553,7 +553,7 @@ static enum power_supply_property cw_bat
};
@ -3821,7 +3820,7 @@ diff -rupN linux.orig/drivers/power/supply/cw2015_battery.c linux/drivers/power/
.num_properties = ARRAY_SIZE(cw_battery_properties),
diff -rupN linux.orig/include/linux/input-polldev.h linux/include/linux/input-polldev.h
--- linux.orig/include/linux/input-polldev.h 1970-01-01 00:00:00.000000000 +0000
+++ linux/include/linux/input-polldev.h 2023-06-23 03:57:17.715782858 +0000
+++ linux/include/linux/input-polldev.h 2023-07-02 20:04:12.325801424 +0000
@@ -0,0 +1,58 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef _INPUT_POLLDEV_H
@ -3881,3 +3880,15 @@ diff -rupN linux.orig/include/linux/input-polldev.h linux/include/linux/input-po
+void input_unregister_polled_device(struct input_polled_dev *dev);
+
+#endif
diff -rupN linux.orig/sound/soc/codecs/es8316.c linux/sound/soc/codecs/es8316.c
--- linux.orig/sound/soc/codecs/es8316.c 2023-07-02 13:08:52.645749113 +0000
+++ linux/sound/soc/codecs/es8316.c 2023-07-02 20:59:43.997250025 +0000
@@ -696,7 +696,7 @@ static void es8316_disable_jack_detect(s
snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE,
ES8316_GPIO_ENABLE_INTERRUPT, 0);
- if (es8316->jack->status & SND_JACK_MICROPHONE) {
+ if (es8316->jack && (es8316->jack->status & SND_JACK_MICROPHONE)) {
es8316_disable_micbias_for_mic_gnd_short_detect(component);
snd_soc_jack_report(es8316->jack, 0, SND_JACK_BTN_0);
}