Merge pull request #1656 from brooksytech/dev

RK3399 and various other updates
This commit is contained in:
Brooksytech 2023-07-01 22:27:12 -07:00 committed by GitHub
commit 1ba80f376f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 2716 additions and 218 deletions

View file

@ -2,11 +2,11 @@
Device = evdev/0/retrogame_joypad
Buttons/A = Button 0
Buttons/B = Button 3
Buttons/Start = Button 9
Buttons/Start = Button 8
Buttons/X = Button 1
Buttons/Y = Button 2
Buttons/Z = Button 7
Buttons/Hotkey = Button 8
Buttons/Hotkey = Button 9
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 3+
C-Stick/Left = Axis 2-

View file

@ -2,11 +2,11 @@
Device = evdev/0/retrogame_joypad
Buttons/A = Button 1
Buttons/B = Button 0
Buttons/Start = Button 9
Buttons/Start = Button 8
Buttons/X = Button 2
Buttons/Y = Button 3
Buttons/Z = Button 7
Buttons/Hotkey = Button 8
Buttons/Hotkey = Button 9
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 3+
C-Stick/Left = Axis 2-

View file

@ -16,7 +16,7 @@ case ${DEVICE} in
PKG_CMAKE_OPTS_TARGET+=" -DUSE_DRMKMS=ON -DENABLE_EGL=ON -DUSE_MALI=OFF"
;;
*)
PKG_VERSION="2d78b3f26a18600cbeb1f7add97f345d7345deeb"
PKG_VERSION="af5f1c711c80f0d34dacdbf801ba9d642c4f6932"
PKG_PATCH_DIRS+=" wayland"
;;
esac

View file

@ -17,8 +17,8 @@ case ${DEVICE} in
PKG_GIT_CLONE_BRANCH="csf"
;;
*)
PKG_VERSION="23.1.2"
PKG_SHA256="60b1f3adb1561830c158bf3c68508943674fb9d69f384c3c7289694385ab5c7e"
PKG_VERSION="23.1.3"
PKG_SHA256="2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9"
PKG_SITE="http://www.mesa3d.org/"
PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
;;

View file

@ -0,0 +1,15 @@
PKG_NAME="RTL8188FU-firmware"
PKG_VERSION="751882b3d8925b72ed796f40e38c0232ccc24785"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/kelebek333/rtl8188fu"
PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_TARGET="toolchain linux kernel-firmware"
PKG_NEED_UNPACK="${LINUX_DEPENDS}"
PKG_LONGDESC="Realtek RTL81xxFU Linux firmware"
PKG_IS_KERNEL_PKG="yes"
PKG_TOOLCHAIN="manual"
makeinstall_target() {
mkdir -p ${INSTALL}/usr/lib/kernel-overlays/base/lib/firmware/rtlwifi
cp firmware/rtl8188fufw.bin ${INSTALL}/usr/lib/kernel-overlays/base/lib/firmware/rtlwifi
}

View file

@ -47,8 +47,8 @@ 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 \
yabasanshiro-sa box64 portmaster"
LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr dolphin-lr"
yabasanshiro-sa portmaster"
LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr dolphin-lr flycast-lr mame-lr"
PKG_RETROARCH+=" retropie-shaders"
;;
RK356*)
@ -146,7 +146,7 @@ makeinstall_target() {
add_emu_core arcade retroarch fbalpha2012 false
add_emu_core arcade retroarch fbalpha2019 false
case ${DEVICE} in
AMD64|RK3588|S922X)
AMD64|RK3588|S922X|RK3399)
add_emu_core arcade retroarch mame false
;;
esac

File diff suppressed because it is too large Load diff

View file

@ -75,13 +75,13 @@
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported,
# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
FIRMWARE="misc-firmware wlan-firmware"
FIRMWARE="misc-firmware wlan-firmware RTL8188FU-firmware"
# additional drivers to install:
# for a list of additional drivers see packages/linux-drivers
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
ADDITIONAL_DRIVERS="RTL8812AU RTL8821AU RTL8821CU RTL88x2BU RTL8188FU"
ADDITIONAL_DRIVERS="RTL8812AU RTL8821AU RTL8821CU RTL88x2BU"
# build and install driver addons (yes / no)
DRIVER_ADDONS_SUPPORT="no"

View file

@ -36,12 +36,8 @@ case ${DEVICE} in
GET_HANDLER_SUPPORT="git"
PKG_GIT_CLONE_BRANCH="main"
;;
RK3326)
PKG_VERSION="6.1.35"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
;;
RK3399)
PKG_VERSION="6.0.19"
RK33*)
PKG_VERSION="6.1.37"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
;;
esac

View file

@ -32,7 +32,7 @@ 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-06-29 13:30:29.099778837 +0000
+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 2023-07-02 03:16:28.952971740 +0000
@@ -0,0 +1,1360 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -1396,11 +1396,12 @@ 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-06-29 14:47:59.405775923 +0000
@@ -0,0 +1,194 @@
+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi 2023-07-02 04:51:32.958689071 +0000
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd
+ * Copyright (C) 2023 BrooksyTech (https://github.com/brooksytech)
+ */
+
+/ {
@ -1408,132 +1409,86 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi linux/a
+ compatible = "operating-points-v2";
+ opp-shared;
+
+ //opp00 {
+ // opp-hz = /bits/ 64 <408000000>;
+ // opp-microvolt = <825000 825000 1250000>;
+ // clock-latency-ns = <40000>;
+ //};
+ //opp01 {
+ // opp-hz = /bits/ 64 <600000000>;
+ // opp-microvolt = <825000 825000 1250000>;
+ //};
+ opp02 {
+ opp00 {
+ opp-hz = /bits/ 64 <816000000>;
+ opp-microvolt = <850000 850000 1250000>;
+ };
+ opp03 {
+ opp01 {
+ opp-hz = /bits/ 64 <1008000000>;
+ opp-microvolt = <925000 925000 1250000>;
+ };
+ opp04 {
+ opp02 {
+ opp-hz = /bits/ 64 <1200000000>;
+ opp-microvolt = <1000000 1000000 1250000>;
+ };
+ opp05 {
+ opp03 {
+ opp-hz = /bits/ 64 <1416000000>;
+ opp-microvolt = <1125000 1125000 1250000>;
+ };
+ opp-06 {
+ opp-04 {
+ opp-hz = /bits/ 64 <1512000000>;
+ opp-microvolt = <1200000 1200000 1250000>;
+ };
+ opp-07 {
+ opp-05 {
+ opp-hz = /bits/ 64 <1608000000>;
+ opp-microvolt = <1200000 1200000 1250000>;
+ };
+ //opp-08 {
+ // opp-hz = /bits/ 64 <1704000000>;
+ // opp-microvolt = <1225000 1225000 1250000>;
+ //};
+ };
+
+ cluster1_opp: opp-table-1 {
+ compatible = "operating-points-v2";
+ opp-shared;
+
+ //opp00 {
+ // opp-hz = /bits/ 64 <408000000>;
+ // opp-microvolt = <825000 825000 1250000>;
+ // clock-latency-ns = <40000>;
+ //};
+ //opp01 {
+ // opp-hz = /bits/ 64 <600000000>;
+ // opp-microvolt = <825000 825000 1250000>;
+ //};
+ opp02 {
+ opp00 {
+ opp-hz = /bits/ 64 <816000000>;
+ opp-microvolt = <825000 825000 1250000>;
+ };
+ opp03 {
+ opp01 {
+ opp-hz = /bits/ 64 <1008000000>;
+ opp-microvolt = <875000 875000 1250000>;
+ };
+ opp04 {
+ opp02 {
+ opp-hz = /bits/ 64 <1200000000>;
+ opp-microvolt = <950000 950000 1250000>;
+ };
+ opp05 {
+ opp03 {
+ opp-hz = /bits/ 64 <1416000000>;
+ opp-microvolt = <1025000 1025000 1250000>;
+ };
+ opp06 {
+ opp04 {
+ opp-hz = /bits/ 64 <1608000000>;
+ opp-microvolt = <1100000 1100000 1250000>;
+ };
+ opp07 {
+ opp05 {
+ opp-hz = /bits/ 64 <1800000000>;
+ opp-microvolt = <1200000 1200000 1250000>;
+ };
+ opp-08 {
+ opp-06 {
+ opp-hz = /bits/ 64 <1992000000>;
+ opp-microvolt = <1250000 1250000 1250000>;
+ };
+ opp-09 {
+ opp-hz = /bits/ 64 <2016000000>;
+ opp-microvolt = <1250000 1250000 1250000>;
+ };
+ opp-10 {
+ opp-hz = /bits/ 64 <2040000000>;
+ opp-microvolt = <1250000 1250000 1250000>;
+ };
+ opp-11 {
+ opp-07 {
+ opp-hz = /bits/ 64 <2088000000>;
+ opp-microvolt = <1250000 1250000 1250000>;
+ };
+ //opp-12 {
+ // opp-hz = /bits/ 64 <2184000000>;
+ // opp-microvolt = <1350000>;
+ //};
+ };
+
+ gpu_opp_table: opp-table-2 {
+ compatible = "operating-points-v2";
+
+ //opp00 {
+ // opp-hz = /bits/ 64 <200000000>;
+ // opp-microvolt = <825000 825000 1150000>;
+ //};
+ //opp01 {
+ // opp-hz = /bits/ 64 <297000000>;
+ // opp-microvolt = <825000 825000 1150000>;
+ //};
+ opp02 {
+ opp-hz = /bits/ 64 <400000000>;
+ opp-microvolt = <825000 825000 1150000>;
+ };
+ opp03 {
+ opp00 {
+ opp-hz = /bits/ 64 <500000000>;
+ opp-microvolt = <875000 875000 1150000>;
+ };
+ opp04 {
+ opp01 {
+ opp-hz = /bits/ 64 <600000000>;
+ opp-microvolt = <925000 925000 1150000>;
+ };
+ opp05 {
+ opp02 {
+ opp-hz = /bits/ 64 <800000000>;
+ opp-microvolt = <1100000 1100000 1150000>;
+ };
+ opp06 {
+ opp03 {
+ opp-hz = /bits/ 64 <900000000>;
+ opp-microvolt = <1100000 1100000 1150000>;
+ };
@ -1542,19 +1497,11 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi linux/a
+ dmc_opp_table: opp-table-3 {
+ compatible = "operating-points-v2";
+
+ //opp00 {
+ // opp-hz = /bits/ 64 <328000000>;
+ // opp-microvolt = <900000>;
+ //};
+ opp01 {
+ opp-hz = /bits/ 64 <416000000>;
+ opp-microvolt = <900000>;
+ };
+ opp02 {
+ opp00 {
+ opp-hz = /bits/ 64 <666000000>;
+ opp-microvolt = <900000>;
+ };
+ opp03 {
+ opp01 {
+ opp-hz = /bits/ 64 <856000000>;
+ opp-microvolt = <900000>;
+ };
@ -1592,6 +1539,25 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi linux/a
+&gpu {
+ operating-points-v2 = <&gpu_opp_table>;
+};
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
@@ -335,13 +335,13 @@ static void rockchip_irq_demux(struct ir
unsigned long pending;
unsigned int irq;
- dev_dbg(bank->dev, "got irq for bank %s\n", bank->name);
+ //dev_dbg(bank->dev, "got irq for bank %s\n", bank->name);
chained_irq_enter(chip, desc);
pending = readl_relaxed(bank->reg_base + bank->gpio_regs->int_status);
for_each_set_bit(irq, &pending, 32) {
- dev_dbg(bank->dev, "handling irq %d\n", irq);
+ //dev_dbg(bank->dev, "handling irq %d\n", irq);
/*
* 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

File diff suppressed because it is too large Load diff