diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..7c4705ccf329878d30d71b2d3bf5648d71c5f1ec
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+RELEASE-NOTES.md merge=union
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f356980f06ec748dd9efccdfb7ebb0e632fc863e..8ad6ae7108d757d8b102a0906590e77fb03a422b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -213,35 +213,19 @@ appimage-amd64:
     - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output"
     - mkdir -p ${OUTPUTDIR}
     - docker build -t "recalbox-${ARCH}" .
-    - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_BEEBEM=${GITLAB_TOKEN_BEEBEM}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac
+    - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_BEEBEM=${GITLAB_TOKEN_BEEBEM}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=9.2.3-Pulstar" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac
     - echo $?
     # Dist
     - export DIST_DIR="dist/${ARCH}"
     - mkdir -p "${DIST_DIR}"
     - cp ${OUTPUTDIR}/images/recalbox/* "${DIST_DIR}"
-    - echo "${RECALBOX_VERSION}" > "${DIST_DIR}/recalbox.version"
+    # forcing 9.2.3 to avoid updates
+    - echo "9.2.3-Pulstar" > "${DIST_DIR}/recalbox.version"
     - cp ${WORKDIR}/CHANGELOG.md "${DIST_DIR}/recalbox.changelog"
     - cp ${WORKDIR}/RELEASE-NOTES.md "${DIST_DIR}/recalbox.releasenotes"
     - cp ${WORKDIR}/RELEASE-NOTES-FULL.md "${DIST_DIR}/RELEASE-NOTES-FULL.md"
     - uploadFolderToBucket "${AWS_ACCESS_KEY_ID}" "${AWS_SECRET_ACCESS_TOKEN}" "recalbox-builds-artifacts" "dist" "${CI_PIPELINE_ID}"
-    # Specific image for RPIZero 1 + GPICASE2w
-    - |
-      if [ "${ARCH}" == "rpi1" ];then
-        sed -i "s/^;case=.*/case=GPi2W/g" output/images/boot-data/recalbox-boot.conf
-        docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "GITLAB_TOKEN_BEEBEM=${GITLAB_TOKEN_BEEBEM}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac
-        OLD_DIST_DIR="${DIST_DIR}"
-        export DIST_DIR="dist/${ARCH}-gpicase2w"
-        mkdir -p "${DIST_DIR}"
-        cp ${OUTPUTDIR}/images/recalbox/* "${DIST_DIR}"
-        echo "${RECALBOX_VERSION}" >> "${DIST_DIR}/recalbox.version"
-        cp ${WORKDIR}/CHANGELOG.md "${DIST_DIR}/recalbox.changelog"
-        cp ${WORKDIR}/RELEASE-NOTES.md "${DIST_DIR}/recalbox.releasenotes"
-        cp ${WORKDIR}/RELEASE-NOTES-FULL.md "${DIST_DIR}/RELEASE-NOTES-FULL.md"
-        uploadFolderToBucket "${AWS_ACCESS_KEY_ID}" "${AWS_SECRET_ACCESS_TOKEN}" "recalbox-builds-artifacts" "dist" "${CI_PIPELINE_ID}"
-        rm -rf "${DIST_DIR}" "${OLD_DIST_DIR}" "${OUTPUTDIR}"
-      else
-        rm -rf "${DIST_DIR}" "${OUTPUTDIR}"
-      fi
+    - rm -rf "${DIST_DIR}" "${OUTPUTDIR}"
   artifacts:
     name: dist-${ARCH}-${CI_PIPELINE_ID}
     when: always
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 7b0e96e898284df1a007ac989038f5cc2522c90b..1e4e2dde25f5c922a44ad7f61ae0cd46f2876a14 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -4,6 +4,20 @@ This file will be processed and will be distributed with Recalbox Releases.
 The text, located between the first `## Version XXX` and the second one, will appear
 as release notes for end user on a Recalbox upgrade.
 
+## Version 9.2.3-Pulstar-RPi5-2GB
+
+- Add support for Raspberry Pi 5 2GB version
+
+## Version 9.2.3-Pulstar
+
+- Fix volume level for flycast core (atomiswave, naomi, naomicd, naomi2)
+- Fix data files, and game recognition in systems using Flycast & Flycast-Next cores
+- Fix scraper not saving all gamelists when scraping virtual systems
+- Fix multiple update pop when exiting screensaver
+- Fix immediate update check after relaunching the interface
+- Fix crash/freeze with auto-scraper conflicting with background scraping
+- Fix blocked reboot/shutdown when scraping in background (save gamelists also)
+
 
 ## Version 9.2.2-Pulstar
 
diff --git a/board/recalbox/fsoverlay/etc/udev/rules.d/90-rpi-add-serial.rules b/board/recalbox/fsoverlay/etc/udev/rules.d/90-rpi-add-serial.rules
deleted file mode 100644
index f20eaac7266b7c3749299feb83a0ba3ac1e7a462..0000000000000000000000000000000000000000
--- a/board/recalbox/fsoverlay/etc/udev/rules.d/90-rpi-add-serial.rules
+++ /dev/null
@@ -1,21 +0,0 @@
-KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
-        ALIASES=/proc/device-tree/aliases; \
-        if [ $(cat $ALIASES/uart0) = $(cat $ALIASES/serial0) ]; then \
-            echo 0;\
-        elif [ $(cat $ALIASES/uart0) = $(cat $ALIASES/serial1) ]; then \
-            echo 1; \
-        else \
-            exit 1; \
-        fi\
-    '", SYMLINK+="serial%c"
-
-KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
-        ALIASES=/proc/device-tree/aliases; \
-        if [ $(cat $ALIASES/uart1) = $(cat $ALIASES/serial0) ]; then \
-            echo 0; \
-        elif [ $(cat $ALIASES/uart1) = $(cat $ALIASES/serial1) ]; then \
-            echo 1; \
-        else \
-            exit 1; \
-        fi \
-'", SYMLINK+="serial%c"
diff --git a/board/recalbox/kernel_patches/6.6/i2c-read-timeout-set-to-50ms.patch b/board/recalbox/kernel_patches/6.6/i2c-read-timeout-set-to-50ms.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5eea1311ca8080851fdf44c74e6ac784cbe5164c
--- /dev/null
+++ b/board/recalbox/kernel_patches/6.6/i2c-read-timeout-set-to-50ms.patch
@@ -0,0 +1,27 @@
+diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
+index 7408e2c136b0..aa46ddfcfaa7 100644
+--- a/drivers/i2c/busses/i2c-bcm2835.c
++++ b/drivers/i2c/busses/i2c-bcm2835.c
+@@ -525,6 +525,7 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
+ 	struct i2c_adapter *adap;
+ 	struct clk *mclk;
+ 	u32 bus_clk_rate;
++	u32 read_timeout;
+ 
+ 	i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
+ 	if (!i2c_dev)
+@@ -594,6 +595,14 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
+ 	adap->dev.of_node = pdev->dev.of_node;
+ 	adap->quirks = of_device_get_match_data(&pdev->dev);
+ 
++
++	ret = of_property_read_u32(pdev->dev.of_node, "read-timeout-ms",
++				   &read_timeout);
++	if (ret >= 0) {
++		dev_info(&pdev->dev,
++			 "Setting i2c read timeout to %u ms\n", read_timeout);
++		adap->timeout	= msecs_to_jiffies(read_timeout);
++	}
+ 	/*
+ 	 * Disable the hardware clock stretching timeout. SMBUS
+ 	 * specifies a limit for how long the device can stretch the
diff --git a/board/recalbox/kernel_patches/6.6/linux-wiimote-abs-not-hat.patch b/board/recalbox/kernel_patches/6.6/linux-wiimote-abs-not-hat.patch
new file mode 100644
index 0000000000000000000000000000000000000000..587f2a1d0646a523905b9a94c392eba9e1fecc86
--- /dev/null
+++ b/board/recalbox/kernel_patches/6.6/linux-wiimote-abs-not-hat.patch
@@ -0,0 +1,53 @@
+diff --git a/drivers/hid/hid-wiimote-modules.c b/drivers/hid/hid-wiimote-modules.c
+index 4390eee..76ed60b 100644
+--- a/drivers/hid/hid-wiimote-modules.c
++++ b/drivers/hid/hid-wiimote-modules.c
+@@ -1126,12 +1126,12 @@
+ 	rt <<= 1;
+ 	lt <<= 1;
+ 
+-	input_report_abs(wdata->extension.input, ABS_HAT1X, lx);
+-	input_report_abs(wdata->extension.input, ABS_HAT1Y, ly);
+-	input_report_abs(wdata->extension.input, ABS_HAT2X, rx - 0x20);
+-	input_report_abs(wdata->extension.input, ABS_HAT2Y, ry - 0x20);
+-	input_report_abs(wdata->extension.input, ABS_HAT3X, rt);
+-	input_report_abs(wdata->extension.input, ABS_HAT3Y, lt);
++	input_report_abs(wdata->extension.input, ABS_HAT0X, lx);
++	input_report_abs(wdata->extension.input, ABS_HAT0Y, ly);
++	input_report_abs(wdata->extension.input, ABS_HAT1X, rx - 0x20);
++	input_report_abs(wdata->extension.input, ABS_HAT1Y, ry - 0x20);
++	input_report_abs(wdata->extension.input, ABS_HAT2X, rt);
++	input_report_abs(wdata->extension.input, ABS_HAT2Y, lt);
+ 
+ 	input_report_key(wdata->extension.input,
+ 			 wiimod_classic_map[WIIMOD_CLASSIC_KEY_LT],
+@@ -1228,12 +1228,16 @@ static int wiimod_classic_probe(const struct wiimod_ops *ops,
+ 			wdata->extension.input->keybit);
+ 
+ 	set_bit(EV_ABS, wdata->extension.input->evbit);
++	set_bit(ABS_HAT0X, wdata->extension.input->absbit);
++	set_bit(ABS_HAT0Y, wdata->extension.input->absbit);
+ 	set_bit(ABS_HAT1X, wdata->extension.input->absbit);
+ 	set_bit(ABS_HAT1Y, wdata->extension.input->absbit);
+ 	set_bit(ABS_HAT2X, wdata->extension.input->absbit);
+ 	set_bit(ABS_HAT2Y, wdata->extension.input->absbit);
+-	set_bit(ABS_HAT3X, wdata->extension.input->absbit);
+-	set_bit(ABS_HAT3Y, wdata->extension.input->absbit);
++	input_set_abs_params(wdata->extension.input,
++			     ABS_HAT0X, -30, 30, 1, 1);
++	input_set_abs_params(wdata->extension.input,
++			     ABS_HAT0Y, -30, 30, 1, 1);
+ 	input_set_abs_params(wdata->extension.input,
+ 			     ABS_HAT1X, -30, 30, 1, 1);
+ 	input_set_abs_params(wdata->extension.input,
+@@ -1242,10 +1246,6 @@ static int wiimod_classic_probe(const struct wiimod_ops *ops,
+ 			     ABS_HAT2X, -30, 30, 1, 1);
+ 	input_set_abs_params(wdata->extension.input,
+ 			     ABS_HAT2Y, -30, 30, 1, 1);
+-	input_set_abs_params(wdata->extension.input,
+-			     ABS_HAT3X, -30, 30, 1, 1);
+-	input_set_abs_params(wdata->extension.input,
+-			     ABS_HAT3Y, -30, 30, 1, 1);
+ 
+ 	ret = input_register_device(wdata->extension.input);
+ 	if (ret)
diff --git a/board/recalbox/kernel_patches/6.6/usbhid-max-quirks.patch b/board/recalbox/kernel_patches/6.6/usbhid-max-quirks.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6ea08d3ffe1a840a727fd9098977ca290121d129
--- /dev/null
+++ b/board/recalbox/kernel_patches/6.6/usbhid-max-quirks.patch
@@ -0,0 +1,13 @@
+diff --git a/include/linux/hid.h b/include/linux/hid.h
+index 251a1d3..e15f38f 100644
+--- a/include/linux/hid.h
++++ b/include/linux/hid.h
+@@ -305,7 +305,7 @@ struct hid_item {
+ /* 
+  * Increase this if you need to configure more HID quirks at module load time
+  */
+-#define MAX_USBHID_BOOT_QUIRKS 4
++#define MAX_USBHID_BOOT_QUIRKS 40
+ 
+ #define HID_QUIRK_INVERT			0x00000001
+ #define HID_QUIRK_NOTOUCH			0x00000002
diff --git a/board/recalbox/odroidgo2/patches/sdl2/0001-sdl2-odroid-go-advance.patch b/board/recalbox/odroidgo2/patches/sdl2/0001-sdl2-odroid-go-advance.patch
index 1fd301f17a8dd4e39ae0c17730a61ec5c8f45f99..a9724617546c04f5268928ebb1aead685ba66763 100644
--- a/board/recalbox/odroidgo2/patches/sdl2/0001-sdl2-odroid-go-advance.patch
+++ b/board/recalbox/odroidgo2/patches/sdl2/0001-sdl2-odroid-go-advance.patch
@@ -1,7 +1,7 @@
-From d7dcbea09cb39213683d1ff88b8009e9cc4970c3 Mon Sep 17 00:00:00 2001
-From: David Barbion <davidb@230ruedubac.fr>
-Date: Wed, 27 Sep 2023 11:57:50 +0200
-Subject: [PATCH 1/2] sdl2 odroid go advance
+From bc9915675460f97f9fbc9589f27c6e0587eabb37 Mon Sep 17 00:00:00 2001
+From: digitalLumberjack <digitallumberjack@gmail.com>
+Date: Mon, 9 Sep 2024 15:05:54 +0200
+Subject: [PATCH] sdl2 odroid go advance
 
 ---
  CMakeLists.txt                        |   2 +-
@@ -13,10 +13,10 @@ Subject: [PATCH 1/2] sdl2 odroid go advance
  6 files changed, 140 insertions(+), 15 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c5c9a77db..633318879 100644
+index 7e135490a..99a6a8053 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -690,7 +690,7 @@ if(USE_GCC OR USE_CLANG)
+@@ -711,7 +711,7 @@ if(USE_GCC OR USE_CLANG OR USE_INTELCC OR USE_QCC)
      check_c_compiler_flag("" HAVE_NO_UNDEFINED)
      set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS})
      if(HAVE_NO_UNDEFINED AND NOT (USE_CLANG AND WINDOWS))
@@ -26,7 +26,7 @@ index c5c9a77db..633318879 100644
    endif()
  
 diff --git a/Makefile.in b/Makefile.in
-index d4eeee402..88f5f4f57 100644
+index 27e0bbbf3..6f75dedbc 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -23,7 +23,7 @@ CXX     = @CXX@
@@ -39,10 +39,10 @@ index d4eeee402..88f5f4f57 100644
  LIBTOOL = @LIBTOOL@
  INSTALL = @INSTALL@
 diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/video/kmsdrm/SDL_kmsdrmopengles.c
-index 969df3e18..626e420c9 100644
+index cbf86c949..90ca246c1 100644
 --- a/src/video/kmsdrm/SDL_kmsdrmopengles.c
 +++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c
-@@ -29,11 +29,16 @@
+@@ -30,11 +30,16 @@
  #include "SDL_kmsdrmopengles.h"
  #include "SDL_kmsdrmdyn.h"
  #include <errno.h>
@@ -58,8 +58,8 @@ index 969df3e18..626e420c9 100644
 +
  /* EGL implementation of SDL OpenGL support */
  
- void
-@@ -92,6 +97,7 @@ KMSDRM_GLES_SwapWindow(_THIS, SDL_Window * window) {
+ void KMSDRM_GLES_DefaultProfileConfig(_THIS, int *mask, int *major, int *minor)
+@@ -93,6 +98,7 @@ int KMSDRM_GLES_SwapWindow(_THIS, SDL_Window *window)
      SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
      KMSDRM_FBInfo *fb_info;
      int ret = 0;
@@ -67,7 +67,7 @@ index 969df3e18..626e420c9 100644
  
      /* Always wait for the previous issued flip before issuing a new one,
         even if you do async flips. */
-@@ -135,7 +141,30 @@ KMSDRM_GLES_SwapWindow(_THIS, SDL_Window * window) {
+@@ -143,7 +149,30 @@ int KMSDRM_GLES_SwapWindow(_THIS, SDL_Window *window)
      }
  
      /* Get an actual usable fb for the next front buffer. */
@@ -100,20 +100,20 @@ index 969df3e18..626e420c9 100644
          SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Could not get a framebuffer");
          return 0;
 diff --git a/src/video/kmsdrm/SDL_kmsdrmsym.h b/src/video/kmsdrm/SDL_kmsdrmsym.h
-index 8b9e7b257..b33373805 100644
+index 7a99e1b6a..a6f1d1e53 100644
 --- a/src/video/kmsdrm/SDL_kmsdrmsym.h
 +++ b/src/video/kmsdrm/SDL_kmsdrmsym.h
-@@ -122,7 +122,7 @@ SDL_KMSDRM_SYM(struct gbm_surface *,gbm_surface_create,(struct gbm_device *gbm,
+@@ -128,7 +128,7 @@ SDL_KMSDRM_SYM(struct gbm_surface *,gbm_surface_create,(struct gbm_device *gbm,
  SDL_KMSDRM_SYM(void,gbm_surface_destroy,(struct gbm_surface *surf))
  SDL_KMSDRM_SYM(struct gbm_bo *,gbm_surface_lock_front_buffer,(struct gbm_surface *surf))
  SDL_KMSDRM_SYM(void,gbm_surface_release_buffer,(struct gbm_surface *surf, struct gbm_bo *bo))
 -
 +SDL_KMSDRM_SYM(int,gbm_bo_get_fd,(struct gbm_bo *bo))
- 
- #undef SDL_KMSDRM_MODULE
- #undef SDL_KMSDRM_SYM
+ SDL_KMSDRM_SYM(uint64_t,gbm_bo_get_modifier,(struct gbm_bo *bo))
+ SDL_KMSDRM_SYM(int,gbm_bo_get_plane_count,(struct gbm_bo *bo))
+ SDL_KMSDRM_SYM(uint32_t,gbm_bo_get_offset,(struct gbm_bo *bo, int plane))
 diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
-index 83cdbf0aa..51613dee7 100644
+index b7abb4fc7..defa7fe7e 100644
 --- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
 +++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
 @@ -44,6 +44,7 @@
@@ -140,12 +140,12 @@ index 83cdbf0aa..51613dee7 100644
 +rga_info_t dst_info = {0};
 +bool odroidgo_rotate = false;
 +
- static int
- get_driindex(void)
+ static int get_driindex(void)
  {
-@@ -79,6 +85,11 @@ get_driindex(void)
-     DIR *folder;
+     int available = -ENOENT;
+@@ -79,6 +85,11 @@ static int get_driindex(void)
      const char *hint;
+     struct dirent *res;
  
 +    if (SDL_getenv("SDL_ODROIDGO_ROTATE") != NULL) {
 +        SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO,
@@ -155,7 +155,7 @@ index 83cdbf0aa..51613dee7 100644
      hint = SDL_GetHint(SDL_HINT_KMSDRM_DEVICE_INDEX);
      if (hint && *hint) {
          char *endptr = NULL;
-@@ -334,6 +345,46 @@ KMSDRM_FBDestroyCallback(struct gbm_bo *bo, void *data)
+@@ -332,6 +343,46 @@ static void KMSDRM_FBDestroyCallback(struct gbm_bo *bo, void *data)
      SDL_free(fb_info);
  }
  
@@ -199,10 +199,10 @@ index 83cdbf0aa..51613dee7 100644
 +    rga_set_rect(&dst_info.rect, 0, 0, frameWidth, frameHeight, frameWidth, frameHeight, RK_FORMAT_BGRA_8888);
 +}
 +
- KMSDRM_FBInfo *
- KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo)
+ KMSDRM_FBInfo *KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo)
  {
-@@ -851,8 +902,13 @@ KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources)
+     SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
+@@ -871,8 +922,13 @@ static void KMSDRM_AddDisplay(_THIS, drmModeConnector *connector, drmModeRes *re
      modedata->mode_index = mode_index;
  
      display.driverdata = dispdata;
@@ -218,7 +218,7 @@ index 83cdbf0aa..51613dee7 100644
      display.desktop_mode.refresh_rate = dispdata->mode.vrefresh;
      display.desktop_mode.format = SDL_PIXELFORMAT_ARGB8888;
      display.desktop_mode.driverdata = modedata;
-@@ -1129,7 +1185,11 @@ KMSDRM_DirtySurfaces(SDL_Window *window) {
+@@ -1147,7 +1203,11 @@ static void KMSDRM_DirtySurfaces(SDL_Window *window)
         or SetWindowFullscreen, send a fake event for now since the actual
         recreation is deferred */
      KMSDRM_GetModeToSet(window, &mode);
@@ -231,7 +231,7 @@ index 83cdbf0aa..51613dee7 100644
  }
  
  /* This determines the size of the fb, which comes from the GBM surface
-@@ -1165,14 +1225,22 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
+@@ -1182,14 +1242,22 @@ int KMSDRM_CreateSurfaces(_THIS, SDL_Window *window)
         mode that's set in sync with what SDL_video.c thinks is set */
      KMSDRM_GetModeToSet(window, &dispdata->mode);
  
@@ -251,13 +251,13 @@ index 83cdbf0aa..51613dee7 100644
 +        display->current_mode.w = dispdata->mode.hdisplay;
 +        display->current_mode.h = dispdata->mode.vdisplay;
 +        windata->gs = KMSDRM_gbm_surface_create(viddata->gbm_dev,
-                       dispdata->mode.hdisplay, dispdata->mode.vdisplay,
-                       surface_fmt, surface_flags);
+                                             dispdata->mode.hdisplay, dispdata->mode.vdisplay,
+                                             surface_fmt, surface_flags);
 +    }
  
      if (!windata->gs) {
          return SDL_SetError("Could not create GBM surface");
-@@ -1194,7 +1262,11 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
+@@ -1211,7 +1279,11 @@ int KMSDRM_CreateSurfaces(_THIS, SDL_Window *window)
      egl_context = (EGLContext)SDL_GL_GetCurrentContext();
      ret = SDL_EGL_MakeCurrent(_this, windata->egl_surface, egl_context);
  
@@ -270,7 +270,7 @@ index 83cdbf0aa..51613dee7 100644
                          dispdata->mode.hdisplay, dispdata->mode.vdisplay);
  
      windata->egl_surface_dirty = SDL_FALSE;
-@@ -1280,9 +1352,13 @@ KMSDRM_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
+@@ -1328,9 +1400,13 @@ void KMSDRM_GetDisplayModes(_THIS, SDL_VideoDisplay *display)
          if (modedata) {
              modedata->mode_index = i;
          }
@@ -287,7 +287,7 @@ index 83cdbf0aa..51613dee7 100644
          mode.refresh_rate = conn->modes[i].vrefresh;
          mode.format = SDL_PIXELFORMAT_ARGB8888;
          mode.driverdata = modedata;
-@@ -1397,6 +1473,13 @@ KMSDRM_DestroyWindow(_THIS, SDL_Window *window)
+@@ -1443,6 +1519,13 @@ void KMSDRM_DestroyWindow(_THIS, SDL_Window *window)
      /*********************************************************************/
      SDL_free(window->driverdata);
      window->driverdata = NULL;
@@ -301,7 +301,7 @@ index 83cdbf0aa..51613dee7 100644
  }
  
  /**********************************************************************/
-@@ -1416,6 +1499,7 @@ KMSDRM_CreateWindow(_THIS, SDL_Window * window)
+@@ -1461,6 +1544,7 @@ int KMSDRM_CreateWindow(_THIS, SDL_Window *window)
      NativeDisplayType egl_display;
      drmModeModeInfo *mode;
      int ret = 0;
@@ -309,7 +309,7 @@ index 83cdbf0aa..51613dee7 100644
  
      /* Allocate window internal data */
      windata = (SDL_WindowData *)SDL_calloc(1, sizeof(SDL_WindowData));
-@@ -1529,7 +1613,11 @@ KMSDRM_CreateWindow(_THIS, SDL_Window * window)
+@@ -1581,7 +1665,11 @@ int KMSDRM_CreateWindow(_THIS, SDL_Window *window)
         SDL_SetMouseFocus() also takes care of calling KMSDRM_ShowCursor() if necessary. */
      SDL_SetMouseFocus(window);
      SDL_SetKeyboardFocus(window);
@@ -320,10 +320,10 @@ index 83cdbf0aa..51613dee7 100644
 +    }
 +  
      /* Tell the app that the window has moved to top-left. */
-     SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, 0, 0);
- 
+     {
+         SDL_Rect display_bounds;
 diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.h b/src/video/kmsdrm/SDL_kmsdrmvideo.h
-index ae004d019..ccfa0d1d5 100644
+index 1fe77f697..9a1750fbc 100644
 --- a/src/video/kmsdrm/SDL_kmsdrmvideo.h
 +++ b/src/video/kmsdrm/SDL_kmsdrmvideo.h
 @@ -32,6 +32,10 @@
@@ -335,9 +335,9 @@ index ae004d019..ccfa0d1d5 100644
 +
 +#define RGA_BUFFERS_MAX (3)
  
- typedef struct SDL_VideoData
- {
-@@ -53,6 +57,10 @@ typedef struct SDL_VideoData
+ #ifndef DRM_FORMAT_MOD_INVALID
+ #define DRM_FORMAT_MOD_INVALID 0x00ffffffffffffffULL
+@@ -92,6 +96,10 @@ typedef struct SDL_VideoData
         open 1 FD and create 1 gbm device. */
      SDL_bool gbm_init;
  
@@ -347,7 +347,7 @@ index ae004d019..ccfa0d1d5 100644
 +
  } SDL_VideoData;
  
- 
+ typedef struct SDL_DisplayModeData
 -- 
-2.42.0
+2.43.0
 
diff --git a/board/recalbox/odroidgo2/patches/sdl2/0002-odroidgoa-kmsdrm-and-rotate-cursor.patch b/board/recalbox/odroidgo2/patches/sdl2/0002-odroidgoa-kmsdrm-and-rotate-cursor.patch
index 863da2950060df85fd2207a320c447e2fd688f8d..9f8c9bdf102e2eff9f2d3589daa16876eadcf219 100644
--- a/board/recalbox/odroidgo2/patches/sdl2/0002-odroidgoa-kmsdrm-and-rotate-cursor.patch
+++ b/board/recalbox/odroidgo2/patches/sdl2/0002-odroidgoa-kmsdrm-and-rotate-cursor.patch
@@ -1,25 +1,25 @@
-From e39c175af161607cbfd027fdff869f9564076f90 Mon Sep 17 00:00:00 2001
-From: David Barbion <davidb@230ruedubac.fr>
-Date: Sat, 30 Sep 2023 00:12:46 +0200
-Subject: [PATCH 2/2] odroidgoa kmsdrm and rotate cursor
+From f25928f13bd23fa4383180a72df93f4dd74f4b2c Mon Sep 17 00:00:00 2001
+From: digitalLumberjack <digitallumberjack@gmail.com>
+Date: Mon, 9 Sep 2024 15:20:45 +0200
+Subject: [PATCH] odroidgoa kmsdrm and rotate cursor
 
 ---
  src/video/kmsdrm/SDL_kmsdrmmouse.c | 39 ++++++++++++++++++++++++------
  1 file changed, 31 insertions(+), 8 deletions(-)
 
 diff --git a/src/video/kmsdrm/SDL_kmsdrmmouse.c b/src/video/kmsdrm/SDL_kmsdrmmouse.c
-index 99b869939..6bdbc8be8 100644
+index ec01004ef..59ec6ac99 100644
 --- a/src/video/kmsdrm/SDL_kmsdrmmouse.c
 +++ b/src/video/kmsdrm/SDL_kmsdrmmouse.c
-@@ -39,6 +39,7 @@ static void KMSDRM_MoveCursor(SDL_Cursor * cursor);
- static void KMSDRM_FreeCursor(SDL_Cursor * cursor);
- static void KMSDRM_WarpMouse(SDL_Window * window, int x, int y);
+@@ -39,6 +39,7 @@ static void KMSDRM_MoveCursor(SDL_Cursor *cursor);
+ static void KMSDRM_FreeCursor(SDL_Cursor *cursor);
+ static void KMSDRM_WarpMouse(SDL_Window *window, int x, int y);
  static int KMSDRM_WarpMouseGlobal(int x, int y);
 +extern bool odroidgo_rotate;
  
  /**************************************************************************************/
  /* BEFORE CODING ANYTHING MOUSE/CURSOR RELATED, REMEMBER THIS.                        */
-@@ -156,6 +157,7 @@ KMSDRM_DumpCursorToBO(SDL_VideoDisplay *display, SDL_Cursor *cursor)
+@@ -150,6 +151,7 @@ static int KMSDRM_DumpCursorToBO(SDL_VideoDisplay *display, SDL_Cursor *cursor)
      uint8_t *src_row;
  
      int i;
@@ -27,12 +27,12 @@ index 99b869939..6bdbc8be8 100644
      int ret;
  
      if (!curdata || !dispdata->cursor_bo) {
-@@ -176,8 +178,15 @@ KMSDRM_DumpCursorToBO(SDL_VideoDisplay *display, SDL_Cursor *cursor)
+@@ -170,8 +172,15 @@ static int KMSDRM_DumpCursorToBO(SDL_VideoDisplay *display, SDL_Cursor *cursor)
  
      /* Copy from the cursor buffer to a buffer that we can dump to the GBM BO. */
      for (i = 0; i < curdata->h; i++) {
--        src_row = &((uint8_t*)curdata->buffer)[i * curdata->w * 4];
--        SDL_memcpy(ready_buffer + (i * bo_stride), src_row, 4 * curdata->w);
+-        src_row = &((uint8_t *)curdata->buffer)[i * curdata->w * 4];
+-        SDL_memcpy(ready_buffer + (i * bo_stride), src_row, (size_t)4 * curdata->w);
 +        if (odroidgo_rotate) {
 +            for (j = 0; j < curdata->w; j++) {
 +                src_row = ((uint32_t*)curdata->buffer)[i * curdata->w + j];
@@ -45,7 +45,7 @@ index 99b869939..6bdbc8be8 100644
      }
  
      /* Dump the cursor buffer to our GBM BO. */
-@@ -189,10 +198,18 @@ KMSDRM_DumpCursorToBO(SDL_VideoDisplay *display, SDL_Cursor *cursor)
+@@ -183,10 +192,18 @@ static int KMSDRM_DumpCursorToBO(SDL_VideoDisplay *display, SDL_Cursor *cursor)
      /* Put the GBM BO buffer on screen using the DRM interface. */
      bo_handle = KMSDRM_gbm_bo_get_handle(dispdata->cursor_bo).u32;
      if (curdata->hot_x == 0 && curdata->hot_y == 0) {
@@ -55,7 +55,7 @@ index 99b869939..6bdbc8be8 100644
 +            bo_handle, dispdata->cursor_h, dispdata->cursor_w);
 +        else
 +          ret = KMSDRM_drmModeSetCursor(viddata->drm_fd, dispdata->crtc->crtc_id,
-             bo_handle, dispdata->cursor_w, dispdata->cursor_h);
+                                       bo_handle, dispdata->cursor_w, dispdata->cursor_h);
      } else {
 -        ret = KMSDRM_drmModeSetCursor2(viddata->drm_fd, dispdata->crtc->crtc_id,
 +        if (odroidgo_rotate)
@@ -63,21 +63,21 @@ index 99b869939..6bdbc8be8 100644
 +            bo_handle, dispdata->cursor_h, dispdata->cursor_w, curdata->hot_y, (curdata->w - curdata->hot_x + 1));
 +        else
 +          ret = KMSDRM_drmModeSetCursor2(viddata->drm_fd, dispdata->crtc->crtc_id,
-             bo_handle, dispdata->cursor_w, dispdata->cursor_h, curdata->hot_x, curdata->hot_y);
+                                        bo_handle, dispdata->cursor_w, dispdata->cursor_h, curdata->hot_x, curdata->hot_y);
      }
  
-@@ -378,9 +395,9 @@ KMSDRM_WarpMouseGlobal(int x, int y)
+@@ -367,9 +384,9 @@ static int KMSDRM_WarpMouseGlobal(int x, int y)
      SDL_Mouse *mouse = SDL_GetMouse();
  
      if (mouse && mouse->cur_cursor && mouse->focus) {
 -
          SDL_Window *window = mouse->focus;
-         SDL_DisplayData *dispdata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+         SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayForWindow(window)->driverdata;
 +        KMSDRM_CursorData *curdata = mouse->cur_cursor->driverdata;
  
          /* Update internal mouse position. */
          SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 0, x, y);
-@@ -389,7 +406,10 @@ KMSDRM_WarpMouseGlobal(int x, int y)
+@@ -378,7 +395,10 @@ static int KMSDRM_WarpMouseGlobal(int x, int y)
          if (dispdata->cursor_bo) {
              int ret = 0;
  
@@ -89,13 +89,13 @@ index 99b869939..6bdbc8be8 100644
  
              if (ret) {
                  SDL_SetError("drmModeMoveCursor() failed.");
-@@ -443,16 +463,19 @@ KMSDRM_MoveCursor(SDL_Cursor * cursor)
+@@ -429,16 +449,19 @@ static void KMSDRM_MoveCursor(SDL_Cursor *cursor)
      /* We must NOT call SDL_SendMouseMotion() here or we will enter recursivity!
         That's why we move the cursor graphic ONLY. */
      if (mouse && mouse->cur_cursor && mouse->focus) {
 -
          SDL_Window *window = mouse->focus;
-         SDL_DisplayData *dispdata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+         SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayForWindow(window)->driverdata;
 +        KMSDRM_CursorData *curdata = mouse->cur_cursor->driverdata;
  
          if (!dispdata->cursor_bo) {
@@ -112,5 +112,5 @@ index 99b869939..6bdbc8be8 100644
          if (ret) {
              SDL_SetError("drmModeMoveCursor() failed.");
 -- 
-2.42.0
+2.43.0
 
diff --git a/board/recalbox/odroidgo2/patches/sdl2/0005-sdl2-libmali-patch.patch b/board/recalbox/odroidgo2/patches/sdl2/0005-sdl2-libmali-patch.patch
index 7ac7857554d8f5c7efc6b841d6dd3c1c76af39d0..3b3c49f74362c7baded1f831c70f61e1edc0a899 100644
--- a/board/recalbox/odroidgo2/patches/sdl2/0005-sdl2-libmali-patch.patch
+++ b/board/recalbox/odroidgo2/patches/sdl2/0005-sdl2-libmali-patch.patch
@@ -1,7 +1,7 @@
-From 241efc729eeedfe48762c95b9221eea0eaa23349 Mon Sep 17 00:00:00 2001
-From: David Barbion <davidb@230ruedubac.fr>
-Date: Sun, 16 Jan 2022 12:40:23 +0100
-Subject: [PATCH 5/5] sdl2 libmali patch
+From d3f4255fba349584e6dfcb8da407541eb2426ba7 Mon Sep 17 00:00:00 2001
+From: digitalLumberjack <digitallumberjack@gmail.com>
+Date: Mon, 9 Sep 2024 15:28:29 +0200
+Subject: [PATCH] sdl2 libmali patch
 
 ---
  src/video/SDL_egl.c                   |  2 +-
@@ -9,10 +9,10 @@ Subject: [PATCH 5/5] sdl2 libmali patch
  2 files changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
-index e10cf7c70..f7cf2751a 100644
+index a89c0e812..c35791ce3 100644
 --- a/src/video/SDL_egl.c
 +++ b/src/video/SDL_egl.c
-@@ -1041,7 +1041,7 @@ SDL_EGL_CreateContext(_THIS, EGLSurface egl_surface)
+@@ -1044,7 +1044,7 @@ SDL_GLContext SDL_EGL_CreateContext(_THIS, EGLSurface egl_surface)
          return NULL;
      }
  
@@ -20,16 +20,16 @@ index e10cf7c70..f7cf2751a 100644
 +    _this->egl_data->egl_swapinterval = 1;
  
      if (SDL_EGL_MakeCurrent(_this, egl_surface, egl_context) < 0) {
-         /* Save the SDL error set by SDL_EGL_MakeCurrent */
+         /* Delete the context */
 diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/video/kmsdrm/SDL_kmsdrmopengles.c
-index ca3556385..150227575 100644
+index 90ca246c1..fc8e6ccd8 100644
 --- a/src/video/kmsdrm/SDL_kmsdrmopengles.c
 +++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c
-@@ -44,11 +44,17 @@ KMSDRM_GLES_DefaultProfileConfig(_THIS, int *mask, int *major, int *minor)
+@@ -46,11 +46,17 @@ void KMSDRM_GLES_DefaultProfileConfig(_THIS, int *mask, int *major, int *minor)
  {
      /* if SDL was _also_ built with the Raspberry Pi driver (so we're
         definitely a Pi device), default to GLES2. */
--#if SDL_VIDEO_DRIVER_RPI
+-#ifdef SDL_VIDEO_DRIVER_RPI
 -    *mask = SDL_GL_CONTEXT_PROFILE_ES;
 -    *major = 2;
 -    *minor = 0;
@@ -46,15 +46,15 @@ index ca3556385..150227575 100644
 +    }
  }
  
- int
-@@ -75,6 +81,7 @@ SDL_EGL_CreateContext_impl(KMSDRM)
- 
- int KMSDRM_GLES_SetSwapInterval(_THIS, int interval) {
+ int KMSDRM_GLES_LoadLibrary(_THIS, const char *path)
+@@ -78,6 +84,7 @@ SDL_EGL_CreateContext_impl(KMSDRM)
+     int KMSDRM_GLES_SetSwapInterval(_THIS, int interval)
+ {
  
 +  interval = 1;
      if (!_this->egl_data) {
          return SDL_SetError("EGL not initialized");
      }
 -- 
-2.34.1
+2.43.0
 
diff --git a/board/recalbox/patches/sdl2/sdl2_input_p003_extra_functions.patch b/board/recalbox/patches/sdl2/sdl2_input_p003_extra_functions.patch
index 4bb7789fd7938f3d5169953268f04bb90259a45f..fd825fe96037dad1414aad7dfb94e99578b8f764 100644
--- a/board/recalbox/patches/sdl2/sdl2_input_p003_extra_functions.patch
+++ b/board/recalbox/patches/sdl2/sdl2_input_p003_extra_functions.patch
@@ -1,23 +1,8 @@
-From e5bdef40d2b42b40e0d8f02f82b6f9731e3b2d18 Mon Sep 17 00:00:00 2001
-From: David Barbion <davidb@230ruedubac.fr>
-Date: Wed, 8 Mar 2023 23:02:52 +0100
-Subject: [PATCH] sdl2 input p003 extra functions
-
----
- include/SDL_joystick.h                 |  5 +++
- src/dynapi/SDL_dynapi_overrides.h      |  6 +++
- src/dynapi/SDL_dynapi_procs.h          |  6 +++
- src/joystick/SDL_joystick.c            | 21 +++++++++
- src/joystick/SDL_sysjoystick.h         |  5 +++
- src/joystick/linux/SDL_sysjoystick.c   | 60 ++++++++++++++++++++++++++
- src/joystick/linux/SDL_sysjoystick_c.h |  1 +
- 7 files changed, 104 insertions(+)
-
 diff --git a/include/SDL_joystick.h b/include/SDL_joystick.h
-index 07d6a2e0a..01aa9cbf5 100644
+index 7a3faf8..dbcb732 100644
 --- a/include/SDL_joystick.h
 +++ b/include/SDL_joystick.h
-@@ -421,6 +421,11 @@ extern DECLSPEC int SDLCALL SDL_JoystickDetachVirtual(int device_index);
+@@ -424,6 +424,11 @@ extern DECLSPEC int SDLCALL SDL_JoystickDetachVirtual(int device_index);
   */
  extern DECLSPEC SDL_bool SDLCALL SDL_JoystickIsVirtual(int device_index);
  
@@ -30,7 +15,7 @@ index 07d6a2e0a..01aa9cbf5 100644
   * Set values on an opened, virtual-joystick's axis.
   *
 diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
-index 52ddfafef..2103e4066 100644
+index f57c522..5131707 100644
 --- a/src/dynapi/SDL_dynapi_overrides.h
 +++ b/src/dynapi/SDL_dynapi_overrides.h
 @@ -209,6 +209,12 @@
@@ -47,7 +32,7 @@ index 52ddfafef..2103e4066 100644
  #define SDL_JoystickGetBall SDL_JoystickGetBall_REAL
  #define SDL_JoystickGetButton SDL_JoystickGetButton_REAL
 diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
-index 2180dbfb1..7dfb9fd85 100644
+index 7f5d325..d3d9399 100644
 --- a/src/dynapi/SDL_dynapi_procs.h
 +++ b/src/dynapi/SDL_dynapi_procs.h
 @@ -243,6 +243,12 @@ SDL_DYNAPI_PROC(int,SDL_JoystickNumButtons,(SDL_Joystick *a),(a),return)
@@ -64,10 +49,10 @@ index 2180dbfb1..7dfb9fd85 100644
  SDL_DYNAPI_PROC(int,SDL_JoystickGetBall,(SDL_Joystick *a, int b, int *c, int *d),(a,b,c,d),return)
  SDL_DYNAPI_PROC(Uint8,SDL_JoystickGetButton,(SDL_Joystick *a, int b),(a,b),return)
 diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
-index b4d6d2edc..95c09ebea 100644
+index dff447b..c90a0fc 100644
 --- a/src/joystick/SDL_joystick.c
 +++ b/src/joystick/SDL_joystick.c
-@@ -2898,6 +2898,27 @@ SDL_JoystickGUID SDL_JoystickGetGUIDFromString(const char *pchGUID)
+@@ -3241,6 +3241,27 @@ SDL_JoystickGUID SDL_JoystickGetGUIDFromString(const char *pchGUID)
      return SDL_GUIDFromString(pchGUID);
  }
  
@@ -96,10 +81,10 @@ index b4d6d2edc..95c09ebea 100644
  void SDL_PrivateJoystickBatteryLevel(SDL_Joystick *joystick, SDL_JoystickPowerLevel ePowerLevel)
  {
 diff --git a/src/joystick/SDL_sysjoystick.h b/src/joystick/SDL_sysjoystick.h
-index 20216bb49..5e40d5e42 100644
+index 173650e..a25a14c 100644
 --- a/src/joystick/SDL_sysjoystick.h
 +++ b/src/joystick/SDL_sysjoystick.h
-@@ -250,6 +250,11 @@ extern SDL_JoystickDriver SDL_N3DS_JoystickDriver;
+@@ -259,6 +259,11 @@ extern SDL_JoystickDriver SDL_N3DS_JoystickDriver;
  }
  #endif
  
@@ -112,12 +97,12 @@ index 20216bb49..5e40d5e42 100644
  
  /* vi: set ts=4 sw=4 expandtab: */
 diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
-index dc534ba6c..86a83d465 100644
+index bb7c31c..379a9b5 100644
 --- a/src/joystick/linux/SDL_sysjoystick.c
 +++ b/src/joystick/linux/SDL_sysjoystick.c
-@@ -957,6 +957,16 @@ ConfigJoystick(SDL_Joystick *joystick, int fd)
-     SDL_bool use_deadzones = SDL_GetHintBoolean(SDL_HINT_LINUX_JOYSTICK_DEADZONES, SDL_FALSE);
-     SDL_bool use_hat_deadzones = SDL_GetHintBoolean(SDL_HINT_LINUX_HAT_DEADZONES, SDL_TRUE);
+@@ -1270,6 +1270,16 @@ static void ConfigJoystick(SDL_Joystick *joystick, int fd, int fd_sensor)
+ 
+     SDL_AssertJoysticksLocked();
  
 +    for(i=0; i<KEY_MAX; i++) {
 +      joystick->hwdata->key_map[i] = -1;
@@ -132,7 +117,7 @@ index dc534ba6c..86a83d465 100644
      /* See if this device uses the new unified event API */
      if ((ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) >= 0) &&
          (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) >= 0) &&
-@@ -2090,6 +2100,56 @@ SDL_JoystickDriver SDL_LINUX_JoystickDriver =
+@@ -2809,6 +2819,56 @@ SDL_JoystickDriver SDL_LINUX_JoystickDriver = {
      LINUX_JoystickGetGamepadMapping
  };
  
@@ -190,17 +175,14 @@ index dc534ba6c..86a83d465 100644
  
  /* vi: set ts=4 sw=4 expandtab: */
 diff --git a/src/joystick/linux/SDL_sysjoystick_c.h b/src/joystick/linux/SDL_sysjoystick_c.h
-index 79e7ab443..2d971ed60 100644
+index 6d6ee69..43f5e07 100644
 --- a/src/joystick/linux/SDL_sysjoystick_c.h
 +++ b/src/joystick/linux/SDL_sysjoystick_c.h
-@@ -53,6 +53,7 @@ struct joystick_hwdata
+@@ -57,6 +57,7 @@ struct joystick_hwdata
      /* Support for the Linux 2.4 unified input interface */
      Uint8 key_map[KEY_MAX];
      Uint8 abs_map[ABS_MAX];
 +    Uint8 hat_map[ABS_MAX];
      SDL_bool has_key[KEY_MAX];
      SDL_bool has_abs[ABS_MAX];
- 
--- 
-2.39.2
-
+     SDL_bool has_accelerometer;
diff --git a/board/recalbox/rpi/kernel-6.1-defconfig-fragment.config b/board/recalbox/rpi/kernel-6.6-defconfig-fragment.config
similarity index 100%
rename from board/recalbox/rpi/kernel-6.1-defconfig-fragment.config
rename to board/recalbox/rpi/kernel-6.6-defconfig-fragment.config
diff --git a/board/recalbox/rpi/kernel_patches/6.6/0001-feat-add-piboy-dmg-panel-for-kms-driver.patch b/board/recalbox/rpi/kernel_patches/6.6/0001-feat-add-piboy-dmg-panel-for-kms-driver.patch
new file mode 100644
index 0000000000000000000000000000000000000000..08f51ad02ea0d0cc4a5edda83a49d3bfc61c4927
--- /dev/null
+++ b/board/recalbox/rpi/kernel_patches/6.6/0001-feat-add-piboy-dmg-panel-for-kms-driver.patch
@@ -0,0 +1,130 @@
+From 6ddecf9eb83ca5685e68cecea6910b87060e6b7e Mon Sep 17 00:00:00 2001
+From: David Barbion <davidb@230ruedubac.fr>
+Date: Thu, 9 Dec 2021 22:48:17 +0100
+Subject: [PATCH 1/8] feat: add piboy dmg panel for kms driver
+
+---
+ arch/arm/boot/dts/overlays/Makefile           |  1 +
+ .../overlays/vc4-kms-dpi-piboydmg-overlay.dts | 44 +++++++++++++++++++
+ drivers/gpu/drm/panel/panel-simple.c          | 35 +++++++++++++++
+ 3 files changed, 80 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-piboydmg-overlay.dts
+
+diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
+index bdd02b8c6f0f..84b38d631576 100644
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -301,6 +301,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	vc4-kms-dpi-hyperpixel4.dtbo \
+ 	vc4-kms-dpi-hyperpixel4sq.dtbo \
+ 	vc4-kms-dpi-panel.dtbo \
++	vc4-kms-dpi-piboydmg.dtbo \
+ 	vc4-kms-dsi-7inch.dtbo \
+ 	vc4-kms-dsi-generic.dtbo \
+ 	vc4-kms-dsi-ili9881-5inch.dtbo \
+diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-piboydmg-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-piboydmg-overlay.dts
+new file mode 100644
+index 000000000000..a4e727dda7d7
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-piboydmg-overlay.dts
+@@ -0,0 +1,44 @@
++/*
++ * vc4-kms-dpi-piboydmg-overlay.dts
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/pinctrl/bcm2835.h>
++
++/ {
++	compatible = "brcm,bcm2835";
++
++	fragment@0 {
++		target-path = "/";
++		__overlay__ {
++			panel: panel {
++				compatible = "xpi,piboydmg", "simple-panel";
++
++				port {
++					panel_in: endpoint {
++						remote-endpoint = <&dpi_out>;
++					};
++				};
++			};
++		};
++	};
++
++	fragment@1 {
++		target = <&dpi>;
++		__overlay__  {
++			status = "okay";
++
++			pinctrl-names = "default";
++			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
++
++			port {
++				dpi_out: endpoint {
++					remote-endpoint = <&panel_in>;
++				};
++			};
++		};
++	};
++};
+diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
+index 035ee7a2f8a0..db5fae3fde9a 100644
+--- a/drivers/gpu/drm/panel/panel-simple.c
++++ b/drivers/gpu/drm/panel/panel-simple.c
+@@ -2228,6 +2228,38 @@ static const struct panel_desc innolux_at043tn24 = {
+ 	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
+ };
+ 
++static const struct display_timing xpi_piboydmg_timing = {
++	.pixelclock = { 32000000, 32000000, 32200000},
++	.hactive = { 640, 640, 640 },
++	.hfront_porch = { 130, 80, 30 },
++	.hback_porch = { 130, 80, 30 },
++	.hsync_len = { 130, 80, 30},
++	.vactive = { 480, 480, 480 },
++	.vfront_porch = { 13, 13, 13},
++	.vback_porch = { 13, 13, 13 },
++	.vsync_len = { 13, 13, 13 },
++	.flags = DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_PHSYNC,
++};
++
++static const struct panel_desc xpi_piboydmg = {
++	.timings = &xpi_piboydmg_timing,
++	.num_timings = 1,
++	.bpc = 6,
++	.size = {
++		.width = 112,
++		.height = 84,
++	},
++	.delay = {
++		.prepare = 50,
++		.enable = 200,
++		.disable = 110,
++		.unprepare = 200,
++	},
++	.bus_format = MEDIA_BUS_FMT_RGB666_1X24_CPADHI,
++	.bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE,
++	.connector_type = DRM_MODE_CONNECTOR_DPI,
++};
++
+ static const struct display_timing innolux_at056tn53v1_timing = {
+ 	.pixelclock = { 39700000, 39700000, 39700000},
+ 	.hactive = { 640, 640, 640 },
+@@ -4366,6 +4398,9 @@ static const struct of_device_id platform_of_match[] = {
+ 	}, {
+ 		.compatible = "innolux,at043tn24",
+ 		.data = &innolux_at043tn24,
++	}, {
++		.compatible = "xpi,piboydmg",
++		.data = &xpi_piboydmg,
+ 	}, {
+ 		.compatible = "innolux,at056tn53v1",
+ 		.data = &innolux_at056tn53v1,
+-- 
+2.44.0
+
diff --git a/board/recalbox/rpi/kernel_patches/6.6/0002-feat-add-auo-a030vvn01-dpi-panel-for-kms-driver.patch b/board/recalbox/rpi/kernel_patches/6.6/0002-feat-add-auo-a030vvn01-dpi-panel-for-kms-driver.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ea302f37114b022af65a43a1ebdb12cc74143d10
--- /dev/null
+++ b/board/recalbox/rpi/kernel_patches/6.6/0002-feat-add-auo-a030vvn01-dpi-panel-for-kms-driver.patch
@@ -0,0 +1,124 @@
+From c22a1ed65525b51a68f9a8b81c729bf997d3005c Mon Sep 17 00:00:00 2001
+From: David Barbion <davidb@230ruedubac.fr>
+Date: Tue, 25 Jan 2022 23:05:52 +0100
+Subject: [PATCH 2/8] feat: add auo a030vvn01 dpi panel for kms driver
+
+---
+ arch/arm/boot/dts/overlays/Makefile           |  1 +
+ .../vc4-kms-dpi-a030vvn01-0-overlay.dts       | 44 +++++++++++++++++++
+ drivers/gpu/drm/panel/panel-simple.c          | 29 ++++++++++++
+ 3 files changed, 74 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-a030vvn01-0-overlay.dts
+
+diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
+index 84b38d631576..6975e3c89f62 100644
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -302,6 +302,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	vc4-kms-dpi-hyperpixel4sq.dtbo \
+ 	vc4-kms-dpi-panel.dtbo \
+ 	vc4-kms-dpi-piboydmg.dtbo \
++	vc4-kms-dpi-a030vvn01-0.dtbo \
+ 	vc4-kms-dsi-7inch.dtbo \
+ 	vc4-kms-dsi-generic.dtbo \
+ 	vc4-kms-dsi-ili9881-5inch.dtbo \
+diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-a030vvn01-0-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-a030vvn01-0-overlay.dts
+new file mode 100644
+index 000000000000..677e21114e3b
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-a030vvn01-0-overlay.dts
+@@ -0,0 +1,44 @@
++/*
++ * vc4-kms-dpi-a030vvn01-1-overlay.dts
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/pinctrl/bcm2835.h>
++
++/ {
++       compatible = "brcm,bcm2835";
++
++       fragment@0 {
++               target-path = "/";
++               __overlay__ {
++                       panel: panel {
++                               compatible = "auo,a030vvn01", "simple-panel";
++
++                               port {
++                                       panel_in: endpoint {
++                                               remote-endpoint = <&dpi_out>;
++                                       };
++                               };
++                       };
++               };
++       };
++
++       fragment@1 {
++               target = <&dpi>;
++               __overlay__  {
++                       status = "okay";
++
++                       pinctrl-names = "default";
++                       pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
++
++                       port {
++                               dpi_out: endpoint {
++                                       remote-endpoint = <&panel_in>;
++                               };
++                       };
++               };
++       };
++};
+diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
+index db5fae3fde9a..9c9c86b0485e 100644
+--- a/drivers/gpu/drm/panel/panel-simple.c
++++ b/drivers/gpu/drm/panel/panel-simple.c
+@@ -2260,6 +2260,32 @@ static const struct panel_desc xpi_piboydmg = {
+ 	.connector_type = DRM_MODE_CONNECTOR_DPI,
+ };
+ 
++static const struct display_timing auo_a030vvn01_timing = {
++	.pixelclock = { 19750000, 24000000, 28220000},
++	.hactive = { 640, 640, 640 },
++	.hfront_porch = { 20, 41, 50 },
++	.hback_porch = { 19, 41, 50 },
++	.hsync_len = { 1, 40, 50},
++	.vactive = { 480, 480, 480 },
++	.vfront_porch = { 1, 18, 30},
++	.vback_porch = { 2, 18, 32 },
++	.vsync_len = { 1, 9, 18 },
++	.flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC,
++};
++
++static const struct panel_desc auo_a030vvn01 = {
++	.timings = &auo_a030vvn01_timing,
++	.num_timings = 1,
++	.bpc = 6,
++	.size = {
++		.width = 60,
++		.height = 45,
++	},
++	.bus_format = MEDIA_BUS_FMT_RGB666_1X24_CPADHI,
++	.bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE,
++	.connector_type = DRM_MODE_CONNECTOR_DPI,
++};
++
+ static const struct display_timing innolux_at056tn53v1_timing = {
+ 	.pixelclock = { 39700000, 39700000, 39700000},
+ 	.hactive = { 640, 640, 640 },
+@@ -4401,6 +4427,9 @@ static const struct of_device_id platform_of_match[] = {
+ 	}, {
+ 		.compatible = "xpi,piboydmg",
+ 		.data = &xpi_piboydmg,
++	}, {
++		.compatible = "auo,a030vvn01",
++		.data = &auo_a030vvn01,
+ 	}, {
+ 		.compatible = "innolux,at056tn53v1",
+ 		.data = &innolux_at056tn53v1,
+-- 
+2.44.0
+
diff --git a/board/recalbox/rpi/kernel_patches/6.6/0003-linux-usb-hid-input-xinmo.patch b/board/recalbox/rpi/kernel_patches/6.6/0003-linux-usb-hid-input-xinmo.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b6fd735202d3a0689399254c493e7282b55b95f7
--- /dev/null
+++ b/board/recalbox/rpi/kernel_patches/6.6/0003-linux-usb-hid-input-xinmo.patch
@@ -0,0 +1,40 @@
+From 99d67e097a1e7855b1d255a86bba2e70bc4d9fa6 Mon Sep 17 00:00:00 2001
+From: David Barbion <davidb@230ruedubac.fr>
+Date: Fri, 18 Feb 2022 22:23:31 +0100
+Subject: [PATCH 3/8] linux usb hid input xinmo
+
+---
+ drivers/hid/hid-input.c | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
+index c8b20d44b147..b28f50572bc7 100644
+--- a/drivers/hid/hid-input.c
++++ b/drivers/hid/hid-input.c
+@@ -874,14 +874,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
+ 
+ 		switch (usage->hid) {
+ 		/* These usage IDs map directly to the usage codes. */
+-		case HID_GD_X: case HID_GD_Y: case HID_GD_Z:
+-		case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:
+-			if (field->flags & HID_MAIN_ITEM_RELATIVE)
+-				map_rel(usage->hid & 0xf);
+-			else
+-				map_abs_clear(usage->hid & 0xf);
+-			break;
+-
+ 		case HID_GD_WHEEL:
+ 			if (field->flags & HID_MAIN_ITEM_RELATIVE) {
+ 				set_bit(REL_WHEEL, input->relbit);
+@@ -890,6 +882,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
+ 				map_abs(usage->hid & 0xf);
+ 			}
+ 			break;
++		case HID_GD_X: case HID_GD_Y: case HID_GD_Z:
++		case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:
+ 		case HID_GD_SLIDER: case HID_GD_DIAL:
+ 			if (field->flags & HID_MAIN_ITEM_RELATIVE)
+ 				map_rel(usage->hid & 0xf);
+-- 
+2.44.0
+
diff --git a/board/recalbox/rpi/kernel_patches/6.6/0004-linux-usb-xinmo20pins-support.patch b/board/recalbox/rpi/kernel_patches/6.6/0004-linux-usb-xinmo20pins-support.patch
new file mode 100644
index 0000000000000000000000000000000000000000..873cd9c740c259758f14d96843d0f2858d2c5d27
--- /dev/null
+++ b/board/recalbox/rpi/kernel_patches/6.6/0004-linux-usb-xinmo20pins-support.patch
@@ -0,0 +1,24 @@
+From aa501a43ae6312be0a934c2c7f4fe70adf8aa957 Mon Sep 17 00:00:00 2001
+From: David Barbion <davidb@230ruedubac.fr>
+Date: Fri, 18 Feb 2022 22:23:52 +0100
+Subject: [PATCH 4/8] linux usb xinmo20pins support
+
+---
+ drivers/hid/hid-quirks.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
+index 1d1949d62dfa..346cf5df550e 100644
+--- a/drivers/hid/hid-quirks.c
++++ b/drivers/hid/hid-quirks.c
+@@ -209,6 +209,7 @@ static const struct hid_device_id hid_quirks[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_THT_2P_ARCADE), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_XENTA, USB_DEVICE_ID_AIRMOUSE_MX3), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
+ 
+-- 
+2.44.0
+
diff --git a/board/recalbox/rpi/kernel_patches/6.6/0005-linux-vc4-dpi-enable-interlace.patch b/board/recalbox/rpi/kernel_patches/6.6/0005-linux-vc4-dpi-enable-interlace.patch
new file mode 100644
index 0000000000000000000000000000000000000000..42e45212f7fe7e62ce2b6c5828b0900ca6b4a8ad
--- /dev/null
+++ b/board/recalbox/rpi/kernel_patches/6.6/0005-linux-vc4-dpi-enable-interlace.patch
@@ -0,0 +1,26 @@
+From 1b00276a429370c3d093f90e5f16dda93b8b58bf Mon Sep 17 00:00:00 2001
+From: David Barbion <davidb@230ruedubac.fr>
+Date: Fri, 18 Feb 2022 22:29:04 +0100
+Subject: [PATCH 5/8] linux vc4 dpi enable interlace
+
+---
+ drivers/gpu/drm/vc4/vc4_dpi.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c
+index 39152e755a13..ca58f74e8b51 100644
+--- a/drivers/gpu/drm/vc4/vc4_dpi.c
++++ b/drivers/gpu/drm/vc4/vc4_dpi.c
+@@ -248,9 +248,6 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder)
+ static enum drm_mode_status vc4_dpi_encoder_mode_valid(struct drm_encoder *encoder,
+ 						       const struct drm_display_mode *mode)
+ {
+-	if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+-		return MODE_NO_INTERLACE;
+-
+ 	return MODE_OK;
+ }
+ 
+-- 
+2.44.0
+
diff --git a/board/recalbox/rpi/kernel_patches/6.6/0006-linux-bcm-clk-add-roundup-ability-to-the-clock-divis.patch b/board/recalbox/rpi/kernel_patches/6.6/0006-linux-bcm-clk-add-roundup-ability-to-the-clock-divis.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c5821d0ab6e8104690f058999ab0ecb635c78872
--- /dev/null
+++ b/board/recalbox/rpi/kernel_patches/6.6/0006-linux-bcm-clk-add-roundup-ability-to-the-clock-divis.patch
@@ -0,0 +1,58 @@
+From 0ebcd5ddb1910ff45431796a3bd956b58a74adff Mon Sep 17 00:00:00 2001
+From: digitalLumberjack <digitallumberjack@gmail.com>
+Date: Fri, 10 Jun 2022 22:03:03 +0200
+Subject: [PATCH 6/8] linux bcm clk add roundup ability to the clock divisor
+
+The commit reverted the round up ability for the bcm clock divisor.
+
+It made clocks for low definitons having bad calculation.
+---
+ drivers/clk/bcm/clk-bcm2835.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
+index eecb2daa423f..e9a824175e37 100644
+--- a/drivers/clk/bcm/clk-bcm2835.c
++++ b/drivers/clk/bcm/clk-bcm2835.c
+@@ -941,7 +941,8 @@ static int bcm2835_clock_is_on(struct clk_hw *hw)
+ 
+ static u32 bcm2835_clock_choose_div(struct clk_hw *hw,
+ 				    unsigned long rate,
+-				    unsigned long parent_rate)
++				    unsigned long parent_rate,
++				    bool round_up)
+ {
+ 	struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
+ 	const struct bcm2835_clock_data *data = clock->data;
+@@ -952,6 +953,10 @@ static u32 bcm2835_clock_choose_div(struct clk_hw *hw,
+ 
+ 	do_div(temp, rate);
+ 	div = temp;
++
++	/* Round up and mask off the unused bits */
++	if (round_up && ((div & unused_frac_mask) != 0 || do_div(temp, rate) != 0))
++		div += unused_frac_mask + 1;
+ 	div &= ~unused_frac_mask;
+ 
+ 	/* different clamping limits apply for a mash clock */
+@@ -1135,7 +1140,7 @@ static int bcm2835_clock_set_rate_and_parent(struct clk_hw *hw,
+ 	struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
+ 	struct bcm2835_cprman *cprman = clock->cprman;
+ 	const struct bcm2835_clock_data *data = clock->data;
+-	u32 div = bcm2835_clock_choose_div(hw, rate, parent_rate);
++	u32 div = bcm2835_clock_choose_div(hw, rate, parent_rate, false);
+ 	u32 ctl;
+ 
+ 	spin_lock(&cprman->regs_lock);
+@@ -1201,7 +1206,7 @@ static unsigned long bcm2835_clock_choose_div_and_prate(struct clk_hw *hw,
+ 
+ 	if (!(BIT(parent_idx) & data->set_rate_parent)) {
+ 		*prate = clk_hw_get_rate(parent);
+-		*div = bcm2835_clock_choose_div(hw, rate, *prate);
++		*div = bcm2835_clock_choose_div(hw, rate, *prate, true);
+ 
+ 		*avgrate = bcm2835_clock_rate_from_divisor(clock, *prate, *div);
+ 
+-- 
+2.44.0
+
diff --git a/board/recalbox/rpi/kernel_patches/6.6/0007-feat-add-retroflag-gpi2w-dpi-panel-for-kms-driver.patch b/board/recalbox/rpi/kernel_patches/6.6/0007-feat-add-retroflag-gpi2w-dpi-panel-for-kms-driver.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e1200d0b8b0c1d6618e8d881a5f87d8b4184c23a
--- /dev/null
+++ b/board/recalbox/rpi/kernel_patches/6.6/0007-feat-add-retroflag-gpi2w-dpi-panel-for-kms-driver.patch
@@ -0,0 +1,124 @@
+From 4cd6d5b255965c95b1682d2c4cc3c75d285e29cf Mon Sep 17 00:00:00 2001
+From: David Barbion <davidb@230ruedubac.fr>
+Date: Fri, 6 Jan 2023 21:04:11 +0100
+Subject: [PATCH 7/8] feat: add retroflag gpi2w dpi panel for kms driver
+
+---
+ arch/arm/boot/dts/overlays/Makefile           |  1 +
+ .../vc4-kms-dpi-retroflag-gpi2w-overlay.dts   | 44 +++++++++++++++++++
+ drivers/gpu/drm/panel/panel-simple.c          | 29 ++++++++++++
+ 3 files changed, 74 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-retroflag-gpi2w-overlay.dts
+
+diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
+index 6975e3c89f62..c309bd6b413d 100644
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -303,6 +303,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	vc4-kms-dpi-panel.dtbo \
+ 	vc4-kms-dpi-piboydmg.dtbo \
+ 	vc4-kms-dpi-a030vvn01-0.dtbo \
++	vc4-kms-dpi-retroflag-gpi2w.dtbo \
+ 	vc4-kms-dsi-7inch.dtbo \
+ 	vc4-kms-dsi-generic.dtbo \
+ 	vc4-kms-dsi-ili9881-5inch.dtbo \
+diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-retroflag-gpi2w-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-retroflag-gpi2w-overlay.dts
+new file mode 100644
+index 000000000000..473a9f812087
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-retroflag-gpi2w-overlay.dts
+@@ -0,0 +1,44 @@
++/*
++ * vc4-kms-dpi-a030vvn01-1-overlay.dts
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/pinctrl/bcm2835.h>
++
++/ {
++       compatible = "brcm,bcm2835";
++
++       fragment@0 {
++               target-path = "/";
++               __overlay__ {
++                       panel: panel {
++                               compatible = "retroflag,gpi2w", "simple-panel";
++
++                               port {
++                                       panel_in: endpoint {
++                                               remote-endpoint = <&dpi_out>;
++                                       };
++                               };
++                       };
++               };
++       };
++
++       fragment@1 {
++               target = <&dpi>;
++               __overlay__  {
++                       status = "okay";
++
++                       pinctrl-names = "default";
++                       pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
++
++                       port {
++                               dpi_out: endpoint {
++                                       remote-endpoint = <&panel_in>;
++                               };
++                       };
++               };
++       };
++};
+diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
+index 9c9c86b0485e..fa8d53e90a0a 100644
+--- a/drivers/gpu/drm/panel/panel-simple.c
++++ b/drivers/gpu/drm/panel/panel-simple.c
+@@ -2286,6 +2286,32 @@ static const struct panel_desc auo_a030vvn01 = {
+ 	.connector_type = DRM_MODE_CONNECTOR_DPI,
+ };
+ 
++static const struct display_timing retroflag_gpi2w_timing = {
++	.pixelclock = { 19200000, 19200000, 19200000},
++	.hactive = { 640, 640, 640 },
++	.hfront_porch = { 1, 1, 1 },
++	.hback_porch = { 20, 20, 20 },
++	.hsync_len = { 1, 1, 1},
++	.vactive = { 480, 480, 480 },
++	.vfront_porch = { 1, 1, 1},
++	.vback_porch = { 2, 2, 2 },
++	.vsync_len = { 1, 1, 1 },
++	.flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC,
++};
++
++static const struct panel_desc retroflag_gpi2w = {
++	.timings = &retroflag_gpi2w_timing,
++	.num_timings = 1,
++	.bpc = 6,
++	.size = {
++		.width = 60,
++		.height = 45,
++	},
++	.bus_format = MEDIA_BUS_FMT_RGB666_1X24_CPADHI,
++	.bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE,
++	.connector_type = DRM_MODE_CONNECTOR_DPI,
++};
++
+ static const struct display_timing innolux_at056tn53v1_timing = {
+ 	.pixelclock = { 39700000, 39700000, 39700000},
+ 	.hactive = { 640, 640, 640 },
+@@ -4430,6 +4456,9 @@ static const struct of_device_id platform_of_match[] = {
+ 	}, {
+ 		.compatible = "auo,a030vvn01",
+ 		.data = &auo_a030vvn01,
++	}, {
++		.compatible = "retroflag,gpi2w",
++		.data = &retroflag_gpi2w,
+ 	}, {
+ 		.compatible = "innolux,at056tn53v1",
+ 		.data = &innolux_at056tn53v1,
+-- 
+2.44.0
+
diff --git a/configs/recalbox-rpi1_defconfig b/configs/recalbox-rpi1_defconfig
index 2560f9e581c25e81febff06f758c0680f3c03544..915dff9d07da1f1f9d3d68b85629c9e0b98ae274 100644
--- a/configs/recalbox-rpi1_defconfig
+++ b/configs/recalbox-rpi1_defconfig
@@ -29,12 +29,12 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/recal
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/copy-recalbox-archives.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,d02bd251d7f85e3aec02e5752df2f44a35961360)/linux-d02bd251d7f85e3aec02e5752df2f44a35961360.tar.gz"
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.1 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.1"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ba0f2212e0e100ee16bdde76b7efca6bb8ee9446)/linux-ba0f2212e0e100ee16bdde76b7efca6bb8ee9446.tar.gz"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.6 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.6"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.1-defconfig-fragment.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.6-defconfig-fragment.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm bcm2708-rpi-zero-w"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-plus broadcom/bcm2708-rpi-cm broadcom/bcm2708-rpi-zero broadcom/bcm2708-rpi-zero-w"
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_DTS_INSTALL_OVERLAYS=y
 BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config"
diff --git a/configs/recalbox-rpi3_defconfig b/configs/recalbox-rpi3_defconfig
index 426d2217037649094a84e92d9a6d54da8be24a27..d4ce6873d3d437bcaa743ea53bdd1f3d2b33054e 100644
--- a/configs/recalbox-rpi3_defconfig
+++ b/configs/recalbox-rpi3_defconfig
@@ -30,12 +30,12 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/recal
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/copy-recalbox-archives.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,d02bd251d7f85e3aec02e5752df2f44a35961360)/linux-d02bd251d7f85e3aec02e5752df2f44a35961360.tar.gz"
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.1 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.1"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ba0f2212e0e100ee16bdde76b7efca6bb8ee9446)/linux-ba0f2212e0e100ee16bdde76b7efca6bb8ee9446.tar.gz"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.6 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.6"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.1-defconfig-fragment.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.6-defconfig-fragment.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3 bcm2710-rpi-zero-2 bcm2710-rpi-zero-2-w"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3 broadcom/bcm2710-rpi-zero-2 broadcom/bcm2710-rpi-zero-2-w"
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_DTS_INSTALL_OVERLAYS=y
 BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config"
diff --git a/configs/recalbox-rpi4_64_defconfig b/configs/recalbox-rpi4_64_defconfig
index 615e45d80e061ec647de35bf1996427d0a4d1756..2f8a908a278fb8a4178e6cf15d4188adaffe6d3e 100644
--- a/configs/recalbox-rpi4_64_defconfig
+++ b/configs/recalbox-rpi4_64_defconfig
@@ -29,10 +29,10 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/recal
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/copy-recalbox-archives.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,d02bd251d7f85e3aec02e5752df2f44a35961360)/linux-d02bd251d7f85e3aec02e5752df2f44a35961360.tar.gz"
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.1 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.1"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ba0f2212e0e100ee16bdde76b7efca6bb8ee9446)/linux-ba0f2212e0e100ee16bdde76b7efca6bb8ee9446.tar.gz"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.6 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.6"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.1-defconfig-fragment.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.6-defconfig-fragment.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4"
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
diff --git a/configs/recalbox-rpi5_64_defconfig b/configs/recalbox-rpi5_64_defconfig
index 52f1236378b0e38f08b48785b403cac67ebbfcf5..c2aa1192b50c004a4bf20e41aeb688f00d257ad5 100644
--- a/configs/recalbox-rpi5_64_defconfig
+++ b/configs/recalbox-rpi5_64_defconfig
@@ -30,12 +30,12 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/recal
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/copy-recalbox-archives.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,d02bd251d7f85e3aec02e5752df2f44a35961360)/linux-d02bd251d7f85e3aec02e5752df2f44a35961360.tar.gz"
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.1 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.1"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ba0f2212e0e100ee16bdde76b7efca6bb8ee9446)/linux-ba0f2212e0e100ee16bdde76b7efca6bb8ee9446.tar.gz"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.6 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.6"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2712"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.1-defconfig-fragment.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.6-defconfig-fragment.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rpi-5-b"
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_DTS_INSTALL_OVERLAYS=y
 BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config"
diff --git a/configs/recalbox-rpizero2_defconfig b/configs/recalbox-rpizero2_defconfig
index bd913c88b4ded1523ceb7a140e5658dd5db80515..7c74a32f23728991df018515933042cd1838d05b 100644
--- a/configs/recalbox-rpizero2_defconfig
+++ b/configs/recalbox-rpizero2_defconfig
@@ -30,10 +30,10 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/recal
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/copy-recalbox-archives.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,d02bd251d7f85e3aec02e5752df2f44a35961360)/linux-d02bd251d7f85e3aec02e5752df2f44a35961360.tar.gz"
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.1 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.1"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ba0f2212e0e100ee16bdde76b7efca6bb8ee9446)/linux-ba0f2212e0e100ee16bdde76b7efca6bb8ee9446.tar.gz"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.6 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.6"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.1-defconfig-fragment.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.6-defconfig-fragment.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-zero-2 bcm2710-rpi-zero-2-w"
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
diff --git a/configs/recalbox-rpizero2legacy_defconfig b/configs/recalbox-rpizero2legacy_defconfig
index ce874b3b2899d6f70b074d8c31e3d78aed9ff02d..86a0fcd796c12eb0bb8c5b02bd1f1518ff8a2c83 100644
--- a/configs/recalbox-rpizero2legacy_defconfig
+++ b/configs/recalbox-rpizero2legacy_defconfig
@@ -30,10 +30,10 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/recal
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/copy-recalbox-archives.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,d02bd251d7f85e3aec02e5752df2f44a35961360)/linux-d02bd251d7f85e3aec02e5752df2f44a35961360.tar.gz"
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.1 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.1"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ba0f2212e0e100ee16bdde76b7efca6bb8ee9446)/linux-ba0f2212e0e100ee16bdde76b7efca6bb8ee9446.tar.gz"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/kernel_patches/6.6 $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel_patches/6.6"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.1-defconfig-fragment.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/rpi/kernel-6.6-defconfig-fragment.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3 bcm2710-rpi-zero-2 bcm2710-rpi-zero-2-w"
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
diff --git a/custom/list.hash b/custom/list.hash
index 42c662bb03e463744f2cf37455042b51632d2d39..c0bbff9275420b8d63e1ed3f9b435a04fede5ea6 100644
--- a/custom/list.hash
+++ b/custom/list.hash
@@ -4,7 +4,6 @@
 #   * a line of minus signs ('-') indicates a file that we remove from Buildroot external tree
 #   * a line of plus signs ('+') indicates a file that we add to the Buildroot external tree
 
-++++++++++++++++++++++++++++++++  package/sdl2/0001-rpi5-disable-async-pageflip.patch
 --------------------------------  package/llvm/0001-nfc-Fix-missing-include.patch
 --------------------------------  package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch
 --------------------------------  package/mesa3d/0004-Fix-uClibc-build.patch
@@ -33,7 +32,10 @@ dfe35e9f39b004b3977968223107bd51  package/libgtk3/0001-disable-atk-bridge.patch
 8e9d594ccabd51a6863314c188bb2e3b  package/llvm/llvm.mk
 64b2fa393cafff6958f4bfd2b9e30f24  package/luajit/Config.in
 201ba12d953eb7111d08b3952a7b6b3c  package/mesa3d/Config.in
+848b4032bd832a28461e364ce5926383  package/mesa3d/mesa3d.hash
 6d6f9c8f807001b9b421d1b924e8d2f3  package/mesa3d/mesa3d.mk
+7e9d13d9f582e09bffee968741ff90f4  package/meson/meson.hash
+19ea768cd63d0ee6a55cb6b25c7f0b31  package/meson/meson.mk
 f0dfbbe844feaf583ba0cd9432704f09  package/mosquitto/mosquitto.mk
 2cd9a8d1ff6aa58b1ae2709179929998  package/mpv/mpv.mk
 eccca9996f67a8e3091c986d75a6b85e  package/python-pygame/python-pygame.hash
@@ -41,6 +43,7 @@ eccca9996f67a8e3091c986d75a6b85e  package/python-pygame/python-pygame.hash
 0f2a1376ed896b443e62fbf9434a99b5  package/rpi-firmware/Config.in
 bb6386cc54355917f1dad1fd576d9298  package/rpi-firmware/rpi-firmware.hash
 dd767d51e6ab8fa62a8cf94e23d44980  package/rpi-firmware/rpi-firmware.mk
+4d001cdf82fc070022638c94d19c6525  package/sdl2/sdl2.hash
 3bfcf3601bf15f5e14fc4aa202bb7c86  package/sdl2/sdl2.mk
 f976cbc5a7299cfc48ec83f255ddf85b  package/sdl2_mixer/sdl2_mixer.mk
 76f5941c64fe63d71fdbafde3594ba78  package/sdl_sound/Config.in
diff --git a/custom/package/mesa3d/mesa3d.hash b/custom/package/mesa3d/mesa3d.hash
new file mode 100644
index 0000000000000000000000000000000000000000..9956c1004c9030827cad4bedeb4766e71d43cb82
--- /dev/null
+++ b/custom/package/mesa3d/mesa3d.hash
@@ -0,0 +1,5 @@
+# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html
+sha256  4ea18b1155a4544a09f7361848974768f6f73c19d88f63de2ec650be313b2d0c  mesa-24.2.3.tar.xz
+sha512  7a1ace23568d1907b778a2859f97c8988a414ba74e02e1fb5af6f95f768e1b1a2dfdaf412b0d655678ed915d28273953fd1236ebcd87553a1880f1a7f3ea4d44  mesa-24.2.3.tar.xz
+# License
+sha256  a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75  docs/license.rst
diff --git a/custom/package/mesa3d/mesa3d.hash.patch b/custom/package/mesa3d/mesa3d.hash.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3543e5b832eca3daa0698f56a99a231803c3cd7e
--- /dev/null
+++ b/custom/package/mesa3d/mesa3d.hash.patch
@@ -0,0 +1,12 @@
+diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
+index e4de997f0e..9956c1004c 100644
+--- a/package/mesa3d/mesa3d.hash
++++ b/package/mesa3d/mesa3d.hash
+@@ -1,5 +1,5 @@
+ # From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html
+-sha256  37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593  mesa-22.3.4.tar.xz
+-sha512  6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d  mesa-22.3.4.tar.xz
++sha256  4ea18b1155a4544a09f7361848974768f6f73c19d88f63de2ec650be313b2d0c  mesa-24.2.3.tar.xz
++sha512  7a1ace23568d1907b778a2859f97c8988a414ba74e02e1fb5af6f95f768e1b1a2dfdaf412b0d655678ed915d28273953fd1236ebcd87553a1880f1a7f3ea4d44  mesa-24.2.3.tar.xz
+ # License
+ sha256  a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75  docs/license.rst
diff --git a/custom/package/mesa3d/mesa3d.mk b/custom/package/mesa3d/mesa3d.mk
index 926910d5cf7f5d604114fcba68fa811da75714b7..6ccc090cbeedb48c84a21abff90d2acd0ea4fa45 100644
--- a/custom/package/mesa3d/mesa3d.mk
+++ b/custom/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 22.3.4
+MESA3D_VERSION = 24.2.3
 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = https://archive.mesa3d.org
 MESA3D_LICENSE = MIT, SGI, Khronos
@@ -21,6 +21,7 @@ MESA3D_DEPENDENCIES = \
 	host-bison \
 	host-flex \
 	host-python-mako \
+	host-python-pyyaml \
 	expat \
 	libdrm \
 	zlib
diff --git a/custom/package/mesa3d/mesa3d.mk.patch b/custom/package/mesa3d/mesa3d.mk.patch
index a13503771896ff0a7d372c9840375ae6775ac6dc..4894fd0825804519561675e6b9334c485dfc2b14 100644
--- a/custom/package/mesa3d/mesa3d.mk.patch
+++ b/custom/package/mesa3d/mesa3d.mk.patch
@@ -1,8 +1,25 @@
 diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
-index 36b7151510..926910d5cf 100644
+index 36b7151510..6ccc090cbe 100644
 --- a/package/mesa3d/mesa3d.mk
 +++ b/package/mesa3d/mesa3d.mk
-@@ -119,7 +119,10 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D)      += v3d
+@@ -5,7 +5,7 @@
+ ################################################################################
+ 
+ # When updating the version, please also update mesa3d-headers
+-MESA3D_VERSION = 22.3.4
++MESA3D_VERSION = 24.2.3
+ MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
+ MESA3D_SITE = https://archive.mesa3d.org
+ MESA3D_LICENSE = MIT, SGI, Khronos
+@@ -21,6 +21,7 @@ MESA3D_DEPENDENCIES = \
+ 	host-bison \
+ 	host-flex \
+ 	host-python-mako \
++	host-python-pyyaml \
+ 	expat \
+ 	libdrm \
+ 	zlib
+@@ -119,7 +120,10 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D)      += v3d
  MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4)      += vc4
  MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL)    += virgl
  # Vulkan Drivers
diff --git a/custom/package/meson/meson.hash b/custom/package/meson/meson.hash
new file mode 100644
index 0000000000000000000000000000000000000000..216f4eb689ec6e732913c3a7ef93c2d3791c3f82
--- /dev/null
+++ b/custom/package/meson/meson.hash
@@ -0,0 +1,4 @@
+# Locally calculated after checking pgp signature
+# https://github.com/mesonbuild/meson/releases/download/1.0.0/meson-1.0.0.tar.gz.asc
+sha256  d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f  meson-1.1.0.tar.gz
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  COPYING
diff --git a/custom/package/meson/meson.hash.patch b/custom/package/meson/meson.hash.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7ac9cea58ec947eddc36be941c5b4160d531b569
--- /dev/null
+++ b/custom/package/meson/meson.hash.patch
@@ -0,0 +1,10 @@
+diff --git a/package/meson/meson.hash b/package/meson/meson.hash
+index 6993b756ae..216f4eb689 100644
+--- a/package/meson/meson.hash
++++ b/package/meson/meson.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated after checking pgp signature
+ # https://github.com/mesonbuild/meson/releases/download/1.0.0/meson-1.0.0.tar.gz.asc
+-sha256  aa50a4ba4557c25e7d48446abfde857957dcdf58385fffbe670ba0e8efacce05  meson-1.0.0.tar.gz
++sha256  d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f  meson-1.1.0.tar.gz
+ sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  COPYING
diff --git a/custom/package/meson/meson.mk b/custom/package/meson/meson.mk
new file mode 100644
index 0000000000000000000000000000000000000000..6b901eb8059d6978d97c871236c9250e51edf91e
--- /dev/null
+++ b/custom/package/meson/meson.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# meson
+#
+################################################################################
+
+MESON_VERSION = 1.1.0
+MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
+MESON_LICENSE = Apache-2.0
+MESON_LICENSE_FILES = COPYING
+MESON_SETUP_TYPE = setuptools
+
+HOST_MESON_DEPENDENCIES = host-ninja
+
+# Avoid interpreter shebang longer than 128 chars
+define HOST_MESON_SET_INTERPRETER
+	$(SED) '1s:.*:#!/usr/bin/env python3:' $(HOST_DIR)/bin/meson
+endef
+HOST_MESON_POST_INSTALL_HOOKS += HOST_MESON_SET_INTERPRETER
+
+$(eval $(host-python-package))
diff --git a/custom/package/meson/meson.mk.patch b/custom/package/meson/meson.mk.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2290c8ad8b0fd0d2f44de2abc9c431d06038699f
--- /dev/null
+++ b/custom/package/meson/meson.mk.patch
@@ -0,0 +1,13 @@
+diff --git a/package/meson/meson.mk b/package/meson/meson.mk
+index e417d8d627..6b901eb805 100644
+--- a/package/meson/meson.mk
++++ b/package/meson/meson.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-MESON_VERSION = 1.0.0
++MESON_VERSION = 1.1.0
+ MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
+ MESON_LICENSE = Apache-2.0
+ MESON_LICENSE_FILES = COPYING
diff --git a/custom/package/rpi-firmware/rpi-firmware.hash b/custom/package/rpi-firmware/rpi-firmware.hash
index 778f9e3400412dda88c0affe6ac62cc7092c514d..c064e842d90f58d021932f3e7859e7f5a2782b92 100644
--- a/custom/package/rpi-firmware/rpi-firmware.hash
+++ b/custom/package/rpi-firmware/rpi-firmware.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  583f11eb4b0c4f2673e4a90519013f654aeddd018c03604c8c1b933651602edb  rpi-firmware-7273369aded28c56937cda2ec8e305f86eaa1203.tar.gz
+sha256  c6e50e82cad762db775db1aa0f279164e7d513689a4005d8d11ebe467da905a4  rpi-firmware-6c7d1719966f459ab0349c8af32f0c774c696234.tar.gz
 sha256  c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b  boot/LICENCE.broadcom
diff --git a/custom/package/rpi-firmware/rpi-firmware.hash.patch b/custom/package/rpi-firmware/rpi-firmware.hash.patch
index f147a134bb01ac1c936da52f0f1f1c490f40be7d..bfdc3600fda532b2f4cbc9b7814028dd97930191 100644
--- a/custom/package/rpi-firmware/rpi-firmware.hash.patch
+++ b/custom/package/rpi-firmware/rpi-firmware.hash.patch
@@ -1,9 +1,9 @@
 diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
-index ec13115f3b..778f9e3400 100644
+index ec13115f3b..c064e842d9 100644
 --- a/package/rpi-firmware/rpi-firmware.hash
 +++ b/package/rpi-firmware/rpi-firmware.hash
 @@ -1,3 +1,3 @@
  # Locally computed
 -sha256  33aea2cb9c3be94c3dd6a96fbb3443eee5af1dc5fc9140e1fadc50832983064e  rpi-firmware-3f20b832b27cd730deb6419b570f31a98167eef6.tar.gz
-+sha256  583f11eb4b0c4f2673e4a90519013f654aeddd018c03604c8c1b933651602edb  rpi-firmware-7273369aded28c56937cda2ec8e305f86eaa1203.tar.gz
++sha256  c6e50e82cad762db775db1aa0f279164e7d513689a4005d8d11ebe467da905a4  rpi-firmware-6c7d1719966f459ab0349c8af32f0c774c696234.tar.gz
  sha256  c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b  boot/LICENCE.broadcom
diff --git a/custom/package/rpi-firmware/rpi-firmware.mk b/custom/package/rpi-firmware/rpi-firmware.mk
index fbc7e43aae5ec3cf8b17b53064499c9680681825..fce789325f78776f4a4a00c7d415d8f7bd0c6db9 100644
--- a/custom/package/rpi-firmware/rpi-firmware.mk
+++ b/custom/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 7273369aded28c56937cda2ec8e305f86eaa1203
+RPI_FIRMWARE_VERSION = 6c7d1719966f459ab0349c8af32f0c774c696234
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
diff --git a/custom/package/rpi-firmware/rpi-firmware.mk.patch b/custom/package/rpi-firmware/rpi-firmware.mk.patch
index 0ca80ac0e2ec18acd92a9eae3c288733a8c905fe..32267227bb489bbb449df83135103775c920fcba 100644
--- a/custom/package/rpi-firmware/rpi-firmware.mk.patch
+++ b/custom/package/rpi-firmware/rpi-firmware.mk.patch
@@ -1,5 +1,5 @@
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
-index 53d6d8ca06..fbc7e43aae 100644
+index 53d6d8ca06..fce789325f 100644
 --- a/package/rpi-firmware/rpi-firmware.mk
 +++ b/package/rpi-firmware/rpi-firmware.mk
 @@ -4,7 +4,7 @@
@@ -7,7 +7,7 @@ index 53d6d8ca06..fbc7e43aae 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 3f20b832b27cd730deb6419b570f31a98167eef6
-+RPI_FIRMWARE_VERSION = 7273369aded28c56937cda2ec8e305f86eaa1203
++RPI_FIRMWARE_VERSION = 6c7d1719966f459ab0349c8af32f0c774c696234
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
diff --git a/custom/package/sdl2/0001-rpi5-disable-async-pageflip.patch b/custom/package/sdl2/0001-rpi5-disable-async-pageflip.patch
deleted file mode 100644
index ed5ce852f6215cd8dbd67e68ab9f7fa2c03889ea..0000000000000000000000000000000000000000
--- a/custom/package/sdl2/0001-rpi5-disable-async-pageflip.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
-index 83cdbf0..827750f 100644
---- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
-+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
-@@ -951,8 +951,11 @@ KMSDRM_InitDisplays (_THIS) {
-     if (ret) {
-         SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Could not determine async page flip capability.");
-     }
-+#ifdef SDL_PI5_NO_ASYNCPAGEFLIP
-+    viddata->async_pageflip_support = SDL_FALSE;
-+#else
-     viddata->async_pageflip_support = async_pageflip ? SDL_TRUE : SDL_FALSE;
--
-+#endif
-     /***********************************/
-     /* Block for Vulkan compatibility. */
-     /***********************************/
diff --git a/custom/package/sdl2/sdl2.hash b/custom/package/sdl2/sdl2.hash
new file mode 100644
index 0000000000000000000000000000000000000000..9d0e8b51bde73d8f8b388069e8b690d539343335
--- /dev/null
+++ b/custom/package/sdl2/sdl2.hash
@@ -0,0 +1,4 @@
+# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.5.tar.gz.sig
+sha256  2508c80438cd5ff3bbeb8fe36b8f3ce7805018ff30303010b61b03bb83ab9694  SDL2-2.30.7.tar.gz
+# Locally calculated
+sha256  9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927  LICENSE.txt
diff --git a/custom/package/sdl2/sdl2.hash.patch b/custom/package/sdl2/sdl2.hash.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9713b22e113f8da105e0384601a63745ca3ec12c
--- /dev/null
+++ b/custom/package/sdl2/sdl2.hash.patch
@@ -0,0 +1,10 @@
+diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash
+index 0c7bdf7fa1..9d0e8b51bd 100644
+--- a/package/sdl2/sdl2.hash
++++ b/package/sdl2/sdl2.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.5.tar.gz.sig
+-sha256  ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7  SDL2-2.26.5.tar.gz
++sha256  2508c80438cd5ff3bbeb8fe36b8f3ce7805018ff30303010b61b03bb83ab9694  SDL2-2.30.7.tar.gz
+ # Locally calculated
+ sha256  9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927  LICENSE.txt
diff --git a/custom/package/sdl2/sdl2.mk b/custom/package/sdl2/sdl2.mk
index ebefc3383b1db471caadab62b05ab2b440e971ac..461e020834bfabce468e2a4bef7922269d221d24 100644
--- a/custom/package/sdl2/sdl2.mk
+++ b/custom/package/sdl2/sdl2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SDL2_VERSION = 2.26.5
+SDL2_VERSION = 2.30.7
 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
 SDL2_SITE = http://www.libsdl.org/release
 SDL2_LICENSE = Zlib
@@ -209,8 +209,4 @@ ifeq ($(BR2_PACKAGE_LIBRGA),y)
 SDL2_DEPENDENCIES += librga
 endif
 
-ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RPI5_64),y)
-  TARGET_CFLAGS += -DSDL_PI5_NO_ASYNCPAGEFLIP=1
-endif
-
 $(eval $(autotools-package))
diff --git a/custom/package/sdl2/sdl2.mk.patch b/custom/package/sdl2/sdl2.mk.patch
index b97d9052c2b1e777031ec76fb8b80bd13319e4c1..d7406792fb5d6a57137746c32d4692c759745b10 100644
--- a/custom/package/sdl2/sdl2.mk.patch
+++ b/custom/package/sdl2/sdl2.mk.patch
@@ -1,7 +1,16 @@
 diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk
-index 5f2e1e0ed1..ebefc3383b 100644
+index 5f2e1e0ed1..461e020834 100644
 --- a/package/sdl2/sdl2.mk
 +++ b/package/sdl2/sdl2.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-SDL2_VERSION = 2.26.5
++SDL2_VERSION = 2.30.7
+ SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
+ SDL2_SITE = http://www.libsdl.org/release
+ SDL2_LICENSE = Zlib
 @@ -15,18 +15,17 @@ SDL2_INSTALL_STAGING = YES
  SDL2_CONFIG_SCRIPTS = sdl2-config
  
@@ -54,7 +63,7 @@ index 5f2e1e0ed1..ebefc3383b 100644
  ifeq ($(BR2_PACKAGE_SDL2_KMSDRM),y)
  SDL2_DEPENDENCIES += libdrm libgbm libegl
  SDL2_CONF_OPTS += --enable-video-kmsdrm
-@@ -181,4 +198,19 @@ else
+@@ -181,4 +198,15 @@ else
  SDL2_CONF_OPTS += --disable-video-kmsdrm
  endif
  
@@ -68,9 +77,5 @@ index 5f2e1e0ed1..ebefc3383b 100644
 +ifeq ($(BR2_PACKAGE_LIBRGA),y)
 +SDL2_DEPENDENCIES += librga
 +endif
-+
-+ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RPI5_64),y)
-+  TARGET_CFLAGS += -DSDL_PI5_NO_ASYNCPAGEFLIP=1
-+endif
 +
  $(eval $(autotools-package))
diff --git a/package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat b/package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
similarity index 100%
rename from package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
rename to package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
diff --git a/package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt b/package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
similarity index 100%
rename from package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
rename to package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
diff --git a/package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst b/package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
similarity index 100%
rename from package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
rename to package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
diff --git a/package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers b/package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
similarity index 100%
rename from package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
rename to package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
diff --git a/package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original b/package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
similarity index 100%
rename from package/arcade-dats/precompiled/atomiswave-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
rename to package/arcade-dats/precompiled/atomiswave-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
diff --git a/package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat b/package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
similarity index 100%
rename from package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
rename to package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
diff --git a/package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt b/package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
similarity index 100%
rename from package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
rename to package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
diff --git a/package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst b/package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
similarity index 100%
rename from package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
rename to package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
diff --git a/package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers b/package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
similarity index 100%
rename from package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
rename to package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
diff --git a/package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original b/package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
similarity index 100%
rename from package/arcade-dats/precompiled/naomi-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
rename to package/arcade-dats/precompiled/naomi-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
diff --git a/package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat b/package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
similarity index 100%
rename from package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
rename to package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
diff --git a/package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt b/package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
similarity index 100%
rename from package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
rename to package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
diff --git a/package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst b/package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
similarity index 100%
rename from package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
rename to package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
diff --git a/package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers b/package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
similarity index 100%
rename from package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
rename to package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
diff --git a/package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original b/package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
similarity index 100%
rename from package/arcade-dats/precompiled/naomi2-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
rename to package/arcade-dats/precompiled/naomi2-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
diff --git a/package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat b/package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
similarity index 100%
rename from package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
rename to package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.dat
diff --git a/package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt b/package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
similarity index 100%
rename from package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
rename to package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.fdt
diff --git a/package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst b/package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
similarity index 100%
rename from package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
rename to package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst
diff --git a/package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers b/package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
similarity index 100%
rename from package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
rename to package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.manufacturers
diff --git a/package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original b/package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
similarity index 100%
rename from package/arcade-dats/precompiled/naomigd-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
rename to package/arcade-dats/precompiled/naomigd-next-92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6.lst.original
diff --git a/package/libretro-flycast-next/libretro-flycast-next.mk b/package/libretro-flycast-next/libretro-flycast-next.mk
index e73277f1922bdfbaf07efa1d2a3f14724b113feb..dfe43bb38c6f58a183ab5aec80252870a4ce28ff 100644
--- a/package/libretro-flycast-next/libretro-flycast-next.mk
+++ b/package/libretro-flycast-next/libretro-flycast-next.mk
@@ -38,10 +38,10 @@ endif
 LIBRETRO_FLYCAST_NEXT_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(COMPILER_COMMONS_CXXFLAGS_EXE) $(LIBRETRO_FLYCAST_NEXT_SIDE_LIBS)"
 
 define LIBRETRO_FLYCAST_NEXT_INSTALL_TARGET_CMDS
-	$(call InstallArcadeFiles,libretro,naomi,$(LIBRETRO_FLYCAST_NEXT_VERSION))
-	$(call InstallArcadeFiles,libretro,naomi2,$(LIBRETRO_FLYCAST_NEXT_VERSION))
-	$(call InstallArcadeFiles,libretro,naomigd,$(LIBRETRO_FLYCAST_NEXT_VERSION))
-	$(call InstallArcadeFiles,libretro,atomiswave,$(LIBRETRO_FLYCAST_NEXT_VERSION))
+	$(call InstallArcadeFiles,libretro,naomi-next,$(LIBRETRO_FLYCAST_NEXT_VERSION))
+	$(call InstallArcadeFiles,libretro,naomi2-next,$(LIBRETRO_FLYCAST_NEXT_VERSION))
+	$(call InstallArcadeFiles,libretro,naomigd-next,$(LIBRETRO_FLYCAST_NEXT_VERSION))
+	$(call InstallArcadeFiles,libretro,atomiswave-next,$(LIBRETRO_FLYCAST_NEXT_VERSION))
 
 	$(INSTALL) -D $(@D)/flycast_libretro.so \
 		$(TARGET_DIR)/usr/lib/libretro/flycast-next_libretro.so
diff --git a/package/mesa3d-rpi5/mesa3d-rpi5.mk b/package/mesa3d-rpi5/mesa3d-rpi5.mk
index dfa75ccb486e9d839c91f49321572b1c375e9c57..ed88219a560a847e8c79821b7d4ba462ac6e6aad 100644
--- a/package/mesa3d-rpi5/mesa3d-rpi5.mk
+++ b/package/mesa3d-rpi5/mesa3d-rpi5.mk
@@ -5,9 +5,9 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_RPI5_VERSION = f59665bb62b579c6cc26155a26ce557f9f3357d2
-MESA3D_RPI5_SITE = https://gitlab.freedesktop.org/mesa/mesa.git
-MESA3D_RPI5_SITE_METHOD = git
+MESA3D_RPI5_VERSION = 24.2.3
+MESA3D_RPI5_SITE = https://archive.mesa3d.org
+MESA3D_RPI5_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_RPI5_LICENSE = MIT, SGI, Khronos
 MESA3D_RPI5_LICENSE_FILES = docs/license.rst
 MESA3D_RPI5_CPE_ID_VENDOR = mesa3d
@@ -21,6 +21,7 @@ MESA3D_RPI5_DEPENDENCIES = \
 	host-bison \
 	host-flex \
 	host-python-mako \
+	host-python-pyyaml \
 	expat \
 	libdrm \
 	zlib
diff --git a/package/recalbox-bluetooth/recalbox-bluetooth.mk b/package/recalbox-bluetooth/recalbox-bluetooth.mk
index 873d1b5626e2e28a86b92e4e56ed87309960ff6f..506b1b61238a681f615b33d1eb9639c025abe2ca 100644
--- a/package/recalbox-bluetooth/recalbox-bluetooth.mk
+++ b/package/recalbox-bluetooth/recalbox-bluetooth.mk
@@ -8,9 +8,7 @@ RECALBOX_BLUETOOTH_SOURCE =
 RECALBOX_BLUETOOTH_VERSION = 1.0
 RECALBOX_BLUETOOTH_LICENSE = MIT
 
-ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RPI0)$(BR2_PACKAGE_RECALBOX_TARGET_RPIZERO2LEGACY)$(BR2_PACKAGE_RECALBOX_TARGET_RPI1)$(BR2_PACKAGE_RECALBOX_TARGET_RPI3)$(BR2_PACKAGE_RECALBOX_TARGET_RPI4)$(BR2_PACKAGE_RECALBOX_TARGET_RPIZERO2)$(BR2_PACKAGE_RECALBOX_TARGET_RPI4_64)$(BR2_PACKAGE_RECALBOX_TARGET_RPI5_64),y)
-RECALBOX_BLUETOOTH_BT_CONTROLLERS=rpi
-else ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RG353X),y)
+ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RG353X),y)
 RECALBOX_BLUETOOTH_BT_CONTROLLERS=rg353x
 else
 RECALBOX_BLUETOOTH_BT_CONTROLLERS=others
diff --git a/package/recalbox-bluetooth/src/scripts/bluetoothcontrollers.sh.rpi b/package/recalbox-bluetooth/src/scripts/bluetoothcontrollers.sh.rpi
deleted file mode 100755
index 7c59cf394c2588bb2c801e36f11c44d2f6703298..0000000000000000000000000000000000000000
--- a/package/recalbox-bluetooth/src/scripts/bluetoothcontrollers.sh.rpi
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-HCIATTACH=/usr/bin/hciattach
-SERIAL=$(awk '/^Serial/{ print $3 }' /proc/cpuinfo)
-B1=${SERIAL:10:2}
-B2=${SERIAL:12:2}
-B3=${SERIAL:14:2}
-BDADDR=$(printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa)))
-
-if [ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ] ; then
-  if [ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ] ; then
-    $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
-  else
-    $HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
-  fi
-else
-  $HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
-fi
diff --git a/package/recalbox-rgb-jamma/Config.in b/package/recalbox-rgb-jamma/Config.in
index bf9f2fce4eacebcc66323d2e9cbaed017b170ec2..c3f4a82b9b89b316126b5822040401c4aca9fee7 100644
--- a/package/recalbox-rgb-jamma/Config.in
+++ b/package/recalbox-rgb-jamma/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_RECALBOX_RGB_JAMMA
 	select BR2_PACKAGE_RECALBOX_I2S_AUDIO
 	select BR2_PACKAGE_RPI_UTILS
 	select BR2_PACKAGE_MOSQUITTO
+	select BR2_PACKAGE_LIBDRM
 	help
 	  Support for Recalbox RGB Jamma, the jamma dac
 	  for Rasbperry Pi 5, 4, 400, and 3
diff --git a/package/recalbox-rgb-jamma/S03rrgbjamma b/package/recalbox-rgb-jamma/S03rrgbjamma
index 17c71f95ef1bf97f344a093114c73fde15a20e80..10ca7f7c7397e9372b635fae96ca8a86f621ae84 100644
--- a/package/recalbox-rgb-jamma/S03rrgbjamma
+++ b/package/recalbox-rgb-jamma/S03rrgbjamma
@@ -22,11 +22,7 @@ if test "$1" == "start"; then
     modprobe i2c-dev
     dtoverlay "i2c0custom${board}"
     res="$(i2cdetect -y "${i2c}" 36 39 | grep '20:')"
-    if echo "$res" | grep -q -e "24 25 -- --"; then
-      adapter="recalboxrgbjamma-v2"
-    elif echo "$res" | grep -q -e "24 25 -- 27"; then
-      adapter="recalboxrgbjamma-v3"
-    elif echo "$res" | grep -q -e "24 25 26 27"; then
+    if echo "$res" | grep -q -e "24 25 26 27"; then
       adapter="recalboxrgbjamma"
     fi
     dtoverlay -r "i2c0custom${board}"
diff --git a/package/recalbox-rgb-jamma/recalbox_rgb_jamma.mk b/package/recalbox-rgb-jamma/recalbox_rgb_jamma.mk
index 764b618df8208196421319603d0345c96560dc35..339a3ad0c49c4c9605a02db62d0b8955cbdc2c63 100644
--- a/package/recalbox-rgb-jamma/recalbox_rgb_jamma.mk
+++ b/package/recalbox-rgb-jamma/recalbox_rgb_jamma.mk
@@ -27,8 +27,6 @@ define RECALBOX_RGB_JAMMA_BUILD_CMDS
 	$(HOST_DIR)/bin/linux-dtc $(@D)/recalboxrgbjamma-pi5-overlay.dts -o $(@D)/recalboxrgbjamma-pi5.dtbo
 	$(HOST_DIR)/bin/linux-dtc $(@D)/i2c0custom-pi5-overlay.dts -o $(@D)/i2c0custom-pi5.dtbo
 	$(HOST_DIR)/bin/linux-dtc $(@D)/i2c0custom-overlay.dts -o $(@D)/i2c0custom.dtbo
-	$(HOST_DIR)/bin/linux-dtc $(@D)/recalboxrgbjamma-v2-overlay.dts -o $(@D)/recalboxrgbjamma-v2.dtbo
-	$(HOST_DIR)/bin/linux-dtc $(@D)/recalboxrgbjamma-v3-overlay.dts -o $(@D)/recalboxrgbjamma-v3.dtbo
 	CFLAGS="$(TARGET_CFLAGS) $(COMPILER_COMMONS_CFLAGS_SO)" CROSS_DIR="$(STAGING_DIR)" \
 		CXXFLAGS="$(TARGET_CXXFLAGS) $(COMPILER_COMMONS_CXXFLAGS_SO) -std=c++11" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(COMPILER_COMMONS_LDFLAGS_SO)" \
@@ -41,8 +39,6 @@ define RECALBOX_RGB_JAMMA_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/i2c0custom-pi5.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/i2c0custom-pi5.dtbo
 	$(INSTALL) -D -m 0644 $(@D)/i2c0custom.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/i2c0custom.dtbo
 	$(INSTALL) -D -m 0644 $(@D)/recalboxrgbjamma-pi5.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/recalboxrgbjamma-pi5.dtbo
-	$(INSTALL) -D -m 0644 $(@D)/recalboxrgbjamma-v2.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/recalboxrgbjamma-v2.dtbo
-	$(INSTALL) -D -m 0644 $(@D)/recalboxrgbjamma-v3.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/recalboxrgbjamma-v3.dtbo
 	$(INSTALL) -D -m 0744 $(RECALBOX_RGB_JAMMA_PKGDIR)/S03rrgbjamma $(TARGET_DIR)/etc/init.d/
 	$(INSTALL) -D -m 0744 $(@D)/screen/recalboxrgbjamma_screen $(TARGET_DIR)/usr/bin/recalboxrgbjamma_screen
 
diff --git a/package/recalbox-romfs2/systems/atomiswave/system.ini b/package/recalbox-romfs2/systems/atomiswave/system.ini
index d552104671f18a669213baa96c3b07bd73b3e5ac..85f416e63ba5b93cc9efb41b0dbd53e1b2218909 100644
--- a/package/recalbox-romfs2/systems/atomiswave/system.ini
+++ b/package/recalbox-romfs2/systems/atomiswave/system.ini
@@ -70,5 +70,5 @@ softpatching = 0
 compatibility = high
 speed = high
 crt.available = 1
-arcade.file = atomiswave.lst
+arcade.file = atomiswave-next.lst
 arcade.ignore =
diff --git a/package/recalbox-romfs2/systems/naomi/system.ini b/package/recalbox-romfs2/systems/naomi/system.ini
index 175d2c1babf0daaa45de7d5c962984116951135b..e4ed2c51d4cb9e3d01199e670a80c3ded07af444 100644
--- a/package/recalbox-romfs2/systems/naomi/system.ini
+++ b/package/recalbox-romfs2/systems/naomi/system.ini
@@ -64,5 +64,5 @@ softpatching = 0
 compatibility = high
 speed = high
 crt.available = 1
-arcade.file = naomi.lst
+arcade.file = naomi-next.lst
 arcade.ignore =
diff --git a/package/recalbox-romfs2/systems/naomi2/system.ini b/package/recalbox-romfs2/systems/naomi2/system.ini
index 738a10b4a790a98c6730ff2fbffe29c17bc0aef3..bf31a919249d38c387e0f0f72ac115d9abd4c840 100644
--- a/package/recalbox-romfs2/systems/naomi2/system.ini
+++ b/package/recalbox-romfs2/systems/naomi2/system.ini
@@ -58,6 +58,6 @@ netplay = 0
 softpatching = 0
 compatibility = high
 speed = high
-arcade.file = naomi2.lst
+arcade.file = naomi2-next.lst
 arcade.ignore =
 crt.available = 1
\ No newline at end of file
diff --git a/package/recalbox-romfs2/systems/naomigd/system.ini b/package/recalbox-romfs2/systems/naomigd/system.ini
index 6a83a313e70ab6ab9275536ac8b0bb496c534d03..fda93810a38ab5d33132c185ec6a73688012c1b3 100644
--- a/package/recalbox-romfs2/systems/naomigd/system.ini
+++ b/package/recalbox-romfs2/systems/naomigd/system.ini
@@ -50,7 +50,7 @@ softpatching = 0
 compatibility = high
 speed = high
 crt.available = 1
-arcade.file = naomigd.lst
+arcade.file = naomigd-next.lst
 arcade.ignore =
 
 [core.1]
diff --git a/projects/configgen/configgen/generators/libretro/libretroGenerator.py b/projects/configgen/configgen/generators/libretro/libretroGenerator.py
index 6b105bc90579fdb58c8a075d86ecb57b221b14d1..6f55d03c0944a6d310396b6ed8c1d04cb2de704e 100644
--- a/projects/configgen/configgen/generators/libretro/libretroGenerator.py
+++ b/projects/configgen/configgen/generators/libretro/libretroGenerator.py
@@ -435,6 +435,12 @@ class LibretroGenerator(Generator):
             retroarchConfig.setString(option[0], option[1])
         retroarchConfig.saveFile()
 
+        if system.Core == "flycast" or system.Core == "flycast-next":
+            retroarchConfig.setString("audio_volume", "-2.0")
+        else:
+            retroarchConfig.setString("audio_volume", "0.0")
+        retroarchConfig.saveFile()
+
         commandArgs = configuration.getCommandLineArguments(retroarchConfig, coreConfig)
 
         return configuration.getRetroarchConfigurationFileName(), \
diff --git a/projects/frontend/es-app/src/MainRunner.cpp b/projects/frontend/es-app/src/MainRunner.cpp
index df40effb0d2e6af490c8105d19ff384e035761d7..5202d1d1e4dbc5375f0ee87102d07f9ab07fe8cf 100644
--- a/projects/frontend/es-app/src/MainRunner.cpp
+++ b/projects/frontend/es-app/src/MainRunner.cpp
@@ -38,6 +38,7 @@
 #include <emulators/run/GameRunner.h>
 #include <sdl2/Sdl2Init.h>
 #include <patreon/PatronInfo.h>
+#include <guis/GuiScraperRun.h>
 
 MainRunner::ExitState MainRunner::sRequestedExitState = MainRunner::ExitState::Quit;
 bool MainRunner::sQuitRequested = false;
@@ -172,7 +173,7 @@ MainRunner::ExitState MainRunner::Run()
 
       // Start update thread
       { LOG(LogDebug) << "[MainRunner] Launching Network thread"; }
-      Upgrade networkThread(window);
+      Upgrade networkThread(window, mRunCount == 0);
       // Start the socket server
       { LOG(LogDebug) << "[MainRunner] Launching Command thread"; }
       CommandThread commandThread(systemManager);
@@ -212,6 +213,7 @@ MainRunner::ExitState MainRunner::Run()
       // Main SDL loop
       exitState = MainLoop(window, systemManager, fileNotifier, mSyncMessageFactory);
 
+      GuiScraperRun::Abort();
       ResetExitState();
       fileNotifier.ResetEventNotifier();
       DeleteReadyFlagFile();
diff --git a/projects/frontend/es-app/src/Upgrade.cpp b/projects/frontend/es-app/src/Upgrade.cpp
index e3ed67e5435054553da8f739ae8d98f7dcaf43f9..f40d768aa5227e4aba85226b664205a6fa5029cf 100755
--- a/projects/frontend/es-app/src/Upgrade.cpp
+++ b/projects/frontend/es-app/src/Upgrade.cpp
@@ -13,8 +13,6 @@
 #include "RecalboxConf.h"
 #include "utils/locale/LocaleHelper.h"
 #include "recalbox/RecalboxSystem.h"
-#include "guis/GuiMsgBox.h"
-#include "guis/GuiMsgBoxScroll.h"
 #include "guis/GuiUpdateRecalbox.h"
 #include <patreon/PatronInfo.h>
 #include <guis/GuiInfoPopup.h>
@@ -25,9 +23,12 @@ String Upgrade::mLocalVersion;
 String Upgrade::mRemoteReleaseNote;
 String Upgrade::mLocalReleaseNote;
 
-Upgrade::Upgrade(WindowManager& window)
+Upgrade::UpdatePopup* Upgrade::UpdatePopup::mInstance = nullptr;
+
+Upgrade::Upgrade(WindowManager& window, bool firstRun)
   : mWindow(window)
   , mSender(*this)
+  , mFirstRun(firstRun)
 {
   Thread::Start("Upgrade");
 }
@@ -46,7 +47,7 @@ void Upgrade::Run()
     PatronInfo::Instance().WaitForAuthentication(*this);
 
     // First check at 15s
-    int waitForSeconds = 15;
+    int waitForSeconds = mFirstRun ? 15 : 3600;
     while (IsRunning())
     {
       if (mSignal.WaitSignal(waitForSeconds * 1000LL)) return;
@@ -120,13 +121,7 @@ void Upgrade::ReceiveSyncMessage()
 
   // Messagebox
   if (!mMessageBoxMessage.empty())
-  {
-    //mWindow.displayScrollMessage(_("AN UPDATE IS AVAILABLE FOR YOUR RECALBOX"), mMessageBoxMessage, false);
-    Gui* gui = new GuiMsgBoxScroll(mWindow, _("AN UPDATE IS AVAILABLE FOR YOUR RECALBOX"), mMessageBoxMessage, _("LATER"), nullptr, _("UPDATE NOW"),
-                                   [this] { mWindow.pushGui(new GuiUpdateRecalbox(mWindow, TarUrl(), ImageUrl(), HashUrl(), NewVersion())); },
-                                   String::Empty, nullptr, TextAlignment::Left);
-    mWindow.pushGui(gui);
-  }
+    UpdatePopup::Show(&mWindow, mMessageBoxMessage);
 }
 
 String Upgrade::GetDomainName()
diff --git a/projects/frontend/es-app/src/Upgrade.h b/projects/frontend/es-app/src/Upgrade.h
index 2b9e41ce6f392684ad6b6542f57228e5fa4748ef..0423f1eb3ba5e24da164ac00597364d69d25f0be 100644
--- a/projects/frontend/es-app/src/Upgrade.h
+++ b/projects/frontend/es-app/src/Upgrade.h
@@ -4,6 +4,10 @@
 #include <utils/sync/SyncMessageSender.h>
 #include <utils/os/system/Signal.h>
 #include <utils/Files.h>
+#include <guis/GuiMsgBoxScroll.h>
+#include <guis/GuiUpdateRecalbox.h>
+#include <WindowManager.h>
+#include "utils/locale/LocaleHelper.h"
 
 // Forward declaration
 class WindowManager;
@@ -24,8 +28,9 @@ class Upgrade: private Thread
     /*!
      * @brief Constructor
      * @param window main Window
+     * @param firstRun True if the front end just lauched, false otherwise
      */
-    explicit Upgrade(WindowManager& window);
+    explicit Upgrade(WindowManager& window, bool firstRun);
 
     /*!
      * @brief Destructor
@@ -90,6 +95,38 @@ class Upgrade: private Thread
     static bool NetworkReady() { return !GetDomainName().empty(); }
 
   private:
+    class UpdatePopup : public GuiMsgBoxScroll
+    {
+      public:
+        //! Build & show the popup if it does not already exists
+        static void Show(WindowManager* window, const String& message)
+        {
+          if (mInstance == nullptr)
+          {
+            mInstance = new UpdatePopup(window, message);
+            window->pushGui(mInstance);
+          }
+        }
+
+        /// Destructor - remove unique instance
+        ~UpdatePopup() { mInstance = nullptr; }
+
+      private:
+        //! Static unitary instance
+        static UpdatePopup* mInstance;
+
+        //! Launch update window
+        static void LaunchUpdate(WindowManager* window)
+        {
+          window->pushGui(new GuiUpdateRecalbox(*window, TarUrl(), ImageUrl(), HashUrl(), NewVersion()));
+        }
+
+        //! Default constructor
+        UpdatePopup(WindowManager* window, const String& message)
+          : GuiMsgBoxScroll(*window, _("AN UPDATE IS AVAILABLE FOR YOUR RECALBOX"), message, _("LATER"), nullptr, _("UPDATE NOW"),
+                            std::bind(UpdatePopup::LaunchUpdate, window), String::Empty, nullptr, TextAlignment::Left) {}
+    };
+
     //! Release DNS
     static constexpr const char* sUpgradeDNS = ".download.recalbox.com";
 
@@ -121,6 +158,8 @@ class Upgrade: private Thread
     static String mRemoteReleaseNote;
     //! Local version
     static String mLocalReleaseNote;
+    //! First run?
+    bool mFirstRun;
 
     /*
      * Thread implementation
diff --git a/projects/frontend/es-app/src/guis/GuiScraperRun.cpp b/projects/frontend/es-app/src/guis/GuiScraperRun.cpp
index 1ac42df781d9b5e376d1a14998b8d1c809d32c0b..4ad79bf6075ef7471be0215a6b4f1b4f83ae4b16 100644
--- a/projects/frontend/es-app/src/guis/GuiScraperRun.cpp
+++ b/projects/frontend/es-app/src/guis/GuiScraperRun.cpp
@@ -43,10 +43,22 @@ void GuiScraperRun::Hide(WindowManager& window)
   }
 }
 
-void GuiScraperRun::Terminate()
+void GuiScraperRun::Abort()
 {
   if (sInstance != nullptr)
+  {
+    sInstance->TerminateScraping();
+    TerminateGui();
+  }
+}
+
+void GuiScraperRun::TerminateGui()
+{
+  if (sInstance != nullptr)
+  {
+    Show(sInstance->mWindow);
     sInstance->Close();
+  }
   sInstance = nullptr;
 }
 
@@ -109,7 +121,8 @@ GuiScraperRun::GuiScraperRun(WindowManager& window, SystemManager& systemManager
 
   std::vector<std::shared_ptr<ButtonComponent>> buttons
   {
-    mButton = std::make_shared<ButtonComponent>(mWindow, _("STOP"), _("stop (progress saved)"), std::bind(&GuiScraperRun::finish, this)),
+    mButton = std::make_shared<ButtonComponent>(mWindow, _("STOP"), _("stop (progress saved)"), std::bind(
+      &GuiScraperRun::TerminateScraping, this)),
     mRunInBgButton = std::make_shared<ButtonComponent>(mWindow, _("RUN IN BACKGROUND"), _("RUN IN BACKGROUND"), [this] { GuiScraperRun::Hide(mWindow); })
   };
 	mButtonGrid = MenuComponent::MakeButtonGrid(mWindow, buttons);
@@ -143,12 +156,11 @@ void GuiScraperRun::onSizeChanged()
 	mGrid.setSize(mSize);
 }
 
-void GuiScraperRun::finish()
+void GuiScraperRun::TerminateScraping()
 {
   mScraper->Abort(true);
-  Terminate();
-  for(const auto& systemData : mSearchQueue)
-    systemData->UpdateGamelistXml();
+  TerminateGui();
+  mSystemManager.UpdateAllGameLists();
   mWindow.CloseAll();
   /*switch(mResult)
   {
@@ -320,7 +332,7 @@ void GuiScraperRun::ScrapingComplete(ScrapeResult reason, MetadataType changedMe
   if (mWindow.InfoPopupIsShown(&mPopup) || mLowResolution)
   {
     String text = mLowResolution ? _("Your scraping session completed!") : _("Your scraping session completed. Press OK to show the results.");
-    GuiMsgBox* msgBox = new GuiMsgBox(mWindow, text, _("OK"), [this] { if (mLowResolution) Terminate(); else Show(mWindow); mButtonGrid->resetCursor(); });
+    GuiMsgBox* msgBox = new GuiMsgBox(mWindow, text, _("OK"), [this] { if (mLowResolution) TerminateGui(); else Show(mWindow); mButtonGrid->resetCursor(); });
     mWindow.pushGui(msgBox);
   }
 }
diff --git a/projects/frontend/es-app/src/guis/GuiScraperRun.h b/projects/frontend/es-app/src/guis/GuiScraperRun.h
index 6160c578064464bc5edc05023e4f7ca29801d718..a7cc727040205f6e6f23b95679d886a8c77d1342 100644
--- a/projects/frontend/es-app/src/guis/GuiScraperRun.h
+++ b/projects/frontend/es-app/src/guis/GuiScraperRun.h
@@ -8,6 +8,7 @@
 #include <components/ButtonComponent.h>
 #include "components/ProgressBarComponent.h"
 #include <guis/GuiInfoPopupScraper.h>
+#include <scraping/scrapers/IScraperEngineFreezer.h>
 
 class ScraperSearchComponent;
 class TextComponent;
@@ -45,10 +46,15 @@ class GuiScraperRun : public Gui
     static bool IsRunning() { return sInstance != nullptr; }
 
     /*!
-     * @brief Terminate the running instance
+     * @brief Abort scraping immediately
+     */
+    static void Abort();
+
+    /*!
+     * @brief TerminateGui the running instance
      * @param window Window manager
      */
-    static void Terminate();
+    static void TerminateGui();
 
     //! Destructor
     ~GuiScraperRun() override = default;
@@ -67,7 +73,7 @@ class GuiScraperRun : public Gui
      */
     GuiScraperRun(WindowManager& window, SystemManager& systemManager, const SystemManager::List& systems, ScrapingMethod method, IScraperEngineFreezer* freezer, bool lowResolution);
 
-    void finish();
+    void TerminateScraping();
 
     //! Instance
     static GuiScraperRun* sInstance;
diff --git a/projects/frontend/es-app/src/views/gamelist/DetailedGameListView.cpp b/projects/frontend/es-app/src/views/gamelist/DetailedGameListView.cpp
index d2609925d3d0077ba3b5dc3676fadca3fe3d43e9..efeb6eb0e6c5d8d619928dde70dcfc8b2224f5c1 100755
--- a/projects/frontend/es-app/src/views/gamelist/DetailedGameListView.cpp
+++ b/projects/frontend/es-app/src/views/gamelist/DetailedGameListView.cpp
@@ -4,6 +4,7 @@
 #include "animations/LambdaAnimation.h"
 #include "scraping/ScraperSeamless.h"
 #include "recalbox/RecalboxStorageWatcher.h"
+#include "guis/GuiScraperRun.h"
 
 DetailedGameListView::DetailedGameListView(WindowManager&window, SystemManager& systemManager, SystemData& system, const IGlobalVariableResolver& resolver, FlagCaches& flagCache)
   : ISimpleGameListView(window, systemManager, system, resolver, flagCache)
@@ -597,7 +598,7 @@ void DetailedGameListView::Update(int deltatime)
   if (mList.isScrolling())
     mVideo.setVideo(Path::Empty);
 
-  if (!mSystem.IsScreenshots())
+  if (!mSystem.IsScreenshots() && !GuiScraperRun::IsRunning())
   {
     // Need busy animation?
     ScraperSeamless& scraper = ScraperSeamless::Instance();
diff --git a/projects/recalbox-rgb-dual/recalboxrgbdual.c b/projects/recalbox-rgb-dual/recalboxrgbdual.c
index 8adc78d68def8b8422b7ffaaa7c1385413f935c3..edc61ae5499d36608f398b9e20c0e73533cd0093 100644
--- a/projects/recalbox-rgb-dual/recalboxrgbdual.c
+++ b/projects/recalbox-rgb-dual/recalboxrgbdual.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/gpio/consumer.h>
+#include <linux/of.h>
 
 #include <video/display_timing.h>
 #include <video/of_display_timing.h>
diff --git a/projects/recalbox-rgb-jamma/Makefile b/projects/recalbox-rgb-jamma/Makefile
index 57f138d0358868412fdca944c32e3d152fc35e8a..85d5ce29152c35fe596cbb491eb72a39d81564b0 100644
--- a/projects/recalbox-rgb-jamma/Makefile
+++ b/projects/recalbox-rgb-jamma/Makefile
@@ -1,5 +1,5 @@
 ifneq (${KERNELRELEASE},)
-	obj-m += recalboxrgbjamma.o recalboxrgbjamma-v2.o recalboxrgbjamma-v3.o
+	obj-m += recalboxrgbjamma.o
 else
 	KERNELDIR        ?= /lib/modules/$(shell uname -r)/build
 	MODULE_DIR       ?= $(shell pwd)
diff --git a/projects/recalbox-rgb-jamma/recalboxrgbjamma-pi5-overlay.dts b/projects/recalbox-rgb-jamma/recalboxrgbjamma-pi5-overlay.dts
index 17dafde25d978a6b712a46057920296ed8c2a439..7988894343724426cf5e92d07d78c6324464c345 100644
--- a/projects/recalbox-rgb-jamma/recalboxrgbjamma-pi5-overlay.dts
+++ b/projects/recalbox-rgb-jamma/recalboxrgbjamma-pi5-overlay.dts
@@ -99,6 +99,25 @@
 		};
 	};
 
+    fragment@50 {
+        target = <&rp1_gpio>;
+        __overlay__ {
+            rp1_i2s0_jamma: rp1_i2s0_jamma {
+                function = "i2s0";
+                pins = "gpio18", "gpio19", "gpio27";
+                bias-disable;
+            };
+        };
+    };
+    fragment@51 {
+        target = <&i2s_clk_producer>;
+        __overlay__ {
+            pinctrl-names = "default";
+            pinctrl-0 = <&rp1_i2s0_jamma>;
+            status = "okay";
+        };
+    };
+
 
 	fragment@5 {
 		target = <&sound>;
@@ -109,7 +128,7 @@
 			simple-audio-card,dai-link@1 {
 				format = "i2s";
 				cpu {
-					sound-dai = <&i2s_clk_producer_27>;
+					sound-dai = <&i2s_clk_producer>;
 					dai-tdm-slot-num = <2>;
 					dai-tdm-slot-width = <32>;
 				};
@@ -132,7 +151,7 @@
 	};
 
 	fragment@7 {
-		target = <&i2s_clk_producer_27>;
+		target = <&i2s_clk_producer>;
 		__overlay__ {
 			#sound-dai-cells = <0>;
 			status = "okay";
diff --git a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v1-overlay.dts b/projects/recalbox-rgb-jamma/recalboxrgbjamma-v1-overlay.dts
deleted file mode 100644
index 609160addc1659673920b8dca8c62813c2973be7..0000000000000000000000000000000000000000
--- a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v1-overlay.dts
+++ /dev/null
@@ -1,194 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
-  fragment@0 {
-      target = <&gpio>;
-      __overlay__ {
-        switch36_gpio: switch36_gpio_conf {
-          brcm,pins = <4>; // GPIO 4
-          brcm,function = <0>; // Input
-          brcm,pull = <2>; // Pull up
-        };
-        irq_gpio_5: irq_gpio_5_conf {
-          brcm,pins = <5>; // GPIO 5
-          brcm,function = <0>; // Input
-          brcm,pull = <2>; // Pull up
-        };
-        irq_gpio_20: irq_gpio_20_conf {
-          brcm,pins = <20>; // GPIO 20
-          brcm,function = <0>; // Input
-          brcm,pull = <2>; // Pull up
-        };
-
-      };
-  };
-
-	fragment@1 {
-		target-path = "/";
-		__overlay__ {
-
-			bridge: recalboxrgbjamma {
-				compatible = "raspberrypi,recalboxrgbdual";
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				vc4-vga666-mode = <8>;
-				recalbox-rgb-jamma = <1>;
-
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-
-						vga_bridge_in: endpoint {
-							remote-endpoint = <&dpi_out>;
-						};
-					};
-
-					port@1 {
-						reg = <1>;
-
-						vga_bridge_out: endpoint {
-							remote-endpoint = <&vga_con_in>;
-						};
-					};
-				};
-			};
-
-			vga {
-				compatible = "vga-connector";
-
-				port {
-					vga_con_in: endpoint {
-						remote-endpoint = <&vga_bridge_out>;
-					};
-				};
-			};
-		};
-	};
-
-	fragment@2 {
-		target = <&dpi>;
-		__overlay__  {
-			status = "okay";
-			port {
-				dpi_out: endpoint@0 {
-					remote-endpoint = <&vga_bridge_in>;
-				};
-			};
-		};
-	};
-
-	fragment@3 {
-		target = <&dpi>;
-		__overlay__  {
-			status = "okay";
-			pinctrl-names = "default";
-			pinctrl-0 = <&vga888_mode8_pins>;
-		};
-	};
-
-	fragment@4 {
-		target = <&gpio>;
-		__overlay__ {
-			vga888_mode8_pins: vga888_mode8_pins {
-				brcm,pins = <2 3
-				      6 7 8 9 10 11
-				      14 15 16 17 18 19
-				      22 23 24 25 26 27>;
-				brcm,function = <6>;
-				brcm,pull = <0>;
-			};
-		};
-	};
-
-	fragment@5 {
-		target = <&audio_pins>;
-		__overlay__ {
-			brcm,pins = < 12 13 >;
-			brcm,function = < 4 4 >; /* alt0 alt0 */
-		};
-	};
-
-	fragment@6 {
-		target = <&audio>;
-		__overlay__  {
-			brcm,disable-headphones = <0>;
-		};
-	};
-
-  fragment@8 {
-    target = <&i2c0if>;
-    __overlay__ {
-      status = "okay";
-      pinctrl-names = "default";
-      pinctrl-0 = <&i2c0_pins>, <&switch36_gpio>;
-      switch36-gpios = <&gpio 4 0>;
-      clock-frequency = <400000>;
-      jammactrl_0: jammactrl_0@21 {
-        compatible = "raspberrypi,recalboxrgbjamma";
-        reg = <0x21>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_5>;
-        interrupt-parent = <&gpio>;
-        interrupts = <5 2>;
-        irq-gpios = <&gpio 5 0>;
-      };
-      jammactrl_1: jammactrl_1@22 {
-        compatible = "raspberrypi,recalboxrgbjamma";
-        reg = <0x22>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_20>;
-        interrupt-parent = <&gpio>;
-        interrupts = <20 2>;
-        irq-gpios = <&gpio 20 0>;
-      };
-    };
-  };
-
-  fragment@9 {
-		target = <&i2c0_pins>;
-		__overlay__ {
-			brcm,pins = <0 1>;
-		};
-	};
-
-
-  fragment@10 {
-    target-path = "/";
-    __overlay__ {
-      fan0: gpio-fan@0 {
-        compatible = "gpio-fan";
-        gpios = <&gpio 21 0>;
-        gpio-fan,speed-map = <0 0>,<5000 1>;
-        #cooling-cells = <2>;
-      };
-    };
-  };
-
-  fragment@11 {
-    target = <&cpu_thermal>;
-    polling-delay = <5000>;	/* milliseconds */
-    __overlay__ {
-      trips {
-        cpu_hot: trip-point@0 {
-          temperature = <60000>;	/* (millicelsius) Fan started at 60°C */
-          hysteresis = <10000>;	/* (millicelsius) Fan stopped at 50°C */
-          type = "active";
-        };
-      };
-      cooling-maps {
-        map0 {
-          trip = <&cpu_hot>;
-          cooling-device = <&fan0 1 1>;
-        };
-      };
-    };
-  };
-};
diff --git a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v2-overlay.dts b/projects/recalbox-rgb-jamma/recalboxrgbjamma-v2-overlay.dts
deleted file mode 100644
index 1275e6e7482b974e9a7bcd508d8f04bc891483a1..0000000000000000000000000000000000000000
--- a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v2-overlay.dts
+++ /dev/null
@@ -1,194 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
-  fragment@0 {
-      target = <&gpio>;
-      __overlay__ {
-        switch36_gpio: switch36_gpio_conf {
-          brcm,pins = <4>; // GPIO 4
-          brcm,function = <0>; // Input
-          brcm,pull = <2>; // Pull up
-        };
-        irq_gpio_5: irq_gpio_5_conf {
-          brcm,pins = <5>; // GPIO 5
-          brcm,function = <0>; // Input
-          brcm,pull = <2>; // Pull up
-        };
-        irq_gpio_20: irq_gpio_20_conf {
-          brcm,pins = <20>; // GPIO 20
-          brcm,function = <0>; // Input
-          brcm,pull = <2>; // Pull up
-        };
-
-      };
-  };
-
-	fragment@1 {
-		target-path = "/";
-		__overlay__ {
-
-			bridge: recalboxrgbjamma {
-				compatible = "raspberrypi,recalboxrgbdual";
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				vc4-vga666-mode = <8>;
-				recalbox-rgb-jamma = <1>;
-
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-
-						vga_bridge_in: endpoint {
-							remote-endpoint = <&dpi_out>;
-						};
-					};
-
-					port@1 {
-						reg = <1>;
-
-						vga_bridge_out: endpoint {
-							remote-endpoint = <&vga_con_in>;
-						};
-					};
-				};
-			};
-
-			vga {
-				compatible = "vga-connector";
-
-				port {
-					vga_con_in: endpoint {
-						remote-endpoint = <&vga_bridge_out>;
-					};
-				};
-			};
-		};
-	};
-
-	fragment@2 {
-		target = <&dpi>;
-		__overlay__  {
-			status = "okay";
-			port {
-				dpi_out: endpoint@0 {
-					remote-endpoint = <&vga_bridge_in>;
-				};
-			};
-		};
-	};
-
-	fragment@3 {
-		target = <&dpi>;
-		__overlay__  {
-			status = "okay";
-			pinctrl-names = "default";
-			pinctrl-0 = <&vga888_mode8_pins>;
-		};
-	};
-
-	fragment@4 {
-		target = <&gpio>;
-		__overlay__ {
-			vga888_mode8_pins: vga888_mode8_pins {
-				brcm,pins = <2 3
-				      6 7 8 9 10 11
-				      14 15 16 17 18 19
-				      22 23 24 25 26 27>;
-				brcm,function = <6>;
-				brcm,pull = <0>;
-			};
-		};
-	};
-
-	fragment@5 {
-		target = <&audio_pins>;
-		__overlay__ {
-			brcm,pins = < 12 13 >;
-			brcm,function = < 4 4 >; /* alt0 alt0 */
-		};
-	};
-
-	fragment@6 {
-		target = <&audio>;
-		__overlay__  {
-			brcm,disable-headphones = <0>;
-		};
-	};
-
-  fragment@8 {
-    target = <&i2c0if>;
-    __overlay__ {
-      status = "okay";
-      pinctrl-names = "default";
-      pinctrl-0 = <&i2c0_pins>, <&switch36_gpio>;
-      switch36-gpios = <&gpio 4 0>;
-      clock-frequency = <400000>;
-      jammactrl_0: jammactrl_0@21 {
-        compatible = "raspberrypi,recalboxrgbjamma-v2";
-        reg = <0x21>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_5>;
-        interrupt-parent = <&gpio>;
-        interrupts = <5 2>;
-        irq-gpios = <&gpio 5 0>;
-      };
-      jammactrl_1: jammactrl_1@22 {
-        compatible = "raspberrypi,recalboxrgbjamma-v2";
-        reg = <0x22>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_20>;
-        interrupt-parent = <&gpio>;
-        interrupts = <20 2>;
-        irq-gpios = <&gpio 20 0>;
-      };
-    };
-  };
-
-  fragment@9 {
-		target = <&i2c0_pins>;
-		__overlay__ {
-			brcm,pins = <0 1>;
-		};
-	};
-
-
-  fragment@10 {
-    target-path = "/";
-    __overlay__ {
-      fan0: gpio-fan@0 {
-        compatible = "gpio-fan";
-        gpios = <&gpio 21 0>;
-        gpio-fan,speed-map = <0 0>,<5000 1>;
-        #cooling-cells = <2>;
-      };
-    };
-  };
-
-  fragment@11 {
-    target = <&cpu_thermal>;
-    polling-delay = <5000>;	/* milliseconds */
-    __overlay__ {
-      trips {
-        cpu_hot: trip-point@0 {
-          temperature = <60000>;	/* (millicelsius) Fan started at 60°C */
-          hysteresis = <10000>;	/* (millicelsius) Fan stopped at 50°C */
-          type = "active";
-        };
-      };
-      cooling-maps {
-        map0 {
-          trip = <&cpu_hot>;
-          cooling-device = <&fan0 1 1>;
-        };
-      };
-    };
-  };
-};
diff --git a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v2.c b/projects/recalbox-rgb-jamma/recalboxrgbjamma-v2.c
deleted file mode 100644
index a10f46128b7a85df22644791a1756d91a1088a37..0000000000000000000000000000000000000000
--- a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v2.c
+++ /dev/null
@@ -1,1598 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- *  PCA953x 4/8/16/24/40 bit I/O ports
- *
- *  Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
- *  Copyright (C) 2007 Marvell International Ltd.
- *  Copyright (C) 2023 digitalLumberjack at recalbox.com.
- *
- *  Derived from drivers/gpio/gpio-pca953x.c
- */
-
-#include <linux/acpi.h>
-#include <linux/bitmap.h>
-#include <linux/gpio/driver.h>
-#include <linux/gpio/consumer.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/of_platform.h>
-#include <linux/platform_data/pca953x.h>
-#include <linux/regmap.h>
-#include <linux/regulator/consumer.h>
-#include <linux/slab.h>
-#include <linux/timer.h>
-#include <linux/input.h>
-#include <linux/timekeeping.h>
-
-#include <asm/unaligned.h>
-
-#define PCA953X_INPUT    0x00
-#define PCA953X_OUTPUT    0x01
-#define PCA953X_INVERT    0x02
-#define PCA953X_DIRECTION  0x03
-
-#define REG_ADDR_MASK    GENMASK(5, 0)
-#define REG_ADDR_EXT    BIT(6)
-#define REG_ADDR_AI    BIT(7)
-
-#define PCAL953X_OUT_STRENGTH  0x20
-#define PCAL953X_IN_LATCH  0x22
-#define PCAL953X_PULL_EN  0x23
-#define PCAL953X_PULL_SEL  0x24
-#define PCAL953X_INT_MASK  0x25
-#define PCAL953X_INT_STAT  0x26
-#define PCAL953X_OUT_CONF  0x27
-
-#define PCA_GPIO_MASK    GENMASK(7, 0)
-
-#define PCAL_GPIO_MASK    GENMASK(4, 0)
-#define PCAL_PINCTRL_MASK  GENMASK(6, 5)
-
-#define PCA_INT      BIT(8)
-#define PCA_PCAL    BIT(9)
-#define PCA_LATCH_INT    (PCA_PCAL | PCA_INT)
-#define PCA953X_TYPE    BIT(12)
-#define PCA_TYPE_MASK    GENMASK(15, 12)
-
-#define PCA_CHIP_TYPE(x)  ((x) & PCA_TYPE_MASK)
-
-#define DEBUG 0
-
-static const struct i2c_device_id pca953x_id[] = {
-    {"recalboxrgbjamma", 16 | PCA953X_TYPE | PCA_INT,},
-    {}
-};
-MODULE_DEVICE_TABLE(i2c, pca953x_id
-);
-
-// Interupts
-#include <linux/dmi.h>
-
-static const struct acpi_gpio_params pca953x_irq_gpios = {0, 0, true};
-
-static const struct acpi_gpio_mapping pca953x_acpi_irq_gpios[] = {
-    {"irq-gpios", &pca953x_irq_gpios, 1, ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER},
-    {}
-};
-
-static int pca953x_acpi_get_irq(struct device *dev) {
-  int ret;
-
-  ret = devm_acpi_dev_add_driver_gpios(dev, pca953x_acpi_irq_gpios);
-  if (ret)
-    dev_warn(dev, "can't add GPIO ACPI mapping\n");
-
-  ret = acpi_dev_gpio_irq_get_by(ACPI_COMPANION(dev), "irq-gpios", 0);
-  if (ret < 0) {
-    dev_info(dev, "could not get acpi gpio by irq-gpios\n");
-    return ret;
-  }
-
-  dev_info(dev, "ACPI interrupt quirk (IRQ %d)\n", ret);
-  return ret;
-}
-
-static const struct acpi_device_id pca953x_acpi_ids[] = {
-    {"INT3491", 16 | PCA953X_TYPE | PCA_LATCH_INT,},
-    {}
-};
-
-#define MAX_BANK 5
-#define BANK_SZ 8
-#define MAX_LINE  (MAX_BANK * BANK_SZ)
-
-#define NBANK(chip) DIV_ROUND_UP(chip->gpio_chip.ngpio, BANK_SZ)
-
-struct pca953x_reg_config {
-  int direction;
-  int output;
-  int input;
-  int invert;
-};
-
-static const struct pca953x_reg_config pca953x_regs = {
-    .direction = PCA953X_DIRECTION,
-    .output = PCA953X_OUTPUT,
-    .input = PCA953X_INPUT,
-    .invert = PCA953X_INVERT,
-};
-
-struct pca953x_chip {
-  unsigned gpio_start;
-  struct mutex i2c_lock;
-  struct regmap *regmap;
-
-  struct mutex irq_lock;
-  DECLARE_BITMAP(irq_mask, MAX_LINE);
-  DECLARE_BITMAP(irq_stat, MAX_LINE);
-  DECLARE_BITMAP(irq_trig_raise, MAX_LINE);
-  DECLARE_BITMAP(irq_trig_fall, MAX_LINE);
-  struct irq_chip irq_chip;
-
-  atomic_t wakeup_path;
-
-  struct i2c_client *client;
-  struct gpio_chip gpio_chip;
-  const char *const *names;
-  unsigned long driver_data;
-  struct regulator *regulator;
-
-  const struct pca953x_reg_config *regs;
-};
-
-static int pca953x_bank_shift(struct pca953x_chip *chip) {
-  return fls((chip->gpio_chip.ngpio - 1) / BANK_SZ);
-}
-
-#define PCA953x_BANK_INPUT  BIT(0)
-#define PCA953x_BANK_OUTPUT  BIT(1)
-#define PCA953x_BANK_POLARITY  BIT(2)
-#define PCA953x_BANK_CONFIG  BIT(3)
-
-#define PCAL9xxx_BANK_IN_LATCH  BIT(8 + 2)
-#define PCAL9xxx_BANK_PULL_EN  BIT(8 + 3)
-#define PCAL9xxx_BANK_PULL_SEL  BIT(8 + 4)
-#define PCAL9xxx_BANK_IRQ_MASK  BIT(8 + 5)
-#define PCAL9xxx_BANK_IRQ_STAT  BIT(8 + 6)
-
-/*
- * We care about the following registers:
- * - Standard set, below 0x40, each port can be replicated up to 8 times
- *   - PCA953x standard
- *     Input port			0x00 + 0 * bank_size	R
- *     Output port			0x00 + 1 * bank_size	RW
- *     Polarity Inversion port		0x00 + 2 * bank_size	RW
- *     Configuration port		0x00 + 3 * bank_size	RW
- *   - PCA957x with mixed up registers
- *     Input port			0x00 + 0 * bank_size	R
- *     Polarity Inversion port		0x00 + 1 * bank_size	RW
- *     Bus hold port			0x00 + 2 * bank_size	RW
- *     Configuration port		0x00 + 4 * bank_size	RW
- *     Output port			0x00 + 5 * bank_size	RW
- *
- * - Extended set, above 0x40, often chip specific.
- *   - PCAL6524/PCAL9555A with custom PCAL IRQ handling:
- *     Input latch register		0x40 + 2 * bank_size	RW
- *     Pull-up/pull-down enable reg	0x40 + 3 * bank_size    RW
- *     Pull-up/pull-down select reg	0x40 + 4 * bank_size    RW
- *     Interrupt mask register		0x40 + 5 * bank_size	RW
- *     Interrupt status register	0x40 + 6 * bank_size	R
- *
- * - Registers with bit 0x80 set, the AI bit
- *   The bit is cleared and the registers fall into one of the
- *   categories above.
- */
-
-static bool pca953x_check_register(struct pca953x_chip *chip, unsigned int reg,
-                                   u32 checkbank) {
-  int bank_shift = pca953x_bank_shift(chip);
-  int bank = (reg & REG_ADDR_MASK) >> bank_shift;
-  int offset = reg & (BIT(bank_shift) - 1);
-
-  /* Special PCAL extended register check. */
-  if (reg & REG_ADDR_EXT) {
-    if (!(chip->driver_data & PCA_PCAL))
-      return false;
-    bank += 8;
-  }
-
-  /* Register is not in the matching bank. */
-  if (!(BIT(bank) & checkbank))
-    return false;
-
-  /* Register is not within allowed range of bank. */
-  if (offset >= NBANK(chip))
-    return false;
-
-  return true;
-}
-
-static bool pca953x_readable_register(struct device *dev, unsigned int reg) {
-  struct pca953x_chip *chip = dev_get_drvdata(dev);
-  u32 bank;
-
-  bank = PCA953x_BANK_INPUT | PCA953x_BANK_OUTPUT |
-         PCA953x_BANK_POLARITY | PCA953x_BANK_CONFIG;
-
-  if (chip->driver_data & PCA_PCAL) {
-    bank |= PCAL9xxx_BANK_IN_LATCH | PCAL9xxx_BANK_PULL_EN |
-            PCAL9xxx_BANK_PULL_SEL | PCAL9xxx_BANK_IRQ_MASK |
-            PCAL9xxx_BANK_IRQ_STAT;
-  }
-
-  return pca953x_check_register(chip, reg, bank);
-}
-
-static bool pca953x_writeable_register(struct device *dev, unsigned int reg) {
-  struct pca953x_chip *chip = dev_get_drvdata(dev);
-  u32 bank;
-
-  bank = PCA953x_BANK_OUTPUT | PCA953x_BANK_POLARITY |
-         PCA953x_BANK_CONFIG;
-
-  if (chip->driver_data & PCA_PCAL)
-    bank |= PCAL9xxx_BANK_IN_LATCH | PCAL9xxx_BANK_PULL_EN |
-            PCAL9xxx_BANK_PULL_SEL | PCAL9xxx_BANK_IRQ_MASK;
-
-  return pca953x_check_register(chip, reg, bank);
-}
-
-static bool pca953x_volatile_register(struct device *dev, unsigned int reg) {
-  struct pca953x_chip *chip = dev_get_drvdata(dev);
-  u32 bank;
-
-  bank = PCA953x_BANK_INPUT;
-
-  if (chip->driver_data & PCA_PCAL)
-    bank |= PCAL9xxx_BANK_IRQ_STAT;
-
-  return pca953x_check_register(chip, reg, bank);
-}
-
-static const struct regmap_config pca953x_i2c_regmap = {
-    .reg_bits = 8,
-    .val_bits = 8,
-
-    .use_single_read = true,
-    .use_single_write = true,
-
-    .readable_reg = pca953x_readable_register,
-    .writeable_reg = pca953x_writeable_register,
-    .volatile_reg = pca953x_volatile_register,
-
-    .disable_locking = true,
-    .cache_type = REGCACHE_RBTREE,
-    .max_register = 0x7f,
-};
-
-
-static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off) {
-  int bank_shift = pca953x_bank_shift(chip);
-  int addr = (reg & PCAL_GPIO_MASK) << bank_shift;
-  int pinctrl = (reg & PCAL_PINCTRL_MASK) << 1;
-  u8 regaddr = pinctrl | addr | (off / BANK_SZ);
-
-  return regaddr;
-}
-
-static int pca953x_write_regs(struct pca953x_chip *chip, int reg, unsigned long *val) {
-  u8 regaddr = pca953x_recalc_addr(chip, reg, 0);
-  u8 value[MAX_BANK];
-  int i, ret;
-
-  for (i = 0; i < NBANK(chip); i++)
-    value[i] = bitmap_get_value8(val, i * BANK_SZ);
-
-  ret = regmap_bulk_write(chip->regmap, regaddr, value, NBANK(chip));
-  if (ret < 0) {
-    dev_err(&chip->client->dev, "failed writing register\n");
-    return ret;
-  }
-
-  return 0;
-}
-
-static int pca953x_read_regs(struct pca953x_chip *chip, int reg, unsigned long *val) {
-  u8 regaddr = pca953x_recalc_addr(chip, reg, 0);
-  u8 value[MAX_BANK];
-  int i, ret;
-
-  ret = regmap_bulk_read(chip->regmap, regaddr, value, NBANK(chip));
-  if (ret < 0) {
-    dev_err(&chip->client->dev, "failed reading register\n");
-    return ret;
-  }
-
-  for (i = 0; i < NBANK(chip); i++)
-    bitmap_set_value8(val, value[i], i * BANK_SZ);
-
-  return 0;
-}
-
-static int pca953x_gpio_direction_input(struct gpio_chip *gc, unsigned off) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
-  u8 bit = BIT(off % BANK_SZ);
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = regmap_write_bits(chip->regmap, dirreg, bit, bit);
-  mutex_unlock(&chip->i2c_lock);
-  return ret;
-}
-
-static int pca953x_gpio_direction_output(struct gpio_chip *gc,
-                                         unsigned off, int val) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
-  u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off);
-  u8 bit = BIT(off % BANK_SZ);
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  /* set output level */
-  ret = regmap_write_bits(chip->regmap, outreg, bit, val ? bit : 0);
-  if (ret)
-    goto exit;
-
-  /* then direction */
-  ret = regmap_write_bits(chip->regmap, dirreg, bit, 0);
-  exit:
-  mutex_unlock(&chip->i2c_lock);
-  return ret;
-}
-
-static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 inreg = pca953x_recalc_addr(chip, chip->regs->input, off);
-  u8 bit = BIT(off % BANK_SZ);
-  u32 reg_val;
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = regmap_read(chip->regmap, inreg, &reg_val);
-  mutex_unlock(&chip->i2c_lock);
-  if (ret < 0)
-    return ret;
-
-  return !!(reg_val & bit);
-}
-
-static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off);
-  u8 bit = BIT(off % BANK_SZ);
-
-  mutex_lock(&chip->i2c_lock);
-  regmap_write_bits(chip->regmap, outreg, bit, val ? bit : 0);
-  mutex_unlock(&chip->i2c_lock);
-}
-
-static int pca953x_gpio_get_direction(struct gpio_chip *gc, unsigned off) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
-  u8 bit = BIT(off % BANK_SZ);
-  u32 reg_val;
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = regmap_read(chip->regmap, dirreg, &reg_val);
-  mutex_unlock(&chip->i2c_lock);
-  if (ret < 0)
-    return ret;
-
-  if (reg_val & bit)
-    return GPIO_LINE_DIRECTION_IN;
-
-  return GPIO_LINE_DIRECTION_OUT;
-}
-
-static int pca953x_gpio_get_multiple(struct gpio_chip *gc,
-                                     unsigned long *mask, unsigned long *bits) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  DECLARE_BITMAP(reg_val, MAX_LINE);
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = pca953x_read_regs(chip, chip->regs->input, reg_val);
-  mutex_unlock(&chip->i2c_lock);
-  if (ret)
-    return ret;
-
-  bitmap_replace(bits, bits, reg_val, mask, gc->ngpio);
-  return 0;
-}
-
-static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
-                                      unsigned long *mask, unsigned long *bits) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  DECLARE_BITMAP(reg_val, MAX_LINE);
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = pca953x_read_regs(chip, chip->regs->output, reg_val);
-  if (ret)
-    goto exit;
-
-  bitmap_replace(reg_val, reg_val, bits, mask, gc->ngpio);
-
-  pca953x_write_regs(chip, chip->regs->output, reg_val);
-  exit:
-  mutex_unlock(&chip->i2c_lock);
-}
-
-static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip,
-                                         unsigned int offset,
-                                         unsigned long config) {
-  u8 pull_en_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_EN, offset);
-  u8 pull_sel_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_SEL, offset);
-  u8 bit = BIT(offset % BANK_SZ);
-  int ret;
-
-  /*
-   * pull-up/pull-down configuration requires PCAL extended
-   * registers
-   */
-  if (!(chip->driver_data & PCA_PCAL))
-    return -ENOTSUPP;
-
-  mutex_lock(&chip->i2c_lock);
-
-  /* Configure pull-up/pull-down */
-  if (config == PIN_CONFIG_BIAS_PULL_UP)
-    ret = regmap_write_bits(chip->regmap, pull_sel_reg, bit, bit);
-  else if (config == PIN_CONFIG_BIAS_PULL_DOWN)
-    ret = regmap_write_bits(chip->regmap, pull_sel_reg, bit, 0);
-  else
-    ret = 0;
-  if (ret)
-    goto exit;
-
-  /* Disable/Enable pull-up/pull-down */
-  if (config == PIN_CONFIG_BIAS_DISABLE)
-    ret = regmap_write_bits(chip->regmap, pull_en_reg, bit, 0);
-  else
-    ret = regmap_write_bits(chip->regmap, pull_en_reg, bit, bit);
-
-  exit:
-  mutex_unlock(&chip->i2c_lock);
-  return ret;
-}
-
-static int pca953x_gpio_set_config(struct gpio_chip *gc, unsigned int offset,
-                                   unsigned long config) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-
-  switch (pinconf_to_config_param(config)) {
-    case PIN_CONFIG_BIAS_PULL_UP:
-    case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:
-    case PIN_CONFIG_BIAS_PULL_DOWN:
-    case PIN_CONFIG_BIAS_DISABLE:
-      return pca953x_gpio_set_pull_up_down(chip, offset, config);
-    default:
-      return -ENOTSUPP;
-  }
-}
-
-static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios) {
-  struct gpio_chip *gc;
-
-  gc = &chip->gpio_chip;
-
-  gc->direction_input = pca953x_gpio_direction_input;
-  gc->direction_output = pca953x_gpio_direction_output;
-  gc->get = pca953x_gpio_get_value;
-  gc->set = pca953x_gpio_set_value;
-  gc->get_direction = pca953x_gpio_get_direction;
-  gc->get_multiple = pca953x_gpio_get_multiple;
-  gc->set_multiple = pca953x_gpio_set_multiple;
-  gc->set_config = pca953x_gpio_set_config;
-  gc->can_sleep = true;
-
-  gc->base = chip->gpio_start;
-  gc->ngpio = gpios;
-  gc->label = dev_name(&chip->client->dev);
-  gc->parent = &chip->client->dev;
-  gc->owner = THIS_MODULE;
-  gc->names = chip->names;
-}
-
-static void pca953x_irq_mask(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  irq_hw_number_t hwirq = irqd_to_hwirq(d);
-
-  clear_bit(hwirq, chip->irq_mask);
-}
-
-static void pca953x_irq_unmask(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  irq_hw_number_t hwirq = irqd_to_hwirq(d);
-
-  set_bit(hwirq, chip->irq_mask);
-}
-
-static int pca953x_irq_set_wake(struct irq_data *d, unsigned int on) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-
-  if (on)
-    atomic_inc(&chip->wakeup_path);
-  else
-    atomic_dec(&chip->wakeup_path);
-
-  return irq_set_irq_wake(chip->client->irq, on);
-}
-
-static void pca953x_irq_bus_lock(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-
-  mutex_lock(&chip->irq_lock);
-}
-
-static void pca953x_irq_bus_sync_unlock(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  DECLARE_BITMAP(irq_mask, MAX_LINE);
-  DECLARE_BITMAP(reg_direction, MAX_LINE);
-  int level;
-
-  if (chip->driver_data & PCA_PCAL) {
-    /* Enable latch on interrupt-enabled inputs */
-    pca953x_write_regs(chip, PCAL953X_IN_LATCH, chip->irq_mask);
-
-    bitmap_complement(irq_mask, chip->irq_mask, gc->ngpio);
-
-    /* Unmask enabled interrupts */
-    pca953x_write_regs(chip, PCAL953X_INT_MASK, irq_mask);
-  }
-
-  /* Switch direction to input if needed */
-  pca953x_read_regs(chip, chip->regs->direction, reg_direction);
-
-  bitmap_or(irq_mask, chip->irq_trig_fall, chip->irq_trig_raise, gc->ngpio);
-  bitmap_complement(reg_direction, reg_direction, gc->ngpio);
-  bitmap_and(irq_mask, irq_mask, reg_direction, gc->ngpio);
-
-  /* Look for any newly setup interrupt */
-  for_each_set_bit(level, irq_mask, gc->ngpio)
-  pca953x_gpio_direction_input(&chip->gpio_chip, level);
-
-  mutex_unlock(&chip->irq_lock);
-}
-
-static int pca953x_irq_set_type(struct irq_data *d, unsigned int type) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  irq_hw_number_t hwirq = irqd_to_hwirq(d);
-
-  if (!(type & IRQ_TYPE_EDGE_BOTH)) {
-    dev_err(&chip->client->dev, "irq %d: unsupported type %d\n",
-            d->irq, type);
-    return -EINVAL;
-  }
-
-  assign_bit(hwirq, chip->irq_trig_fall, type & IRQ_TYPE_EDGE_FALLING);
-  assign_bit(hwirq, chip->irq_trig_raise, type & IRQ_TYPE_EDGE_RISING);
-
-  return 0;
-}
-
-static void pca953x_irq_shutdown(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  irq_hw_number_t hwirq = irqd_to_hwirq(d);
-
-  clear_bit(hwirq, chip->irq_trig_raise);
-  clear_bit(hwirq, chip->irq_trig_fall);
-}
-
-static bool pca953x_irq_pending(struct pca953x_chip *chip, unsigned long *pending) {
-  struct gpio_chip *gc = &chip->gpio_chip;
-  DECLARE_BITMAP(reg_direction, MAX_LINE);
-  DECLARE_BITMAP(old_stat, MAX_LINE);
-  DECLARE_BITMAP(cur_stat, MAX_LINE);
-  DECLARE_BITMAP(new_stat, MAX_LINE);
-  DECLARE_BITMAP(trigger, MAX_LINE);
-  int ret;
-
-  if (chip->driver_data & PCA_PCAL) {
-    /* Read the current interrupt status from the device */
-    ret = pca953x_read_regs(chip, PCAL953X_INT_STAT, trigger);
-    if (ret)
-      return false;
-
-    /* Check latched inputs and clear interrupt status */
-    ret = pca953x_read_regs(chip, chip->regs->input, cur_stat);
-    if (ret)
-      return false;
-
-    /* Apply filter for rising/falling edge selection */
-    bitmap_replace(new_stat, chip->irq_trig_fall, chip->irq_trig_raise, cur_stat, gc->ngpio);
-
-    bitmap_and(pending, new_stat, trigger, gc->ngpio);
-
-    return !bitmap_empty(pending, gc->ngpio);
-  }
-
-  ret = pca953x_read_regs(chip, chip->regs->input, cur_stat);
-  if (ret)
-    return false;
-
-  /* Remove output pins from the equation */
-  pca953x_read_regs(chip, chip->regs->direction, reg_direction);
-
-  bitmap_copy(old_stat, chip->irq_stat, gc->ngpio);
-
-  bitmap_and(new_stat, cur_stat, reg_direction, gc->ngpio);
-  bitmap_xor(cur_stat, new_stat, old_stat, gc->ngpio);
-  bitmap_and(trigger, cur_stat, chip->irq_mask, gc->ngpio);
-
-  bitmap_copy(chip->irq_stat, new_stat, gc->ngpio);
-
-  if (bitmap_empty(trigger, gc->ngpio))
-    return false;
-
-  bitmap_and(cur_stat, chip->irq_trig_fall, old_stat, gc->ngpio);
-  bitmap_and(old_stat, chip->irq_trig_raise, new_stat, gc->ngpio);
-  bitmap_or(new_stat, old_stat, cur_stat, gc->ngpio);
-  bitmap_and(pending, new_stat, trigger, gc->ngpio);
-
-  return !bitmap_empty(pending, gc->ngpio);
-}
-
-static int process_inputs(struct gpio_chip *gpio_chip);
-
-static struct config {
-  struct gpio_chip *gpio_chip_0;
-  struct gpio_chip *gpio_chip_1;
-  struct gpio_desc *switch36_gpio_ref;
-  int switch36_gpio_state;
-  struct task_struct *config_thread;
-  struct task_struct *debounce_thread;
-  struct mutex process_mutex;
-  bool hotkey_patterns;
-  bool disable_credit_on_hk_btn1;
-  bool reverse_credit_logic;
-  uint buttons_on_jamma;
-} jamma_config;
-
-static irqreturn_t pca953x_irq_handler(int irq, void *devid) {
-
-  struct pca953x_chip *chip = (struct pca953x_chip *)devid;
-  if(&chip->gpio_chip == jamma_config.gpio_chip_0){
-    DEBUG && printk(KERN_INFO
-    "recalboxrgbjamma: IRQ triggered on chip 0\n");
-    process_inputs(jamma_config.gpio_chip_0);
-  } else {
-    DEBUG && printk(KERN_INFO
-    "recalboxrgbjamma: IRQ triggered on chip 1\n");
-    process_inputs(jamma_config.gpio_chip_1);
-  }
-
-  return IRQ_RETVAL(1);
-}
-
-static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base) {
-  struct i2c_client *client = chip->client;
-  struct irq_chip *irq_chip = &chip->irq_chip;
-  DECLARE_BITMAP(reg_direction, MAX_LINE);
-  DECLARE_BITMAP(irq_stat, MAX_LINE);
-  struct gpio_irq_chip *girq;
-  int ret;
-
-  printk(KERN_INFO
-  "recalboxrgbjamma: setting IRQ\n");
-
-  if (!client->irq)
-    return 0;
-
-  if (irq_base == -1)
-    return 0;
-
-  if (!(chip->driver_data & PCA_INT))
-    return 0;
-
-  ret = pca953x_read_regs(chip, chip->regs->input, irq_stat);
-  if (ret)
-    return ret;
-
-  /*
-   * There is no way to know which GPIO line generated the
-   * interrupt.  We have to rely on the previous read for
-   * this purpose.
-   */
-  pca953x_read_regs(chip, chip->regs->direction, reg_direction);
-  bitmap_and(chip->irq_stat, irq_stat, reg_direction, chip->gpio_chip.ngpio);
-  mutex_init(&chip->irq_lock);
-
-  irq_chip->name = dev_name(&client->dev);
-  irq_chip->irq_mask = pca953x_irq_mask;
-  irq_chip->irq_unmask = pca953x_irq_unmask;
-  irq_chip->irq_set_wake = pca953x_irq_set_wake;
-  irq_chip->irq_bus_lock = pca953x_irq_bus_lock;
-  irq_chip->irq_bus_sync_unlock = pca953x_irq_bus_sync_unlock;
-  irq_chip->irq_set_type = pca953x_irq_set_type;
-  irq_chip->irq_shutdown = pca953x_irq_shutdown;
-
-  girq = &chip->gpio_chip.irq;
-  girq->chip = irq_chip;
-  /* This will let us handle the parent IRQ in the driver */
-  girq->parent_handler = NULL;
-  girq->num_parents = 0;
-  girq->parents = NULL;
-  girq->default_type = IRQ_TYPE_NONE;
-  girq->handler = handle_simple_irq;
-  girq->threaded = true;
-  girq->first = irq_base; /* FIXME: get rid of this */
-
-  ret = devm_request_threaded_irq(&client->dev, client->irq,
-                                  NULL, pca953x_irq_handler,
-                                  IRQF_ONESHOT | IRQF_SHARED,
-                                  dev_name(&client->dev), chip);
-  if (ret) {
-    dev_err(&client->dev, "failed to request irq %d\n",
-            client->irq);
-    return ret;
-  }
-
-  return 0;
-}
-
-static int device_pca95xx_init(struct pca953x_chip *chip, u32 invert) {
-  DECLARE_BITMAP(val, MAX_LINE);
-  u8 regaddr;
-  int ret;
-
-  regaddr = pca953x_recalc_addr(chip, chip->regs->output, 0);
-  ret = regcache_sync_region(chip->regmap, regaddr,
-                             regaddr + NBANK(chip) - 1);
-  if (ret)
-    goto out;
-
-  regaddr = pca953x_recalc_addr(chip, chip->regs->direction, 0);
-  ret = regcache_sync_region(chip->regmap, regaddr,
-                             regaddr + NBANK(chip) - 1);
-  if (ret)
-    goto out;
-
-  /* set platform specific polarity inversion */
-  if (invert)
-    bitmap_fill(val, MAX_LINE);
-  else
-    bitmap_zero(val, MAX_LINE);
-
-  ret = pca953x_write_regs(chip, chip->regs->invert, val);
-  out:
-  return ret;
-}
-
-
-static int pca953x_probe(struct i2c_client *client,
-                         const struct i2c_device_id *i2c_id) {
-  struct pca953x_platform_data *pdata;
-  struct pca953x_chip *chip;
-  int irq_base = 0;
-  int ret;
-  int gpio_idx = 0;
-  u32 invert = 0;
-  struct regulator *reg;
-  const struct regmap_config *regmap_config;
-
-  chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
-  if (chip == NULL)
-    return -ENOMEM;
-
-  pdata = dev_get_platdata(&client->dev);
-  if (pdata) {
-    irq_base = pdata->irq_base;
-    chip->gpio_start = pdata->gpio_base;
-    invert = pdata->invert;
-    chip->names = pdata->names;
-  } else {
-    struct gpio_desc *reset_gpio;
-
-    chip->gpio_start = -1;
-    irq_base = 0;
-
-    /*
-     * See if we need to de-assert a reset pin.
-     *
-     * There is no known ACPI-enabled platforms that are
-     * using "reset" GPIO. Otherwise any of those platform
-     * must use _DSD method with corresponding property.
-     */
-    reset_gpio = devm_gpiod_get_optional(&client->dev, "reset",
-                                         GPIOD_OUT_LOW);
-    if (IS_ERR(reset_gpio))
-      return PTR_ERR(reset_gpio);
-  }
-
-  chip->client = client;
-
-  reg = devm_regulator_get(&client->dev, "vcc");
-  if (IS_ERR(reg))
-    return dev_err_probe(&client->dev, PTR_ERR(reg), "reg get err\n");
-
-  ret = regulator_enable(reg);
-  if (ret) {
-    dev_err(&client->dev, "reg en err: %d\n", ret);
-    return ret;
-  }
-  chip->regulator = reg;
-
-  if (i2c_id) {
-    chip->driver_data = i2c_id->driver_data;
-  } else {
-    const void *match;
-
-    match = device_get_match_data(&client->dev);
-    if (!match) {
-      ret = -ENODEV;
-      goto err_exit;
-    }
-
-    chip->driver_data = (uintptr_t) match;
-  }
-
-  i2c_set_clientdata(client, chip);
-
-  pca953x_setup_gpio(chip, chip->driver_data & PCA_GPIO_MASK);
-
-  regmap_config = &pca953x_i2c_regmap;
-
-  chip->regmap = devm_regmap_init_i2c(client, regmap_config);
-  if (IS_ERR(chip->regmap)) {
-    ret = PTR_ERR(chip->regmap);
-    goto err_exit;
-  }
-
-  regcache_mark_dirty(chip->regmap);
-
-  mutex_init(&chip->i2c_lock);
-  /*
-   * In case we have an i2c-mux controlled by a GPIO provided by an
-   * expander using the same driver higher on the device tree, read the
-   * i2c adapter nesting depth and use the retrieved value as lockdep
-   * subclass for chip->i2c_lock.
-   *
-   * REVISIT: This solution is not complete. It protects us from lockdep
-   * false positives when the expander controlling the i2c-mux is on
-   * a different level on the device tree, but not when it's on the same
-   * level on a different branch (in which case the subclass number
-   * would be the same).
-   *
-   * TODO: Once a correct solution is developed, a similar fix should be
-   * applied to all other i2c-controlled GPIO expanders (and potentially
-   * regmap-i2c).
-   */
-  lockdep_set_subclass(&chip->i2c_lock,
-                       i2c_adapter_depth(client->adapter));
-
-  /* initialize cached registers from their original values.
-   * we can't share this chip with another i2c master.
-   */
-
-  chip->regs = &pca953x_regs;
-  ret = device_pca95xx_init(chip, invert);
-  if (ret)
-    goto err_exit;
-
-  ret = pca953x_irq_setup(chip, irq_base);
-  if (ret)
-    goto err_exit;
-
-  ret = devm_gpiochip_add_data(&client->dev, &chip->gpio_chip, chip);
-  if (ret)
-    goto err_exit;
-
-  if (pdata && pdata->setup) {
-    ret = pdata->setup(client, chip->gpio_chip.base,
-                       chip->gpio_chip.ngpio, pdata->context);
-    if (ret < 0) {
-      dev_warn(&client->dev, "setup failed, %d\n", ret);
-      goto err_exit;
-    }
-  }
-  int command_ret;
-  for (gpio_idx = 0; gpio_idx < 16; gpio_idx++) {
-/*    command_ret = pca953x_gpio_set_config(&chip->gpio_chip, gpio_idx, PIN_CONFIG_BIAS_PULL_UP);
-    if(command_ret != 0) {
-      dev_err(&client->dev, "cannot set pull up for gpio %d on chip %d. error: %d\n", gpio_idx, client->addr, command_ret);
-      goto err_exit;
-    }*/
-    if (pca953x_gpio_direction_input(&chip->gpio_chip, gpio_idx) != 0) {
-      dev_err(&client->dev, "cannot set input for gpio %d on chip %d\n", gpio_idx, client->addr);
-      goto err_exit;
-    }
-  }
-
-  dev_info(&client->dev, "created jamma pca at %d\n", client->addr);
-  if (client->addr == 0x21 || client->addr == 0x20 || client->addr == 0x25) {
-    jamma_config.switch36_gpio_ref = gpiod_get((client->dev.parent), "switch36", GPIOD_IN);
-    if (IS_ERR(jamma_config.switch36_gpio_ref)) {
-      dev_warn(&client->dev, "cannot get switch36 gpio reference, default to 6 buttons\n");
-      jamma_config.switch36_gpio_ref = NULL;
-      jamma_config.switch36_gpio_state = 1;
-    } else {
-      jamma_config.switch36_gpio_state = gpiod_get_value(jamma_config.switch36_gpio_ref);
-      dev_info(&client->dev, "switch36 gpio reference found, set to = %s.\n",
-               jamma_config.switch36_gpio_state ? "6 buttons" : "3 buttons");
-    }
-    jamma_config.gpio_chip_0 = &chip->gpio_chip;
-  } else if (client->addr == 0x22 || client->addr == 0x24) {
-    jamma_config.gpio_chip_1 = &chip->gpio_chip;
-  }
-
-  process_inputs(NULL);
-  return 0;
-
-  err_exit:
-  regulator_disable(chip->regulator);
-  return ret;
-}
-
-static void pca953x_remove(struct i2c_client *client) {
-  struct pca953x_platform_data *pdata = dev_get_platdata(&client->dev);
-  struct pca953x_chip *chip = i2c_get_clientdata(client);
-
-  if (pdata && pdata->teardown) {
-    pdata->teardown(client, chip->gpio_chip.base,
-                          chip->gpio_chip.ngpio, pdata->context);
-  }
-
-  regulator_disable(chip->regulator);
-}
-
-static const struct of_device_id pca953x_dt_ids[] = {
-    {.compatible = "raspberrypi,recalboxrgbjamma-v2", .data = (void *) (16 | PCA953X_TYPE | PCA_INT),},
-    {}
-};
-
-MODULE_DEVICE_TABLE(of, pca953x_dt_ids
-);
-static SIMPLE_DEV_PM_OPS(pca953x_pm_ops, pca953x_suspend, pca953x_resume
-);
-
-static struct i2c_driver pca953x_driver = {
-    .driver = {
-        .name  = "recalboxrgbjamma-v2",
-        .pm  = &pca953x_pm_ops,
-        .of_match_table = pca953x_dt_ids,
-        .acpi_match_table = pca953x_acpi_ids,
-    },
-    .probe     = pca953x_probe,
-    .remove    = pca953x_remove,
-    .id_table  = pca953x_id,
-};
-
-/*
- * A,B,X,Y are in SNES notation
- *
- * Chip 0 : address = 0x25
- *                                    __________
- *   P1-B5  (P1-L)       IO0-0  <--- |0        8| ---> IO1-0  P1-B6  (P1-R)
- *   P2-B5  (P2-L)       IO0-1  <--- |1        9| ---> IO1-1  P2-B6  (P2-R)
- *   P1-B4  (P1-X)       IO0-2  <--- |2       10| ---> IO1-2  P1K-B4 (P1-X)
- *   P2-B4  (P2-X)       IO0-3  <--- |3       11| ---> IO1-3  P1K-B5 (P1-L)
- *   P1-B2  (P1-A)       IO0-4  <--- |4       12| ---> IO1-4  P1K-B6 (P1-R)
- *   P2-B2  (P2-A)       IO0-5  <--- |5       13| ---> IO1-5  P2K-B4 (P2-X)
- *   P1-B3  (P1-Y)       IO0-6  <--- |6       14| ---> IO1-6  P2K-B5 (P2-L)
- *   P2-B3  (P2-Y)       IO0-7  <--- |7       15| ---> IO1-7  P2K-B5 (P2-R)
- *                                    ‾‾‾‾‾‾‾‾‾‾
- * Chip 1 : address = 0x24
- *                                    __________
- *   SERVICE             IO0-0  <--- |16      24| ---> IO1-0  P2-B1 (P2-B)
- *   TEST                IO0-1  <--- |17      25| ---> IO1-1  P1-B1 (P1-B)
- *   P1-UP               IO0-2  <--- |18      26| ---> IO1-2  P2-RIGHT
- *   P2-UP               IO0-3  <--- |19      27| ---> IO1-3  P1-RIGHT
- *   P1-DOWN             IO0-4  <--- |20      28| ---> IO1-4  P2-START
- *   P2-DOWN             IO0-5  <--- |21      29| ---> IO1-5  P1-START
- *   P1-LEFT             IO0-6  <--- |22      30| ---> IO1-6  P1-COIN
- *   P2-LEFT             IO0-7  <--- |23      31| ---> IO1-7  P2-COIN
- *                                    ‾‾‾‾‾‾‾‾‾‾
- *
- */
-
-
-struct input_dev *player_devs[2];
-
-// Standard buttons mapping
-#define BTN_PER_PLAYER 11
-#define BTN_PER_PLAYER_ON_JAMMA 10
-// Keep in mind the vanilla mapping for Recalbox RGB Jamma is (SNES notation):
-// B A Y
-// X L R
-// We use this mapping to get B and A on first line, whatever the number of buttons
-// Keep also in mind that the A is SOUTH and B is EAST (they are switched) on Linux notation, and that NORTH and WEST are also reversed in auto mapping...
-//
-static const unsigned int buttons_codes[BTN_PER_PLAYER] = {
-    //  B1        B2         B3         B4         B5          B6          START          COIN            SERVICE         TEST             HOTKEY
-    BTN_A, BTN_B, BTN_X, BTN_Y, BTN_TL, BTN_TR, BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR, BTN_MODE,
-};
-
-
-// The value is the bit of the data containing the
-// information for the button at the same index in buttons_codes array
-// Start is a special case
-static const int player1_6btn_bits[BTN_PER_PLAYER_ON_JAMMA] = {
-    25, 4, 6, 2, 0, 8, -1, 30, 16, 17,
-};
-// 3btn mode bits
-static const int player1_3btn_bits[BTN_PER_PLAYER_ON_JAMMA] = {
-    25, 4, 6, -1, -1, -1, -1, 30, 16, 17,
-};
-// Kick harness buttons mapping
-// Only use values where >= 0
-static const int player1_kick_btn_bits[BTN_PER_PLAYER_ON_JAMMA] = {
-    -1, -1, -1, 10, 11, 12, -1, -1, -1, -1,
-};
-
-#define P1_UP 18
-#define P1_DOWN 20
-#define P1_LEFT 22
-#define P1_RIGHT 27
-#define P1_START 29
-#define P1_BTN1 player1_3btn_bits[0]
-
-static const int player2_6btn_bits[BTN_PER_PLAYER_ON_JAMMA] = {
-    24, 5, 7, 3, 1, 9, 28, 31, -1, -1,
-};
-static const int player2_3btn_bits[BTN_PER_PLAYER_ON_JAMMA] = {
-    24, 5, 7, -1, -1, -1, 28, 31, -1, -1,
-};
-
-static const int player2_kick_btn_bits[BTN_PER_PLAYER_ON_JAMMA] = {
-    -1, -1, -1, 13, 14, 15, -1, -1, -1, -1,
-};
-
-#define P2_UP 19
-#define P2_DOWN 21
-#define P2_LEFT 23
-#define P2_RIGHT 26
-#define P2_BTN1 player2_3btn_bits[0]
-
-// Logic is not the same for each buttons (coins and service/test are reversed)
-// TODO: add service and test for next version
-static const unsigned short buttonsReleasedValues[32] = {
-    1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 0, 0
-};
-// TODO: add service and test for next version
-static const unsigned short buttonsReleasedValuesReversed[32] = {
-    1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1
-};
-
-#define PRESSED(data, btn) ((btn) != -1 ? (((data >> (btn)) & 1)^(jamma_config.reverse_credit_logic ? buttonsReleasedValuesReversed[btn]: buttonsReleasedValues[btn])) : 0)
-#define WAIT_SYNC() usleep_range(50000,80000);
-//Exit delay (HK + START) set to 2 secondes
-#define EXIT_DELAY(now, start) ((now - start) / 1000000000UL >= 2)
-//HK delay set to 1 second
-#define HOTKEY_DELAY(now, start) ((now - start) / 1000000000UL >= 1)
-static long long int last_start_press = 0;
-static unsigned long start_state = 0;
-static unsigned int start_credit = 0;
-static short can_exit = 0;
-static short should_release_hk = 0;
-
-#define PRESS_AND_SYNC(player, button) input_report_key(player_devs[(player)], (button), 1); input_sync(player_devs[(player)]); WAIT_SYNC();
-#define RELEASE_AND_SYNC(player, button) input_report_key(player_devs[(player)], (button), 0); input_sync(player_devs[(player)]); WAIT_SYNC();
-
-
-/**
- *
- * @param data_chips the data read from both chips
- * The right 16 bits are for the chip 1, left 16 bits for the chip 0
- */
-static void input_report(unsigned long *data_chips, long long int *time_ns) {
-  int j;
-  int gpio;
-  int buttonValue;
-
-  if (jamma_config.hotkey_patterns) {
-    // Special case for HOTKEY:
-    // Simple press + release of START -> START event
-    // Simple press of START + BTN1 -> send SELECT (COIN)
-    // Simple press of START + an other button -> send HOTKEY + BUTTON
-    // Long press (3s) of START -> HOTKEY + START
-
-    if (PRESSED(*data_chips, P1_START)) {
-      DEBUG && printk(KERN_INFO
-      "recalboxrgbjamma: start is pressed\n");
-      if (last_start_press == 0) {
-        // First press
-        DEBUG && printk(KERN_INFO
-        "recalboxrgbjamma: saving first press\n");
-        last_start_press = *time_ns;
-        start_state = *data_chips;
-        can_exit = 1;
-        start_credit = 0;
-      } else {
-        DEBUG && printk(KERN_INFO
-        "recalboxrgbjamma: startstate=%u data_chips=%u different=%d B1=%d\n", start_state, *data_chips, start_state !=
-                                                                                                       *data_chips,
-            PRESSED(
-                *data_chips,
-                P1_BTN1));
-        if (start_state != *data_chips /*&& !start_credit*/) {
-          // If we can use START + BTN1 for a credit
-          if (!jamma_config.disable_credit_on_hk_btn1 && PRESSED(*data_chips, P1_BTN1)) {
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: credit (SELECT) triggered (hk+P1_BTN1) B1=%u\n", PRESSED(*data_chips, P1_BTN1));
-            PRESS_AND_SYNC(0, BTN_SELECT);
-            RELEASE_AND_SYNC(0, BTN_SELECT);
-            start_credit = 1;
-            can_exit = 0;
-          } if (!jamma_config.disable_credit_on_hk_btn1 && PRESSED(*data_chips, P2_BTN1)) {
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: credit (SELECT) triggered (hk+P2_BTN1) B1=%u\n", PRESSED(*data_chips, P1_BTN1));
-            PRESS_AND_SYNC(1, BTN_SELECT);
-            RELEASE_AND_SYNC(1, BTN_SELECT);
-            start_credit = 1;
-            can_exit = 0;
-          } else if (!start_credit && !should_release_hk) {
-            // As another button has been pressed, we press hotkey before
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: other button press (hk+x)\n");
-            PRESS_AND_SYNC(0, BTN_MODE);
-            can_exit = 0;
-            should_release_hk = 1;
-          }
-        }
-        start_state = *data_chips;
-
-      }
-    } else {
-      if (last_start_press != 0) {
-        // Start released
-        if (!start_credit) {
-          DEBUG && printk(KERN_INFO
-          "recalboxrgbjamma: start released\n");
-          if (should_release_hk) {
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: release hotkey\n");
-            should_release_hk = 0;
-            RELEASE_AND_SYNC(0, BTN_MODE);
-          } else if (can_exit && EXIT_DELAY(*time_ns, last_start_press)) {
-            // Longest press, so we send both HK + START
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: long press : sending HK + START\n");
-            PRESS_AND_SYNC(0, BTN_MODE);
-            PRESS_AND_SYNC(0, BTN_START);
-            RELEASE_AND_SYNC(0, BTN_START);
-            RELEASE_AND_SYNC(0, BTN_MODE);
-          } else if (HOTKEY_DELAY(*time_ns, last_start_press)) {
-            // Long press, so we send HK
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: middle press : sending HK\n");
-            PRESS_AND_SYNC(0, BTN_MODE);
-            RELEASE_AND_SYNC(0, BTN_MODE);
-          } else {
-            // Simple start
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: quick press : sending START\n");
-            PRESS_AND_SYNC(0, BTN_START);
-            RELEASE_AND_SYNC(0, BTN_START);
-          }
-        }
-        last_start_press = 0;
-      }
-    }
-  } else {
-    // Standard start
-    input_report_key(player_devs[0], BTN_START, PRESSED(*data_chips, P1_START));
-  }
-
-  if (!start_credit) {
-    // Player 1
-    input_report_abs(player_devs[0], ABS_Y, PRESSED(*data_chips, P1_DOWN) - PRESSED(*data_chips, P1_UP));
-    input_report_abs(player_devs[0], ABS_X, PRESSED(*data_chips, P1_RIGHT) - PRESSED(*data_chips, P1_LEFT));
-
-    for (j = 0; j < BTN_PER_PLAYER_ON_JAMMA; j++) {
-      //printk(KERN_INFO "recalboxrgbjamma: sending report P1 for key bit:%d, inputcode:%d, value : %d\n", player1_btn_bits[j],
-      //       buttons_codes[j], PRESSED(data_chips, player1_btn_bits[j]));
-
-      // Either 6btn mode code, or the 3btn, or the kick. No report if button is -1
-      if (j <= 5 && j >= jamma_config.buttons_on_jamma) {
-        // Only kick harness as the jamma does not have this button
-        buttonValue = PRESSED(*data_chips, player1_kick_btn_bits[j]);
-      } else {
-        if (jamma_config.switch36_gpio_state) {
-          // 6 buttons on jamma, plus kick harness
-          buttonValue = PRESSED(*data_chips, player1_6btn_bits[j]) | PRESSED(*data_chips, player1_kick_btn_bits[j]);
-        } else {
-          // 3 buttons on jamma, plus kick harness
-          buttonValue = PRESSED(*data_chips, player1_3btn_bits[j]) | PRESSED(*data_chips, player1_kick_btn_bits[j]);
-        }
-      }
-      input_report_key(player_devs[0], buttons_codes[j], buttonValue);
-    }
-    input_sync(player_devs[0]);
-  }
-  // Player 2
-  input_report_abs(player_devs[1], ABS_Y, PRESSED(*data_chips, P2_DOWN) - PRESSED(*data_chips, P2_UP));
-  input_report_abs(player_devs[1], ABS_X, PRESSED(*data_chips, P2_RIGHT) - PRESSED(*data_chips, P2_LEFT));
-  for (j = 0; j < BTN_PER_PLAYER_ON_JAMMA; j++) {
-    // Either 6btn mode code, or the 3btn, or the kick. No report if button is -1
-    if (j <= 5 && j >= jamma_config.buttons_on_jamma) {
-      // Only kick harness as the jamma does not have this button
-      buttonValue = PRESSED(*data_chips, player2_kick_btn_bits[j]);
-    } else {
-      if (jamma_config.switch36_gpio_state) {
-        // 6 buttons on jamma, plus kick harness
-        buttonValue = PRESSED(*data_chips, player2_6btn_bits[j]) | PRESSED(*data_chips, player2_kick_btn_bits[j]);
-      } else {
-        // 3 buttons on jamma, plus kick harness
-        buttonValue = PRESSED(*data_chips, player2_3btn_bits[j]) | PRESSED(*data_chips, player2_kick_btn_bits[j]);
-      }
-    }
-    input_report_key(player_devs[1], buttons_codes[j], buttonValue);
-  }
-  input_sync(player_devs[1]);
-}
-
-static unsigned long lastGpioState = 0;
-static unsigned long debounceGpioValue = 0;
-static long long int lastActionOn[32] = {0};
-
-#define SETGPIO(data_addr, gpio, value) (*(data_addr) = ((*(data_addr) & (~(1UL << (gpio)))) | ((value) << (gpio))))
-
-static int debounce(unsigned long *data_chips, unsigned long *debounced_data, long long int *time_ns) {
-  unsigned long gpioVal;
-  *debounced_data = *data_chips;
-  unsigned int gpio;
-  for (gpio = 0; gpio < 32; gpio++) {
-    if (lastActionOn[gpio] != 0) {
-      // We are in debounce time lap
-      // We cancel this event by setting the saved value at debounce start
-      DEBUG && printk(KERN_INFO
-      "recalboxrgbjamma: debouncing: setting gpio %d value to %d (%s) in place of %d\n", gpio,
-          (debounceGpioValue >> gpio) &
-          1, ((debounceGpioValue >> gpio) & 1) ? "released" : "pressed", gpioVal);
-      SETGPIO(debounced_data, gpio, (debounceGpioValue >> gpio) & 1);
-    } else {
-      gpioVal = (((*data_chips) >> gpio) & 1);
-      if (((lastGpioState >> gpio) & 1) != gpioVal) {
-        // Gpio changed its state since last event
-        // We set the start time for debounce and the value of the gpio
-        lastActionOn[gpio] = *time_ns;
-        // Saving the value that will be still during the debounce
-        DEBUG && printk(KERN_INFO
-        "recalboxrgbjamma: debouncing: first event of gpio %d, setting debounced value to %d \n", gpio, gpioVal);
-        SETGPIO(&debounceGpioValue, gpio, gpioVal);
-      }
-    }
-  }
-  lastGpioState = *data_chips;
-  return 0;
-}
-static const unsigned long mask = 0xFFFF;
-
-static int read_gpios(unsigned long *gpio_data) {
-  unsigned long gpio_values0 = 0;
-  unsigned long gpio_values1 = 0;
-  if (jamma_config.gpio_chip_0 != NULL) {
-    if (pca953x_gpio_get_multiple(jamma_config.gpio_chip_0, &mask, &gpio_values0)) {
-      printk(KERN_INFO
-      "recalboxrgbjamma: unable to read gpio on chip 0, skipping\n");
-      return -1;
-    };
-  }
-  if (jamma_config.gpio_chip_1 != NULL) {
-    if (pca953x_gpio_get_multiple(jamma_config.gpio_chip_1, &mask, &gpio_values1)) {
-      printk(KERN_INFO
-      "recalboxrgbjamma: unable to read gpio chip 1, skipping\n");
-      return -1;
-    }
-  }
-  *gpio_data = (gpio_values1 << 16) | gpio_values0;
-  return 0;
-}
-
-static int read_gpios_one_chip(unsigned long *gpio_data, struct gpio_chip *gpio_chip) {
-  if (pca953x_gpio_get_multiple(gpio_chip, &mask, gpio_data)) {
-    printk(KERN_INFO
-    "recalboxrgbjamma: unable to read gpio on chip %s, skipping\n", gpio_chip == jamma_config.gpio_chip_0 ? "0":"1");
-    return -1;
-  };
-  return 0;
-}
-
-
-// Debounce to 40ms
-#define DEBOUNCE_TIME (40000000)
-
-static unsigned long gpio_data = 0;
-
-static int process_inputs(struct gpio_chip *gpio_chip) {
-  unsigned long debounced_data = 0;
-  unsigned long gpio_data_chip = 0;
-  long long int time_start = ktime_to_ns(ktime_get_boottime());
-  mutex_lock(&jamma_config.process_mutex);
-
-  if(gpio_chip != NULL) {
-    if (read_gpios_one_chip(&gpio_data_chip, gpio_chip)) {
-      mutex_unlock(&jamma_config.process_mutex);
-      return -1;
-    }
-    DEBUG && printk(KERN_INFO
-    "recalboxrgbjamma: read gpio values on chip : %u\n", gpio_data_chip);
-    if(gpio_chip == jamma_config.gpio_chip_0){
-      gpio_data = ((gpio_data & 0xFFFF0000) | gpio_data_chip);
-    } else {
-      gpio_data = ((gpio_data & 0x0000FFFF) | (gpio_data_chip << 16));
-    }
-
-    DEBUG && printk(KERN_INFO
-    "recalboxrgbjamma: gpio_data = %u\n", gpio_data);
-  } else {
-    if (read_gpios(&gpio_data)) {
-      mutex_unlock(&jamma_config.process_mutex);
-      return -1;
-    }
-  }
-
-  debounce(&gpio_data, &debounced_data, &time_start);
-  input_report(&debounced_data, &time_start);
-  mutex_unlock(&jamma_config.process_mutex);
-  return 0;
-}
-
-static int process_debounce(void *idx) {
-  unsigned int gpio;
-  long long int time_ns;
-  bool sendEvent;
-
-  while (!kthread_should_stop()) {
-    time_ns = ktime_to_ns(ktime_get_boottime());
-    sendEvent = false;
-    for (gpio = 0; gpio < 32; gpio++) {
-      if (lastActionOn[gpio] != 0) {
-        if (time_ns - lastActionOn[gpio] > DEBOUNCE_TIME) {
-          // This gpio must be debounced
-          DEBUG && printk(KERN_INFO
-          "recalboxrgbjamma: debouncing thread: finish debouncing of %d\n", gpio);
-          sendEvent = 1;
-          lastActionOn[gpio] = 0;
-        }
-      }
-    }
-    if (sendEvent) {
-      // Maybe we should not debounce here
-      process_inputs(NULL);
-    }
-    usleep_range(10000, 15000);
-  }
-  return 0;
-}
-
-static int unregister_controllers(void) {
-  int player;
-  for (player = 0; player < 2; player++) {
-    if (player_devs[player] != NULL)
-      input_unregister_device(player_devs[player]);
-  }
-  return 0;
-}
-
-static const char *controllers_names[2] = {
-    "JammaControllerP1", "JammaControllerP2"
-};
-
-static int register_controllers(void) {
-  int err = 0, i = 0, player = 0;
-  for (player = 0; player < 2; player++) {
-    if (!(player_devs[player] = input_allocate_device())) {
-      pr_err("recalboxrgbjamma: not enough memory for input device\n");
-      return -ENOMEM;
-    }
-
-    player_devs[player]->name = controllers_names[player];
-    player_devs[player]->phys = controllers_names[player];
-    player_devs[player]->id.bustype = BUS_I2C;
-    player_devs[player]->id.vendor = 0x7262;
-    player_devs[player]->id.product = 0x0A01;
-    player_devs[player]->id.version = 0x0100;
-
-    player_devs[player]->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-
-    for (i = 0; i < 2; i++)
-      input_set_abs_params(player_devs[player], ABS_X + i, -1, 1, 0, 0);
-    for (i = 0; i < BTN_PER_PLAYER; i++)
-      __set_bit(buttons_codes[i], player_devs[player]->keybit);
-
-    if ((err = input_register_device(player_devs[player]))) {
-      pr_err("recalboxrgbjamma: Cannot register input device\n");
-      input_free_device(player_devs[player]);
-      player_devs[player] = NULL;
-      return -1;
-    }
-  }
-  return 0;
-}
-// Load configuration from recalbox-crt-options.cfg
-// Used to get Hotkey mode
-#define READ_SIZE_MAX 2048
-#define LINE_SIZE_MAX 256
-static char read_buf[READ_SIZE_MAX];
-static const char *config_path = "/boot/crt/recalbox-crt-options.cfg";
-
-static int load_config(void) {
-  struct file *fp = NULL;
-  ssize_t read_size = 0;
-  size_t cursor = 0;
-  char line[LINE_SIZE_MAX];
-  char optionname[LINE_SIZE_MAX];
-  int optionvalue = 0;
-  size_t line_start = 0;
-  size_t line_len = 0;
-  int scanret = 0;
-
-  fp = filp_open(config_path, O_RDONLY, 0);
-  if (IS_ERR(fp) || !fp) {
-    //printk(KERN_INFO "recalboxrgbjamma: config file not found, skipping configuration loading\n");
-    return 0;
-  }
-
-  read_size = kernel_read(fp, &read_buf, READ_SIZE_MAX, &fp->f_pos);
-  if (read_size <= 0) {
-    filp_close(fp, NULL);
-    //printk(KERN_INFO "recalboxrgbjamma: empty config file found, skipping configuration loading\n");
-    return 0;
-  }
-  filp_close(fp, NULL);
-  for (cursor = 0; cursor < read_size; cursor++) {
-    line[cursor - line_start] = read_buf[cursor];
-    line_len++;
-    if (line_len >= LINE_SIZE_MAX || read_buf[cursor] == '\n' || read_buf[cursor] == '\0') {
-      if (line_len > 1 && line[0] != '#') {
-        line[line_len - 1] = '\0';
-        scanret = sscanf(line, "%s = %d", &optionname, &optionvalue);
-        if (scanret == 2) {
-          if (strcmp(optionname, "options.jamma.hk_patterns") == 0) {
-            if (jamma_config.hotkey_patterns != optionvalue) {
-              printk(KERN_INFO
-              "recalboxrgbjamma: switch to %s mode\n",
-                  optionvalue ? "hotkey_patterns" : "enable_hk_on_start");
-              jamma_config.hotkey_patterns = optionvalue;
-            }
-          } else if (strcmp(optionname, "options.jamma.disable_credit_on_hk_btn1") == 0) {
-            if (jamma_config.disable_credit_on_hk_btn1 != optionvalue) {
-              printk(KERN_INFO
-              "recalboxrgbjamma: switch to %s mode\n",
-                  optionvalue ? "disable_credit_on_hk_btn1" : "enable_credit_on_hk_btn1");
-              jamma_config.disable_credit_on_hk_btn1 = optionvalue;
-            }
-          } else if (strcmp(optionname, "options.jamma.buttons_on_jamma") == 0) {
-            if (jamma_config.buttons_on_jamma != optionvalue) {
-              printk(KERN_INFO
-              "recalboxrgbjamma: switch buttons_on_jamma to %d\n",
-                  optionvalue);
-              jamma_config.buttons_on_jamma = optionvalue;
-            }
-          } else if (strcmp(optionname, "options.jamma.buttons_on_jamma") == 0) {
-            if (jamma_config.buttons_on_jamma != optionvalue) {
-              printk(KERN_INFO
-              "recalboxrgbjamma: switch buttons_on_jamma to %d\n",
-                  optionvalue);
-              jamma_config.buttons_on_jamma = optionvalue;
-            }
-          } else if (strcmp(optionname, "options.jamma.reverse_credit_logic") == 0) {
-            if (jamma_config.reverse_credit_logic != optionvalue) {
-              printk(KERN_INFO
-              "recalboxrgbjamma: switch reverse_credit_logic to %d\n",
-                  optionvalue);
-              jamma_config.reverse_credit_logic = optionvalue;
-            }
-          }
-        }
-      }
-      line_start += line_len;
-      line_len = 0;
-      memset(line, 0, 128);
-    }
-  }
-  return 0;
-}
-
-static int watch_configuration(void *idx) {
-  int gpio_value = 0;
-  while (!kthread_should_stop()) {
-    // Read file
-    load_config();
-    // Change switch 3/6 GPIO
-    if (jamma_config.switch36_gpio_ref != NULL) {
-      gpio_value = gpiod_get_value(jamma_config.switch36_gpio_ref);
-      if (gpio_value != jamma_config.switch36_gpio_state) {
-        jamma_config.switch36_gpio_state = gpio_value;
-        printk(KERN_INFO
-        "recalboxrgbjamma: switch to %s buttons mode\n", gpio_value ? "6" : "3");
-      }
-    }
-    usleep_range(10000000, 15000000);
-  }
-  return 0;
-}
-
-static int __init
-
-pca953x_init(void) {
-  int idx = 0;
-  jamma_config.switch36_gpio_ref = NULL;
-  jamma_config.switch36_gpio_state = 1;
-  jamma_config.gpio_chip_0 = NULL;
-  jamma_config.gpio_chip_1 = NULL;
-  jamma_config.hotkey_patterns = true;
-  jamma_config.disable_credit_on_hk_btn1 = false;
-  jamma_config.reverse_credit_logic = false;
-  jamma_config.buttons_on_jamma = 6;
-
-  jamma_config.config_thread = kthread_create(watch_configuration, &idx, "kthread_recalboxrgbjamma_cfg");
-  printk(KERN_INFO
-  "recalboxrgbjamma: setting configuration thread\n");
-  if (jamma_config.config_thread != NULL) {
-    wake_up_process(jamma_config.config_thread);
-    printk(KERN_INFO
-    "recalboxrgbjamma: kthread_recalboxrgbjamma_cfg is running\n");
-  } else {
-    printk(KERN_ERR
-    "recalboxrgbjamma: kthread kthread_recalboxrgbjamma_cfg could not be created\n");
-    return -1;
-  }
-
-  jamma_config.debounce_thread = kthread_create(process_debounce, &idx, "kthread_recalboxrgbjamma_debounce");
-  printk(KERN_INFO
-  "recalboxrgbjamma: setting debounce thread\n");
-  if (jamma_config.debounce_thread != NULL) {
-    wake_up_process(jamma_config.debounce_thread);
-    printk(KERN_INFO
-    "recalboxrgbjamma: kthread_recalboxrgbjamma_debounce is running\n");
-  } else {
-    printk(KERN_ERR
-    "recalboxrgbjamma: kthread_recalboxrgbjamma_debounce could not be created\n");
-    return -1;
-  }
-
-  mutex_init(&jamma_config.process_mutex);
-  printk(KERN_INFO
-  "recalboxrgbjamma: registering controllers\n");
-  register_controllers();
-  return i2c_add_driver(&pca953x_driver);
-}
-
-/* register after i2c/ postcore initcall and before
- * subsys initcalls that may rely on these GPIOs
- */
-subsys_initcall(pca953x_init);
-
-static void __exit
-
-pca953x_exit(void) {
-  printk(KERN_INFO
-  "recalboxrgbjamma: exiting\n");
-  if (kthread_stop(jamma_config.config_thread)) {
-    printk("recalboxrgbjamma: can't stop config thread");
-  }
-  if (kthread_stop(jamma_config.debounce_thread)) {
-    printk("recalboxrgbjamma: can't stop debounce thread");
-  }
-  unregister_controllers();
-  if (jamma_config.switch36_gpio_ref != NULL)
-    gpiod_put(jamma_config.switch36_gpio_ref);
-  i2c_del_driver(&pca953x_driver);
-}
-
-module_exit(pca953x_exit);
-
-MODULE_AUTHOR("eric miao <eric.miao@marvell.com>, digitalLumberjack <digitalLumberjack@recalbox.com>");
-MODULE_DESCRIPTION("Recalbox RGB Jamma controllers driver");
-MODULE_LICENSE("GPL");
\ No newline at end of file
diff --git a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v3-overlay.dts b/projects/recalbox-rgb-jamma/recalboxrgbjamma-v3-overlay.dts
deleted file mode 100644
index 294fa95469f4c0e4d55e9cdfa7824fe272dbfbe1..0000000000000000000000000000000000000000
--- a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v3-overlay.dts
+++ /dev/null
@@ -1,213 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
-  fragment@0 {
-      target = <&gpio>;
-      __overlay__ {
-        irq_gpio_27: irq_gpio_27_conf {
-          brcm,pins = <27>; // GPIO 5
-          brcm,function = <0>; // Input
-          brcm,pull = <2>; // Pull up
-        };
-        irq_gpio_10: irq_gpio_10_conf {
-          brcm,pins = <10>; // GPIO 10
-          brcm,function = <0>; // Input
-          brcm,pull = <2>; // Pull up
-        };
-        irq_gpio_0: irq_gpio_0_conf {
-          brcm,pins = <0>; // GPIO 0
-          brcm,function = <0>; // Input
-          brcm,pull = <2>; // Pull up
-        };
-        videofilter_gpio: videofilter_gpio_conf {
-          brcm,pins = <11>; // GPIO 11
-          brcm,function = <1>; // Output
-          brcm,pull = <0>; // Pull up
-        };
-
-      };
-  };
-
-	fragment@1 {
-		target-path = "/";
-		__overlay__ {
-
-			bridge: recalboxrgbjamma {
-				compatible = "raspberrypi,recalboxrgbdual";
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				vc4-vga666-mode = <6>;
-				recalbox-rgb-jamma = <1>;
-				videofilter-gpios = <&gpio 11 1>;
-				pinctrl-0 = <&videofilter_gpio>;
-				pinctrl-names = "default";
-
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-
-						vga_bridge_in: endpoint {
-							remote-endpoint = <&dpi_out>;
-						};
-					};
-
-					port@1 {
-						reg = <1>;
-
-						vga_bridge_out: endpoint {
-							remote-endpoint = <&vga_con_in>;
-						};
-					};
-				};
-			};
-
-			vga {
-				compatible = "vga-connector";
-
-				port {
-					vga_con_in: endpoint {
-						remote-endpoint = <&vga_bridge_out>;
-					};
-				};
-			};
-		};
-	};
-
-	fragment@2 {
-		target = <&dpi>;
-		__overlay__  {
-			status = "okay";
-			port {
-				dpi_out: endpoint@0 {
-					remote-endpoint = <&vga_bridge_in>;
-				};
-			};
-		};
-	};
-
-	fragment@3 {
-		target = <&dpi>;
-		__overlay__  {
-			status = "okay";
-			pinctrl-names = "default";
-			pinctrl-0 = <&vga666_mode6_pins>;
-		};
-	};
-
-	fragment@4 {
-		target = <&gpio>;
-		__overlay__ {
-			vga666_mode6_pins: vga666_mode6_pins {
-				brcm,pins = <1
-				      4  5  6  7  8  9
-				      12 13 14 15 16 17
-				      20 21 22 23 24 25>;
-				brcm,function = <6>;
-				brcm,pull = <0>;
-			};
-		};
-	};
-
-    fragment@5 {
-        target = <&audio_pins>;
-            __overlay__ {
-                brcm,pins = < 18 19 >;
-                brcm,function = < 2 >; /* alt5 alt5 */
-                swap_lr;
-            };
-    };
-
-    fragment@6 {
-        target = <&chosen>;
-        __overlay__  {
-            bootargs = "snd_bcm2835.enable_headphones=1";
-        };
-    };
-
-  fragment@8 {
-    target = <&i2c1>;
-    __overlay__ {
-      status = "okay";
-      pinctrl-names = "default";
-      pinctrl-0 = <&i2c1_pins>;
-      clock-frequency = <400000>;
-      read-timeout-ms = <50>;
-      jammactrl_0: jammactrl_0@25 {
-        compatible = "raspberrypi,recalboxrgbjamma-v3";
-        reg = <0x25>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_27>;
-        interrupt-parent = <&gpio>;
-        interrupts = <27 2>;
-        irq-gpios = <&gpio 27 0>;
-      };
-      jammactrl_1: jammactrl_1@24 {
-        compatible = "raspberrypi,recalboxrgbjamma-v3";
-        reg = <0x24>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_10>;
-        interrupt-parent = <&gpio>;
-        interrupts = <10 2>;
-        irq-gpios = <&gpio 10 0>;
-      };
-      jammactrl_2: jammactrl_2@27 {
-        compatible = "raspberrypi,recalboxrgbjamma-v3";
-        reg = <0x27>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_0>;
-        interrupt-parent = <&gpio>;
-        interrupts = <0 2>;
-        irq-gpios = <&gpio 0 0>;
-      };
-    };
-  };
-
-  fragment@9 {
-		target = <&i2c1_pins>;
-		__overlay__ {
-			brcm,pins = <2 3>;
-		};
-	};
-
-
-  fragment@10 {
-    target-path = "/";
-    __overlay__ {
-      fan0: gpio-fan@0 {
-        compatible = "gpio-fan";
-        gpios = <&gpio 26 0>;
-        gpio-fan,speed-map = <0 0>,<5000 1>;
-        #cooling-cells = <2>;
-      };
-    };
-  };
-
-  fragment@11 {
-    target = <&cpu_thermal>;
-    polling-delay = <5000>;	/* milliseconds */
-    __overlay__ {
-      trips {
-        cpu_hot: trip-point@0 {
-          temperature = <60000>;	/* (millicelsius) Fan started at 60°C */
-          hysteresis = <10000>;	    /* (millicelsius) Fan stopped at 50°C */
-          type = "active";
-        };
-      };
-      cooling-maps {
-        map0 {
-          trip = <&cpu_hot>;
-          cooling-device = <&fan0 1 1>;
-        };
-      };
-    };
-  };
-};
diff --git a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v3.c b/projects/recalbox-rgb-jamma/recalboxrgbjamma-v3.c
deleted file mode 100644
index e5ac555d8ae66f9a2d299ff6fc11d5a07930b53f..0000000000000000000000000000000000000000
--- a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v3.c
+++ /dev/null
@@ -1,1622 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- *  PCA953x 4/8/16/24/40 bit I/O ports
- *
- *  Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
- *  Copyright (C) 2007 Marvell International Ltd.
- *  Copyright (C) 2023 digitalLumberjack at recalbox.com.
- *
- *  Derived from drivers/gpio/gpio-pca953x.c
- */
-
-#include <linux/acpi.h>
-#include <linux/bitmap.h>
-#include <linux/gpio/driver.h>
-#include <linux/gpio/consumer.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/of_platform.h>
-#include <linux/platform_data/pca953x.h>
-#include <linux/regmap.h>
-#include <linux/regulator/consumer.h>
-#include <linux/slab.h>
-#include <linux/timer.h>
-#include <linux/input.h>
-#include <linux/timekeeping.h>
-
-#include <asm/unaligned.h>
-
-#define PCA953X_INPUT    0x00
-#define PCA953X_OUTPUT    0x01
-#define PCA953X_INVERT    0x02
-#define PCA953X_DIRECTION  0x03
-
-#define REG_ADDR_MASK    GENMASK(5, 0)
-#define REG_ADDR_EXT    BIT(6)
-#define REG_ADDR_AI    BIT(7)
-
-#define PCAL953X_OUT_STRENGTH  0x20
-#define PCAL953X_IN_LATCH  0x22
-#define PCAL953X_PULL_EN  0x23
-#define PCAL953X_PULL_SEL  0x24
-#define PCAL953X_INT_MASK  0x25
-#define PCAL953X_INT_STAT  0x26
-#define PCAL953X_OUT_CONF  0x27
-
-#define PCA_GPIO_MASK    GENMASK(7, 0)
-
-#define PCAL_GPIO_MASK    GENMASK(4, 0)
-#define PCAL_PINCTRL_MASK  GENMASK(6, 5)
-
-#define PCA_INT      BIT(8)
-#define PCA_PCAL    BIT(9)
-#define PCA_LATCH_INT    (PCA_PCAL | PCA_INT)
-#define PCA953X_TYPE    BIT(12)
-#define PCA_TYPE_MASK    GENMASK(15, 12)
-
-#define PCA_CHIP_TYPE(x)  ((x) & PCA_TYPE_MASK)
-
-#define DEBUG 0
-
-static const struct i2c_device_id pca953x_id[] = {
-    {"recalboxrgbjamma", 16 | PCA953X_TYPE | PCA_INT,},
-    {}
-};
-MODULE_DEVICE_TABLE(i2c, pca953x_id
-);
-
-// Interupts
-#include <linux/dmi.h>
-
-static const struct acpi_gpio_params pca953x_irq_gpios = {0, 0, true};
-
-static const struct acpi_gpio_mapping pca953x_acpi_irq_gpios[] = {
-    {"irq-gpios", &pca953x_irq_gpios, 1, ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER},
-    {}
-};
-
-static int pca953x_acpi_get_irq(struct device *dev) {
-  int ret;
-
-  ret = devm_acpi_dev_add_driver_gpios(dev, pca953x_acpi_irq_gpios);
-  if (ret)
-    dev_warn(dev, "can't add GPIO ACPI mapping\n");
-
-  ret = acpi_dev_gpio_irq_get_by(ACPI_COMPANION(dev), "irq-gpios", 0);
-  if (ret < 0) {
-    dev_info(dev, "could not get acpi gpio by irq-gpios\n");
-    return ret;
-  }
-
-  dev_info(dev, "ACPI interrupt quirk (IRQ %d)\n", ret);
-  return ret;
-}
-
-static const struct acpi_device_id pca953x_acpi_ids[] = {
-    {"INT3491", 16 | PCA953X_TYPE | PCA_LATCH_INT,},
-    {}
-};
-
-#define MAX_BANK 5
-#define BANK_SZ 8
-#define MAX_LINE  (MAX_BANK * BANK_SZ)
-
-#define NBANK(chip) DIV_ROUND_UP(chip->gpio_chip.ngpio, BANK_SZ)
-
-struct pca953x_reg_config {
-  int direction;
-  int output;
-  int input;
-  int invert;
-};
-
-static const struct pca953x_reg_config pca953x_regs = {
-    .direction = PCA953X_DIRECTION,
-    .output = PCA953X_OUTPUT,
-    .input = PCA953X_INPUT,
-    .invert = PCA953X_INVERT,
-};
-
-struct pca953x_chip {
-  unsigned gpio_start;
-  struct mutex i2c_lock;
-  struct regmap *regmap;
-
-  struct mutex irq_lock;
-  DECLARE_BITMAP(irq_mask, MAX_LINE);
-  DECLARE_BITMAP(irq_stat, MAX_LINE);
-  DECLARE_BITMAP(irq_trig_raise, MAX_LINE);
-  DECLARE_BITMAP(irq_trig_fall, MAX_LINE);
-  struct irq_chip irq_chip;
-
-  atomic_t wakeup_path;
-
-  struct i2c_client *client;
-  struct gpio_chip gpio_chip;
-  const char *const *names;
-  unsigned long driver_data;
-  struct regulator *regulator;
-
-  const struct pca953x_reg_config *regs;
-};
-
-static int pca953x_bank_shift(struct pca953x_chip *chip) {
-  return fls((chip->gpio_chip.ngpio - 1) / BANK_SZ);
-}
-
-#define PCA953x_BANK_INPUT  BIT(0)
-#define PCA953x_BANK_OUTPUT  BIT(1)
-#define PCA953x_BANK_POLARITY  BIT(2)
-#define PCA953x_BANK_CONFIG  BIT(3)
-
-#define PCAL9xxx_BANK_IN_LATCH  BIT(8 + 2)
-#define PCAL9xxx_BANK_PULL_EN  BIT(8 + 3)
-#define PCAL9xxx_BANK_PULL_SEL  BIT(8 + 4)
-#define PCAL9xxx_BANK_IRQ_MASK  BIT(8 + 5)
-#define PCAL9xxx_BANK_IRQ_STAT  BIT(8 + 6)
-
-/*
- * We care about the following registers:
- * - Standard set, below 0x40, each port can be replicated up to 8 times
- *   - PCA953x standard
- *     Input port			0x00 + 0 * bank_size	R
- *     Output port			0x00 + 1 * bank_size	RW
- *     Polarity Inversion port		0x00 + 2 * bank_size	RW
- *     Configuration port		0x00 + 3 * bank_size	RW
- *   - PCA957x with mixed up registers
- *     Input port			0x00 + 0 * bank_size	R
- *     Polarity Inversion port		0x00 + 1 * bank_size	RW
- *     Bus hold port			0x00 + 2 * bank_size	RW
- *     Configuration port		0x00 + 4 * bank_size	RW
- *     Output port			0x00 + 5 * bank_size	RW
- *
- * - Extended set, above 0x40, often chip specific.
- *   - PCAL6524/PCAL9555A with custom PCAL IRQ handling:
- *     Input latch register		0x40 + 2 * bank_size	RW
- *     Pull-up/pull-down enable reg	0x40 + 3 * bank_size    RW
- *     Pull-up/pull-down select reg	0x40 + 4 * bank_size    RW
- *     Interrupt mask register		0x40 + 5 * bank_size	RW
- *     Interrupt status register	0x40 + 6 * bank_size	R
- *
- * - Registers with bit 0x80 set, the AI bit
- *   The bit is cleared and the registers fall into one of the
- *   categories above.
- */
-
-static bool pca953x_check_register(struct pca953x_chip *chip, unsigned int reg,
-                                   u32 checkbank) {
-  int bank_shift = pca953x_bank_shift(chip);
-  int bank = (reg & REG_ADDR_MASK) >> bank_shift;
-  int offset = reg & (BIT(bank_shift) - 1);
-
-  /* Special PCAL extended register check. */
-  if (reg & REG_ADDR_EXT) {
-    if (!(chip->driver_data & PCA_PCAL))
-      return false;
-    bank += 8;
-  }
-
-  /* Register is not in the matching bank. */
-  if (!(BIT(bank) & checkbank))
-    return false;
-
-  /* Register is not within allowed range of bank. */
-  if (offset >= NBANK(chip))
-    return false;
-
-  return true;
-}
-
-static bool pca953x_readable_register(struct device *dev, unsigned int reg) {
-  struct pca953x_chip *chip = dev_get_drvdata(dev);
-  u32 bank;
-
-  bank = PCA953x_BANK_INPUT | PCA953x_BANK_OUTPUT |
-         PCA953x_BANK_POLARITY | PCA953x_BANK_CONFIG;
-
-  if (chip->driver_data & PCA_PCAL) {
-    bank |= PCAL9xxx_BANK_IN_LATCH | PCAL9xxx_BANK_PULL_EN |
-            PCAL9xxx_BANK_PULL_SEL | PCAL9xxx_BANK_IRQ_MASK |
-            PCAL9xxx_BANK_IRQ_STAT;
-  }
-
-  return pca953x_check_register(chip, reg, bank);
-}
-
-static bool pca953x_writeable_register(struct device *dev, unsigned int reg) {
-  struct pca953x_chip *chip = dev_get_drvdata(dev);
-  u32 bank;
-
-  bank = PCA953x_BANK_OUTPUT | PCA953x_BANK_POLARITY |
-         PCA953x_BANK_CONFIG;
-
-  if (chip->driver_data & PCA_PCAL)
-    bank |= PCAL9xxx_BANK_IN_LATCH | PCAL9xxx_BANK_PULL_EN |
-            PCAL9xxx_BANK_PULL_SEL | PCAL9xxx_BANK_IRQ_MASK;
-
-  return pca953x_check_register(chip, reg, bank);
-}
-
-static bool pca953x_volatile_register(struct device *dev, unsigned int reg) {
-  struct pca953x_chip *chip = dev_get_drvdata(dev);
-  u32 bank;
-
-  bank = PCA953x_BANK_INPUT;
-
-  if (chip->driver_data & PCA_PCAL)
-    bank |= PCAL9xxx_BANK_IRQ_STAT;
-
-  return pca953x_check_register(chip, reg, bank);
-}
-
-static const struct regmap_config pca953x_i2c_regmap = {
-    .reg_bits = 8,
-    .val_bits = 8,
-
-    .use_single_read = true,
-    .use_single_write = true,
-
-    .readable_reg = pca953x_readable_register,
-    .writeable_reg = pca953x_writeable_register,
-    .volatile_reg = pca953x_volatile_register,
-
-    .disable_locking = true,
-    .cache_type = REGCACHE_RBTREE,
-    .max_register = 0x7f,
-};
-
-
-static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off) {
-  int bank_shift = pca953x_bank_shift(chip);
-  int addr = (reg & PCAL_GPIO_MASK) << bank_shift;
-  int pinctrl = (reg & PCAL_PINCTRL_MASK) << 1;
-  u8 regaddr = pinctrl | addr | (off / BANK_SZ);
-
-  return regaddr;
-}
-
-static int pca953x_write_regs(struct pca953x_chip *chip, int reg, unsigned long *val) {
-  u8 regaddr = pca953x_recalc_addr(chip, reg, 0);
-  u8 value[MAX_BANK];
-  int i, ret;
-
-  for (i = 0; i < NBANK(chip); i++)
-    value[i] = bitmap_get_value8(val, i * BANK_SZ);
-
-  ret = regmap_bulk_write(chip->regmap, regaddr, value, NBANK(chip));
-  if (ret < 0) {
-    dev_err(&chip->client->dev, "failed writing register\n");
-    return ret;
-  }
-
-  return 0;
-}
-
-static int pca953x_read_regs(struct pca953x_chip *chip, int reg, unsigned long *val) {
-  u8 regaddr = pca953x_recalc_addr(chip, reg, 0);
-  u8 value[MAX_BANK];
-  int i, ret;
-
-  ret = regmap_bulk_read(chip->regmap, regaddr, value, NBANK(chip));
-  if (ret < 0) {
-    dev_err(&chip->client->dev, "failed reading register\n");
-    return ret;
-  }
-
-  for (i = 0; i < NBANK(chip); i++)
-    bitmap_set_value8(val, value[i], i * BANK_SZ);
-
-  return 0;
-}
-
-static int pca953x_gpio_direction_input(struct gpio_chip *gc, unsigned off) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
-  u8 bit = BIT(off % BANK_SZ);
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = regmap_write_bits(chip->regmap, dirreg, bit, bit);
-  mutex_unlock(&chip->i2c_lock);
-  return ret;
-}
-
-static int pca953x_gpio_direction_output(struct gpio_chip *gc,
-                                         unsigned off, int val) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
-  u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off);
-  u8 bit = BIT(off % BANK_SZ);
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  /* set output level */
-  ret = regmap_write_bits(chip->regmap, outreg, bit, val ? bit : 0);
-  if (ret)
-    goto exit;
-
-  /* then direction */
-  ret = regmap_write_bits(chip->regmap, dirreg, bit, 0);
-  exit:
-  mutex_unlock(&chip->i2c_lock);
-  return ret;
-}
-
-static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 inreg = pca953x_recalc_addr(chip, chip->regs->input, off);
-  u8 bit = BIT(off % BANK_SZ);
-  u32 reg_val;
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = regmap_read(chip->regmap, inreg, &reg_val);
-  mutex_unlock(&chip->i2c_lock);
-  if (ret < 0)
-    return ret;
-
-  return !!(reg_val & bit);
-}
-
-static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off);
-  u8 bit = BIT(off % BANK_SZ);
-
-  mutex_lock(&chip->i2c_lock);
-  regmap_write_bits(chip->regmap, outreg, bit, val ? bit : 0);
-  mutex_unlock(&chip->i2c_lock);
-}
-
-static int pca953x_gpio_get_direction(struct gpio_chip *gc, unsigned off) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off);
-  u8 bit = BIT(off % BANK_SZ);
-  u32 reg_val;
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = regmap_read(chip->regmap, dirreg, &reg_val);
-  mutex_unlock(&chip->i2c_lock);
-  if (ret < 0)
-    return ret;
-
-  if (reg_val & bit)
-    return GPIO_LINE_DIRECTION_IN;
-
-  return GPIO_LINE_DIRECTION_OUT;
-}
-
-static int pca953x_gpio_get_multiple(struct gpio_chip *gc,
-                                     unsigned long *mask, unsigned long *bits) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  DECLARE_BITMAP(reg_val, MAX_LINE);
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = pca953x_read_regs(chip, chip->regs->input, reg_val);
-  mutex_unlock(&chip->i2c_lock);
-  if (ret)
-    return ret;
-
-  bitmap_replace(bits, bits, reg_val, mask, gc->ngpio);
-  return 0;
-}
-
-static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
-                                      unsigned long *mask, unsigned long *bits) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  DECLARE_BITMAP(reg_val, MAX_LINE);
-  int ret;
-
-  mutex_lock(&chip->i2c_lock);
-  ret = pca953x_read_regs(chip, chip->regs->output, reg_val);
-  if (ret)
-    goto exit;
-
-  bitmap_replace(reg_val, reg_val, bits, mask, gc->ngpio);
-
-  pca953x_write_regs(chip, chip->regs->output, reg_val);
-  exit:
-  mutex_unlock(&chip->i2c_lock);
-}
-
-static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip,
-                                         unsigned int offset,
-                                         unsigned long config) {
-  u8 pull_en_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_EN, offset);
-  u8 pull_sel_reg = pca953x_recalc_addr(chip, PCAL953X_PULL_SEL, offset);
-  u8 bit = BIT(offset % BANK_SZ);
-  int ret;
-
-  /*
-   * pull-up/pull-down configuration requires PCAL extended
-   * registers
-   */
-  if (!(chip->driver_data & PCA_PCAL))
-    return -ENOTSUPP;
-
-  mutex_lock(&chip->i2c_lock);
-
-  /* Configure pull-up/pull-down */
-  if (config == PIN_CONFIG_BIAS_PULL_UP)
-    ret = regmap_write_bits(chip->regmap, pull_sel_reg, bit, bit);
-  else if (config == PIN_CONFIG_BIAS_PULL_DOWN)
-    ret = regmap_write_bits(chip->regmap, pull_sel_reg, bit, 0);
-  else
-    ret = 0;
-  if (ret)
-    goto exit;
-
-  /* Disable/Enable pull-up/pull-down */
-  if (config == PIN_CONFIG_BIAS_DISABLE)
-    ret = regmap_write_bits(chip->regmap, pull_en_reg, bit, 0);
-  else
-    ret = regmap_write_bits(chip->regmap, pull_en_reg, bit, bit);
-
-  exit:
-  mutex_unlock(&chip->i2c_lock);
-  return ret;
-}
-
-static int pca953x_gpio_set_config(struct gpio_chip *gc, unsigned int offset,
-                                   unsigned long config) {
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-
-  switch (pinconf_to_config_param(config)) {
-    case PIN_CONFIG_BIAS_PULL_UP:
-    case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:
-    case PIN_CONFIG_BIAS_PULL_DOWN:
-    case PIN_CONFIG_BIAS_DISABLE:
-      return pca953x_gpio_set_pull_up_down(chip, offset, config);
-    default:
-      return -ENOTSUPP;
-  }
-}
-
-static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios) {
-  struct gpio_chip *gc;
-
-  gc = &chip->gpio_chip;
-
-  gc->direction_input = pca953x_gpio_direction_input;
-  gc->direction_output = pca953x_gpio_direction_output;
-  gc->get = pca953x_gpio_get_value;
-  gc->set = pca953x_gpio_set_value;
-  gc->get_direction = pca953x_gpio_get_direction;
-  gc->get_multiple = pca953x_gpio_get_multiple;
-  gc->set_multiple = pca953x_gpio_set_multiple;
-  gc->set_config = pca953x_gpio_set_config;
-  gc->can_sleep = true;
-
-  gc->base = chip->gpio_start;
-  gc->ngpio = gpios;
-  gc->label = dev_name(&chip->client->dev);
-  gc->parent = &chip->client->dev;
-  gc->owner = THIS_MODULE;
-  gc->names = chip->names;
-}
-
-static void pca953x_irq_mask(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  irq_hw_number_t hwirq = irqd_to_hwirq(d);
-
-  clear_bit(hwirq, chip->irq_mask);
-}
-
-static void pca953x_irq_unmask(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  irq_hw_number_t hwirq = irqd_to_hwirq(d);
-
-  set_bit(hwirq, chip->irq_mask);
-}
-
-static int pca953x_irq_set_wake(struct irq_data *d, unsigned int on) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-
-  if (on)
-    atomic_inc(&chip->wakeup_path);
-  else
-    atomic_dec(&chip->wakeup_path);
-
-  return irq_set_irq_wake(chip->client->irq, on);
-}
-
-static void pca953x_irq_bus_lock(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-
-  mutex_lock(&chip->irq_lock);
-}
-
-static void pca953x_irq_bus_sync_unlock(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  DECLARE_BITMAP(irq_mask, MAX_LINE);
-  DECLARE_BITMAP(reg_direction, MAX_LINE);
-  int level;
-
-  if (chip->driver_data & PCA_PCAL) {
-    /* Enable latch on interrupt-enabled inputs */
-    pca953x_write_regs(chip, PCAL953X_IN_LATCH, chip->irq_mask);
-
-    bitmap_complement(irq_mask, chip->irq_mask, gc->ngpio);
-
-    /* Unmask enabled interrupts */
-    pca953x_write_regs(chip, PCAL953X_INT_MASK, irq_mask);
-  }
-
-  /* Switch direction to input if needed */
-  pca953x_read_regs(chip, chip->regs->direction, reg_direction);
-
-  bitmap_or(irq_mask, chip->irq_trig_fall, chip->irq_trig_raise, gc->ngpio);
-  bitmap_complement(reg_direction, reg_direction, gc->ngpio);
-  bitmap_and(irq_mask, irq_mask, reg_direction, gc->ngpio);
-
-  /* Look for any newly setup interrupt */
-  for_each_set_bit(level, irq_mask, gc->ngpio)
-  pca953x_gpio_direction_input(&chip->gpio_chip, level);
-
-  mutex_unlock(&chip->irq_lock);
-}
-
-static int pca953x_irq_set_type(struct irq_data *d, unsigned int type) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  irq_hw_number_t hwirq = irqd_to_hwirq(d);
-
-  if (!(type & IRQ_TYPE_EDGE_BOTH)) {
-    dev_err(&chip->client->dev, "irq %d: unsupported type %d\n",
-            d->irq, type);
-    return -EINVAL;
-  }
-
-  assign_bit(hwirq, chip->irq_trig_fall, type & IRQ_TYPE_EDGE_FALLING);
-  assign_bit(hwirq, chip->irq_trig_raise, type & IRQ_TYPE_EDGE_RISING);
-
-  return 0;
-}
-
-static void pca953x_irq_shutdown(struct irq_data *d) {
-  struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-  struct pca953x_chip *chip = gpiochip_get_data(gc);
-  irq_hw_number_t hwirq = irqd_to_hwirq(d);
-
-  clear_bit(hwirq, chip->irq_trig_raise);
-  clear_bit(hwirq, chip->irq_trig_fall);
-}
-
-static bool pca953x_irq_pending(struct pca953x_chip *chip, unsigned long *pending) {
-  struct gpio_chip *gc = &chip->gpio_chip;
-  DECLARE_BITMAP(reg_direction, MAX_LINE);
-  DECLARE_BITMAP(old_stat, MAX_LINE);
-  DECLARE_BITMAP(cur_stat, MAX_LINE);
-  DECLARE_BITMAP(new_stat, MAX_LINE);
-  DECLARE_BITMAP(trigger, MAX_LINE);
-  int ret;
-
-  if (chip->driver_data & PCA_PCAL) {
-    /* Read the current interrupt status from the device */
-    ret = pca953x_read_regs(chip, PCAL953X_INT_STAT, trigger);
-    if (ret)
-      return false;
-
-    /* Check latched inputs and clear interrupt status */
-    ret = pca953x_read_regs(chip, chip->regs->input, cur_stat);
-    if (ret)
-      return false;
-
-    /* Apply filter for rising/falling edge selection */
-    bitmap_replace(new_stat, chip->irq_trig_fall, chip->irq_trig_raise, cur_stat, gc->ngpio);
-
-    bitmap_and(pending, new_stat, trigger, gc->ngpio);
-
-    return !bitmap_empty(pending, gc->ngpio);
-  }
-
-  ret = pca953x_read_regs(chip, chip->regs->input, cur_stat);
-  if (ret)
-    return false;
-
-  /* Remove output pins from the equation */
-  pca953x_read_regs(chip, chip->regs->direction, reg_direction);
-
-  bitmap_copy(old_stat, chip->irq_stat, gc->ngpio);
-
-  bitmap_and(new_stat, cur_stat, reg_direction, gc->ngpio);
-  bitmap_xor(cur_stat, new_stat, old_stat, gc->ngpio);
-  bitmap_and(trigger, cur_stat, chip->irq_mask, gc->ngpio);
-
-  bitmap_copy(chip->irq_stat, new_stat, gc->ngpio);
-
-  if (bitmap_empty(trigger, gc->ngpio))
-    return false;
-
-  bitmap_and(cur_stat, chip->irq_trig_fall, old_stat, gc->ngpio);
-  bitmap_and(old_stat, chip->irq_trig_raise, new_stat, gc->ngpio);
-  bitmap_or(new_stat, old_stat, cur_stat, gc->ngpio);
-  bitmap_and(pending, new_stat, trigger, gc->ngpio);
-
-  return !bitmap_empty(pending, gc->ngpio);
-}
-
-static int process_inputs(struct gpio_chip *gpio_chip);
-
-static struct config {
-  struct gpio_chip *gpio_chip_0;
-  struct gpio_chip *gpio_chip_1;
-  struct gpio_chip *gpio_chip_2;
-  struct task_struct *config_thread;
-  struct task_struct *debounce_thread;
-  struct mutex process_mutex;
-  bool hotkey_patterns;
-  bool disable_credit_on_hk_btn1;
-  uint buttons_on_jamma;
-} jamma_config;
-
-static irqreturn_t pca953x_irq_handler(int irq, void *devid) {
-
-  struct pca953x_chip *chip = (struct pca953x_chip *)devid;
-  if(&chip->gpio_chip == jamma_config.gpio_chip_0){
-    DEBUG && printk(KERN_INFO
-    "recalboxrgbjamma: IRQ triggered on chip 0\n");
-    process_inputs(jamma_config.gpio_chip_0);
-  } else if(&chip->gpio_chip == jamma_config.gpio_chip_1){
-    DEBUG && printk(KERN_INFO
-    "recalboxrgbjamma: IRQ triggered on chip 1\n");
-    process_inputs(jamma_config.gpio_chip_1);
-  } else {
-    DEBUG && printk(KERN_INFO
-    "recalboxrgbjamma: IRQ triggered on chip 2\n");
-    process_inputs(jamma_config.gpio_chip_2);
-  }
-
-  return IRQ_RETVAL(1);
-}
-
-static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base) {
-  struct i2c_client *client = chip->client;
-  struct irq_chip *irq_chip = &chip->irq_chip;
-  DECLARE_BITMAP(reg_direction, MAX_LINE);
-  DECLARE_BITMAP(irq_stat, MAX_LINE);
-  struct gpio_irq_chip *girq;
-  int ret;
-
-  printk(KERN_INFO
-  "recalboxrgbjamma: setting IRQ\n");
-
-  if (!client->irq)
-    return 0;
-
-  if (irq_base == -1)
-    return 0;
-
-  if (!(chip->driver_data & PCA_INT))
-    return 0;
-
-  ret = pca953x_read_regs(chip, chip->regs->input, irq_stat);
-  if (ret)
-    return ret;
-
-  /*
-   * There is no way to know which GPIO line generated the
-   * interrupt.  We have to rely on the previous read for
-   * this purpose.
-   */
-  pca953x_read_regs(chip, chip->regs->direction, reg_direction);
-  bitmap_and(chip->irq_stat, irq_stat, reg_direction, chip->gpio_chip.ngpio);
-  mutex_init(&chip->irq_lock);
-
-  irq_chip->name = dev_name(&client->dev);
-  irq_chip->irq_mask = pca953x_irq_mask;
-  irq_chip->irq_unmask = pca953x_irq_unmask;
-  irq_chip->irq_set_wake = pca953x_irq_set_wake;
-  irq_chip->irq_bus_lock = pca953x_irq_bus_lock;
-  irq_chip->irq_bus_sync_unlock = pca953x_irq_bus_sync_unlock;
-  irq_chip->irq_set_type = pca953x_irq_set_type;
-  irq_chip->irq_shutdown = pca953x_irq_shutdown;
-
-  girq = &chip->gpio_chip.irq;
-  girq->chip = irq_chip;
-  /* This will let us handle the parent IRQ in the driver */
-  girq->parent_handler = NULL;
-  girq->num_parents = 0;
-  girq->parents = NULL;
-  girq->default_type = IRQ_TYPE_NONE;
-  girq->handler = handle_simple_irq;
-  girq->threaded = true;
-  girq->first = irq_base; /* FIXME: get rid of this */
-
-  ret = devm_request_threaded_irq(&client->dev, client->irq,
-                                  NULL, pca953x_irq_handler,
-                                  IRQF_ONESHOT | IRQF_SHARED,
-                                  dev_name(&client->dev), chip);
-  if (ret) {
-    dev_err(&client->dev, "failed to request irq %d\n",
-            client->irq);
-    return ret;
-  }
-
-  return 0;
-}
-
-static int device_pca95xx_init(struct pca953x_chip *chip, u32 invert) {
-  DECLARE_BITMAP(val, MAX_LINE);
-  u8 regaddr;
-  int ret;
-
-  regaddr = pca953x_recalc_addr(chip, chip->regs->output, 0);
-  ret = regcache_sync_region(chip->regmap, regaddr,
-                             regaddr + NBANK(chip) - 1);
-  if (ret)
-    goto out;
-
-  regaddr = pca953x_recalc_addr(chip, chip->regs->direction, 0);
-  ret = regcache_sync_region(chip->regmap, regaddr,
-                             regaddr + NBANK(chip) - 1);
-  if (ret)
-    goto out;
-
-  /* set platform specific polarity inversion */
-  if (invert)
-    bitmap_fill(val, MAX_LINE);
-  else
-    bitmap_zero(val, MAX_LINE);
-
-  ret = pca953x_write_regs(chip, chip->regs->invert, val);
-  out:
-  return ret;
-}
-
-
-/*
- * A,B,X,Y are in SNES notation
- *
- * Chip 0 : address = 0x25
- *                                    __________
- *   P1K-B4 (P1-X)       IO0-0  <--- |0        8| ---> IO1-0  P1-B4    (P1-X)
- *   P1K-B5 (P1-L)       IO0-1  <--- |1        9| ---> IO1-1  P2-B4    (P2-X)
- *   P1K-B6 (P1-R)       IO0-2  <--- |2       10| ---> IO1-2  P1-B5    (P1-L)
- *   P2-B6  (P2-R)       IO0-3  <--- |3       11| ---> IO1-3  P2-B5    (P2-L)
- *   P1-B6  (P1-R)       IO0-4  <--- |4       12| ---> IO1-4  P3K-B3   (P3-Y)
- *   P2K-B4 (P2-X)       IO0-5  <--- |5       13| ---> IO1-5  P3K-LOCK (P3-LOCK)
- *   P2K-B5 (P2-L)       IO0-6  <--- |6       14| ---> IO1-6  P3K-START
- *   P2K-B5 (P2-R)       IO0-7  <--- |7       15| ---> IO1-7  P3K-UP
- *                                    ‾‾‾‾‾‾‾‾‾‾
- * Chip 1 : address = 0x24
- *                                    __________
- *   P4K-RIGHT           IO0-0  <--- |16      24| ---> IO1-0  P1-B3 (P1-Y)
- *   P4K-LEFT            IO0-1  <--- |17      25| ---> IO1-1  P2-B3 (P2-Y)
- *   P4K-DOWN            IO0-2  <--- |18      26| ---> IO1-2  P1-B2
- *   P4K-B1              IO0-3  <--- |19      27| ---> IO1-3  P2-B2
- *   P4K-B3              IO0-4  <--- |20      28| ---> IO1-4  P4K-LOCK
- *   P4K-B4              IO0-5  <--- |21      29| ---> IO1-5  P4K-UP
- *   P4K-B2              IO0-6  <--- |22      30| ---> IO1-6  P4K-START
- *   P3K-B4              IO0-7  <--- |23      31| ---> IO1-7  P4K-COIN
- *                                    ‾‾‾‾‾‾‾‾‾‾
- *                                    ‾‾‾‾‾‾‾‾‾‾
- * Chip 3 : address = 0x28
- *                                    __________
- *   P2-B1               IO0-0  <--- |32      40| ---> IO1-0  P2-UP
- *   P1-B1               IO0-1  <--- |33      41| ---> IO1-1  P1-UP
- *   P1-DOWN             IO0-2  <--- |34      42| ---> IO1-2  P2-START
- *   P2-DOWN             IO0-3  <--- |35      43| ---> IO1-3  P1-START
- *   P1-LEFT             IO0-4  <--- |36      44| ---> IO1-4  P2-COIN
- *   P2-LEFT             IO0-5  <--- |37      45| ---> IO1-5  P1-COIN
- *   P1-RIGHT            IO0-6  <--- |38      46| ---> IO1-6  TEST
- *   P2-RIGHT            IO0-7  <--- |39      47| ---> IO1-7  SERVICE
- *                                    ‾‾‾‾‾‾‾‾‾‾
- *
- */
-
-#define TOTAL_PLAYERS 2
-
-struct input_dev *player_devs[TOTAL_PLAYERS];
-
-// Standard buttons mapping
-#define BTN_PER_PLAYER 11
-#define BTN_PER_PLAYER_ON_JAMMA 10
-#define TOTAL_GPIO_ON_PCA 48
-
-// Keep in mind the vanilla mapping for Recalbox RGB Jamma is (SNES notation):
-// B A Y
-// X L R
-// We use this mapping to get B and A on first line, whatever the number of buttons
-// Keep also in mind that the A is SOUTH and B is EAST (they are switched) on Linux notation, and that NORTH and WEST are also reversed in auto mapping...
-//
-static const unsigned int buttons_codes[BTN_PER_PLAYER] = {
-    BTN_A,          //  JAMMA_BTN_1
-    BTN_B,          //  JAMMA_BTN_2
-    BTN_X,          //  JAMMA_BTN_3
-    BTN_Y,          //  JAMMA_BTN_4
-    BTN_TL,         //  JAMMA_BTN_5
-    BTN_TR,         //  JAMMA_BTN_6
-    BTN_START,      //  JAMMA_BTN_START
-    BTN_SELECT,     //  JAMMA_BTN_COIN
-    BTN_THUMBL,     //  JAMMA_BTN_SERVICE
-    BTN_THUMBR,     //  JAMMA_BTN_TEST
-    BTN_MODE,       // BTN_HOTKEY
-};
-
-#define JAMMA_BTN_1 0
-#define JAMMA_BTN_2 1
-#define JAMMA_BTN_3 2
-#define JAMMA_BTN_4 3
-#define JAMMA_BTN_5 4
-#define JAMMA_BTN_6 5
-#define JAMMA_BTN_START 6
-#define JAMMA_BTN_COIN 7
-#define JAMMA_BTN_SERVICE 8
-#define JAMMA_BTN_TEST 9
-#define BTN_HOTKEY 10
-
-// Games buttons are from 0 to 5 in buttons codes
-#define LAST_GAME_BUTTON 5
-
-
-#define PLAYER1 0
-#define PLAYER2 1
-#define JAMMA_BTNS 0
-#define KICK_BTNS 1
-
-static const int buttons_bits[2][2][BTN_PER_PLAYER_ON_JAMMA] = {
-  // Player 1
-  {
-    // The value is the bit of the data containing the
-    // information for the button at the same index in buttons_codes array
-    // Start is a special case
-    {33, 26, 24, 8, 10, 4, -1, 45, 47, 46,},
-    // Kick harness buttons mapping
-    // Only use values where >= 0
-    {-1, -1, -1, 0, 1, 2, -1, -1, -1, -1,},
-  },
-  // Player 2
-  {
-    {32, 27, 25, 9, 11, 3, 42, 44, -1, -1,},
-    {-1, -1, -1, 5, 6, 7, -1, -1, -1, -1,},
-  }
-};
-
-#define P1_START 43
-#define P1_BTN1 buttons_bits[PLAYER1][JAMMA_BTNS][JAMMA_BTN_1]
-#define P2_BTN1 buttons_bits[PLAYER2][JAMMA_BTNS][JAMMA_BTN_1]
-
-#define DIR_UP 0
-#define DIR_DOWN 1
-#define DIR_LEFT 2
-#define DIR_RIGHT 3
-
-static const int direction_bits[2][4]= {
-  // Player 1
-    {41,34,36,38},
-    {40,35,37,39},
-};
-
-
-
-// Logic is not the same for each buttons (coins and service/test are reversed)
-// TODO: add service and test for next version
-static unsigned short buttonsReleasedValues[TOTAL_GPIO_ON_PCA] = {
-    1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1
-};
-
-
-
-#define PRESSED(data, btn) ((btn) != -1 ? (((data >> (btn)) & 1)^(buttonsReleasedValues[btn])) : 0)
-#define WAIT_SYNC() usleep_range(50000,80000);
-//Exit delay (HK + START) set to 2 secondes
-#define EXIT_DELAY(now, start) ((now - start) / 1000000000UL >= 2)
-//HK delay set to 1 second
-#define HOTKEY_DELAY(now, start) ((now - start) / 1000000000UL >= 1)
-static long long int last_start_press = 0;
-static unsigned long start_state = 0;
-static unsigned int start_credit = 0;
-static short can_exit = 0;
-static short should_release_hk = 0;
-
-#define PRESS_AND_SYNC(player, button) input_report_key(player_devs[(player)], (button), 1); input_sync(player_devs[(player)]); WAIT_SYNC();
-#define RELEASE_AND_SYNC(player, button) input_report_key(player_devs[(player)], (button), 0); input_sync(player_devs[(player)]); WAIT_SYNC();
-
-
-/**
- *
- * @param data_chips the data read from both chips
- * The right 16 bits are for the chip 1, left 16 bits for the chip 0
- */
-static void input_report(unsigned long long *data_chips, long long int *time_ns) {
-  int player, buttonIndex, buttonValue;
-
-  if (jamma_config.hotkey_patterns) {
-    // Special case for HOTKEY:
-    // Simple press + release of START -> START event
-    // Simple press of START + BTN1 -> send SELECT (COIN)
-    // Simple press of START + an other button -> send HOTKEY + BUTTON
-    // Long press (3s) of START -> HOTKEY + START
-
-    if (PRESSED(*data_chips, P1_START)) {
-      DEBUG && printk(KERN_INFO
-      "recalboxrgbjamma: start is pressed\n");
-      if (last_start_press == 0) {
-        // First press
-        DEBUG && printk(KERN_INFO
-        "recalboxrgbjamma: saving first press\n");
-        last_start_press = *time_ns;
-        start_state = *data_chips;
-        can_exit = 1;
-        start_credit = 0;
-      } else {
-        DEBUG && printk(KERN_INFO
-        "recalboxrgbjamma: startstate=%u data_chips=%u different=%d B1=%d\n", start_state, *data_chips, start_state !=
-                                                                                                       *data_chips,
-            PRESSED(
-                *data_chips,
-                P1_BTN1));
-        if (start_state != *data_chips /*&& !start_credit*/) {
-          // If we can use START + BTN1 for a credit
-          if (!jamma_config.disable_credit_on_hk_btn1 && PRESSED(*data_chips, P1_BTN1)) {
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: credit (SELECT) triggered (hk+P1_BTN1) B1=%u\n", PRESSED(*data_chips, P1_BTN1));
-            PRESS_AND_SYNC(PLAYER1, BTN_SELECT);
-            RELEASE_AND_SYNC(PLAYER1, BTN_SELECT);
-            start_credit = 1;
-            can_exit = 0;
-          } if (!jamma_config.disable_credit_on_hk_btn1 && PRESSED(*data_chips, P2_BTN1)) {
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: credit (SELECT) triggered (hk+P2_BTN1) B1=%u\n", PRESSED(*data_chips, P1_BTN1));
-            PRESS_AND_SYNC(PLAYER2, BTN_SELECT);
-            RELEASE_AND_SYNC(PLAYER2, BTN_SELECT);
-            start_credit = 1;
-            can_exit = 0;
-          } else if (!start_credit && !should_release_hk) {
-            // As another button has been pressed, we press hotkey before
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: other button press (hk+x)\n");
-            PRESS_AND_SYNC(PLAYER1, BTN_MODE);
-            can_exit = 0;
-            should_release_hk = 1;
-          }
-        }
-        start_state = *data_chips;
-
-      }
-    } else {
-      if (last_start_press != 0) {
-        // Start released
-        if (!start_credit) {
-          DEBUG && printk(KERN_INFO
-          "recalboxrgbjamma: start released\n");
-          if (should_release_hk) {
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: release hotkey\n");
-            should_release_hk = 0;
-            RELEASE_AND_SYNC(PLAYER1, BTN_MODE);
-          } else if (can_exit && EXIT_DELAY(*time_ns, last_start_press)) {
-            // Longest press, so we send both HK + START
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: long press : sending HK + START\n");
-            PRESS_AND_SYNC(PLAYER1, BTN_MODE);
-            PRESS_AND_SYNC(PLAYER1, BTN_START);
-            RELEASE_AND_SYNC(PLAYER1, BTN_START);
-            RELEASE_AND_SYNC(PLAYER1, BTN_MODE);
-          } else if (HOTKEY_DELAY(*time_ns, last_start_press)) {
-            // Long press, so we send HK
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: middle press : sending HK\n");
-            PRESS_AND_SYNC(PLAYER1, BTN_MODE);
-            RELEASE_AND_SYNC(PLAYER1, BTN_MODE);
-          } else {
-            // Simple start
-            DEBUG && printk(KERN_INFO
-            "recalboxrgbjamma: quick press : sending START\n");
-            PRESS_AND_SYNC(PLAYER1, BTN_START);
-            RELEASE_AND_SYNC(PLAYER1, BTN_START);
-          }
-        } else {
-          // Start have been released after a credit
-          start_credit = 0;
-        }
-        last_start_press = 0;
-      }
-    }
-  } else {
-    // Standard start
-    input_report_key(player_devs[PLAYER1], BTN_START, PRESSED(*data_chips, P1_START));
-  }
-
-  for(player = 0; player < TOTAL_PLAYERS; player++){
-    // Only process P1 if start + credit is not running
-    if (player > PLAYER1 || !start_credit) {
-      input_report_abs(player_devs[player], ABS_Y, PRESSED(*data_chips, direction_bits[player][DIR_DOWN]) - PRESSED(*data_chips, direction_bits[player][DIR_UP]));
-      input_report_abs(player_devs[player], ABS_X, PRESSED(*data_chips, direction_bits[player][DIR_RIGHT]) - PRESSED(*data_chips, direction_bits[player][DIR_LEFT]));
-
-      for (buttonIndex = 0; buttonIndex < BTN_PER_PLAYER_ON_JAMMA; buttonIndex++) {
-        // If we are on a game button that is not on jamma (because user config)
-        // then we use kickharness
-        if ((buttonIndex <= LAST_GAME_BUTTON && buttonIndex >= jamma_config.buttons_on_jamma)) {
-          buttonValue = PRESSED(*data_chips, buttons_bits[player][KICK_BTNS][buttonIndex]);
-          /* DEBUG && printk(KERN_INFO "recalboxrgbjamma: sending report P1 for key bit:%d, inputcode:%d, value : %d\n", player1_kick_btn_bits[j],
-             buttons_codes[j], PRESSED(data_chips, player1_kick_btn_bits[j]));*/
-        } else {
-          // let's read on both inputs
-          buttonValue = PRESSED(*data_chips, buttons_bits[player][JAMMA_BTNS][buttonIndex]) | PRESSED(*data_chips, buttons_bits[player][KICK_BTNS][buttonIndex]);
-        }
-        input_report_key(player_devs[player], buttons_codes[buttonIndex], buttonValue);
-      }
-      input_sync(player_devs[player]);
-    }
-  }
-}
-
-static unsigned long lastGpioState = 0;
-static unsigned long debounceGpioValue = 0;
-static long long int lastActionOn[TOTAL_GPIO_ON_PCA] = {0};
-
-#define SETGPIO(data_addr, gpio, value) (*(data_addr) = ((*(data_addr) & (~(1UL << (gpio)))) | ((value) << (gpio))))
-
-static int debounce(unsigned long long *data_chips, unsigned long long *debounced_data, long long int *time_ns) {
-  unsigned long gpioVal;
-  *debounced_data = *data_chips;
-  unsigned int gpio;
-  for (gpio = 0; gpio < TOTAL_GPIO_ON_PCA; gpio++) {
-    if (lastActionOn[gpio] != 0) {
-      // We are in debounce time lap
-      // We cancel this event by setting the saved value at debounce start
-      DEBUG && printk(KERN_INFO
-      "recalboxrgbjamma: debouncing: setting gpio %d value to %d (%s) in place of %d\n", gpio,
-          (debounceGpioValue >> gpio) &
-          1, ((debounceGpioValue >> gpio) & 1) ? "released" : "pressed", gpioVal);
-      SETGPIO(debounced_data, gpio, (debounceGpioValue >> gpio) & 1);
-    } else {
-      gpioVal = (((*data_chips) >> gpio) & 1);
-      if (((lastGpioState >> gpio) & 1) != gpioVal) {
-        // Gpio changed its state since last event
-        // We set the start time for debounce and the value of the gpio
-        lastActionOn[gpio] = *time_ns;
-        // Saving the value that will be still during the debounce
-        DEBUG && printk(KERN_INFO
-        "recalboxrgbjamma: debouncing: first event of gpio %d, setting debounced value to %d \n", gpio, gpioVal);
-        SETGPIO(&debounceGpioValue, gpio, gpioVal);
-      }
-    }
-  }
-  lastGpioState = *data_chips;
-  return 0;
-}
-static const unsigned long mask = 0xFFFF;
-
-static int read_gpios(unsigned long long *gpio_data) {
-  unsigned long gpio_values0 = 0;
-  unsigned long gpio_values1 = 0;
-  unsigned long gpio_values2 = 0;
-  if (jamma_config.gpio_chip_0 != NULL) {
-    if (pca953x_gpio_get_multiple(jamma_config.gpio_chip_0, &mask, &gpio_values0)) {
-      printk(KERN_INFO
-      "recalboxrgbjamma: unable to read gpio on chip 0, skipping\n");
-      return -1;
-    };
-  }
-  if (jamma_config.gpio_chip_1 != NULL) {
-    if (pca953x_gpio_get_multiple(jamma_config.gpio_chip_1, &mask, &gpio_values1)) {
-      printk(KERN_INFO
-      "recalboxrgbjamma: unable to read gpio chip 1, skipping\n");
-      return -1;
-    }
-  }
-  if (jamma_config.gpio_chip_2 != NULL) {
-    if (pca953x_gpio_get_multiple(jamma_config.gpio_chip_2, &mask, &gpio_values2)) {
-      printk(KERN_INFO
-      "recalboxrgbjamma: unable to read gpio chip 2, skipping\n");
-      return -1;
-    }
-  }
-  *gpio_data = (gpio_values2 << 32) | (gpio_values1 << 16) | gpio_values0;
-  return 0;
-}
-
-static int read_gpios_one_chip(unsigned long *gpio_data, struct gpio_chip *gpio_chip) {
-  if (pca953x_gpio_get_multiple(gpio_chip, &mask, gpio_data)) {
-    printk(KERN_INFO
-    "recalboxrgbjamma: unable to read gpio on chip %s, skipping\n", gpio_chip == jamma_config.gpio_chip_0 ? "0":(gpio_chip == jamma_config.gpio_chip_1 ? "1" : "2"));
-    return -1;
-  };
-  return 0;
-}
-
-
-// Debounce to 40ms
-#define DEBOUNCE_TIME (40000000)
-
-static unsigned long long gpio_data = 0;
-
-static int process_inputs(struct gpio_chip *gpio_chip) {
-  unsigned long long debounced_data = 0;
-  unsigned long gpio_data_chip = 0;
-  long long int time_start = ktime_to_ns(ktime_get_boottime());
-  mutex_lock(&jamma_config.process_mutex);
-
-  if(gpio_chip != NULL) {
-    if (read_gpios_one_chip(&gpio_data_chip, gpio_chip)) {
-      mutex_unlock(&jamma_config.process_mutex);
-      return -1;
-    }
-    DEBUG && printk(KERN_INFO
-    "recalboxrgbjamma: read gpio values on chip : %u\n", gpio_data_chip);
-    if(gpio_chip == jamma_config.gpio_chip_0){
-      gpio_data = ((gpio_data & 0xFFFFFFFF0000) | gpio_data_chip);
-    } else if(gpio_chip == jamma_config.gpio_chip_1) {
-      gpio_data = ((gpio_data & 0xFFFF0000FFFF) | (gpio_data_chip << 16));
-    } else if(gpio_chip == jamma_config.gpio_chip_2) {
-      gpio_data = ((gpio_data & 0x0000FFFFFFFF) | (gpio_data_chip << 32));
-    }
-
-    DEBUG && printk(KERN_INFO
-    "recalboxrgbjamma: gpio_data = %u\n", gpio_data);
-  } else {
-    if (read_gpios(&gpio_data)) {
-      mutex_unlock(&jamma_config.process_mutex);
-      return -1;
-    }
-  }
-
-  debounce(&gpio_data, &debounced_data, &time_start);
-  input_report(&debounced_data, &time_start);
-  mutex_unlock(&jamma_config.process_mutex);
-  return 0;
-}
-
-static int process_debounce(void *idx) {
-  unsigned int gpio;
-  long long int time_ns;
-  bool sendEvent;
-
-  while (!kthread_should_stop()) {
-    time_ns = ktime_to_ns(ktime_get_boottime());
-    sendEvent = false;
-    for (gpio = 0; gpio < TOTAL_GPIO_ON_PCA; gpio++) {
-      if (lastActionOn[gpio] != 0) {
-        if (time_ns - lastActionOn[gpio] > DEBOUNCE_TIME) {
-          // This gpio must be debounced
-          DEBUG && printk(KERN_INFO
-          "recalboxrgbjamma: debouncing thread: finish debouncing of %d\n", gpio);
-          sendEvent = 1;
-          lastActionOn[gpio] = 0;
-        }
-      }
-    }
-    if (sendEvent) {
-      // Maybe we should not debounce here
-      process_inputs(NULL);
-    }
-    usleep_range(10000, 15000);
-  }
-  return 0;
-}
-
-static int unregister_controllers(void) {
-  int player;
-  for (player = 0; player < TOTAL_PLAYERS; player++) {
-    if (player_devs[player] != NULL)
-      input_unregister_device(player_devs[player]);
-  }
-  return 0;
-}
-
-static const char *controllers_names[2] = {
-    "JammaControllerP1", "JammaControllerP2"
-};
-
-static int register_controllers(void) {
-  int err = 0, i = 0, player = 0;
-  for (player = 0; player < TOTAL_PLAYERS; player++) {
-    if (!(player_devs[player] = input_allocate_device())) {
-      pr_err("recalboxrgbjamma: not enough memory for input device\n");
-      return -ENOMEM;
-    }
-
-    player_devs[player]->name = controllers_names[player];
-    player_devs[player]->phys = controllers_names[player];
-    player_devs[player]->id.bustype = BUS_I2C;
-    player_devs[player]->id.vendor = 0x7262;
-    player_devs[player]->id.product = 0x0A01;
-    player_devs[player]->id.version = 0x0100;
-
-    player_devs[player]->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-
-    for (i = 0; i < 2; i++)
-      input_set_abs_params(player_devs[player], ABS_X + i, -1, 1, 0, 0);
-    for (i = 0; i < BTN_PER_PLAYER; i++)
-      __set_bit(buttons_codes[i], player_devs[player]->keybit);
-
-    if ((err = input_register_device(player_devs[player]))) {
-      pr_err("recalboxrgbjamma: Cannot register input device\n");
-      input_free_device(player_devs[player]);
-      player_devs[player] = NULL;
-      return -1;
-    }
-  }
-  return 0;
-}
-// Load configuration from recalbox-crt-options.cfg
-// Used to get Hotkey mode
-#define READ_SIZE_MAX 2048
-#define LINE_SIZE_MAX 256
-static char read_buf[READ_SIZE_MAX];
-static const char *config_path = "/boot/crt/recalbox-crt-options.cfg";
-
-static int load_config(void) {
-  struct file *fp = NULL;
-  ssize_t read_size = 0;
-  size_t cursor = 0;
-  char line[LINE_SIZE_MAX];
-  char optionname[LINE_SIZE_MAX];
-  int optionvalue = 0;
-  size_t line_start = 0;
-  size_t line_len = 0;
-  int scanret = 0;
-
-  fp = filp_open(config_path, O_RDONLY, 0);
-  if (IS_ERR(fp) || !fp) {
-    //printk(KERN_INFO "recalboxrgbjamma: config file not found, skipping configuration loading\n");
-    return 0;
-  }
-
-  read_size = kernel_read(fp, &read_buf, READ_SIZE_MAX, &fp->f_pos);
-  if (read_size <= 0) {
-    filp_close(fp, NULL);
-    //printk(KERN_INFO "recalboxrgbjamma: empty config file found, skipping configuration loading\n");
-    return 0;
-  }
-  filp_close(fp, NULL);
-  for (cursor = 0; cursor < read_size; cursor++) {
-    line[cursor - line_start] = read_buf[cursor];
-    line_len++;
-    if (line_len >= LINE_SIZE_MAX || read_buf[cursor] == '\n' || read_buf[cursor] == '\0') {
-      if (line_len > 1 && line[0] != '#') {
-        line[line_len - 1] = '\0';
-        scanret = sscanf(line, "%s = %d", &optionname, &optionvalue);
-        if (scanret == 2) {
-          if (strcmp(optionname, "options.jamma.hk_patterns") == 0) {
-            if (jamma_config.hotkey_patterns != optionvalue) {
-              printk(KERN_INFO
-              "recalboxrgbjamma: switch to %s mode\n",
-                  optionvalue ? "hotkey_patterns" : "enable_hk_on_start");
-              jamma_config.hotkey_patterns = optionvalue;
-            }
-          } else if (strcmp(optionname, "options.jamma.disable_credit_on_hk_btn1") == 0) {
-            if (jamma_config.disable_credit_on_hk_btn1 != optionvalue) {
-              printk(KERN_INFO
-              "recalboxrgbjamma: switch to %s mode\n",
-                  optionvalue ? "disable_credit_on_hk_btn1" : "enable_credit_on_hk_btn1");
-              jamma_config.disable_credit_on_hk_btn1 = optionvalue;
-            }
-          } else if (strcmp(optionname, "options.jamma.buttons_on_jamma") == 0) {
-            if (jamma_config.buttons_on_jamma != optionvalue) {
-              printk(KERN_INFO
-              "recalboxrgbjamma: switch buttons_on_jamma to %d\n",
-                  optionvalue);
-              jamma_config.buttons_on_jamma = optionvalue;
-            }
-          }
-        }
-      }
-      line_start += line_len;
-      line_len = 0;
-      memset(line, 0, 128);
-    }
-  }
-  return 0;
-}
-
-static int watch_configuration(void *idx) {
-  int gpio_value = 0;
-  while (!kthread_should_stop()) {
-    // Read file
-    load_config();
-    // Change switch 3/6 GPIO
-    /*if (jamma_config.switch36_gpio_ref != NULL) {
-      gpio_value = gpiod_get_value(jamma_config.switch36_gpio_ref);
-      if (gpio_value != jamma_config.switch36_gpio_state) {
-        jamma_config.switch36_gpio_state = gpio_value;
-        printk(KERN_INFO
-        "recalboxrgbjamma: switch to %s buttons mode\n", gpio_value ? "6" : "3");
-      }
-    }*/
-    usleep_range(5000000, 10000000);
-  }
-  return 0;
-}
-
-
-
-
-
-static int pca953x_probe(struct i2c_client *client,
-                         const struct i2c_device_id *i2c_id) {
-  struct pca953x_platform_data *pdata;
-  struct pca953x_chip *chip;
-  int irq_base = 0;
-  int ret;
-  int gpio_idx = 0;
-  u32 invert = 0;
-  struct regulator *reg;
-  const struct regmap_config *regmap_config;
-
-  chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
-  if (chip == NULL)
-    return -ENOMEM;
-
-  pdata = dev_get_platdata(&client->dev);
-  if (pdata) {
-    irq_base = pdata->irq_base;
-    chip->gpio_start = pdata->gpio_base;
-    invert = pdata->invert;
-    chip->names = pdata->names;
-  } else {
-    struct gpio_desc *reset_gpio;
-
-    chip->gpio_start = -1;
-    irq_base = 0;
-
-    /*
-     * See if we need to de-assert a reset pin.
-     *
-     * There is no known ACPI-enabled platforms that are
-     * using "reset" GPIO. Otherwise any of those platform
-     * must use _DSD method with corresponding property.
-     */
-    reset_gpio = devm_gpiod_get_optional(&client->dev, "reset",
-                                         GPIOD_OUT_LOW);
-    if (IS_ERR(reset_gpio))
-      return PTR_ERR(reset_gpio);
-  }
-
-  chip->client = client;
-
-  reg = devm_regulator_get(&client->dev, "vcc");
-  if (IS_ERR(reg))
-    return dev_err_probe(&client->dev, PTR_ERR(reg), "reg get err\n");
-
-  ret = regulator_enable(reg);
-  if (ret) {
-    dev_err(&client->dev, "reg en err: %d\n", ret);
-    return ret;
-  }
-  chip->regulator = reg;
-
-  if (i2c_id) {
-    chip->driver_data = i2c_id->driver_data;
-  } else {
-    const void *match;
-
-    match = device_get_match_data(&client->dev);
-    if (!match) {
-      ret = -ENODEV;
-      goto err_exit;
-    }
-
-    chip->driver_data = (uintptr_t) match;
-  }
-
-  i2c_set_clientdata(client, chip);
-
-  pca953x_setup_gpio(chip, chip->driver_data & PCA_GPIO_MASK);
-
-  regmap_config = &pca953x_i2c_regmap;
-
-  chip->regmap = devm_regmap_init_i2c(client, regmap_config);
-  if (IS_ERR(chip->regmap)) {
-    ret = PTR_ERR(chip->regmap);
-    goto err_exit;
-  }
-
-  regcache_mark_dirty(chip->regmap);
-
-  mutex_init(&chip->i2c_lock);
-  /*
-   * In case we have an i2c-mux controlled by a GPIO provided by an
-   * expander using the same driver higher on the device tree, read the
-   * i2c adapter nesting depth and use the retrieved value as lockdep
-   * subclass for chip->i2c_lock.
-   *
-   * REVISIT: This solution is not complete. It protects us from lockdep
-   * false positives when the expander controlling the i2c-mux is on
-   * a different level on the device tree, but not when it's on the same
-   * level on a different branch (in which case the subclass number
-   * would be the same).
-   *
-   * TODO: Once a correct solution is developed, a similar fix should be
-   * applied to all other i2c-controlled GPIO expanders (and potentially
-   * regmap-i2c).
-   */
-  lockdep_set_subclass(&chip->i2c_lock,
-                       i2c_adapter_depth(client->adapter));
-
-  /* initialize cached registers from their original values.
-   * we can't share this chip with another i2c master.
-   */
-
-  chip->regs = &pca953x_regs;
-  ret = device_pca95xx_init(chip, invert);
-  if (ret)
-    goto err_exit;
-
-  ret = pca953x_irq_setup(chip, irq_base);
-  if (ret)
-    goto err_exit;
-
-  ret = devm_gpiochip_add_data(&client->dev, &chip->gpio_chip, chip);
-  if (ret)
-    goto err_exit;
-
-  if (pdata && pdata->setup) {
-    ret = pdata->setup(client, chip->gpio_chip.base,
-                       chip->gpio_chip.ngpio, pdata->context);
-    if (ret < 0) {
-      dev_warn(&client->dev, "setup failed, %d\n", ret);
-      goto err_exit;
-    }
-  }
-  int command_ret;
-  for (gpio_idx = 0; gpio_idx < 16; gpio_idx++) {
-    /*    command_ret = pca953x_gpio_set_config(&chip->gpio_chip, gpio_idx, PIN_CONFIG_BIAS_PULL_UP);
-        if(command_ret != 0) {
-          dev_err(&client->dev, "cannot set pull up for gpio %d on chip %d. error: %d\n", gpio_idx, client->addr, command_ret);
-          goto err_exit;
-        }*/
-    if (pca953x_gpio_direction_input(&chip->gpio_chip, gpio_idx) != 0) {
-      dev_err(&client->dev, "cannot set input for gpio %d on chip %d\n", gpio_idx, client->addr);
-      goto err_exit;
-    }
-  }
-
-  dev_info(&client->dev, "created jamma pca at %d\n", client->addr);
-  if (client->addr == 0x21 || client->addr == 0x20 || client->addr == 0x25) {
-    // Check if button 6 is on gnd, and if it is, we will ignore it
-    jamma_config.gpio_chip_0 = &chip->gpio_chip;
-    if (process_inputs(&chip->gpio_chip) == 0) {
-      if(PRESSED(gpio_data, buttons_bits[PLAYER1][JAMMA_BTNS][JAMMA_BTN_6])){
-        dev_info(&client->dev, "disabled 6th button on jamma for player 1!\n");
-        // Todo remove this logic for btn6 an set output 0
-        buttonsReleasedValues[buttons_bits[PLAYER1][JAMMA_BTNS][JAMMA_BTN_6]] = 0;
-      }
-      if(PRESSED(gpio_data,buttons_bits[PLAYER2][JAMMA_BTNS][JAMMA_BTN_6])){
-        dev_info(&client->dev, "disabled 6th button on jamma for player 2!\n");
-        buttonsReleasedValues[buttons_bits[PLAYER2][JAMMA_BTNS][JAMMA_BTN_6]] = 0;
-      }
-      if(PRESSED(gpio_data, buttons_bits[PLAYER1][JAMMA_BTNS][JAMMA_BTN_SERVICE])){
-        dev_info(&client->dev, "reversing logic for SERVICE button on jamma!\n");
-        buttonsReleasedValues[buttons_bits[PLAYER1][JAMMA_BTNS][JAMMA_BTN_SERVICE]] = 0;
-      }
-      if(PRESSED(gpio_data, buttons_bits[PLAYER1][JAMMA_BTNS][JAMMA_BTN_TEST])){
-        dev_info(&client->dev, "reversing logic for TEST button on jamma!\n");
-        buttonsReleasedValues[buttons_bits[PLAYER1][JAMMA_BTNS][JAMMA_BTN_TEST]] = 0;
-      }
-    }
-  } else if (client->addr == 0x22 || client->addr == 0x24) {
-    jamma_config.gpio_chip_1 = &chip->gpio_chip;
-  } else if (client->addr == 0x27) {
-    jamma_config.gpio_chip_2 = &chip->gpio_chip;
-  }
-
-  process_inputs(NULL);
-  return 0;
-
-  err_exit:
-  regulator_disable(chip->regulator);
-  return ret;
-}
-
-static void pca953x_remove(struct i2c_client *client) {
-  struct pca953x_platform_data *pdata = dev_get_platdata(&client->dev);
-  struct pca953x_chip *chip = i2c_get_clientdata(client);
-
-  if (pdata && pdata->teardown) {
-    pdata->teardown(client, chip->gpio_chip.base,
-                          chip->gpio_chip.ngpio, pdata->context);
-  }
-
-  regulator_disable(chip->regulator);
-}
-
-static const struct of_device_id pca953x_dt_ids[] = {
-  {.compatible = "raspberrypi,recalboxrgbjamma-v3", .data = (void *) (16 | PCA953X_TYPE | PCA_INT),},
-  {}
-};
-
-MODULE_DEVICE_TABLE(of, pca953x_dt_ids
-);
-static SIMPLE_DEV_PM_OPS(pca953x_pm_ops, pca953x_suspend, pca953x_resume
-);
-
-static struct i2c_driver pca953x_driver = {
-  .driver = {
-    .name  = "recalboxrgbjamma-v3",
-    .pm  = &pca953x_pm_ops,
-    .of_match_table = pca953x_dt_ids,
-    .acpi_match_table = pca953x_acpi_ids,
-  },
-  .probe     = pca953x_probe,
-  .remove    = pca953x_remove,
-  .id_table  = pca953x_id,
-};
-
-static int __init
-
-pca953x_init(void) {
-  int idx = 0;
-  jamma_config.gpio_chip_0 = NULL;
-  jamma_config.gpio_chip_1 = NULL;
-  jamma_config.gpio_chip_2 = NULL;
-  jamma_config.hotkey_patterns = true;
-  jamma_config.disable_credit_on_hk_btn1 = false;
-  jamma_config.buttons_on_jamma = 6;
-
-
-  jamma_config.config_thread = kthread_create(watch_configuration, &idx, "kthread_recalboxrgbjamma_cfg");
-  printk(KERN_INFO
-  "recalboxrgbjamma: setting configuration thread\n");
-  if (jamma_config.config_thread != NULL) {
-    wake_up_process(jamma_config.config_thread);
-    printk(KERN_INFO
-    "recalboxrgbjamma: kthread_recalboxrgbjamma_cfg is running\n");
-  } else {
-    printk(KERN_ERR
-    "recalboxrgbjamma: kthread kthread_recalboxrgbjamma_cfg could not be created\n");
-    return -1;
-  }
-
-  jamma_config.debounce_thread = kthread_create(process_debounce, &idx, "kthread_recalboxrgbjamma_debounce");
-  printk(KERN_INFO
-  "recalboxrgbjamma: setting debounce thread\n");
-  if (jamma_config.debounce_thread != NULL) {
-    wake_up_process(jamma_config.debounce_thread);
-    printk(KERN_INFO
-    "recalboxrgbjamma: kthread_recalboxrgbjamma_debounce is running\n");
-  } else {
-    printk(KERN_ERR
-    "recalboxrgbjamma: kthread_recalboxrgbjamma_debounce could not be created\n");
-    return -1;
-  }
-
-  mutex_init(&jamma_config.process_mutex);
-  printk(KERN_INFO
-  "recalboxrgbjamma: registering controllers\n");
-  register_controllers();
-  return i2c_add_driver(&pca953x_driver);
-}
-
-/* register after i2c/ postcore initcall and before
- * subsys initcalls that may rely on these GPIOs
- */
-subsys_initcall(pca953x_init);
-
-static void __exit
-
-pca953x_exit(void) {
-  printk(KERN_INFO
-  "recalboxrgbjamma: exiting\n");
-  if (kthread_stop(jamma_config.config_thread)) {
-    printk("recalboxrgbjamma: can't stop config thread");
-  }
-  if (kthread_stop(jamma_config.debounce_thread)) {
-    printk("recalboxrgbjamma: can't stop debounce thread");
-  }
-  unregister_controllers();
-  i2c_del_driver(&pca953x_driver);
-}
-
-module_exit(pca953x_exit);
-
-MODULE_AUTHOR("eric miao <eric.miao@marvell.com>, digitalLumberjack <digitalLumberjack@recalbox.com>");
-MODULE_DESCRIPTION("Recalbox RGB Jamma controllers driver");
-MODULE_LICENSE("GPL");
\ No newline at end of file
diff --git a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v4-overlay.dts b/projects/recalbox-rgb-jamma/recalboxrgbjamma-v4-overlay.dts
deleted file mode 100644
index 4ffbaa7a9cec88ef94d763978636e0da39abbece..0000000000000000000000000000000000000000
--- a/projects/recalbox-rgb-jamma/recalboxrgbjamma-v4-overlay.dts
+++ /dev/null
@@ -1,197 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
-    fragment@0 {
-        target = <&gpio>;
-        __overlay__ {
-            irq_gpio_11: irq_gpio_11_conf {
-                brcm,pins = <11>; // GPIO 11
-                brcm,function = <0>; // Input
-                brcm,pull = <2>; // Pull up
-            };
-            irq_gpio_10: irq_gpio_10_conf {
-                brcm,pins = <10>; // GPIO 10
-                brcm,function = <0>; // Input
-                brcm,pull = <2>; // Pull up
-            };
-            irq_gpio_0: irq_gpio_0_conf {
-                brcm,pins = <0>; // GPIO 0
-                brcm,function = <0>; // Input
-                brcm,pull = <2>; // Pull up
-            };
-        };
-    };
-
-	fragment@1 {
-		target-path = "/";
-		__overlay__ {
-
-			bridge: recalboxrgbjamma {
-				compatible = "raspberrypi,recalboxrgbdual";
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				vc4-vga666-mode = <6>;
-				recalbox-rgb-jamma = <1>;
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-						vga_bridge_in: endpoint {
-							remote-endpoint = <&dpi_out>;
-						};
-					};
-
-					port@1 {
-						reg = <1>;
-						vga_bridge_out: endpoint {
-							remote-endpoint = <&vga_con_in>;
-						};
-					};
-				};
-			};
-
-			vga {
-				compatible = "vga-connector";
-				port {
-					vga_con_in: endpoint {
-						remote-endpoint = <&vga_bridge_out>;
-					};
-				};
-			};
-		};
-	};
-
-	fragment@2 {
-		target = <&dpi>;
-		__overlay__  {
-			pinctrl-names = "default";
-			pinctrl-0 = <&vga666_mode6_pins>;
-			status = "okay";
-			port {
-				dpi_out: endpoint@0 {
-					remote-endpoint = <&vga_bridge_in>;
-				};
-			};
-		};
-	};
-
-	fragment@4 {
-		target = <&gpio>;
-		__overlay__ {
-			vga666_mode6_pins: vga666_mode6_pins {
-				brcm,pins = <1
-				      4  5  6  7  8  9
-				      12 13 14 15 16 17
-				      20 21 22 23 24 25>;
-				brcm,function = <6>;
-				brcm,pull = <0>;
-			};
-		};
-	};
-
-    fragment@5 {
-        target = <&audio_pins>;
-            __overlay__ {
-                brcm,pins = < 18 19 >;
-                brcm,function = < 2 >; /* alt5 alt5 */
-                swap_lr;
-            };
-    };
-
-    fragment@6 {
-        target = <&chosen>;
-        __overlay__  {
-            bootargs = "snd_bcm2835.enable_headphones=1";
-        };
-    };
-
-  fragment@8 {
-    target = <&i2c1>;
-    __overlay__ {
-      status = "okay";
-      pinctrl-names = "default";
-      pinctrl-0 = <&i2c1_pins>;
-      clock-frequency = <400000>;
-      read-timeout-ms = <50>;
-      jammactrl_0: jammactrl_0@25 {
-        compatible = "raspberrypi,recalboxrgbjamma";
-        reg = <0x25>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_11>;
-        interrupt-parent = <&gpio>;
-        interrupts = <11 2>;
-        irq-gpios = <&gpio 11 0>;
-      };
-      jammactrl_1: jammactrl_1@24 {
-        compatible = "raspberrypi,recalboxrgbjamma";
-        reg = <0x24>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_10>;
-        interrupt-parent = <&gpio>;
-        interrupts = <10 2>;
-        irq-gpios = <&gpio 10 0>;
-      };
-      jammactrl_2: jammactrl_2@27 {
-        compatible = "raspberrypi,recalboxrgbjamma";
-        reg = <0x27>;
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&irq_gpio_0>;
-        interrupt-parent = <&gpio>;
-        interrupts = <0 2>;
-        irq-gpios = <&gpio 0 0>;
-      };
-      jammaexpander: jammaexpander@26 {
-        compatible = "raspberrypi,recalboxrgbjamma";
-        reg = <0x26>;
-        status = "okay";
-      };
-    };
-  };
-
-  fragment@9 {
-		target = <&i2c1_pins>;
-		__overlay__ {
-			brcm,pins = <2 3>;
-		};
-	};
-
-  fragment@10 {
-    target-path = "/";
-    __overlay__ {
-      fan0: gpio-fan@0 {
-        compatible = "gpio-fan";
-        gpios = <&gpio 26 0>;
-        gpio-fan,speed-map = <0 0>,<5000 1>;
-        #cooling-cells = <2>;
-      };
-    };
-  };
-
-  fragment@11 {
-    target = <&cpu_thermal>;
-    polling-delay = <5000>;	/* milliseconds */
-    __overlay__ {
-      trips {
-        cpu_hot: trip-point@0 {
-          temperature = <60000>;	/* (millicelsius) Fan started at 60°C */
-          hysteresis = <10000>;	    /* (millicelsius) Fan stopped at 50°C */
-          type = "active";
-        };
-      };
-      cooling-maps {
-        map0 {
-          trip = <&cpu_hot>;
-          cooling-device = <&fan0 1 1>;
-        };
-      };
-    };
-  };
-};
diff --git a/projects/recalbox-rgb-jamma/recalboxrgbjamma.c b/projects/recalbox-rgb-jamma/recalboxrgbjamma.c
index 317d914737fab7d92f069caa121f9d4303ec29f0..037e2c1d5b8b1b57e2d3f0cb35d613554ce169b9 100644
--- a/projects/recalbox-rgb-jamma/recalboxrgbjamma.c
+++ b/projects/recalbox-rgb-jamma/recalboxrgbjamma.c
@@ -860,19 +860,19 @@ struct input_dev *player_devs[MAX_PLAYERS];
 // Keep also in mind that the A is SOUTH and B is EAST (they are switched) on Linux notation, and that NORTH and WEST are also reversed in auto mapping...
 //
 static const unsigned int buttons_codes[BTN_PER_PLAYER] = {
-    BTN_A,              //  JAMMA_BTN_1
-    BTN_B,              //  JAMMA_BTN_2
-    BTN_X,              //  JAMMA_BTN_3
-    BTN_Y,              //  JAMMA_BTN_4
-    BTN_TL,             //  JAMMA_BTN_5
-    BTN_TR,             //  JAMMA_BTN_6
-    BTN_START,          //  JAMMA_BTN_START
-    BTN_SELECT,         //  JAMMA_BTN_COIN
-    BTN_THUMBL,         //  JAMMA_BTN_SERVICE
-    BTN_THUMBR,         //  JAMMA_BTN_TEST
-    BTN_MODE,           //  BTN_HOTKEY
-    KEY_VOLUMEUP,       //  VOLUME_UP
-    KEY_VOLUMEDOWN,     //  VOLUME_DOWN
+    BTN_A,         //  JAMMA_BTN_1
+    BTN_B,         //  JAMMA_BTN_2
+    BTN_X,         //  JAMMA_BTN_3
+    BTN_Y,         //  JAMMA_BTN_4
+    BTN_TL,        //  JAMMA_BTN_5
+    BTN_TR,        //  JAMMA_BTN_6
+    BTN_START,     //  JAMMA_BTN_START
+    BTN_SELECT,    //  JAMMA_BTN_COIN
+    BTN_THUMBL,    //  JAMMA_BTN_SERVICE
+    BTN_THUMBR,    //  JAMMA_BTN_TEST
+    BTN_MODE,      //  BTN_HOTKEY
+    KEY_VOLUMEUP,  //  VOLUME_UP
+    KEY_VOLUMEDOWN,//  VOLUME_DOWN
 };
 
 #define JAMMA_BTN_1 0
@@ -1057,7 +1057,7 @@ void manage_special_inputs(unsigned long long *data_chips, long long int *time_n
         for (int direction = DIR_UP; direction <= DIR_DOWN; direction++) {
           if (PRESSED(*data_chips, direction_bits[player][direction])) {
             // Volume (UP/DOWN)
-            if(direction == DIR_UP) {
+            if (direction == DIR_UP) {
               printk(KERN_INFO "recalboxrgbjamma: VOLUME UP\n");
               PRESS_AND_RELEASE(player, buttons_codes[VOLUME_UP]);
               should_release_start = 0;
@@ -1319,8 +1319,8 @@ static int process_inputs(struct gpio_chip *gpio_chip) {
   long long int time_start = ktime_to_ns(ktime_get_boottime());
   DEBUG &&printk(KERN_INFO "recalboxrgbjamma: locking mutex\n");
   mutex_lock(&jamma_config.process_mutex);
-  for(int i = PLAYER1; i < jamma_config.player_count; i ++){
-    if(player_devs[i] == NULL){
+  for (int i = PLAYER1; i < jamma_config.player_count; i++) {
+    if (player_devs[i] == NULL) {
       printk(KERN_INFO "recalboxrgbjamma: some players are NULL, unable to process inputs\n");
       mutex_unlock(&jamma_config.process_mutex);
       return 0;
@@ -1490,9 +1490,9 @@ static int load_config(void) {
   for (cursor = 0; cursor < read_size; cursor++) {
     line[cursor - line_start] = read_buf[cursor];
     line_len++;
-    if (line_len >= LINE_SIZE_MAX || read_buf[cursor] == '\n' || read_buf[cursor] == '\0' || cursor == read_size-1) {
+    if (line_len >= LINE_SIZE_MAX || read_buf[cursor] == '\n' || read_buf[cursor] == '\0' || cursor == read_size - 1) {
       if (line_len > 1 && line[0] != '#') {
-        if(line[line_len - 1] == '\n')
+        if (line[line_len - 1] == '\n')
           line[line_len - 1] = '\0';
         scanret = sscanf(line, "%s = %d", optionname, &optionvalue);
         if (scanret == 2) {
@@ -1573,10 +1573,10 @@ static int load_config(void) {
             }
           } else if (strcmp(optionname, "options.jamma.amp.boost") == 0) {
             if (jamma_config.amp_boost != optionvalue && jamma_config.expander != NULL) {
-                printk(KERN_INFO "recalboxrgbjamma: switch amp_boost to %d\n", optionvalue);
-                jamma_config.amp_boost = optionvalue;
-                pca953x_gpio_direction_output(jamma_config.expander, EXP_GAIN0, jamma_config.amp_boost & 0x1);
-                pca953x_gpio_direction_output(jamma_config.expander, EXP_GAIN1, jamma_config.amp_boost & 0x2);
+              printk(KERN_INFO "recalboxrgbjamma: switch amp_boost to %d\n", optionvalue);
+              jamma_config.amp_boost = optionvalue;
+              pca953x_gpio_direction_output(jamma_config.expander, EXP_GAIN0, jamma_config.amp_boost & 0x1);
+              pca953x_gpio_direction_output(jamma_config.expander, EXP_GAIN1, jamma_config.amp_boost & 0x2);
             }
           } else if (strcmp(optionname, "options.jamma.amp.disable") == 0) {
             if (jamma_config.amp_disable != optionvalue && jamma_config.expander != NULL) {
@@ -1605,8 +1605,7 @@ static int watch_configuration(void *idx) {
   return 0;
 }
 
-static int pca953x_probe(struct i2c_client *client,
-                         const struct i2c_device_id *i2c_id) {
+static int pca953x_probe(struct i2c_client *client) {
   struct pca953x_platform_data *pdata;
   struct pca953x_chip *chip;
   int irq_base = 0;
@@ -1646,6 +1645,9 @@ static int pca953x_probe(struct i2c_client *client,
   }
 
   chip->client = client;
+  chip->driver_data = (uintptr_t) i2c_get_match_data(client);
+  if (!chip->driver_data)
+    return -ENODEV;
 
   reg = devm_regulator_get(&client->dev, "vcc");
   if (IS_ERR(reg))
@@ -1658,20 +1660,6 @@ static int pca953x_probe(struct i2c_client *client,
   }
   chip->regulator = reg;
 
-  if (i2c_id) {
-    chip->driver_data = i2c_id->driver_data;
-  } else {
-    const void *match;
-
-    match = device_get_match_data(&client->dev);
-    if (!match) {
-      ret = -ENODEV;
-      goto err_exit;
-    }
-
-    chip->driver_data = (uintptr_t) match;
-  }
-
   i2c_set_clientdata(client, chip);
 
   pca953x_setup_gpio(chip, chip->driver_data & PCA_GPIO_MASK);