Merge pull request #7638 from vpeter4/hwdb-11

systemd: fix error in 70-local-keyboard.hwdb

packages/graphics/bcm2835-driver/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="489d3e2d025f5035491004f50d58cfe9690e3976"
-PKG_SHA256="bb6f06f0cfd0d6d810a0cb07225daddea3c0490a2e9bd69c4095341dc45dfc55"
+PKG_VERSION="2c9ca22c4aedd1a8a6bc14698be5861525f2bfdf"
+PKG_SHA256="92d8e4b6afe864c82cb19db387ab3b089d9148a1eadbc467c441fda4450bc5c3"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/graphics/mesa/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mesa"
-PKG_VERSION="22.3.5"
-PKG_SHA256="3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9"
+PKG_VERSION="22.3.7"
+PKG_SHA256="894ce2f4a1c2e76177cdd2284620192d0da3066b243eec2fbb1d7cf37f13042c"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"

packages/linux/package.mk

@@ -16,21 +16,21 @@ PKG_PATCH_DIRS="${LINUX}"
 
 case "${LINUX}" in
   amlogic)
-    PKG_VERSION="7d54cb2c26dad1264ecca85992bfe8984df4b7b5" # 6.1.14
-    PKG_SHA256="76f039741d61e06c740b846291e5017b97da7d3f91fb2f368230a161d46905a6"
+    PKG_VERSION="6449a0ba6843fe70523eeb7855984054f36f6d24" # 6.1.19
+    PKG_SHA256="6a46c7b91028157d56437736cc8601fa46485e6f52bd6983e92ff80f17aa3065"
     PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     PKG_PATCH_DIRS="default"
     ;;
   raspberrypi)
-    PKG_VERSION="df7cc0b7ce879a5b551b2db026b3ddad8ae78b26" # 6.1.12
-    PKG_SHA256="f4bd86147b58cbc25b00fd77719ce700d630e5e078df5b56b136418d3aaaf313"
+    PKG_VERSION="e3376fb94fda798d2a322e9c70789286132a1a9f" # 6.1.19
+    PKG_SHA256="f1b518ea84ad269ec0a926623aaba43ea0c176e8254438bb4e8c87f267e87e1e"
     PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
   *)
-    PKG_VERSION="6.1.18"
-    PKG_SHA256="842ac15eff0e6fb0c150fdf83f4f6aaf6b4c1239dcf8c14e2227620ec0ae141e"
+    PKG_VERSION="6.1.19"
+    PKG_SHA256="9e991c6e5f6c1ca45eea98c55e82ef6ae3dccc73b3e8a655c8665e585f5a8647"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
     PKG_PATCH_DIRS="default"
     ;;

packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch

@@ -0,0 +1,41 @@
+From affc6fdac5376701ea468270af1b6fd9ca7616be Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Sat, 11 Mar 2023 22:41:17 +0100
+Subject: [PATCH] drm/vc4: drop unnecessary and harmful HDMI RGB format check
+
+RGB is a mandatory format for all DVI and HDMI monitors so there's
+no need to check for presence of the DRM_COLOR_FORMAT_RGB444 bit in
+color_formats.
+
+More importantly this checks breaks working around EDID issues with
+eg video=HDMI-A-1:1024x768D or drm.edid_firmware=edid/1024x768.bin
+as the RGB444 bit is only set when a valid EDID with digital bit set in
+the input byte is present - which isn't the case when no EDID can be
+read from the display device at all or with the in-built kernel EDIDs,
+which mimic analog (VGA) displays without the digital bit set.
+
+So drop the check, if we output video on the HDMI connector we can
+assume that the display can accept 8bit RGB.
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
+index bd762b4e3e8f2..3c60c93c0f888 100644
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1962,9 +1962,6 @@ vc4_hdmi_sink_supports_format_bpc(const struct vc4_hdmi *vc4_hdmi,
+ 	case VC4_HDMI_OUTPUT_RGB:
+ 		drm_dbg(dev, "RGB Format, checking the constraints.\n");
+ 
+-		if (!(info->color_formats & DRM_COLOR_FORMAT_RGB444))
+-			return false;
+-
+ 		if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) {
+ 			drm_dbg(dev, "10 BPC but sink doesn't support Deep Color 30.\n");
+ 			return false;
+-- 
+2.39.2
+

packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="inputstream.adaptive"
-PKG_VERSION="20.3.4-Nexus"
-PKG_SHA256="49fe8dc908166d4b0c5130d3201d3221f24e860a7a05c5b0db3491f64422c14f"
-PKG_REV="3"
+PKG_VERSION="20.3.5-Nexus"
+PKG_SHA256="3851e1ac48aa38681b6ff6cfb39ab2cc24156b859d1a257be63f3c4d9fd926de"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/inputstream.adaptive"

packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="peripheral.joystick"
-PKG_VERSION="20.1.7-Nexus"
-PKG_SHA256="da141fb79474de1346704b1afc67dc3b615aef4f74b14bfb896dfe8dfb91ddc5"
+PKG_VERSION="20.1.8-Nexus"
+PKG_SHA256="6e8fb553309d3ad48fad21d2d6cebdb537a4e2b88878b6fdc43707c7bc37e160"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk

@@ -3,9 +3,9 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.vbox"
-PKG_VERSION="20.4.1-Nexus"
-PKG_SHA256="c8ee26a903491fa8a2c321322a5ae3184139e892508f30faadbd9bd0df6287bc"
-PKG_REV="2"
+PKG_VERSION="20.4.2-Nexus"
+PKG_SHA256="04c50eba71426f062339491e7567545ec8c910b17c7055b28285eab14f26ca6f"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/kodi-pvr/pvr.vbox"

packages/mediacenter/kodi/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="kodi"
-PKG_VERSION="20.0-Nexus"
-PKG_SHA256="4c75add8b9ea44924b6ee45f94439545676033f35f5993908871e3dded527b79"
+PKG_VERSION="20.1-Nexus"
+PKG_SHA256="cd4158b2bc2d9593ad2f5c1cd2494957ab726b13d8379bbfb09d7d36df7b7d7e"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"

packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch

@@ -3,7 +3,7 @@ Subject: disable online check
 ---
 --- a/xbmc/GUIInfoManager.cpp
 +++ b/xbmc/GUIInfoManager.cpp
-@@ -1840,7 +1840,6 @@ const infomap system_labels[] = {
+@@ -1919,7 +1919,6 @@ const infomap system_labels[] = {
      {"currentcontrol", SYSTEM_CURRENT_CONTROL},
      {"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
      {"dvdlabel", SYSTEM_DVD_LABEL},
@@ -34,7 +34,7 @@ Subject: disable online check
  std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
 --- a/xbmc/windows/GUIWindowSystemInfo.cpp
 +++ b/xbmc/windows/GUIWindowSystemInfo.cpp
-@@ -124,7 +124,6 @@ void CGUIWindowSystemInfo::FrameMove()
+@@ -126,7 +126,6 @@ void CGUIWindowSystemInfo::FrameMove()
      SetControlLabel(i++, "{}: {}", 13160, NETWORK_GATEWAY_ADDRESS);
      SetControlLabel(i++, "{}: {}", 13161, NETWORK_DNS1_ADDRESS);
      SetControlLabel(i++, "{}: {}", 20307, NETWORK_DNS2_ADDRESS);

packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch

@@ -10,8 +10,6 @@ credits to vpeter4 for the patch
  xbmc/addons/Addon.cpp | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
 
-diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
-index 90669bb10e..f6aabfc615 100644
 --- a/xbmc/addons/Addon.cpp
 +++ b/xbmc/addons/Addon.cpp
 @@ -29,6 +29,10 @@
@@ -54,6 +52,3 @@ index 90669bb10e..f6aabfc615 100644
    addon->OnPostInstall(update, modal);
  }
  
--- 
-2.34.1
-

packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch

@@ -7,11 +7,9 @@ Subject: [PATCH] disable minimize
  xbmc/application/Application.cpp | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/xbmc/application/Application.cpp b/xbmc/application/Application.cpp
-index 27b7bc80cb..bafb5de064 100644
 --- a/xbmc/application/Application.cpp
 +++ b/xbmc/application/Application.cpp
-@@ -1572,7 +1572,6 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
+@@ -1609,7 +1609,6 @@ void CApplication::OnApplicationMessage(
      break;
  
    case TMSG_MINIMIZE:
@@ -19,6 +17,3 @@ index 27b7bc80cb..bafb5de064 100644
      break;
  
    case TMSG_EXECUTE_OS:
--- 
-2.34.1
-

packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch

@@ -12,7 +12,7 @@ tz-data.service
 
 --- a/xbmc/platform/posix/PosixTimezone.cpp
 +++ b/xbmc/platform/posix/PosixTimezone.cpp
-@@ -26,6 +26,8 @@
+@@ -25,6 +25,8 @@
  
  #include <algorithm>
  
@@ -21,7 +21,7 @@ tz-data.service
  CPosixTimezone::CPosixTimezone()
  {
     char* line = NULL;
-@@ -143,6 +145,16 @@ void CPosixTimezone::OnSettingChanged(co
+@@ -142,6 +144,16 @@ void CPosixTimezone::OnSettingChanged(co
    const std::string &settingId = setting->GetId();
    if (settingId == CSettings::SETTING_LOCALE_TIMEZONE)
    {

packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch

@@ -9,11 +9,9 @@ Subject: [PATCH] Use a wrapper to setup service addons
  xbmc/addons/AddonManager.cpp |  3 +++
  3 files changed, 47 insertions(+)
 
-diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
-index f6aabfc615..496e1fcfa0 100644
 --- a/xbmc/addons/Addon.cpp
 +++ b/xbmc/addons/Addon.cpp
-@@ -658,6 +658,37 @@ CAddonVersion CAddon::GetDependencyVersion(const std::string& dependencyID) cons
+@@ -658,6 +658,37 @@ CAddonVersion CAddon::GetDependencyVersi
    return m_addonInfo->DependencyVersion(dependencyID);
  }
  
@@ -51,7 +49,7 @@ index f6aabfc615..496e1fcfa0 100644
  void OnPreInstall(const AddonPtr& addon)
  {
    //Fallback to the pre-install callback in the addon.
-@@ -687,6 +718,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
+@@ -687,6 +718,8 @@ void OnPostInstall(const AddonPtr& addon
      }
      closedir(addonsDir);
    }
@@ -60,7 +58,7 @@ index f6aabfc615..496e1fcfa0 100644
    // OE
  
    addon->OnPostInstall(update, modal);
-@@ -694,6 +727,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
+@@ -694,6 +727,8 @@ void OnPostInstall(const AddonPtr& addon
  
  void OnPreUnInstall(const AddonPtr& addon)
  {
@@ -69,11 +67,9 @@ index f6aabfc615..496e1fcfa0 100644
    addon->OnPreUnInstall();
  }
  
-diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h
-index a09b8db80f..629f028584 100644
 --- a/xbmc/addons/Addon.h
 +++ b/xbmc/addons/Addon.h
-@@ -31,6 +31,15 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal);
+@@ -31,6 +31,15 @@ void OnPostInstall(const AddonPtr& addon
  void OnPreUnInstall(const AddonPtr& addon);
  void OnPostUnInstall(const AddonPtr& addon);
  
@@ -89,8 +85,6 @@ index a09b8db80f..629f028584 100644
  class CAddon : public IAddon
  {
  public:
-diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
-index bb0b510378..0524caa5a9 100644
 --- a/xbmc/addons/AddonManager.cpp
 +++ b/xbmc/addons/AddonManager.cpp
 @@ -12,6 +12,7 @@
@@ -101,7 +95,7 @@ index bb0b510378..0524caa5a9 100644
  #include "addons/AddonBuilder.h"
  #include "addons/AddonDatabase.h"
  #include "addons/AddonEvents.h"
-@@ -863,6 +864,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled
+@@ -863,6 +864,7 @@ bool CAddonMgr::DisableAddon(const std::
    AddonPtr addon;
    if (GetAddon(id, addon, AddonType::UNKNOWN, OnlyEnabled::CHOICE_NO) && addon != nullptr)
    {
@@ -109,7 +103,7 @@ index bb0b510378..0524caa5a9 100644
      auto eventLog = CServiceBroker::GetEventLog();
      if (eventLog)
        eventLog->Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
-@@ -914,6 +916,7 @@ bool CAddonMgr::EnableSingle(const std::string& id)
+@@ -914,6 +916,7 @@ bool CAddonMgr::EnableSingle(const std::
    if (!m_database->EnableAddon(id))
      return false;
    m_disabled.erase(id);
@@ -117,6 +111,3 @@ index bb0b510378..0524caa5a9 100644
  
    // If enabling a repo add-on without an origin, set its origin to its own id
    if (addon->HasType(AddonType::REPOSITORY) && addon->Origin().empty())
--- 
-2.34.1
-

packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch

@@ -20,11 +20,9 @@ so, when shutdown/reboot is requested:
  .../powermanagement/LogindUPowerSyscall.cpp   |  2 --
  3 files changed, 20 insertions(+), 8 deletions(-)
 
-diff --git a/xbmc/application/Application.cpp b/xbmc/application/Application.cpp
-index bafb5de064..c5f39217cc 100644
 --- a/xbmc/application/Application.cpp
 +++ b/xbmc/application/Application.cpp
-@@ -1444,12 +1444,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
+@@ -1481,12 +1481,12 @@ void CApplication::OnApplicationMessage(
    switch (msg)
    {
    case TMSG_POWERDOWN:
@@ -39,7 +37,7 @@ index bafb5de064..c5f39217cc 100644
      break;
  
    case TMSG_SHUTDOWN:
-@@ -1470,12 +1470,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
+@@ -1507,12 +1507,13 @@ void CApplication::OnApplicationMessage(
  
    case TMSG_RESTART:
    case TMSG_RESET:
@@ -54,7 +52,7 @@ index bafb5de064..c5f39217cc 100644
      Stop(EXITCODE_RESTARTAPP);
  #endif
      break;
-@@ -2039,7 +2040,7 @@ bool CApplication::Stop(int exitCode)
+@@ -2083,7 +2084,7 @@ bool CApplication::Stop(int exitCode)
      m_frameMoveGuard.unlock();
  
      CVariant vExitCode(CVariant::VariantTypeObject);
@@ -63,7 +61,7 @@ index bafb5de064..c5f39217cc 100644
      CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
  
      // Abort any active screensaver
-@@ -2071,7 +2072,6 @@ bool CApplication::Stop(int exitCode)
+@@ -2115,7 +2116,6 @@ bool CApplication::Stop(int exitCode)
      // Needs cleaning up
      CServiceBroker::GetAppMessenger()->Stop();
      m_AppFocused = false;
@@ -71,7 +69,7 @@ index bafb5de064..c5f39217cc 100644
      CLog::Log(LOGINFO, "Stopping all");
  
      // cancel any jobs from the jobmanager
-@@ -2602,6 +2602,18 @@ void CApplication::StopPlaying()
+@@ -2658,6 +2658,18 @@ void CApplication::StopPlaying()
    }
  }
  
@@ -89,8 +87,8 @@ index bafb5de064..c5f39217cc 100644
 +
  bool CApplication::OnMessage(CGUIMessage& message)
  {
-   switch ( message.GetMessage() )
-@@ -3114,7 +3126,7 @@ void CApplication::ProcessSlow()
+   switch (message.GetMessage())
+@@ -3178,7 +3190,7 @@ void CApplication::ProcessSlow()
    if (CPlatformPosix::TestQuitFlag())
    {
      CLog::Log(LOGINFO, "Quitting due to POSIX signal");
@@ -99,31 +97,27 @@ index bafb5de064..c5f39217cc 100644
    }
  #endif
  
-diff --git a/xbmc/application/Application.h b/xbmc/application/Application.h
-index 710ea9923b..59763464ab 100644
 --- a/xbmc/application/Application.h
 +++ b/xbmc/application/Application.h
-@@ -120,6 +120,7 @@ public:
+@@ -113,6 +113,7 @@ public:
    bool CreateGUI();
    bool InitWindow(RESOLUTION res = RES_INVALID);
  
 +  bool SetExitCode(int exitCode);
    bool Stop(int exitCode);
-   void ReloadSkin(bool confirm = false);
    const std::string& CurrentFile();
-@@ -274,6 +275,7 @@ private:
-   CApplicationPlayer m_appPlayer;
-   CApplicationStackHelper m_stackHelper;
+   CFileItem& CurrentFileItem();
+@@ -251,6 +252,7 @@ private:
+   unsigned int m_ProcessedExternalCalls = 0;      /*!< counts calls which are processed during one "door open" cycle in FrameMove */
+   unsigned int m_ProcessedExternalDecay = 0;      /*!< counts to close door after a few frames of no python activity */
    int m_ExitCode{EXITCODE_QUIT};
 +  bool m_ExitCodeSet = false;
  };
  
  XBMC_GLOBAL_REF(CApplication,g_application);
-diff --git a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
-index 34eed6e41b..c374dbdbd3 100644
 --- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
 +++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
-@@ -78,8 +78,6 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall()
+@@ -79,8 +79,6 @@ CLogindUPowerSyscall::~CLogindUPowerSysc
  
  bool CLogindUPowerSyscall::Powerdown()
  {
@@ -132,6 +126,3 @@ index 34eed6e41b..c374dbdbd3 100644
    return LogindSetPowerState("PowerOff");
  }
  
--- 
-2.34.1
-

packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch

@@ -1,6 +1,6 @@
 --- a/xbmc/windows/GUIWindowSystemInfo.cpp
 +++ b/xbmc/windows/GUIWindowSystemInfo.cpp
-@@ -99,7 +99,6 @@ void CGUIWindowSystemInfo::FrameMove()
+@@ -100,7 +100,6 @@ void CGUIWindowSystemInfo::FrameMove()
      SetControlLabel(i++, "{} {}", 13283, SYSTEM_OS_VERSION_INFO);
      SetControlLabel(i++, "{}: {}", 12390, SYSTEM_UPTIME);
      SetControlLabel(i++, "{}: {}", 12394, SYSTEM_TOTALUPTIME);

packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch

@@ -1,8 +1,6 @@
-diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake
-index 4817d15799..c56630001a 100644
 --- a/cmake/modules/buildtools/FindTexturePacker.cmake
 +++ b/cmake/modules/buildtools/FindTexturePacker.cmake
-@@ -52,15 +52,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable)
+@@ -52,15 +52,6 @@ if(NOT TARGET TexturePacker::TexturePack
        endif()
      endif()
  

packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch

@@ -7,11 +7,9 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall
  xbmc/addons/Addon.cpp | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
-index 496e1fcfa0..da0a5955e0 100644
 --- a/xbmc/addons/Addon.cpp
 +++ b/xbmc/addons/Addon.cpp
-@@ -723,6 +723,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
+@@ -723,6 +723,9 @@ void OnPostInstall(const AddonPtr& addon
    // OE
  
    addon->OnPostInstall(update, modal);
@@ -21,7 +19,7 @@ index 496e1fcfa0..da0a5955e0 100644
  }
  
  void OnPreUnInstall(const AddonPtr& addon)
-@@ -735,6 +738,9 @@ void OnPreUnInstall(const AddonPtr& addon)
+@@ -735,6 +738,9 @@ void OnPreUnInstall(const AddonPtr& addo
  void OnPostUnInstall(const AddonPtr& addon)
  {
    addon->OnPostUnInstall();
@@ -31,6 +29,3 @@ index 496e1fcfa0..da0a5955e0 100644
  }
  
  } // namespace ADDON
--- 
-2.34.1
-

packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch

@@ -12,21 +12,18 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  addons/skin.estuary/xml/Settings.xml | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
 
-diff --git a/addons/skin.estuary/xml/Settings.xml b/addons/skin.estuary/xml/Settings.xml
-index fa63b174b8..e25d96dec2 100644
 --- a/addons/skin.estuary/xml/Settings.xml
 +++ b/addons/skin.estuary/xml/Settings.xml
-@@ -54,10 +54,17 @@
- 						<onclick>ActivateWindow(systeminfo)</onclick>
+@@ -55,9 +55,16 @@
  						<icon>icons/settings/sysinfo.png</icon>
  					</item>
-+					<item>
+ 					<item>
 +						<label>LibreELEC</label>
 +						<onclick>RunAddon(service.libreelec.settings)</onclick>
 +						<icon>icons/settings/libreelec.png</icon>
 +						<visible>System.AddonIsEnabled(service.libreelec.settings)</visible>
 +					</item>
- 					<item>
++					<item>
  						<label>$LOCALIZE[31067]</label>
  						<onclick>ActivateWindow(eventlog)</onclick>
  						<icon>icons/settings/eventlog.png</icon>
@@ -47,6 +44,3 @@ index fa63b174b8..e25d96dec2 100644
  				</content>
  			</control>
  		</control>
--- 
-2.34.1
-

packages/mediacenter/kodi/patches/kodi-995.11-smbc_getxattr.patch

@@ -1,11 +0,0 @@
---- ./xbmc/platform/posix/filesystem/SMBDirectory.cpp.orig	2023-02-03 14:31:42.518877830 +0100
-+++ ./xbmc/platform/posix/filesystem/SMBDirectory.cpp	2023-02-03 14:36:27.357905849 +0100
-@@ -171,7 +171,7 @@
-             char value[20];
-             // We poll for extended attributes which symbolizes bits but split up into a string. Where 0x02 is hidden and 0x12 is hidden directory.
-             // According to the libsmbclient.h it's supposed to return 0 if ok, or the length of the string. It seems always to return the length which is 4
--            if (smbc_getxattr(strFullName.c_str(), "system.dos_attr.mode", value, sizeof(value)) > 0)
-+            if (smbc_getxattr(strFullName.c_str(), "system.dos_attr.mode", value, sizeof(value)) >= 0)
-             {
-               long longvalue = strtol(value, NULL, 16);
-               if (longvalue & SMBC_DOS_MODE_HIDDEN)

packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch

@@ -1,16 +1,14 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e5824f0d20b7..cf17e1563a7f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -45,6 +45,7 @@ include(ExternalProject)
- 
+@@ -47,6 +47,7 @@ include(CMakeDependentOption)
+ include(cmake/scripts/common/DependencyOptions.cmake)
  
  # general
 +option(HEADERS_ONLY       "Skip building" OFF)
  option(VERBOSE            "Enable verbose output?" OFF)
  option(ENABLE_CLANGTIDY   "Enable clang-tidy support?" OFF)
  option(ENABLE_CPPCHECK    "Enable cppcheck support?" OFF)
-@@ -95,6 +96,7 @@ endif()
+@@ -107,6 +108,7 @@ endif()
  
  core_find_git_rev(APP_SCMID FULL)
  
@@ -18,7 +16,7 @@ index e5824f0d20b7..cf17e1563a7f 100644
  # Dynamically loaded libraries built with the project
  add_custom_target(${APP_NAME_LC}-libraries)
  set(LIBRARY_FILES "" CACHE STRING "" FORCE)
-@@ -458,6 +460,7 @@ endif()
+@@ -478,6 +480,7 @@ endif()
  if(FFMPEG_CREATE_SHARED_LIBRARY)
    set(CMAKE_CXX_CREATE_SHARED_LIBRARY "${FFMPEG_CREATE_SHARED_LIBRARY}")
  endif()
@@ -26,11 +24,9 @@ index e5824f0d20b7..cf17e1563a7f 100644
  
  # Platform specific additional extra targets
  if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/scripts/${CORE_SYSTEM_NAME}/ExtraTargets.cmake)
-diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake
-index 331722cb5616..cc00c55fa27c 100644
 --- a/cmake/scripts/linux/Install.cmake
 +++ b/cmake/scripts/linux/Install.cmake
-@@ -51,6 +51,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.desktop.in
+@@ -51,6 +51,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools
  configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.metainfo.xml.in
                 ${CORE_BUILD_DIR}/${APP_PACKAGE}.metainfo.xml @ONLY)
  

packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb

@@ -24,7 +24,7 @@ evdev:input:b0005v0957p1001*
 
 # g7bts remote
 evdev:input:b0005v045Ep0041e0300*
- KEYBOARD_KEY_c0041=enter
+ KEYBOARD_KEY_c0041=enter
 
 # g20bts remote
 evdev:input:b0005v2B54p1600e0000*

packages/tools/amlogic-boot-fip/package.mk

@@ -3,8 +3,8 @@
 
 PKG_NAME="amlogic-boot-fip"
 PKG_LICENSE="nonfree"
-PKG_VERSION="955a8ae91630038d50342814bae1b055c75707db"
-PKG_SHA256="32dbcf80440b406f00783bfc1ffacb721ac829c7c12624c594474ecf48a77db8"
+PKG_VERSION="e96b6a694380ff07d5a9e4be644ffe254bd18512"
+PKG_SHA256="2cc06bc7d5647fd8c0025181fa42c4a8ef0ed16b918a1fa2060ea83c22e47b20"
 PKG_SITE="https://github.com/LibreELEC/amlogic-boot-fip"
 PKG_URL="https://github.com/LibreELEC/amlogic-boot-fip/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="Firmware Image Package (FIP) sources used to sign Amlogic u-boot binaries in LibreELEC images"

packages/tools/bcm2835-bootloader/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="489d3e2d025f5035491004f50d58cfe9690e3976"
-PKG_SHA256="ac2f526fd17c6b15dd6e67aceffb93c5ca7afa7cc1e757fdd06123d318126b99"
+PKG_VERSION="2c9ca22c4aedd1a8a6bc14698be5861525f2bfdf"
+PKG_SHA256="575d16dfd8e481abbe7410e284b30706e82bd69f1f56528520bcb7dea72766f1"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch

@@ -1,7 +1,7 @@
-From 6142085e9460414a2fc7f51f0a52afea5eaf0923 Mon Sep 17 00:00:00 2001
+From c5478965aad09d2ebc682438e5474f7606e06eb2 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 13 Apr 2019 05:41:51 +0000
-Subject: [PATCH 001/119] LOCAL: set meson-gx cma pool to 896MB
+Subject: [PATCH 001/120] LOCAL: set meson-gx cma pool to 896MB
 
 This change sets the CMA pool to a larger 896MB! value for vdec use
 
@@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-index fa6cff4a2ebc..5ee7640fad06 100644
+index 80d86780cb6b..7f20b90e11da 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 @@ -58,7 +58,7 @@ secmon_reserved_bl32: secmon@5300000 {

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch

@@ -1,7 +1,7 @@
-From c0df9052aeb8d47bc2a18e0873b20fb68b54321a Mon Sep 17 00:00:00 2001
+From f442bde4d5400279042a90b8af49e4631eac3133 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 14 Aug 2019 19:58:14 +0000
-Subject: [PATCH 002/119] LOCAL: set meson-g12 cma pool to 896MB
+Subject: [PATCH 002/120] LOCAL: set meson-g12 cma pool to 896MB
 
 This change sets the CMA pool to a larger 896MB! value for vdec use
 
@@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-index 894cea697550..8be0381cd419 100644
+index 131a8a5a9f5a..d2b6fa8034ea 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 @@ -116,7 +116,7 @@ secmon_reserved_bl32: secmon@5300000 {

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch

@@ -1,7 +1,7 @@
-From 980967e34f6463f7b8dc3d37e7a255abb4950dfc Mon Sep 17 00:00:00 2001
+From 79decc6d434e12c4bb2fc6c88073ab210bc8c8cb Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 13 Apr 2019 05:45:18 +0000
-Subject: [PATCH 003/119] LOCAL: arm64: fix Kodi sysinfo CPU information
+Subject: [PATCH 003/120] LOCAL: arm64: fix Kodi sysinfo CPU information
 
 This allows the CPU information to show in the Kodi sysinfo screen, e.g.
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch

@@ -1,7 +1,7 @@
-From 6ef4c65b5e4796e163beb7241cdb0b5d2c7698de Mon Sep 17 00:00:00 2001
+From 4430a4f8e570fc70b2053fc4970758bc0976fda9 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 3 Nov 2016 15:29:23 +0100
-Subject: [PATCH 004/119] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
+Subject: [PATCH 004/120] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
 
 The Amlogic Meson GX SoCs uses a non-standard argument to the
 PSCI CPU_SUSPEND call to enter system suspend.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch

@@ -1,7 +1,7 @@
-From 2712b6a5207c3bdff9612c9938ee0d97a683e007 Mon Sep 17 00:00:00 2001
+From dbe7af745c89a0824b90c8f0dcf9bb4cc0f48d4c Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 3 Nov 2016 15:29:25 +0100
-Subject: [PATCH 005/119] LOCAL: arm64: dts: meson: add support for GX PM and
+Subject: [PATCH 005/120] LOCAL: arm64: dts: meson: add support for GX PM and
  Virtual RTC
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
@@ -10,7 +10,7 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-index 5ee7640fad06..b8e43b406cec 100644
+index 7f20b90e11da..f39de6ead2fb 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 @@ -221,6 +221,10 @@ sm: secure-monitor {

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch

@@ -1,7 +1,7 @@
-From 694b9b83d3442791ee6d6c01868d04357bc9b782 Mon Sep 17 00:00:00 2001
+From 08655d3530269d8c17410a6dc3fde69e9c23fe2f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 21 Jan 2021 01:35:36 +0000
-Subject: [PATCH 006/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
+Subject: [PATCH 006/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
  Khadas VIM
 
 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch

@@ -1,7 +1,7 @@
-From 70d3c7b8d66da08a0deef1c99657ed822b7131b0 Mon Sep 17 00:00:00 2001
+From 35731fd9e4a198dbd96911828de0270f7f7fcfe9 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 6 Nov 2021 13:01:08 +0000
-Subject: [PATCH 007/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
+Subject: [PATCH 007/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
  Khadas VIM2
 
 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch

@@ -1,7 +1,7 @@
-From a2df580982a2c364aa35da82aa66feddf2e56f36 Mon Sep 17 00:00:00 2001
+From 54396343f2c349acae2c8c31fd07719f3f71577f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 1 Feb 2021 19:27:40 +0000
-Subject: [PATCH 008/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
+Subject: [PATCH 008/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
  Minix NEO U9-H
 
 Add node aliases to prevent meson-vrtc from claiming /dev/rtc0

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch

@@ -1,7 +1,7 @@
-From 86032671e6f5efd8eac2ba503c50b10f538e2c52 Mon Sep 17 00:00:00 2001
+From 6f81de193a1d33648341c8d3a702a070dc71c133 Mon Sep 17 00:00:00 2001
 From: Anssi Hannula <anssi.hannula@iki.fi>
 Date: Sun, 17 Apr 2022 04:37:48 +0000
-Subject: [PATCH 009/119] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958
+Subject: [PATCH 009/120] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958
  kctls to device 0
 
 On SoC sound devices utilizing codec2codec DAI links with a HDMI codec

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch

@@ -1,7 +1,7 @@
-From 95087f3fd82785ef72de4dc4ab3364a76ecbfdf4 Mon Sep 17 00:00:00 2001
+From 6101cde6d49a5d6c4ed4535131dbce78f3523eb9 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 3 Jan 2022 10:44:17 +0000
-Subject: [PATCH 010/119] LOCAL: usb: hub: disable autosuspend for Genesys
+Subject: [PATCH 010/120] LOCAL: usb: hub: disable autosuspend for Genesys
  Logic Hubs
 
 Disable autosuspend in Genesys Logic hubs to allow USB devices on the
@@ -17,10 +17,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 0aaaadb02cc6..1ca434aed00b 100644
+index 1abe43ddb75f..7889811e5516 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5800,7 +5800,7 @@ static const struct usb_device_id hub_id_table[] = {
+@@ -5799,7 +5799,7 @@ static const struct usb_device_id hub_id_table[] = {
  			| USB_DEVICE_ID_MATCH_INT_CLASS,
        .idVendor = USB_VENDOR_GENESYS_LOGIC,
        .bInterfaceClass = USB_CLASS_HUB,

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch

@@ -1,7 +1,7 @@
-From 9742de1efcdbf512e3ee5671e0b5d4b7b2dde9d1 Mon Sep 17 00:00:00 2001
+From 012c3d681e1370c701cc666027871817bfc0ec6d Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 15 Sep 2021 05:00:45 +0000
-Subject: [PATCH 011/119] LOCAL: of: partial revert of fdt.c changes
+Subject: [PATCH 011/120] LOCAL: of: partial revert of fdt.c changes
 
 This resolves reports similar to the below which are present in dmesg
 since Linux 5.10; which are also causing crashes in some distros:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch

@@ -1,7 +1,7 @@
-From ebc9244e10d017655e8df41d0f7f12da5a90fb9a Mon Sep 17 00:00:00 2001
+From 8f94ff5bdfe66ddbaafd35beb20b77fd3a1790f8 Mon Sep 17 00:00:00 2001
 From: Carlo Caione <ccaione@baylibre.com>
 Date: Mon, 13 Feb 2023 10:32:09 +0100
-Subject: [PATCH 058/119] FROMLIST(v2): drm/meson/meson_venc: Relax the
+Subject: [PATCH 012/120] FROMGIT(FIXES): drm/meson/meson_venc: Relax the
  supported mode checks
 
 Relax a bit the supported modes list by including also 480x1920 and

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch

@@ -1,53 +0,0 @@
-From 04e35d23966417d7feea63379cfa97734e88882c Mon Sep 17 00:00:00 2001
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Thu, 19 Jan 2023 05:03:53 +0000
-Subject: [PATCH 013/119] FROMGIT(6.3): arm64: dts: meson: remove CPU opps
- below 1GHz for G12A boards
-
-Amlogic G12A devices experience CPU stalls and random board wedges when
-the system idles and CPU cores clock down to lower opp points. Recent
-vendor kernels include a change to remove 100-250MHz and other distro
-sources also remove the 500/667MHz points. Unless all 100-667Mhz opps
-are removed or the CPU governor forced to performance stalls are still
-observed, so let's remove them to improve stability and uptime.
-
-Fixes: b190056fa9ee ("arm64: dts: meson-g12a: add cpus OPP table")
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
----
- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 20 --------------------
- 1 file changed, 20 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
-index fb0ab27d1f64..6eaceb717d61 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
-@@ -57,26 +57,6 @@ cpu_opp_table: opp-table {
- 		compatible = "operating-points-v2";
- 		opp-shared;
- 
--		opp-100000000 {
--			opp-hz = /bits/ 64 <100000000>;
--			opp-microvolt = <731000>;
--		};
--
--		opp-250000000 {
--			opp-hz = /bits/ 64 <250000000>;
--			opp-microvolt = <731000>;
--		};
--
--		opp-500000000 {
--			opp-hz = /bits/ 64 <500000000>;
--			opp-microvolt = <731000>;
--		};
--
--		opp-667000000 {
--			opp-hz = /bits/ 64 <666666666>;
--			opp-microvolt = <731000>;
--		};
--
- 		opp-1000000000 {
- 			opp-hz = /bits/ 64 <1000000000>;
- 			opp-microvolt = <731000>;
--- 
-2.34.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch

@@ -0,0 +1,38 @@
+From eb87fb2d9f172769fadab83e148d3138c2a2031b Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Wed, 1 Mar 2023 12:48:28 +0000
+Subject: [PATCH 013/120] FROMGIT(FIXES): drm/meson: fix 1px pink line on GXM
+ when scaling video overlay
+
+Playing media with a resolution smaller than the crtc size requires the
+video overlay to be scaled for output and GXM boards display a 1px pink
+line on the bottom of the scaled overlay. Comparing with the downstream
+vendor driver revealed VPP_DUMMY_DATA not being set [0].
+
+Setting VPP_DUMMY_DATA prevents the 1px pink line from being seen.
+
+[0] https://github.com/endlessm/linux-s905x/blob/master/drivers/amlogic/amports/video.c#L7869
+
+Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller")
+Suggested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ drivers/gpu/drm/meson/meson_vpp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c
+index 154837688ab0..5df1957c8e41 100644
+--- a/drivers/gpu/drm/meson/meson_vpp.c
++++ b/drivers/gpu/drm/meson/meson_vpp.c
+@@ -100,6 +100,8 @@ void meson_vpp_init(struct meson_drm *priv)
+ 			       priv->io_base + _REG(VPP_DOLBY_CTRL));
+ 		writel_relaxed(0x1020080,
+ 				priv->io_base + _REG(VPP_DUMMY_DATA1));
++		writel_relaxed(0x42020,
++				priv->io_base + _REG(VPP_DUMMY_DATA));
+ 	} else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A))
+ 		writel_relaxed(0xf, priv->io_base + _REG(DOLBY_PATH_CTRL));
+ 
+-- 
+2.34.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch

@@ -1,7 +1,7 @@
-From 933161dcf2708d0d8765f0134d6cf08f0634737f Mon Sep 17 00:00:00 2001
+From df013bc124b5814849cf5d4d97027432752d976d Mon Sep 17 00:00:00 2001
 From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
 Date: Wed, 4 Jan 2023 15:19:06 +0000
-Subject: [PATCH 012/119] FROMGIT(6.2): Revert "arm64: dts:
+Subject: [PATCH 014/120] FROMGIT(6.2): Revert "arm64: dts:
  meson-sm1-odroid-hc4: disable unused USB PHY0"
 
 This reverts commit 703e84d6615a4a95fb504c8f2e4c9426b86f3930.
@@ -17,10 +17,10 @@ Signed-off-by: Pierre-Olivier Mercier <nemunaire@nemunai.re>
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
-index e3486f60645a..a1f0c38ccadd 100644
+index 3d642d739c35..74088e7280fe 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
-@@ -131,10 +131,6 @@ flash@0 {
+@@ -139,10 +139,6 @@ flash@0 {
  };
  
  &usb {

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch

@@ -1,7 +1,7 @@
-From dbc56924b4ef2ef4929dbbd3a71dd5f9c587cb56 Mon Sep 17 00:00:00 2001
+From bc574310bb7aad62c46aeee3a7e590df1f5ae0e7 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 03:50:01 +0000
-Subject: [PATCH 014/119] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to
+Subject: [PATCH 015/120] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to
  P212 dtsi
 
 The P212 has a combined WiFi/BT module. The BT side is already enabled

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch

@@ -1,7 +1,7 @@
-From 734fe8a9758c83353f4e87d92217fe3f0c94a773 Mon Sep 17 00:00:00 2001
+From 127106564fbef4f111b65f556affddef25d73764 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 03:56:12 +0000
-Subject: [PATCH 015/119] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in
+Subject: [PATCH 016/120] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in
  P212 dtsi
 
 Cosmetic-only change to alpha-sort the pwm_ef node.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch

@@ -1,7 +1,7 @@
-From 687aa721901391c0d26b6f11b164963881cccde0 Mon Sep 17 00:00:00 2001
+From 0097b59b870692e148373b4fe171b227295d296b Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 03:58:58 +0000
-Subject: [PATCH 016/119] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes
+Subject: [PATCH 017/120] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes
  from Khadas VIM1
 
 The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch

@@ -1,7 +1,7 @@
-From 5b1f67e6014292c83505302f67d7f0d1ebd8a93f Mon Sep 17 00:00:00 2001
+From da97eaeea4e9583bee58cc05afc29462a7d42403 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 04:30:44 +0000
-Subject: [PATCH 017/119] FROMGIT(6.3): arm64: dts: meson: add audio playback
+Subject: [PATCH 018/120] FROMGIT(6.3): arm64: dts: meson: add audio playback
  to S905X-P212 dts
 
 Add support for the HDMI and Analogue i2s audio outputs.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch

@@ -1,7 +1,7 @@
-From 2650a26be4c5432a8263096f2a89a5d10d270154 Mon Sep 17 00:00:00 2001
+From 6dafa687717b7d33cdecbc0494cca51f5b754251 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Wed, 30 Nov 2022 12:03:14 +0000
-Subject: [PATCH 018/119] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add
+Subject: [PATCH 019/120] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add
  missing NNA reset
 
 Doesn't appear in the TRM I have, but it is used by the downstream

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch

@@ -1,7 +1,7 @@
-From 3d021e127ccda3f91708b37f14ad3ea1da299d1e Mon Sep 17 00:00:00 2001
+From 7327250ae9d136ee318b4f9d0537b965df324111 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Wed, 30 Nov 2022 12:04:02 +0000
-Subject: [PATCH 019/119] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power
+Subject: [PATCH 020/120] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power
  domain
 
 Add define for the NNA power domain for the NPU in the G12A.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch

@@ -1,7 +1,7 @@
-From 0e9313ae8e525d1d811e35a778fc17cf590661f7 Mon Sep 17 00:00:00 2001
+From 17a33be46d9bf9f977855c631a6303c99abd002e Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Wed, 30 Nov 2022 12:04:51 +0000
-Subject: [PATCH 020/119] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power
+Subject: [PATCH 021/120] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power
  domain for A311D
 
 Based on power initialization sequence in downstream driver.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch

@@ -1,7 +1,7 @@
-From fe1c33c1c209927e3cf08485eba3498275dccc32 Mon Sep 17 00:00:00 2001
+From f34fad413355b9fb666b61cc9e8df7156bbbb7b6 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Wed, 30 Nov 2022 12:05:46 +0000
-Subject: [PATCH 021/119] FROMGIT(6.3): arm64: dts: Add DT node for the
+Subject: [PATCH 022/120] FROMGIT(6.3): arm64: dts: Add DT node for the
  VIPNano-QI on the A311D
 
 This "NPU" is very similar to the Vivante GPUs and Etnaviv works well
@@ -15,7 +15,7 @@ Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
  2 files changed, 16 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-index 8be0381cd419..146610cbf05e 100644
+index d2b6fa8034ea..c90066823250 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 @@ -11,6 +11,7 @@

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch

@@ -1,7 +1,7 @@
-From 88b256191bb62756826193b5b8cce03f046bd946 Mon Sep 17 00:00:00 2001
+From 32817c57b6cc75595d60ea68ccc0c7c767d46898 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Sat, 3 Dec 2022 06:01:47 +0000
-Subject: [PATCH 022/119] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip
+Subject: [PATCH 023/120] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip
  feature struct
 
 We will use these for differentiating between GPUs and NPUs, as the

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch

@@ -1,7 +1,7 @@
-From 6bc70bd7f8321a13dab880378d239c813a6c74c1 Mon Sep 17 00:00:00 2001
+From b3155f8944de71787491aa1cedbf079939539de7 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Sat, 3 Dec 2022 06:02:31 +0000
-Subject: [PATCH 023/119] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs
+Subject: [PATCH 024/120] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs
 
 Userspace is still not making full use of the hardware, so we don't know
 yet if changes to the UAPI won't be needed. Warn about it.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch

@@ -1,7 +1,7 @@
-From 726e813f6501345007ebca68891fd137945b8a88 Mon Sep 17 00:00:00 2001
+From 3e9c8855643486b4f793bd13fbfc759058524062 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Sat, 3 Dec 2022 06:03:16 +0000
-Subject: [PATCH 024/119] FROMGIT(6.3): drm/etnaviv: add HWDB entry for
+Subject: [PATCH 025/120] FROMGIT(6.3): drm/etnaviv: add HWDB entry for
  VIPNano-QI.7120.0055
 
 This is a compute-only module marketed towards AI and vision

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch

@@ -1,7 +1,7 @@
-From b314d9f65e9d729c33229230c61a6d7ca05d67ab Mon Sep 17 00:00:00 2001
+From 2a3a6c002d0055ae280e94bdcff00088c60e56a6 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Sat, 3 Dec 2022 06:04:00 +0000
-Subject: [PATCH 025/119] FROMGIT(6.3): arm64: dts: Fix NPU power domain
+Subject: [PATCH 026/120] FROMGIT(6.3): arm64: dts: Fix NPU power domain
  references in Amlogic G12-based SoCs
 
 The power sequence is different between SoCs in that family, so get the
@@ -15,7 +15,7 @@ Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
  3 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-index 146610cbf05e..749d5b3e3554 100644
+index c90066823250..bb2e86073261 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 @@ -11,7 +11,6 @@

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch

@@ -1,7 +1,7 @@
-From feb3f7acd48af99a6a3cc3e247f1ee39dd8c0727 Mon Sep 17 00:00:00 2001
+From 3a1d65dcdcdd2201dacf97eb5394bec9f4677297 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Mon, 26 Dec 2022 04:41:46 +0000
-Subject: [PATCH 026/119] FROMGIT(6.3): clk: meson: mpll: Switch from
+Subject: [PATCH 027/120] FROMGIT(6.3): clk: meson: mpll: Switch from
  .round_rate to .determine_rate
 
 clk_ops.round_rate will be removed at some point. It's replacement is

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch

@@ -1,7 +1,7 @@
-From d446faa2fd433dcdddf9bb3c6903fb41f21cc7de Mon Sep 17 00:00:00 2001
+From 6239c914d58c0517ccc5f1386918da94c03c2508 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Mon, 26 Dec 2022 04:42:41 +0000
-Subject: [PATCH 027/119] FROMGIT(6.3): clk: meson: dualdiv: switch from
+Subject: [PATCH 028/120] FROMGIT(6.3): clk: meson: dualdiv: switch from
  .round_rate to .determine_rate
 
 clk_ops.round_rate will be removed at some point. It's replacement is

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch

@@ -1,7 +1,7 @@
-From b25c8b76c5c500741e1bae5be92f40af8302646f Mon Sep 17 00:00:00 2001
+From 450b9f39897989b1f1f9c1efe5a07417d7ef04cf Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Mon, 26 Dec 2022 04:43:33 +0000
-Subject: [PATCH 028/119] FROMGIT(6.3): clk: meson: sclk-div: switch from
+Subject: [PATCH 029/120] FROMGIT(6.3): clk: meson: sclk-div: switch from
  .round_rate to .determine_rate
 
 clk_ops.round_rate will be removed at some point. It's replacement is

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch

@@ -1,42 +0,0 @@
-From 827db0a8686d83ae15ba6a60c219c9ca7a91a599 Mon Sep 17 00:00:00 2001
-From: Neil Armstrong <neil.armstrong@linaro.org>
-Date: Tue, 24 Jan 2023 12:39:08 +0100
-Subject: [PATCH 030/119] FROMGIT(6.3): arm64: dts: amlogic:
- meson-sm1-odroid-hc4: fix active fan thermal trip
-
-Add an active trip tied to the on-board fan cooling device, which is better
-than describing it along the passive cooling maps.
-
-Fixes: 33b14f663df8 ("arm64: dts: meson: add initial device-tree for ODROID-HC4")
-Reported-by: Ricardo Pardini <ricardo@pardini.net>
-Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
----
- arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
-index a1f0c38ccadd..74088e7280fe 100644
---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
-@@ -76,9 +76,17 @@ sound {
- };
- 
- &cpu_thermal {
-+	trips {
-+		cpu_active: cpu-active {
-+			temperature = <60000>; /* millicelsius */
-+			hysteresis = <2000>; /* millicelsius */
-+			type = "active";
-+		};
-+	};
-+
- 	cooling-maps {
- 		map {
--			trip = <&cpu_passive>;
-+			trip = <&cpu_active>;
- 			cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
- 		};
- 	};
--- 
-2.34.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch

@@ -1,7 +1,7 @@
-From b3173d4cbebb7494013b2471869f61aa7c50523b Mon Sep 17 00:00:00 2001
+From 900d5cb13f3c1b7ced0586497190be1ed96a4742 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Mon, 26 Dec 2022 04:44:26 +0000
-Subject: [PATCH 029/119] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from
+Subject: [PATCH 030/120] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from
  .round_rate to .determine_rate
 
 clk_ops.round_rate will be removed at some point. It's replacement is

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch

@@ -1,7 +1,7 @@
-From 6a563c7bffe748e52a415383f4fb9d1fcbf1caaa Mon Sep 17 00:00:00 2001
+From 6e28630c533846d7c79bb388a1cc1e13650e45b6 Mon Sep 17 00:00:00 2001
 From: David Heidelberg <david@ixit.cz>
 Date: Sat, 27 Nov 2021 07:23:35 +0000
-Subject: [PATCH 031/119] FROMGIT(6.3): arm64: dts: meson: make dts use
+Subject: [PATCH 031/120] FROMGIT(6.3): arm64: dts: meson: make dts use
  gpio-fan matrix instead of array
 
 No functional changes.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch

@@ -1,7 +1,7 @@
-From fe8bd6ed716a8dee218e13d39eec3bf6df05f055 Mon Sep 17 00:00:00 2001
+From 67e3334c533941ed976a3d6390c4553a0a4bf660 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 25 Jan 2023 08:10:48 +0000
-Subject: [PATCH 034/119] FROMGIT(6.3): arm64: dts: meson:
+Subject: [PATCH 032/120] FROMGIT(6.3): arm64: dts: meson:
  meson-sm1-bananapi-m5: convert to dtsi
 
 Convert the BPI-M5 dts into meson-sm1-bananapi.dtsi to support the
@@ -15,7 +15,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
-index e8a23861013f..34b3238ee0a0 100644
+index 38ebe98ba9c6..34b3238ee0a0 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
 @@ -6,10 +6,7 @@
@@ -34,13 +34,13 @@ index e8a23861013f..34b3238ee0a0 100644
  	compatible = "bananapi,bpi-m5", "amlogic,sm1";
  	model = "Banana Pi BPI-M5";
  
--	adc_keys {
+-	adc-keys {
 -		compatible = "adc-keys";
 -		io-channels = <&saradc 2>;
 -		io-channel-names = "buttons";
 -		keyup-threshold-microvolt = <1800000>;
 -
--		key {
+-		button-sw3 {
 -			label = "SW3";
 -			linux,code = <BTN_3>;
 -			press-threshold-microvolt = <1700000>;

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch

@@ -1,27 +0,0 @@
-From 24cdc899972f989681b564140e1ac677cd0dc12a Mon Sep 17 00:00:00 2001
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Thu, 26 Jan 2023 12:20:19 +0000
-Subject: [PATCH 032/119] FROMGIT(6.3): arm64: dts: meson: radxa-zero: allow
- usb otg mode
-
-Setting dr_mode to "host" prevents otg which can be useful on a board
-with limited connectivity options. So don't force host mode.
-
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
----
- arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-index e3bb6df42ff3..cf0a9be83fc4 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-@@ -401,5 +401,4 @@ &uart_AO {
- 
- &usb {
- 	status = "okay";
--	dr_mode = "host";
- };
--- 
-2.34.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch

@@ -1,38 +0,0 @@
-From d4acc14701de1429557af4e427e4e85131f12802 Mon Sep 17 00:00:00 2001
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Thu, 26 Jan 2023 16:15:59 +0000
-Subject: [PATCH 033/119] FROMGIT(6.3): arm64: dts: meson: bananapi-m5: switch
- VDDIO_C pin to OPEN_DRAIN
-
-For proper warm (re)boot from SD card the BPI-M5 board requires TFLASH_VDD_EN
-and VDDIO_C pins to be switched to high impedance mode. This can be achieved
-using OPEN_DRAIN instead of ACTIVE_HIGH to leave the GPIO pins in input mode
-and retain high state (pin has the pull-up).
-
-This change is inspired by meson-sm1-odroid.dtsi where OPEN_DRAIN has been
-used to resolve similar problems with the Odroid C4 board (TF_IO in the C4
-dts is the equivalent regulator).
-
-Fixes 976e920183e4 ("arm64: dts: meson-sm1: add Banana PI BPI-M5 board dts")
-Suggested-by: Neil Armstrong <neil.armstrong@linaro.org>
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
----
- arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
-index cadba194b149..e8a23861013f 100644
---- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
-@@ -123,7 +123,7 @@ vddio_c: regulator-vddio_c {
- 		regulator-min-microvolt = <1800000>;
- 		regulator-max-microvolt = <3300000>;
- 
--		enable-gpio = <&gpio_ao GPIOE_2 GPIO_ACTIVE_HIGH>;
-+		enable-gpio = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>;
- 		enable-active-high;
- 		regulator-always-on;
- 
--- 
-2.34.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch

@@ -0,0 +1,28 @@
+From 654df5af5a8feddbb6407c100061a1412a5f8238 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Wed, 25 Jan 2023 09:28:27 +0000
+Subject: [PATCH 033/120] FROMGIT(6.3): dt-bindings: arm: amlogic: add support
+ for BananaPi M2-Pro
+
+BPI-M2-PRO is based upon the BPI-M5 using the Amlogic SM1 (S905X3) chipset.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
+index 9fda2436c618..d63f6b899f25 100644
+--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
+@@ -175,6 +175,7 @@ properties:
+           - enum:
+               - amediatech,x96-air
+               - amediatech,x96-air-gbit
++              - bananapi,bpi-m2-pro
+               - bananapi,bpi-m5
+               - cyx,a95xf3-air
+               - cyx,a95xf3-air-gbit
+-- 
+2.34.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch

@@ -1,7 +1,7 @@
-From 8a627052d2914e54417e93d22900d3546d116e3a Mon Sep 17 00:00:00 2001
+From 2c38c04f66a209ef843a74c47d5ad55049a45fee Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 25 Jan 2023 08:13:28 +0000
-Subject: [PATCH 036/119] FROMGIT(6.3): arm64: dts: meson: add support for
+Subject: [PATCH 034/120] FROMGIT(6.3): arm64: dts: meson: add support for
  BananaPi M2-Pro
 
 BPI-M2-PRO is based upon the BPI-M5 design except for a different

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch

@@ -1,28 +1,30 @@
-From 84ce435b0892826680ab99807b7e086c8b5569f5 Mon Sep 17 00:00:00 2001
+From b71a8761891cdca7af133b91aaef4f485e7542b3 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Wed, 25 Jan 2023 09:28:27 +0000
-Subject: [PATCH 035/119] FROMGIT(6.3): dt-bindings: arm: amlogic: add support
- for BananaPi M2-Pro
+Date: Wed, 16 Feb 2022 07:27:07 +0000
+Subject: [PATCH 035/120] FROMGIT(6.3): dt-bindings: arm: amlogic: add support
+ for Radxa Zero2
 
-BPI-M2-PRO is based upon the BPI-M5 using the Amlogic SM1 (S905X3) chipset.
+The Radxa Zero2 is a small form-factor SBC using the Amlogic
+A311D chip.
 
 Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 ---
  Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 9fda2436c618..d63f6b899f25 100644
+index d63f6b899f25..7ded40b309a4 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -175,6 +175,7 @@ properties:
+@@ -154,6 +154,7 @@ properties:
+         items:
            - enum:
-               - amediatech,x96-air
-               - amediatech,x96-air-gbit
-+              - bananapi,bpi-m2-pro
-               - bananapi,bpi-m5
-               - cyx,a95xf3-air
-               - cyx,a95xf3-air-gbit
+               - khadas,vim3
++              - radxa,zero2
+           - const: amlogic,a311d
+           - const: amlogic,g12b
+ 
 -- 
 2.34.1
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch

@@ -1,7 +1,7 @@
-From 158ba8f7ed4d4e6e774df5a400bdc63c70db384e Mon Sep 17 00:00:00 2001
+From 263e11fb9680d32705f0980569dc32a412818488 Mon Sep 17 00:00:00 2001
 From: Yuntian Zhang <yt@radxa.com>
 Date: Fri, 14 Jan 2022 15:50:02 +0000
-Subject: [PATCH 038/119] FROMGIT(6.3): arm64: dts: meson: add support for
+Subject: [PATCH 036/120] FROMGIT(6.3): arm64: dts: meson: add support for
  Radxa Zero2
 
 Radxa Zero2 is a small form factor SBC based on the Amlogic A311D

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch

@@ -1,30 +0,0 @@
-From 7fa5cf2ed6c65f2071fcf92d5e1ede56322154f6 Mon Sep 17 00:00:00 2001
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Wed, 16 Feb 2022 07:27:07 +0000
-Subject: [PATCH 037/119] FROMGIT(6.3): dt-bindings: arm: amlogic: add support
- for Radxa Zero2
-
-The Radxa Zero2 is a small form-factor SBC using the Amlogic
-A311D chip.
-
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
-Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
----
- Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index d63f6b899f25..7ded40b309a4 100644
---- a/Documentation/devicetree/bindings/arm/amlogic.yaml
-+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -154,6 +154,7 @@ properties:
-         items:
-           - enum:
-               - khadas,vim3
-+              - radxa,zero2
-           - const: amlogic,a311d
-           - const: amlogic,g12b
- 
--- 
-2.34.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch

@@ -1,7 +1,7 @@
-From 29d379e87a02cecbe4213618c2a66d1a03768d02 Mon Sep 17 00:00:00 2001
+From be94b9629bc355647bda972f92e0887d3a94c17f Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Mon, 30 Jan 2023 16:16:15 +0100
-Subject: [PATCH 039/119] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio
+Subject: [PATCH 037/120] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio
  multiplexer
 
 Add documentation for the MDIO bus multiplexer found on the Amlogic GXL

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch

@@ -1,7 +1,7 @@
-From 3fa339d30ff897466809b54738aef7b0884f1b54 Mon Sep 17 00:00:00 2001
+From 7246aabe2dcaced67c24646712e930e931177c71 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Mon, 30 Jan 2023 16:16:16 +0100
-Subject: [PATCH 040/119] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux
+Subject: [PATCH 038/120] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux
  support
 
 Add support for the mdio mux and internal phy glue of the GXL SoC

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch

@@ -1,7 +1,7 @@
-From 90b6d6340680523ec3b0390d182f058fe4cfd272 Mon Sep 17 00:00:00 2001
+From 3f94f73ae5c31ac0c009e2867a25077cd63df251 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 12 Feb 2023 22:43:32 +0100
-Subject: [PATCH 041/119] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd
+Subject: [PATCH 039/120] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd
 
 MMC core only checks whether return value of .get_cd() equals zero.
 Therefore -ENOSYS and 1 are effectively the same and the function

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch

@@ -1,7 +1,7 @@
-From c0fa86921daa596b83cd24ca6ee9d832d3f62f55 Mon Sep 17 00:00:00 2001
+From 5142ba301edc43cc70ca708aafa84cf1b2b32feb Mon Sep 17 00:00:00 2001
 From: Benjamin Roszak <benjamin545@gmail.com>
 Date: Thu, 15 Jul 2021 14:32:33 -0400
-Subject: [PATCH 050/119] FROMLIST(v1): media: meson: vdec: remove redundant if
+Subject: [PATCH 040/120] FROMGIT(6.4): media: meson: vdec: remove redundant if
  statement
 
 Checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done as a

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch

@@ -1,7 +1,7 @@
-From a504e22a654a64c4920b96446f74c5d007140329 Mon Sep 17 00:00:00 2001
+From 1b5d94d6c98f76a33fcc98f09a9e2c414cb6c4ee Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 1 Feb 2023 08:53:39 +0000
-Subject: [PATCH 054/119] FROMLIST(v2): dt-bindings: media: rc: add rc-dreambox
+Subject: [PATCH 041/120] FROMGIT(6.4): dt-bindings: media: rc: add rc-dreambox
  binding
 
 Add a binding for the rc-dreambox remote keymap

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch

@@ -1,7 +1,7 @@
-From d978b4f1de65c75d27f09e370054946b600eb091 Mon Sep 17 00:00:00 2001
+From c86408e487a66dc5664c3002da54478eb103228c Mon Sep 17 00:00:00 2001
 From: Emanuel Strobel <emanuel.strobel@yahoo.com>
 Date: Mon, 5 Apr 2021 17:57:57 +0000
-Subject: [PATCH 055/119] FROMLIST(v2): media: rc: add common keymap for
+Subject: [PATCH 042/120] FROMGIT(6.4): media: rc: add common keymap for
  Dreambox RC10/RC0 and RC20/RC-BT remotes
 
 Add a common keymap for the RC10/RC0 and RC20/RC-BT remotes used with

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch

@@ -1,7 +1,7 @@
-From 89bf0cf980d400a58d5fb12f0cb23af6c00e0415 Mon Sep 17 00:00:00 2001
+From b2ab233ef1556f2e210c6fe88ea7fca11b52092c Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 4 Feb 2023 06:42:20 +0000
-Subject: [PATCH 056/119] FROMLIST(v2): dt-bindings: media: rc: add
+Subject: [PATCH 043/120] FROMGIT(6.4): dt-bindings: media: rc: add
  rc-beelink-mxiii
 
 Add a binding for the rc-beelink-mxiii remote keymap

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch

@@ -1,7 +1,7 @@
-From 39794f188cf5778a6b84517d95c50e830d9d89ba Mon Sep 17 00:00:00 2001
+From 428bfd6a70cdf2dba7e39568e2cb5a3c283c0bb6 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 8 Dec 2021 15:33:47 +0000
-Subject: [PATCH 057/119] FROMLIST(v2): media: rc: add Beelink Mini MXIII
+Subject: [PATCH 044/120] FROMGIT(6.4): media: rc: add Beelink Mini MXIII
  keymap
 
 Add a keymap for the simple IR (NEC) remote used with the Beelink

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch

@@ -1,7 +1,7 @@
-From 5ecde6b3e72b51715d366c5f2a63b4161aab4ac8 Mon Sep 17 00:00:00 2001
+From 5c659c53668a1a8dbe101959142bb9e468a7cd87 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 10 Feb 2023 02:16:12 +0000
-Subject: [PATCH 059/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: sort
+Subject: [PATCH 045/120] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: sort
  and tidy the dts
 
 Alpha-sort the nodes, move the default line in the LED node to where it's
@@ -11,14 +11,14 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
 Tested-by: Ferass El Hafidi <vitali64pmemail@protonmail.com>
 Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
 ---
- .../boot/dts/amlogic/meson-gxbb-kii-pro.dts   | 32 ++++++++-----------
- 1 file changed, 14 insertions(+), 18 deletions(-)
+ .../boot/dts/amlogic/meson-gxbb-kii-pro.dts   | 31 ++++++++-----------
+ 1 file changed, 13 insertions(+), 18 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
-index 6d8cc00fedc7..9bfdb54d912a 100644
+index 5f2d4317ecfb..73ad0f5110f3 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
-@@ -6,21 +6,22 @@
+@@ -6,10 +6,10 @@
  /dts-v1/;
  
  #include "meson-gxbb-p20x.dtsi"
@@ -30,11 +30,9 @@ index 6d8cc00fedc7..9bfdb54d912a 100644
  / {
  	compatible = "videostrong,kii-pro", "amlogic,meson-gxbb";
  	model = "Videostrong KII Pro";
- 
- 	leds {
+@@ -18,9 +18,9 @@ leds {
  		compatible = "gpio-leds";
-+
- 		status {
+ 		led {
  			gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;
 -			default-state = "off";
  			color = <LED_COLOR_ID_RED>;
@@ -43,13 +41,13 @@ index 6d8cc00fedc7..9bfdb54d912a 100644
  		};
  	};
  
-@@ -34,24 +35,8 @@ button-reset {
+@@ -34,24 +34,8 @@ button-reset {
  			gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
  		};
  	};
 -
--};
--
+ };
+ 
 -
 -
 -&uart_A {
@@ -61,14 +59,14 @@ index 6d8cc00fedc7..9bfdb54d912a 100644
 -	bluetooth {
 -		compatible = "brcm,bcm4335a0";
 -	};
- };
- 
+-};
+-
 -
 -
  &ethmac {
  	status = "okay";
  	pinctrl-0 = <&eth_rmii_pins>;
-@@ -78,3 +63,14 @@ eth_phy0: ethernet-phy@0 {
+@@ -78,3 +62,14 @@ eth_phy0: ethernet-phy@0 {
  &ir {
  	linux,rc-map-name = "rc-videostrong-kii-pro";
  };

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch

@@ -1,7 +1,7 @@
-From 8e6a3584cedb7b625d698b08781ab96f7f515a9d Mon Sep 17 00:00:00 2001
+From eb1e3d228629c1946aef18c7337c5bc0e2694610 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 10 Feb 2023 02:21:08 +0000
-Subject: [PATCH 060/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro:
+Subject: [PATCH 046/120] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro:
  complete the bluetooth node
 
 Add missing content to the bluetooth node to align it with the content
@@ -15,10 +15,10 @@ Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
-index 9bfdb54d912a..435ae2aa404e 100644
+index 73ad0f5110f3..a800e8955c4a 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
-@@ -72,5 +72,10 @@ &uart_A {
+@@ -71,5 +71,10 @@ &uart_A {
  
  	bluetooth {
  		compatible = "brcm,bcm4335a0";

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch

@@ -1,7 +1,7 @@
-From 26e09e684c37965401d31cacdc5f03912b84121b Mon Sep 17 00:00:00 2001
+From 52fdf527ce95b5c7347cde0f0105b3003a834ac8 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 10 Feb 2023 02:29:00 +0000
-Subject: [PATCH 061/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: add
+Subject: [PATCH 047/120] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: add
  initial audio support
 
 Add initial support for HDMI and S/PDIF audio output.
@@ -14,7 +14,7 @@ Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
  1 file changed, 60 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
-index 435ae2aa404e..a09340e9f73a 100644
+index a800e8955c4a..e238f1f10124 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
 @@ -9,11 +9,19 @@
@@ -36,8 +36,8 @@ index 435ae2aa404e..a09340e9f73a 100644
 +
  	leds {
  		compatible = "gpio-leds";
- 
-@@ -35,6 +43,58 @@ button-reset {
+ 		led {
+@@ -34,6 +42,58 @@ button-reset {
  			gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
  		};
  	};

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch

@@ -0,0 +1,39 @@
+From dafb23b2d7961125dc39553fa6b2ffb1b892a8b5 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <neil.armstrong@linaro.org>
+Date: Fri, 3 Mar 2023 18:37:57 +0100
+Subject: [PATCH 048/120] FROMGIT(6.4): dt-bindings: arm: amlogic: Document the
+ boards with the BPI-CM4 connected
+
+The BPI-CM4 module with an Amlogic A311D SoC is a module compatible
+with the Raspberry Pi CM4 specifications.
+
+Document the boards using this module, by specifying the BananaPi CM4
+compatible in addition to the baseboard compatible.
+
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+---
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
+index 7ded40b309a4..94f68e7c85ed 100644
+--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
+@@ -158,6 +158,14 @@ properties:
+           - const: amlogic,a311d
+           - const: amlogic,g12b
+ 
++      - description: Boards using the BPI-CM4 module with Amlogic Meson G12B A311D SoC
++        items:
++          - enum:
++              - bananapi,bpi-cm4io
++          - const: bananapi,bpi-cm4
++          - const: amlogic,a311d
++          - const: amlogic,g12b
++
+       - description: Boards with the Amlogic Meson G12B S922X SoC
+         items:
+           - enum:
+-- 
+2.34.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch

@@ -0,0 +1,610 @@
+From b76cd699a611d0fb168b6204489b8f2e41311b6b Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <neil.armstrong@linaro.org>
+Date: Sat, 4 Mar 2023 07:14:17 +0000
+Subject: [PATCH 049/120] FROMGIT(6.4): arm64: dts: amlogic: Add initial
+ support for BPI-CM4 module with BPI-CM4IO baseboard
+
+Add support for both the BananaPi BPI-CM4 module and the BananaPi
+baseboard which is comnpatible with the RaspberryPi CM4IO baseboard.
+
+The BananaPi BPI-CM4 module follows the CM4 specifications at [1],
+but with a single HDMI port and a since DSI output.
+
+The current CM4IO baseboard DT should work fine on the Raspberry CM4
+baseboard and other derivatives baseboards, but proper DT should
+be written for other baseboards.
+
+The split is done so it's easy to describe a new CM4 baseboard, enabling
+only the necessary HW used on the baseboard.
+
+[1] https://datasheets.raspberrypi.com/cm4io/cm4io-datasheet.pdf
+
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+---
+ arch/arm64/boot/dts/amlogic/Makefile          |   1 +
+ .../amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 165 ++++++++
+ .../dts/amlogic/meson-g12b-bananapi-cm4.dtsi  | 388 ++++++++++++++++++
+ 3 files changed, 554 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
+
+diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
+index 5d5ec22a469e..f5845e565efb 100644
+--- a/arch/arm64/boot/dts/amlogic/Makefile
++++ b/arch/arm64/boot/dts/amlogic/Makefile
+@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
+new file mode 100644
+index 000000000000..1b0c3881c6a1
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
+@@ -0,0 +1,165 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (c) 2023 Neil Armstrong <neil.armstrong@linaro.org>
++ */
++
++/dts-v1/;
++
++#include "meson-g12b-bananapi-cm4.dtsi"
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/leds/common.h>
++#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
++
++/ {
++	compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
++	model = "BananaPi BPI-CM4IO Baseboard with BPI-CM4 Module";
++
++	aliases {
++		ethernet0 = &ethmac;
++		i2c0 = &i2c1;
++		i2c1 = &i2c3;
++	};
++
++	adc-keys {
++		compatible = "adc-keys";
++		io-channels = <&saradc 2>;
++		io-channel-names = "buttons";
++		keyup-threshold-microvolt = <1710000>;
++
++		button-function {
++			label = "Function";
++			linux,code = <KEY_FN>;
++			press-threshold-microvolt = <10000>;
++		};
++	};
++
++	hdmi_connector: hdmi-connector {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_connector_in: endpoint {
++				remote-endpoint = <&hdmi_tx_tmds_out>;
++			};
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		led-blue {
++			color = <LED_COLOR_ID_BLUE>;
++			function = LED_FUNCTION_STATUS;
++			gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "heartbeat";
++		};
++
++		led-green {
++			color = <LED_COLOR_ID_GREEN>;
++			function = LED_FUNCTION_STATUS;
++			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
++		};
++	};
++
++	sound {
++		compatible = "amlogic,axg-sound-card";
++		model = "BPI-CM4IO";
++		audio-aux-devs = <&tdmout_b>;
++		audio-routing =	"TDMOUT_B IN 0", "FRDDR_A OUT 1",
++				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
++				"TDMOUT_B IN 2", "FRDDR_C OUT 1",
++				"TDM_B Playback", "TDMOUT_B OUT";
++
++		assigned-clocks = <&clkc CLKID_MPLL2>,
++				  <&clkc CLKID_MPLL0>,
++				  <&clkc CLKID_MPLL1>;
++		assigned-clock-parents = <0>, <0>, <0>;
++		assigned-clock-rates = <294912000>,
++				       <270950400>,
++				       <393216000>;
++
++		dai-link-0 {
++			sound-dai = <&frddr_a>;
++		};
++
++		dai-link-1 {
++			sound-dai = <&frddr_b>;
++		};
++
++		dai-link-2 {
++			sound-dai = <&frddr_c>;
++		};
++
++		/* 8ch hdmi interface */
++		dai-link-3 {
++			sound-dai = <&tdmif_b>;
++			dai-format = "i2s";
++			dai-tdm-slot-tx-mask-0 = <1 1>;
++			dai-tdm-slot-tx-mask-1 = <1 1>;
++			dai-tdm-slot-tx-mask-2 = <1 1>;
++			dai-tdm-slot-tx-mask-3 = <1 1>;
++			mclk-fs = <256>;
++
++			codec {
++				sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
++			};
++		};
++
++		/* hdmi glue */
++		dai-link-4 {
++			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
++
++			codec {
++				sound-dai = <&hdmi_tx>;
++			};
++		};
++	};
++};
++
++&cecb_AO {
++	status = "okay";
++};
++
++&ethmac {
++	status = "okay";
++};
++
++&hdmi_tx {
++	status = "okay";
++};
++
++&hdmi_tx_tmds_port {
++	hdmi_tx_tmds_out: endpoint {
++		remote-endpoint = <&hdmi_connector_in>;
++	};
++};
++
++/* CSI port */
++&i2c1 {
++	status = "okay";
++};
++
++/* DSI port for touchscreen */
++&i2c3 {
++	status = "okay";
++};
++
++/* miniPCIe port with USB + SIM slot */
++&pcie {
++	status = "okay";
++};
++
++&sd_emmc_b {
++	status = "okay";
++};
++
++&tohdmitx {
++	status = "okay";
++};
++
++/* Peripheral Only USB-C port */
++&usb {
++	dr_mode = "peripheral";
++
++	status = "okay";
++};
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
+new file mode 100644
+index 000000000000..dc0988c82694
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
+@@ -0,0 +1,388 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (c) 2023 Neil Armstrong <neil.armstrong@linaro.org>
++ */
++
++#include "meson-g12b-a311d.dtsi"
++#include <dt-bindings/gpio/meson-g12a-gpio.h>
++
++/ {
++	aliases {
++		serial0 = &uart_AO;
++		rtc1 = &vrtc;
++	};
++
++	chosen {
++		stdout-path = "serial0:115200n8";
++	};
++
++	emmc_pwrseq: emmc-pwrseq {
++		compatible = "mmc-pwrseq-emmc";
++		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
++	};
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x0 0x0 0x0 0x40000000>;
++	};
++
++	sdio_pwrseq: sdio-pwrseq {
++		compatible = "mmc-pwrseq-simple";
++		reset-gpios = <&gpio GPIOAO_6 GPIO_ACTIVE_LOW>;
++		clocks = <&wifi32k>;
++		clock-names = "ext_clock";
++	};
++
++	emmc_1v8: regulator-emmc_1v8 {
++		compatible = "regulator-fixed";
++		regulator-name = "EMMC_1V8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++		vin-supply = <&vddao_3v3>;
++		regulator-always-on;
++	};
++
++	dc_in: regulator-dc-in {
++		compatible = "regulator-fixed";
++		regulator-name = "DC_IN";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		regulator-always-on;
++	};
++
++	vddio_c: regulator-vddio-c {
++		compatible = "regulator-gpio";
++		regulator-name = "VDDIO_C";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <3300000>;
++
++		enable-gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
++		enable-active-high;
++		regulator-always-on;
++
++		gpios = <&gpio_ao GPIOAO_9 GPIO_OPEN_DRAIN>;
++		gpios-states = <1>;
++
++		states = <1800000 0>,
++			 <3300000 1>;
++	};
++
++	vddao_1v8: regulator-vddao-1v8 {
++		compatible = "regulator-fixed";
++		regulator-name = "VDDAO_1V8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++		vin-supply = <&vddao_3v3>;
++		regulator-always-on;
++	};
++
++	vddao_3v3: regulator-vddao-3v3 {
++		compatible = "regulator-fixed";
++		regulator-name = "VDDAO_3V3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		vin-supply = <&dc_in>;
++		regulator-always-on;
++	};
++
++	vddcpu_a: regulator-vddcpu-a {
++		/*
++		 * MP8756GD DC/DC Regulator.
++		 */
++		compatible = "pwm-regulator";
++
++		regulator-name = "VDDCPU_A";
++		regulator-min-microvolt = <680000>;
++		regulator-max-microvolt = <1040000>;
++
++		pwm-supply = <&dc_in>;
++
++		pwms = <&pwm_ab 0 1250 0>;
++		pwm-dutycycle-range = <100 0>;
++
++		regulator-boot-on;
++		regulator-always-on;
++	};
++
++	vddcpu_b: regulator-vddcpu-b {
++		/*
++		 * SY8120B1ABC DC/DC Regulator.
++		 */
++		compatible = "pwm-regulator";
++
++		regulator-name = "VDDCPU_B";
++		regulator-min-microvolt = <680000>;
++		regulator-max-microvolt = <1040000>;
++
++		pwm-supply = <&dc_in>;
++
++		pwms = <&pwm_AO_cd 1 1250 0>;
++		pwm-dutycycle-range = <100 0>;
++
++		regulator-boot-on;
++		regulator-always-on;
++	};
++
++	wifi32k: wifi32k {
++		compatible = "pwm-clock";
++		#clock-cells = <0>;
++		clock-frequency = <32768>;
++		pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
++	};
++};
++
++&arb {
++	status = "okay";
++};
++
++&clkc_audio {
++	status = "okay";
++};
++
++&cec_AO {
++	pinctrl-0 = <&cec_ao_a_h_pins>;
++	pinctrl-names = "default";
++	hdmi-phandle = <&hdmi_tx>;
++};
++
++&cecb_AO {
++	pinctrl-0 = <&cec_ao_b_h_pins>;
++	pinctrl-names = "default";
++	hdmi-phandle = <&hdmi_tx>;
++};
++
++&cpu0 {
++	cpu-supply = <&vddcpu_b>;
++	operating-points-v2 = <&cpu_opp_table_0>;
++	clocks = <&clkc CLKID_CPU_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu1 {
++	cpu-supply = <&vddcpu_b>;
++	operating-points-v2 = <&cpu_opp_table_0>;
++	clocks = <&clkc CLKID_CPU_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu100 {
++	cpu-supply = <&vddcpu_a>;
++	operating-points-v2 = <&cpub_opp_table_1>;
++	clocks = <&clkc CLKID_CPUB_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu101 {
++	cpu-supply = <&vddcpu_a>;
++	operating-points-v2 = <&cpub_opp_table_1>;
++	clocks = <&clkc CLKID_CPUB_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu102 {
++	cpu-supply = <&vddcpu_a>;
++	operating-points-v2 = <&cpub_opp_table_1>;
++	clocks = <&clkc CLKID_CPUB_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu103 {
++	cpu-supply = <&vddcpu_a>;
++	operating-points-v2 = <&cpub_opp_table_1>;
++	clocks = <&clkc CLKID_CPUB_CLK>;
++	clock-latency = <50000>;
++};
++
++&ext_mdio {
++	external_phy: ethernet-phy@0 {
++		/* Realtek RTL8211F (0x001cc916) */
++		reg = <0>;
++		max-speed = <1000>;
++
++		interrupt-parent = <&gpio_intc>;
++		/* MAC_INTR on GPIOZ_14 */
++		interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
++	};
++};
++
++/* Ethernet to be enabled in baseboard DT */
++&ethmac {
++	pinctrl-0 = <&eth_pins>, <&eth_rgmii_pins>;
++	pinctrl-names = "default";
++	phy-mode = "rgmii-txid";
++	phy-handle = <&external_phy>;
++};
++
++&frddr_a {
++	status = "okay";
++};
++
++&frddr_b {
++	status = "okay";
++};
++
++&frddr_c {
++	status = "okay";
++};
++
++/* HDMI to be enabled in baseboard DT */
++&hdmi_tx {
++	pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
++	pinctrl-names = "default";
++	hdmi-supply = <&dc_in>;
++};
++
++/* "Camera" I2C bus */
++&i2c1 {
++	pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>;
++	pinctrl-names = "default";
++};
++
++/* Main I2C bus */
++&i2c2 {
++	pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
++	pinctrl-names = "default";
++};
++
++/* "ID" I2C bus */
++&i2c3 {
++	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
++	pinctrl-names = "default";
++};
++
++&pcie {
++	reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>;
++};
++
++&pwm_ab {
++	pinctrl-0 = <&pwm_a_e_pins>;
++	pinctrl-names = "default";
++	clocks = <&xtal>;
++	clock-names = "clkin0";
++
++	status = "okay";
++};
++
++&pwm_ef {
++	pinctrl-0 = <&pwm_e_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++};
++
++&pwm_AO_cd {
++	pinctrl-0 = <&pwm_ao_d_e_pins>;
++	pinctrl-names = "default";
++	clocks = <&xtal>;
++	clock-names = "clkin1";
++
++	status = "okay";
++};
++
++&saradc {
++	vref-supply = <&vddao_1v8>;
++
++	status = "okay";
++};
++
++/* on-module SDIO WiFi */
++&sd_emmc_a {
++	pinctrl-0 = <&sdio_pins>;
++	pinctrl-1 = <&sdio_clk_gate_pins>;
++	pinctrl-names = "default", "clk-gate";
++	#address-cells = <1>;
++	#size-cells = <0>;
++
++	bus-width = <4>;
++	sd-uhs-sdr104;
++	max-frequency = <50000000>;
++
++	non-removable;
++	disable-wp;
++
++	/* WiFi firmware requires power in suspend */
++	keep-power-in-suspend;
++
++	mmc-pwrseq = <&sdio_pwrseq>;
++
++	vmmc-supply = <&vddao_3v3>;
++	vqmmc-supply = <&vddao_3v3>;
++
++	status = "okay";
++
++	rtl8822cs: wifi@1 {
++		reg = <1>;
++	};
++};
++
++/* SD card to be enabled in baseboard DT */
++&sd_emmc_b {
++	pinctrl-0 = <&sdcard_c_pins>;
++	pinctrl-1 = <&sdcard_clk_gate_c_pins>;
++	pinctrl-names = "default", "clk-gate";
++
++	bus-width = <4>;
++	cap-sd-highspeed;
++	max-frequency = <50000000>;
++	disable-wp;
++
++	cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
++	vmmc-supply = <&vddao_3v3>;
++	vqmmc-supply = <&vddio_c>;
++};
++
++/* on-module eMMC */
++&sd_emmc_c {
++	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
++	pinctrl-1 = <&emmc_clk_gate_pins>;
++	pinctrl-names = "default", "clk-gate";
++
++	bus-width = <8>;
++	cap-mmc-highspeed;
++	mmc-ddr-1_8v;
++	mmc-hs200-1_8v;
++	max-frequency = <200000000>;
++	disable-wp;
++
++	mmc-pwrseq = <&emmc_pwrseq>;
++	vmmc-supply = <&vddao_3v3>;
++	vqmmc-supply = <&vddao_1v8>;
++
++	status = "okay";
++};
++
++&tdmif_b {
++	status = "okay";
++};
++
++&tdmout_b {
++	status = "okay";
++};
++
++/* on-module UART BT */
++&uart_A {
++	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
++	pinctrl-names = "default";
++	uart-has-rtscts;
++
++	status = "okay";
++
++	bluetooth {
++		compatible = "realtek,rtl8822cs-bt";
++		enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
++		host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
++		device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
++	};
++};
++
++&uart_AO {
++	pinctrl-0 = <&uart_ao_a_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++};
++
++&usb {
++	phys = <&usb2_phy0>, <&usb2_phy1>;
++	phy-names = "usb2-phy0", "usb2-phy1";
++};
+-- 
+2.34.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch

@@ -1,7 +1,7 @@
-From ec6df411382a6b218aed3dc3f3247c88d6f533da Mon Sep 17 00:00:00 2001
+From df65d487bb29ae0489c9794428ce57383471c6d7 Mon Sep 17 00:00:00 2001
 From: Sergey Shtylyov <s.shtylyov@omp.ru>
 Date: Fri, 24 Dec 2021 06:09:57 +0000
-Subject: [PATCH 042/119] FROMLIST(v1): mmc: meson-gx: fix deferred probing
+Subject: [PATCH 050/120] FROMLIST(v1): mmc: meson-gx: fix deferred probing
 
 The driver overrides the error codes and IRQ0 returned by platform_get_irq()
 to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch

@@ -1,7 +1,7 @@
-From 76869c873dc2fc0bb999a7f078a981b3cca8d79b Mon Sep 17 00:00:00 2001
+From 022946dc830b928d2361e87501c7fca8505d6910 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Sun, 20 Feb 2022 08:23:12 +0000
-Subject: [PATCH 043/119] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
+Subject: [PATCH 051/120] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
  Micro Electronics
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch

@@ -1,7 +1,7 @@
-From ea68b39d92eb6daeae900078a8d5fb884aa2aedb Mon Sep 17 00:00:00 2001
+From 94060333363a0241442deb5b993655188901840d Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 20 Feb 2022 08:24:47 +0000
-Subject: [PATCH 044/119] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan
+Subject: [PATCH 052/120] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan
  Micro Electronics TM1628
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch

@@ -1,7 +1,7 @@
-From 9b520e8a8d6edbd7da36baed8a221f4abe110633 Mon Sep 17 00:00:00 2001
+From a53c2bef9b9f389914eb410e73b02b5099266708 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 20 Feb 2022 08:26:27 +0000
-Subject: [PATCH 045/119] FROMLIST(v5): docs: ABI: document tm1628 attribute
+Subject: [PATCH 053/120] FROMLIST(v5): docs: ABI: document tm1628 attribute
  display-text
 
 Document the attribute for reading / writing the text to be displayed on

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch

@@ -1,7 +1,7 @@
-From 1f2f8f35ca011bbc72ef1292b1927aa002a34811 Mon Sep 17 00:00:00 2001
+From e64e545d0880e5617042ae8d28e60a455a689a78 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Mon, 4 Apr 2022 18:51:20 +0000
-Subject: [PATCH 046/119] FROMLIST(v5): auxdisplay: add support for Titanmec
+Subject: [PATCH 054/120] FROMLIST(v5): auxdisplay: add support for Titanmec
  TM1628 7 segment display controller
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch

@@ -1,7 +1,7 @@
-From a8d66974c12c82d16e132e6bdbaf8bd309e2e8e0 Mon Sep 17 00:00:00 2001
+From 136c5d1f6275026217be5741df24816a3875e7a4 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Mon, 4 Apr 2022 18:52:34 +0000
-Subject: [PATCH 047/119] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini:
+Subject: [PATCH 055/120] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini:
  add support for the 7 segment display
 
 This patch adds support for the 7 segment display of the device.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch

@@ -1,7 +1,7 @@
-From 61450e18700a00f6fbf4194f2afa3238687c8044 Mon Sep 17 00:00:00 2001
+From fbc5936b6016a740768dcd2ac99be9691750e649 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Mon, 4 Apr 2022 18:53:32 +0000
-Subject: [PATCH 048/119] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
+Subject: [PATCH 056/120] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
  auxdisplay driver
 
 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch

@@ -1,7 +1,7 @@
-From 24048a5997adb905190d42eb60c3b73118d860b1 Mon Sep 17 00:00:00 2001
+From fdcff6282a2fcb2afb2751c33f22ea245002b068 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 23 Dec 2018 02:24:38 +0100
-Subject: [PATCH 049/119] FROMLIST(v1): ASoC: hdmi-codec: reorder channel
+Subject: [PATCH 057/120] FROMLIST(v1): ASoC: hdmi-codec: reorder channel
  allocation list
 
 Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx().

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch

@@ -1,7 +1,7 @@
-From 93eacecf63e1c2f0fe5abcaed4a78c2bebd24560 Mon Sep 17 00:00:00 2001
+From 89e62d3e8515a1f51b415b255b7200bdf8f1209d Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 22 Nov 2021 09:15:21 +0000
-Subject: [PATCH 051/119] FROMLIST(v1): media: meson: vdec: esparser: check
+Subject: [PATCH 058/120] FROMLIST(v1): media: meson: vdec: esparser: check
  parsing state with hardware write pointer
 
 Also check the hardware write pointer to check if ES Parser has stalled.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch

@@ -1,7 +1,7 @@
-From 7c7cfd0c00e1037fc0226393ee509169893756f0 Mon Sep 17 00:00:00 2001
+From 88671c6347d92c258d84e6448d2f0590ed8766d4 Mon Sep 17 00:00:00 2001
 From: Benjamin Roszak <benjamin545@gmail.com>
 Date: Mon, 23 Jan 2023 10:56:46 +0000
-Subject: [PATCH 052/119] FROMLIST(v2): media: meson: vdec: implement 10bit
+Subject: [PATCH 059/120] FROMLIST(v2): media: meson: vdec: implement 10bit
  bitstream handling
 
 In order to support 10bit bitstream decoding, buffers and MMU

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch

@@ -1,7 +1,7 @@
-From 5033662952d289300d6ee76c17913abe3e5de47e Mon Sep 17 00:00:00 2001
+From bc74e7054ac07e488d17c25f7c30660fcff5fb4d Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Mon, 23 Jan 2023 11:07:04 +0000
-Subject: [PATCH 053/119] FROMLIST(v2): media: meson: vdec: add HEVC decode
+Subject: [PATCH 060/120] FROMLIST(v2): media: meson: vdec: add HEVC decode
  codec
 
 Add initial HEVC codec for the Amlogic GXBB/GXL/GXM SoCs using

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch

@@ -1,7 +1,7 @@
-From 4df952eb87fb849535fa3ce7b9b8c86e9c3d7e1a Mon Sep 17 00:00:00 2001
+From f9e1f4f9ae2a9390cc8bde8742f4454acc29ff0f Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Wed, 22 Feb 2023 21:41:53 +0100
-Subject: [PATCH 062/119] FROMLIST(v2): dt-bindings: serial:
+Subject: [PATCH 061/120] FROMLIST(v2): dt-bindings: serial:
  amlogic,meson-uart: Add compatible string for G12A
 
 Amlogic G12A SoCs gained a new "divide XTAL by 2" bit. Everything else

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch

@@ -1,7 +1,7 @@
-From a795fe52d97a8792a94d8c1109f68984c89ed527 Mon Sep 17 00:00:00 2001
+From 6784e19cbe62900c5524fe8e2b5b6216f7fb2ae5 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Wed, 22 Feb 2023 21:44:16 +0100
-Subject: [PATCH 063/119] FROMLIST(v2): tty: serial: meson: Add a new
+Subject: [PATCH 062/120] FROMLIST(v2): tty: serial: meson: Add a new
  compatible string for the G12A SoC
 
 Amlogic Meson G12A (and later) SoCs also have the "divide XTAL by 2" bit

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch

@@ -1,7 +1,7 @@
-From 0e9c49a97b49745c4de3ec41bd9f3eaf6755d71a Mon Sep 17 00:00:00 2001
+From 9bf0bf029cc3ddea57cab66ea49db0d69048ee99 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Wed, 22 Feb 2023 21:47:16 +0100
-Subject: [PATCH 064/119] FROMLIST(v2): arm64: dts: meson-g12-common: Use the
+Subject: [PATCH 063/120] FROMLIST(v2): arm64: dts: meson-g12-common: Use the
  G12A UART compatible string
 
 Switch meson-12-common.dtsi to use the Meson G12A specific UART
@@ -18,7 +18,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
  1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-index 749d5b3e3554..977bfc1f1701 100644
+index bb2e86073261..ec78283d9a9e 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 @@ -2040,7 +2040,8 @@ pwm_AO_cd: pwm@2000 {

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch

@@ -1,7 +1,7 @@
-From f589d7cc58e31e96f58b80e516945e5f701b62a1 Mon Sep 17 00:00:00 2001
+From 866fcbd4b9f8e1f3502ab857a23a7a19f2d0ba9e Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 5 Jan 2023 15:16:46 +0000
-Subject: [PATCH 065/119] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware
+Subject: [PATCH 064/120] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware
  decoding
 
 The MPEG1/2 decoder is broken and nobody has volunteered to poke

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch

@@ -1,7 +1,7 @@
-From 76d5200e280b14a0f50556b7b50371c13455dddc Mon Sep 17 00:00:00 2001
+From 705f27c026178c3cc9af1142fcbea2f686e034a5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 18 Jan 2022 15:09:12 +0000
-Subject: [PATCH 066/119] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
+Subject: [PATCH 065/120] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
  100MHz
 
 Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch

@@ -1,7 +1,7 @@
-From f1eb8cf980881ab603ec1fd257e5801d3b412032 Mon Sep 17 00:00:00 2001
+From fb0a50ba250cb8b6c328e32b5132f29a7ada0488 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 19 Jan 2022 06:45:06 +0000
-Subject: [PATCH 067/119] WIP: arm64: dts: meson: add UHS SDIO capabilities to
+Subject: [PATCH 066/120] WIP: arm64: dts: meson: add UHS SDIO capabilities to
  p212/p23x/q20x
 
 Add UHS capabilities to the SDIO node to enable 100MHz speeds.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch

@@ -1,7 +1,7 @@
-From bebad1696209039640521ca5649548d106d32eeb Mon Sep 17 00:00:00 2001
+From dac1058a8890451e943cd3dd82a04b23436928b2 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 18 Jan 2022 15:18:32 +0000
-Subject: [PATCH 068/119] WIP: arm64: dts: meson: remove SDIO node from Khadas
+Subject: [PATCH 067/120] WIP: arm64: dts: meson: remove SDIO node from Khadas
  VIM1
 
 Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch

@@ -1,7 +1,7 @@
-From 855a21c63c2b82230248a9bab6ba2865518a7bd5 Mon Sep 17 00:00:00 2001
+From 8aadc1cc8f6f3ff75b071c935e2f885fd735ba81 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 07:52:47 +0000
-Subject: [PATCH 069/119] WIP: arm64: dts: meson: add audio playback to p201
+Subject: [PATCH 068/120] WIP: arm64: dts: meson: add audio playback to p201
 
 Add initial audio support limited to HDMI i2s.
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch

@@ -1,7 +1,7 @@
-From c6e8181b98c57349768ad232ee3557ce9b606c06 Mon Sep 17 00:00:00 2001
+From a44b679ac6004a5a9a3c28ed744e597df0c840b5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 07:56:15 +0000
-Subject: [PATCH 070/119] WIP: arm64: dts: meson: add audio playback to p200
+Subject: [PATCH 069/120] WIP: arm64: dts: meson: add audio playback to p200
 
 Add initial support limited to HDMI i2s and SPDIF (LPCM).
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch

@@ -1,7 +1,7 @@
-From fff41879355aba35bc6c674ca32a4f90408e7f98 Mon Sep 17 00:00:00 2001
+From 76dfcdd0088bbc374551c52759be7223f8752074 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 17 May 2020 05:00:55 +0000
-Subject: [PATCH 071/119] WIP: arm64: dts: meson: add audio playback to u200
+Subject: [PATCH 070/120] WIP: arm64: dts: meson: add audio playback to u200
 
 Add initial support limited to HDMI i2s and SPDIF (LPCM).
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch

@@ -1,7 +1,7 @@
-From 6e49e1d60237acf467191c490b5fecb8536f7536 Mon Sep 17 00:00:00 2001
+From c60ca77b02dd6904ffbd5418138a5880a822b460 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 27 Nov 2021 13:50:06 +0000
-Subject: [PATCH 072/119] WIP: arm64: dts: meson: add Headphone output to
+Subject: [PATCH 071/120] WIP: arm64: dts: meson: add Headphone output to
  Beelink GT-King
 
 Add support for the Headphone audio DAC built-in to the S922X chip.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch

@@ -1,7 +1,7 @@
-From 959c3000813126592068fc508428b3dd8a2f7445 Mon Sep 17 00:00:00 2001
+From d7ec2bf4d082d383dd2f3a77cbf46bb10261ea59 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 29 Feb 2020 15:13:02 +0000
-Subject: [PATCH 073/119] WIP: dt-bindings: arm: amlogic: add support for the
+Subject: [PATCH 072/120] WIP: dt-bindings: arm: amlogic: add support for the
  Tanix TX5 Max
 
 The Oranth (Tanix) TX5 Max is based on the Amlogic U200 reference
@@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 7ded40b309a4..940fda576809 100644
+index 94f68e7c85ed..845a5eb56ff3 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -146,6 +146,7 @@ properties: