diff --git a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
index cdc198015..bccb089ab 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
@@ -50,7 +50,6 @@ This document describes all available systems emulators and cores available for
|Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
|
|Microsoft|MSX (msx)|1983|`msx`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)
**retroarch:** fmsx
|
|Microsoft|MSX 2 (msx2)|1988|`msx2`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)
**retroarch:** fmsx
|
-|Milton Bradley|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)
|
|NEC|PC Engine (pcengine)|1987|`pcengine`|.pce .bin .zip .7z|**retroarch:** beetle_pce_fast (default)
**retroarch:** beetle_pce
**retroarch:** beetle_supergrafx
|
|NEC|PC Engine CD (pcenginecd)|1988|`pcenginecd`|.cue .ccd .chd .toc .m3u|**retroarch:** beetle_pce_fast (default)
**retroarch:** beetle_pce
**retroarch:** beetle_supergrafx
|
|NEC|PC-8800 (pc-8800)|1981|`pc88`|.d88 .m3u|**retroarch:** quasi88 (default)
|
@@ -104,8 +103,9 @@ This document describes all available systems emulators and cores available for
|Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)
|
|Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse
|
|Sinclair|ZX81 (zx81)|1981|`zx81`|.tzx .p .zip .7z|**retroarch:** 81 (default)
|
+|Smith Engineering|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)
|
|SNK|Neo Geo (neogeo)|1990|`neogeo`|.7z .zip|**retroarch:** fbneo (default)
**retroarch:** mame2003_plus
**retroarch:** fbalpha2012
**retroarch:** fbalpha2019
**retroarch:** mame2010
**retroarch:** mame2015
**retroarch:** mame
|
-|SNK|Neo Geo CD (neocd)|1990|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)
**retroarch:** fbneo
|
+|SNK|Neo Geo CD (neocd)|1994|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)
**retroarch:** fbneo
|
|SNK|Neo Geo Pocket (ngp)|1998|`ngp`|.ngc .ngp .zip .7z|**retroarch:** beetle_ngp (default)
**retroarch:** race
|
|SNK|Neo Geo Pocket Color (ngpc)|1999|`ngpc`|.ngc .zip .7z|**retroarch:** beetle_ngp (default)
**retroarch:** race
|
|Sony|PlayStation (psx)|1994|`psx`|.bin .cue .img .mdf .pbp .toc .cbn .m3u .ccd .chd .iso|**retroarch:** pcsx_rearmed (default)
**retroarch:** beetle_psx
**duckstation:** duckstation-sa
**retroarch:** duckstation
**retroarch:** swanstation
|
@@ -114,7 +114,7 @@ This document describes all available systems emulators and cores available for
|Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)
**retroarch:** ppsspp
|
|Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)
|
|Various|EasyRPG (easyrpg)|2003|`easyrpg`|.zip .easyrpg .ldb|**retroarch:** easyrpg (default)
|
-|Various|OpenBOR (openbor)|2008|`openbor`|.pak|**OpenBOR:** OpenBOR (default)
|
+|Various|OpenBOR (openbor)|2003|`openbor`|.pak|**OpenBOR:** OpenBOR (default)
|
|Various|ScummVM (scummvm)|2001|`games`|.sh .svm .scummvm|**retroarch:** scummvm (default)
|
|Watara|Supervision (supervision)|1992|`supervision`|.sv .zip .7z|**retroarch:** potator (default)
|
|Welback Holdings|Mega Duck (megaduck)|1993|`megaduck`|.bin .zip .7z|**retroarch:** sameduck (default)
|
diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led
deleted file mode 100755
index 056bc304f..000000000
--- a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led
+++ /dev/null
@@ -1 +0,0 @@
-echo none > /sys/class/leds/n2\:blue/trigger
diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path
index 0253d7bbf..3db271a64 100755
--- a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path
+++ b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path
@@ -3,9 +3,6 @@
# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
cat </storage/.config/profile.d/002-audio_path
-DEVICE_PLAYBACK_PATH_SPK="SPK"
-DEVICE_PLAYBACK_PATH_HP="HP"
-DEVICE_PLAYBACK_PATH="Playback Mux"
DEVICE_PIPEWIRE_PROFILE="pro-audio"
EOF
@@ -14,12 +11,6 @@ amixer -c 0 -q sset 'FRDDR_A SRC 1 EN' 'on'
amixer -c 0 -q sset 'TDMOUT_B SRC SEL' 'IN 0'
amixer -c 0 -q sset 'TOHDMITX I2S SRC' 'I2S B'
amixer -c 0 -q sset 'TOHDMITX' 'on'
-amixer -c 0 -q sset 'FRDDR_B SINK 1 SEL' 'OUT 2'
-amixer -c 0 -q sset 'FRDDR_B SRC 1 EN' 'on'
-amixer -c 0 -q sset 'TDMOUT_C SRC SEL' 'IN 1'
amixer -c 0 -q sset 'TOACODEC SRC' 'I2S B'
amixer -c 0 -q sset 'TOACODEC OUT EN' 'on'
-amixer -c 0 -q sset 'TOACODEC Lane Select' '0'
amixer -c 0 -q sset 'ACODEC' '255'
-amixer -c 0 -q sset 'FRDDR_C SINK 1 SEL' 'OUT 3'
-amixer -c 0 -q sset 'FRDDR_C SRC 1 EN' 'on'
diff --git a/packages/hardware/quirks/platforms/S922X/020-no_blinking_led b/packages/hardware/quirks/platforms/S922X/020-no_blinking_led
deleted file mode 100755
index 842d188b7..000000000
--- a/packages/hardware/quirks/platforms/S922X/020-no_blinking_led
+++ /dev/null
@@ -1 +0,0 @@
-echo none > /sys/class/leds/blue\:/trigger
diff --git a/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense b/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense
index 4b5db1dc1..1f31c0493 100644
--- a/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense
+++ b/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense
@@ -6,6 +6,8 @@
# Source predefined functions and variables
. /etc/profile
+[ -z "${DEVICE_PLAYBACK_PATH}" -o -z "${DEVICE_PLAYBACK_PATH_HP}" -o -z "${DEVICE_PLAYBACK_PATH_SPK}" ] && exit 0
+
### Set correct audio output device at boot.
HEADPHONE_STATE=$(cat /sys/kernel/debug/gpio | grep HEADPHONE)
if [[ "${HEADPHONE_STATE}" == *"hi"* ]]; then
diff --git a/projects/Amlogic/packages/linux/patches/S922X/000-s922x-devices.patch b/projects/Amlogic/packages/linux/patches/S922X/000-s922x-devices.patch
index aaaf4a85f..9093b89a7 100644
--- a/projects/Amlogic/packages/linux/patches/S922X/000-s922x-devices.patch
+++ b/projects/Amlogic/packages/linux/patches/S922X/000-s922x-devices.patch
@@ -339,7 +339,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+ color = ;
+ function = LED_FUNCTION_STATUS;
+ gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
-+ linux,default-trigger = "heartbeat";
++ linux,default-trigger = "none";
+ };
+
+ led-red {
@@ -1353,7 +1353,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-
+ color = ;
+ function = LED_FUNCTION_STATUS;
+ gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
-+ linux,default-trigger = "heartbeat";
++ linux,default-trigger = "none";
+ };
+
+ led-red {
@@ -8581,3 +8581,14 @@ diff -rupN linux.orig/sound/soc/meson/axg-card.c linux/sound/soc/meson/axg-card.
for_each_rtd_codec_dais(rtd, i, codec_dai) {
ret = snd_soc_dai_set_tdm_slot(codec_dai,
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -45,7 +45,7 @@
+ led-blue {
+ label = "n2:blue";
+ gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
+- linux,default-trigger = "heartbeat";
++ linux,default-trigger = "none";
+ };
+ };
+