diff --git a/packages/audio/wireplumber/package.mk b/packages/audio/wireplumber/package.mk index e048dca17..a0c7ad4c8 100644 --- a/packages/audio/wireplumber/package.mk +++ b/packages/audio/wireplumber/package.mk @@ -38,6 +38,10 @@ EOF cat > ${INSTALL}/usr/share/wireplumber/bluetooth.lua.d/89-disable-bluez-hfphsp-backend.lua << EOF bluez_monitor.properties["bluez5.hfphsp-backend"] = "none" +EOF + + cat > ${INSTALL}/usr/share/wireplumber/main.lua.d/50-libcamera-config.lua << EOF +libcamera_monitor.enabled = false EOF } diff --git a/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo3_joypad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo3_joypad.cfg index cdb424e21..8904a8239 100644 --- a/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo3_joypad.cfg +++ b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo3_joypad.cfg @@ -4,21 +4,21 @@ input_device_display_name = "Odroid GO Super" input_b_btn = "0" input_y_btn = "3" -input_select_btn = "12" -input_start_btn = "13" +input_select_btn = "8" +input_start_btn = "9" input_a_btn = "1" input_x_btn = "2" input_l_btn = "4" input_r_btn = "5" input_l2_btn = "6" input_r2_btn = "7" -input_l3_btn = "15" -input_r3_btn = "16" +input_l3_btn = "10" +input_r3_btn = "11" -input_up_btn = "8" -input_down_btn = "9" -input_left_btn = "10" -input_right_btn = "11" +input_up_btn = "12" +input_down_btn = "13" +input_left_btn = "14" +input_right_btn = "15" input_l_x_plus_axis = "+0" input_l_x_minus_axis = "-0" @@ -31,8 +31,8 @@ input_r_y_plus_axis = "+3" input_r_y_minus_axis = "-3" # Hotkeys -input_enable_hotkey_btn = "12" -input_exit_emulator_btn = "13" +input_enable_hotkey_btn = "8" +input_exit_emulator_btn = "9" input_menu_toggle_btn = "2" input_fps_toggle_btn = "3" diff --git a/packages/kernel/linux/package.mk b/packages/kernel/linux/package.mk index 2db33b01b..48e03cbc0 100644 --- a/packages/kernel/linux/package.mk +++ b/packages/kernel/linux/package.mk @@ -35,7 +35,7 @@ case ${DEVICE} in PKG_PATCH_DIRS+=" mainline" ;; *) - PKG_VERSION="6.10.4" + PKG_VERSION="6.9.12" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS+=" mainline" ;; diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index 6d43d68f6..444b94a2a 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -53,7 +53,7 @@ case "${DEVICE}" in ;; S922X) [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 pcsx_rearmed-lr wine" - PKG_EMUS+=" aethersx2-sa box64 dolphin-sa drastic-sa portmaster yabasanshiro-sa" + PKG_EMUS+=" aethersx2-sa box64 dolphin-sa drastic-sa portmaster scummvmsa yabasanshiro-sa" LIBRETRO_CORES+=" beetle-psx-lr bsnes-lr bsnes-hd-lr dolphin-lr geolith-lr flycast-lr uae4arm" [ "${USE_MALI}" != "no" ] && PKG_EMUS+=" lime3ds-sa" PKG_RETROARCH+=" retropie-shaders" @@ -894,15 +894,8 @@ makeinstall_target() { add_es_system pokemini ### ScummVM - case ${DEVICE} in - S922X) - add_emu_core scummvm retroarch scummvm true - ;; - *) - add_emu_core scummvm scummvmsa scummvm true - add_emu_core scummvm retroarch scummvm false - ;; - esac + add_emu_core scummvm scummvmsa scummvm true + add_emu_core scummvm retroarch scummvm false add_es_system scummvm install_script "Start ScummVM.sh" diff --git a/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf b/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf index e320b0687..d42b3b788 100644 --- a/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf +++ b/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.10.0 Kernel Configuration +# Linux/arm64 6.9.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-rocknix-linux-gnueabi-gcc-14.1.0 (GCC) 14.1.0" +CONFIG_CC_VERSION_TEXT="aarch64-rocknix-linux-gnueabi-gcc-12.3.1 (GCC) 12.3.1 20240103" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=140100 +CONFIG_GCC_VERSION=120301 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24100 @@ -15,6 +15,7 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -129,7 +130,6 @@ CONFIG_PREEMPT_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_TREE_SRCU=y CONFIG_TASKS_RCU_GENERIC=y -CONFIG_NEED_TASKS_RCU=y CONFIG_TASKS_RCU=y CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y @@ -159,7 +159,6 @@ CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_GCC_NO_STRINGOP_OVERFLOW=y CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_ARCH_SUPPORTS_INT128=y -CONFIG_SLAB_OBJ_EXT=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set @@ -234,7 +233,7 @@ CONFIG_POSIX_TIMERS=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -# CONFIG_BASE_SMALL is not set +CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_FUTEX_PI=y CONFIG_EPOLL=y @@ -306,7 +305,6 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y # Platform selection # # CONFIG_ARCH_ACTIONS is not set -# CONFIG_ARCH_AIROHA is not set # CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_APPLE is not set @@ -387,9 +385,6 @@ CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y -CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y -CONFIG_ARM64_ERRATUM_3194386=y -CONFIG_ARM64_ERRATUM_3312417=y # CONFIG_CAVIUM_ERRATUM_22375 is not set # CONFIG_CAVIUM_ERRATUM_23154 is not set # CONFIG_CAVIUM_ERRATUM_27456 is not set @@ -688,7 +683,6 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_WANT_PMD_MKWRITE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_ARCH_WANTS_EXECMEM_LATE=y CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y CONFIG_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y @@ -726,7 +720,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y CONFIG_ARCH_HAS_HW_PTE_YOUNG=y -CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y # # GCOV-based kernel profiling @@ -740,11 +733,10 @@ CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT=4 -CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y -CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y # end of General architecture-dependent options CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_DEBUG is not set # CONFIG_MODULE_FORCE_LOAD is not set @@ -773,6 +765,7 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y CONFIG_BLK_DEV_WRITE_MOUNTED=y # CONFIG_BLK_DEV_ZONED is not set CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set # CONFIG_BLK_WBT is not set CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOCOST is not set @@ -874,7 +867,7 @@ CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_HAVE_GUP_FAST=y +CONFIG_HAVE_FAST_GUP=y CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -903,7 +896,6 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set CONFIG_THP_SWAP=y # CONFIG_READ_ONLY_THP_FOR_FS is not set -CONFIG_PGTABLE_HAS_HUGE_LEAVES=y CONFIG_CMA=y CONFIG_CMA_DEBUGFS=y # CONFIG_CMA_SYSFS is not set @@ -932,7 +924,6 @@ CONFIG_SECRETMEM=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y -CONFIG_EXECMEM=y # # Data Access Monitoring @@ -1399,7 +1390,6 @@ CONFIG_BT_HCIUART_QCA=y CONFIG_BT_MTKSDIO=m CONFIG_BT_MTKUART=m # CONFIG_BT_NXPUART is not set -# CONFIG_BT_INTEL_PCIE is not set # end of Bluetooth device drivers # CONFIG_AF_RXRPC is not set @@ -2044,7 +2034,6 @@ CONFIG_MACVLAN=m # CONFIG_GENEVE is not set # CONFIG_BAREUDP is not set # CONFIG_GTP is not set -# CONFIG_PFCP is not set # CONFIG_AMT is not set # CONFIG_MACSEC is not set CONFIG_NETCONSOLE=y @@ -2165,7 +2154,6 @@ CONFIG_FIXED_PHY=y # # MII PHY device drivers # -# CONFIG_AIR_EN8811H_PHY is not set # CONFIG_AMD_PHY is not set CONFIG_MESON_GXL_PHY=y # CONFIG_ADIN_PHY is not set @@ -2474,7 +2462,6 @@ CONFIG_RTLWIFI_PCI=m CONFIG_RTLWIFI_USB=m # CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m -CONFIG_RTL8192D_COMMON=m CONFIG_RTL8723_COMMON=m CONFIG_RTLBTCOEXIST=m CONFIG_RTL8XXXU=m @@ -2485,7 +2472,6 @@ CONFIG_RTW88_PCI=m CONFIG_RTW88_USB=m CONFIG_RTW88_8822B=m CONFIG_RTW88_8822C=m -CONFIG_RTW88_8723X=m CONFIG_RTW88_8723D=m CONFIG_RTW88_8821C=m CONFIG_RTW88_8822BE=m @@ -2496,7 +2482,6 @@ CONFIG_RTW88_8822CE=m # CONFIG_RTW88_8822CU is not set CONFIG_RTW88_8723DE=m # CONFIG_RTW88_8723DS is not set -# CONFIG_RTW88_8723CS is not set # CONFIG_RTW88_8723DU is not set CONFIG_RTW88_8821CE=m # CONFIG_RTW88_8821CS is not set @@ -2508,7 +2493,6 @@ CONFIG_RTW89=m # CONFIG_RTW89_8852AE is not set # CONFIG_RTW89_8852BE is not set # CONFIG_RTW89_8852CE is not set -# CONFIG_RTW89_8922AE is not set CONFIG_WLAN_VENDOR_RSI=y # CONFIG_RSI_91X is not set CONFIG_WLAN_VENDOR_SILABS=y @@ -2925,6 +2909,7 @@ CONFIG_SPI_MESON_SPIFC=y # CONFIG_SPI_OC_TINY is not set # CONFIG_SPI_PCI1XXXX is not set CONFIG_SPI_PL022=y +# CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set # CONFIG_SPI_SN_F_OSPI is not set @@ -3941,9 +3926,9 @@ CONFIG_DRM_FBDEV_OVERALLOC=200 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DISPLAY_HELPER=y -# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set -# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set CONFIG_DRM_DISPLAY_HDMI_HELPER=y +# CONFIG_DRM_DP_AUX_CHARDEV is not set +# CONFIG_DRM_DP_CEC is not set CONFIG_DRM_GEM_DMA_HELPER=y # @@ -4012,7 +3997,6 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set -# CONFIG_DRM_PANEL_LG_SW43408 is not set # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set @@ -4034,13 +4018,11 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set -# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set @@ -4152,12 +4134,10 @@ CONFIG_DRM_MESON_DW_MIPI_DSI=y # CONFIG_DRM_PL111 is not set # CONFIG_DRM_LIMA is not set # CONFIG_DRM_PANFROST is not set -# CONFIG_DRM_PANTHOR is not set # CONFIG_DRM_TIDSS is not set # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set # CONFIG_DRM_POWERVR is not set -# CONFIG_DRM_WERROR is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # @@ -4448,6 +4428,7 @@ CONFIG_SND_SOC_ES8328_I2C=y # CONFIG_SND_SOC_HDA is not set # CONFIG_SND_SOC_ICS43432 is not set # CONFIG_SND_SOC_IDT821034 is not set +# CONFIG_SND_SOC_INNO_RK3036 is not set # CONFIG_SND_SOC_MAX98088 is not set # CONFIG_SND_SOC_MAX98090 is not set CONFIG_SND_SOC_MAX98357A=y @@ -4475,8 +4456,8 @@ CONFIG_SND_SOC_MAX98357A=y # CONFIG_SND_SOC_PCM5102A is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set -# CONFIG_SND_SOC_PCM6240 is not set # CONFIG_SND_SOC_PEB2466 is not set +# CONFIG_SND_SOC_RK3328 is not set CONFIG_SND_SOC_RK817=y # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set @@ -4693,7 +4674,6 @@ CONFIG_HID_TOPSEED=y # CONFIG_HID_U2FZERO is not set # CONFIG_HID_WACOM is not set CONFIG_HID_WIIMOTE=m -# CONFIG_HID_WINWING is not set CONFIG_HID_XINMO=y # CONFIG_HID_ZEROPLUS is not set CONFIG_HID_ZYDACRON=y @@ -4870,7 +4850,7 @@ CONFIG_USB_DWC2_DUAL_ROLE=y # CONFIG_USB_HSIC_USB4604 is not set # CONFIG_USB_LINK_LAYER_TEST is not set # CONFIG_USB_CHAOSKEY is not set -# CONFIG_USB_ONBOARD_DEV is not set +# CONFIG_USB_ONBOARD_HUB is not set # # USB Physical Layer drivers @@ -5112,6 +5092,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # CONFIG_LEDS_TRIGGER_PANIC is not set # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set +# CONFIG_LEDS_TRIGGER_AUDIO is not set # CONFIG_LEDS_TRIGGER_TTY is not set # @@ -5168,7 +5149,6 @@ CONFIG_RTC_DRV_PCF8563=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8010 is not set -# CONFIG_RTC_DRV_RX8111 is not set # CONFIG_RTC_DRV_RX8581 is not set # CONFIG_RTC_DRV_RX8025 is not set # CONFIG_RTC_DRV_EM3027 is not set @@ -5270,6 +5250,7 @@ CONFIG_DMABUF_HEAPS_CMA=y # CONFIG_GREYBUS is not set # CONFIG_COMEDI is not set CONFIG_STAGING=y +# CONFIG_PRISM2_USB is not set # CONFIG_RTLLIB is not set # CONFIG_RTL8723BS is not set # CONFIG_R8712U is not set @@ -5326,6 +5307,7 @@ CONFIG_VIDEO_MESON_VDEC=y # CONFIG_LTE_GDM724X is not set # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set +# CONFIG_PI433 is not set # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_FIELDBUS_DEV is not set # CONFIG_VME_BUS is not set @@ -5333,8 +5315,6 @@ CONFIG_VIDEO_MESON_VDEC=y # CONFIG_CHROME_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_SURFACE_PLATFORMS=y -CONFIG_ARM64_PLATFORM_DEVICES=y -# CONFIG_EC_ACER_ASPIRE1 is not set CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -5414,7 +5394,6 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_MAILBOX=y CONFIG_ARM_MHU=y # CONFIG_ARM_MHU_V2 is not set -# CONFIG_ARM_MHU_V3 is not set CONFIG_PLATFORM_MHU=y # CONFIG_PL320_MBOX is not set # CONFIG_ALTERA_MBOX is not set @@ -5644,7 +5623,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # CONFIG_AD7091R5 is not set # CONFIG_AD7091R8 is not set # CONFIG_AD7124 is not set -# CONFIG_AD7173 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -5661,7 +5639,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # CONFIG_AD7793 is not set # CONFIG_AD7887 is not set # CONFIG_AD7923 is not set -# CONFIG_AD7944 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set # CONFIG_AD9467 is not set @@ -5798,8 +5775,6 @@ CONFIG_MESON_SARADC=y # CONFIG_AD5593R is not set # CONFIG_AD5504 is not set # CONFIG_AD5624R_SPI is not set -# CONFIG_AD9739A is not set -# CONFIG_ADI_AXI_DAC is not set # CONFIG_LTC2688 is not set # CONFIG_AD5686_SPI is not set # CONFIG_AD5696_I2C is not set @@ -5943,7 +5918,6 @@ CONFIG_MESON_SARADC=y # CONFIG_AL3010 is not set # CONFIG_AL3320A is not set # CONFIG_APDS9300 is not set -# CONFIG_APDS9306 is not set # CONFIG_APDS9960 is not set # CONFIG_AS73211 is not set # CONFIG_BH1750 is not set @@ -6137,6 +6111,7 @@ CONFIG_MESON_SARADC=y # CONFIG_NTB is not set CONFIG_PWM=y +CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set # CONFIG_PWM_ATMEL_TCB is not set # CONFIG_PWM_CLK is not set @@ -6590,7 +6565,6 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y @@ -6923,13 +6897,13 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_DMA_DECLARE_COHERENT=y CONFIG_ARCH_HAS_SETUP_DMA_OPS=y +CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y CONFIG_SWIOTLB=y # CONFIG_SWIOTLB_DYNAMIC is not set CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y -CONFIG_DMA_NEED_SYNC=y # CONFIG_DMA_RESTRICTED_POOL is not set CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_COHERENT_POOL=y @@ -6948,6 +6922,7 @@ CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y +# CONFIG_FORCE_NR_CPUS is not set CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_GLOB=y @@ -7087,7 +7062,6 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y # CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y @@ -7185,7 +7159,6 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_LATENCYTOP is not set -CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y diff --git a/projects/Amlogic/patches/linux/S922X/0001-clk-meson-add-vclk-driver.patch b/projects/Amlogic/patches/linux/S922X/0001-clk-meson-add-vclk-driver.patch new file mode 100755 index 000000000..a243a2a51 --- /dev/null +++ b/projects/Amlogic/patches/linux/S922X/0001-clk-meson-add-vclk-driver.patch @@ -0,0 +1,263 @@ +From 801ce8505a73f0b9f1e66ca84b1ae8a0e56d212c Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Wed, 3 Apr 2024 09:46:33 +0200 +Subject: [PATCH 01/44] clk: meson: add vclk driver + +The VCLK and VCLK_DIV clocks have supplementary bits. + +The VCLK gate has a "SOFT RESET" bit to toggle after the whole +VCLK sub-tree rate has been set, this is implemented in +the gate enable callback. + +The VCLK_DIV clocks as enable and reset bits used to disable +and reset the divider, associated with CLK_SET_RATE_GATE it ensures +the rate is set while the divider is disabled and in reset mode. + +The VCLK_DIV enable bit isn't implemented as a gate since it's part +of the divider logic and vendor does this exact sequence to ensure +the divider is correctly set. + +Signed-off-by: Neil Armstrong +--- + drivers/clk/meson/Kconfig | 4 ++ + drivers/clk/meson/Makefile | 1 + + drivers/clk/meson/vclk.c | 141 +++++++++++++++++++++++++++++++++++++ + drivers/clk/meson/vclk.h | 51 ++++++++++++++ + 4 files changed, 197 insertions(+) + create mode 100644 drivers/clk/meson/vclk.c + create mode 100644 drivers/clk/meson/vclk.h + +diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig +index 29ffd14d267b..8a9823789fa3 100644 +--- a/drivers/clk/meson/Kconfig ++++ b/drivers/clk/meson/Kconfig +@@ -30,6 +30,10 @@ config COMMON_CLK_MESON_VID_PLL_DIV + tristate + select COMMON_CLK_MESON_REGMAP + ++config COMMON_CLK_MESON_VCLK ++ tristate ++ select COMMON_CLK_MESON_REGMAP ++ + config COMMON_CLK_MESON_CLKC_UTILS + tristate + +diff --git a/drivers/clk/meson/Makefile b/drivers/clk/meson/Makefile +index 9ee4b954c896..9ba43fe7a07a 100644 +--- a/drivers/clk/meson/Makefile ++++ b/drivers/clk/meson/Makefile +@@ -12,6 +12,7 @@ obj-$(CONFIG_COMMON_CLK_MESON_PLL) += clk-pll.o + obj-$(CONFIG_COMMON_CLK_MESON_REGMAP) += clk-regmap.o + obj-$(CONFIG_COMMON_CLK_MESON_SCLK_DIV) += sclk-div.o + obj-$(CONFIG_COMMON_CLK_MESON_VID_PLL_DIV) += vid-pll-div.o ++obj-$(CONFIG_COMMON_CLK_MESON_VCLK) += vclk.o + + # Amlogic Clock controllers + +diff --git a/drivers/clk/meson/vclk.c b/drivers/clk/meson/vclk.c +new file mode 100644 +index 000000000000..45dc216941ea +--- /dev/null ++++ b/drivers/clk/meson/vclk.c +@@ -0,0 +1,141 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (c) 2024 Neil Armstrong ++ */ ++ ++#include ++#include "vclk.h" ++ ++/* The VCLK gate has a supplementary reset bit to pulse after ungating */ ++ ++static inline struct meson_vclk_gate_data * ++clk_get_meson_vclk_gate_data(struct clk_regmap *clk) ++{ ++ return (struct meson_vclk_gate_data *)clk->data; ++} ++ ++static int meson_vclk_gate_enable(struct clk_hw *hw) ++{ ++ struct clk_regmap *clk = to_clk_regmap(hw); ++ struct meson_vclk_gate_data *vclk = clk_get_meson_vclk_gate_data(clk); ++ ++ meson_parm_write(clk->map, &vclk->enable, 1); ++ ++ /* Do a reset pulse */ ++ meson_parm_write(clk->map, &vclk->reset, 1); ++ meson_parm_write(clk->map, &vclk->reset, 0); ++ ++ return 0; ++} ++ ++static void meson_vclk_gate_disable(struct clk_hw *hw) ++{ ++ struct clk_regmap *clk = to_clk_regmap(hw); ++ struct meson_vclk_gate_data *vclk = clk_get_meson_vclk_gate_data(clk); ++ ++ meson_parm_write(clk->map, &vclk->enable, 0); ++} ++ ++static int meson_vclk_gate_is_enabled(struct clk_hw *hw) ++{ ++ struct clk_regmap *clk = to_clk_regmap(hw); ++ struct meson_vclk_gate_data *vclk = clk_get_meson_vclk_gate_data(clk); ++ ++ return meson_parm_read(clk->map, &vclk->enable); ++} ++ ++const struct clk_ops meson_vclk_gate_ops = { ++ .enable = meson_vclk_gate_enable, ++ .disable = meson_vclk_gate_disable, ++ .is_enabled = meson_vclk_gate_is_enabled, ++}; ++EXPORT_SYMBOL_GPL(meson_vclk_gate_ops); ++ ++/* The VCLK Divider has supplementary reset & enable bits */ ++ ++static inline struct meson_vclk_div_data * ++clk_get_meson_vclk_div_data(struct clk_regmap *clk) ++{ ++ return (struct meson_vclk_div_data *)clk->data; ++} ++ ++static unsigned long meson_vclk_div_recalc_rate(struct clk_hw *hw, ++ unsigned long prate) ++{ ++ struct clk_regmap *clk = to_clk_regmap(hw); ++ struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk); ++ ++ return divider_recalc_rate(hw, prate, meson_parm_read(clk->map, &vclk->div), ++ vclk->table, vclk->flags, vclk->div.width); ++} ++ ++static int meson_vclk_div_determine_rate(struct clk_hw *hw, ++ struct clk_rate_request *req) ++{ ++ struct clk_regmap *clk = to_clk_regmap(hw); ++ struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk); ++ ++ return divider_determine_rate(hw, req, vclk->table, vclk->div.width, ++ vclk->flags); ++} ++ ++static int meson_vclk_div_set_rate(struct clk_hw *hw, unsigned long rate, ++ unsigned long parent_rate) ++{ ++ struct clk_regmap *clk = to_clk_regmap(hw); ++ struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk); ++ int ret; ++ ++ ret = divider_get_val(rate, parent_rate, vclk->table, vclk->div.width, ++ vclk->flags); ++ if (ret < 0) ++ return ret; ++ ++ meson_parm_write(clk->map, &vclk->div, ret); ++ ++ return 0; ++}; ++ ++static int meson_vclk_div_enable(struct clk_hw *hw) ++{ ++ struct clk_regmap *clk = to_clk_regmap(hw); ++ struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk); ++ ++ /* Unreset the divider when ungating */ ++ meson_parm_write(clk->map, &vclk->reset, 0); ++ meson_parm_write(clk->map, &vclk->enable, 1); ++ ++ return 0; ++} ++ ++static void meson_vclk_div_disable(struct clk_hw *hw) ++{ ++ struct clk_regmap *clk = to_clk_regmap(hw); ++ struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk); ++ ++ /* Reset the divider when gating */ ++ meson_parm_write(clk->map, &vclk->enable, 0); ++ meson_parm_write(clk->map, &vclk->reset, 1); ++} ++ ++static int meson_vclk_div_is_enabled(struct clk_hw *hw) ++{ ++ struct clk_regmap *clk = to_clk_regmap(hw); ++ struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk); ++ ++ return meson_parm_read(clk->map, &vclk->enable); ++} ++ ++const struct clk_ops meson_vclk_div_ops = { ++ .recalc_rate = meson_vclk_div_recalc_rate, ++ .determine_rate = meson_vclk_div_determine_rate, ++ .set_rate = meson_vclk_div_set_rate, ++ .enable = meson_vclk_div_enable, ++ .disable = meson_vclk_div_disable, ++ .is_enabled = meson_vclk_div_is_enabled, ++}; ++EXPORT_SYMBOL_GPL(meson_vclk_div_ops); ++ ++MODULE_DESCRIPTION("Amlogic vclk clock driver"); ++MODULE_AUTHOR("Neil Armstrong "); ++MODULE_LICENSE("GPL v2"); +diff --git a/drivers/clk/meson/vclk.h b/drivers/clk/meson/vclk.h +new file mode 100644 +index 000000000000..20b0b181db09 +--- /dev/null ++++ b/drivers/clk/meson/vclk.h +@@ -0,0 +1,51 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (c) 2024 Neil Armstrong ++ */ ++ ++#ifndef __VCLK_H ++#define __VCLK_H ++ ++#include "clk-regmap.h" ++#include "parm.h" ++ ++/** ++ * struct meson_vclk_gate_data - vclk_gate regmap backed specific data ++ * ++ * @enable: vclk enable field ++ * @reset: vclk reset field ++ * @flags: hardware-specific flags ++ * ++ * Flags: ++ * Same as clk_gate except CLK_GATE_HIWORD_MASK which is ignored ++ */ ++struct meson_vclk_gate_data { ++ struct parm enable; ++ struct parm reset; ++ u8 flags; ++}; ++ ++extern const struct clk_ops meson_vclk_gate_ops; ++ ++/** ++ * struct meson_vclk_div_data - vclk_div regmap back specific data ++ * ++ * @div: divider field ++ * @enable: vclk divider enable field ++ * @reset: vclk divider reset field ++ * @table: array of value/divider pairs, last entry should have div = 0 ++ * ++ * Flags: ++ * Same as clk_divider except CLK_DIVIDER_HIWORD_MASK which is ignored ++ */ ++struct meson_vclk_div_data { ++ struct parm div; ++ struct parm enable; ++ struct parm reset; ++ const struct clk_div_table *table; ++ u8 flags; ++}; ++ ++extern const struct clk_ops meson_vclk_div_ops; ++ ++#endif /* __VCLK_H */ +-- +2.34.1 + diff --git a/projects/Amlogic/patches/linux/S922X/0002-clk-meson-g12a-make-VCLK2-and-ENCL-clock-path-config.patch b/projects/Amlogic/patches/linux/S922X/0002-clk-meson-g12a-make-VCLK2-and-ENCL-clock-path-config.patch new file mode 100755 index 000000000..633e0f785 --- /dev/null +++ b/projects/Amlogic/patches/linux/S922X/0002-clk-meson-g12a-make-VCLK2-and-ENCL-clock-path-config.patch @@ -0,0 +1,290 @@ +From 024103a845d9efb602225f975175ed2b678578e7 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Wed, 3 Apr 2024 09:46:34 +0200 +Subject: [PATCH 02/44] clk: meson: g12a: make VCLK2 and ENCL clock path + configurable by CCF + +In order to setup the DSI clock, let's make the unused VCLK2 clock path +configuration via CCF. + +The nocache option is removed from following clocks: +- vclk2_sel +- vclk2_input +- vclk2_div +- vclk2 +- vclk_div1 +- vclk2_div2_en +- vclk2_div4_en +- vclk2_div6_en +- vclk2_div12_en +- vclk2_div2 +- vclk2_div4 +- vclk2_div6 +- vclk2_div12 +- cts_encl_sel + +vclk2 and vclk2_div uses the newly introduced vclk regmap driver +to handle the enable and reset bits. + +In order to set a rate on cts_encl via the vclk2 clock path, +the NO_REPARENT flag is set on cts_encl_sel & vclk2_sel in order +to keep CCF from selection a parent. +The parents of cts_encl_sel & vclk2_sel are expected to be defined +in DT or manually set by the display driver at some point. + +The following clock scheme is to be used for DSI: + +xtal +\_ gp0_pll_dco + \_ gp0_pll + |- vclk2_sel + | \_ vclk2_input + | \_ vclk2_div + | \_ vclk2 + | \_ vclk2_div1 + | \_ cts_encl_sel + | \_ cts_encl -> to VPU LCD Encoder + |- mipi_dsi_pxclk_sel + \_ mipi_dsi_pxclk_div + \_ mipi_dsi_pxclk -> to DSI controller + +The mipi_dsi_pxclk_div is set as bypass with a single /1 entry in div_table +in order to use the same GP0 for mipi_dsi_pxclk and vclk2_input. + +The SET_RATE_PARENT is only set on the mipi_dsi_pxclk_sel clock so the +DSI bitclock is the reference base clock to calculate the vclk2_div value +when pixel clock is set on the cts_encl endpoint. + +Signed-off-by: Neil Armstrong +--- + drivers/clk/meson/Kconfig | 1 + + drivers/clk/meson/g12a.c | 76 ++++++++++++++++++++++++++++----------- + 2 files changed, 57 insertions(+), 20 deletions(-) + +diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig +index 8a9823789fa3..59a40a49f8e1 100644 +--- a/drivers/clk/meson/Kconfig ++++ b/drivers/clk/meson/Kconfig +@@ -144,6 +144,7 @@ config COMMON_CLK_G12A + select COMMON_CLK_MESON_EE_CLKC + select COMMON_CLK_MESON_CPU_DYNDIV + select COMMON_CLK_MESON_VID_PLL_DIV ++ select COMMON_CLK_MESON_VCLK + select MFD_SYSCON + help + Support for the clock controller on Amlogic S905D2, S905X2 and S905Y2 +diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c +index 90f4c6103014..df7e17c850d8 100644 +--- a/drivers/clk/meson/g12a.c ++++ b/drivers/clk/meson/g12a.c +@@ -22,6 +22,7 @@ + #include "clk-regmap.h" + #include "clk-cpu-dyndiv.h" + #include "vid-pll-div.h" ++#include "vclk.h" + #include "meson-eeclk.h" + #include "g12a.h" + +@@ -3165,7 +3166,7 @@ static struct clk_regmap g12a_vclk2_sel = { + .ops = &clk_regmap_mux_ops, + .parent_hws = g12a_vclk_parent_hws, + .num_parents = ARRAY_SIZE(g12a_vclk_parent_hws), +- .flags = CLK_SET_RATE_NO_REPARENT | CLK_GET_RATE_NOCACHE, ++ .flags = CLK_SET_RATE_NO_REPARENT, + }, + }; + +@@ -3193,7 +3194,6 @@ static struct clk_regmap g12a_vclk2_input = { + .ops = &clk_regmap_gate_ops, + .parent_hws = (const struct clk_hw *[]) { &g12a_vclk2_sel.hw }, + .num_parents = 1, +- .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, + }, + }; + +@@ -3215,19 +3215,32 @@ static struct clk_regmap g12a_vclk_div = { + }; + + static struct clk_regmap g12a_vclk2_div = { +- .data = &(struct clk_regmap_div_data){ +- .offset = HHI_VIID_CLK_DIV, +- .shift = 0, +- .width = 8, ++ .data = &(struct meson_vclk_div_data){ ++ .div = { ++ .reg_off = HHI_VIID_CLK_DIV, ++ .shift = 0, ++ .width = 8, ++ }, ++ .enable = { ++ .reg_off = HHI_VIID_CLK_DIV, ++ .shift = 16, ++ .width = 1, ++ }, ++ .reset = { ++ .reg_off = HHI_VIID_CLK_DIV, ++ .shift = 17, ++ .width = 1, ++ }, ++ .flags = CLK_DIVIDER_ROUND_CLOSEST, + }, + .hw.init = &(struct clk_init_data){ + .name = "vclk2_div", +- .ops = &clk_regmap_divider_ops, ++ .ops = &meson_vclk_div_ops, + .parent_hws = (const struct clk_hw *[]) { + &g12a_vclk2_input.hw + }, + .num_parents = 1, +- .flags = CLK_GET_RATE_NOCACHE, ++ .flags = CLK_SET_RATE_GATE, + }, + }; + +@@ -3246,16 +3259,24 @@ static struct clk_regmap g12a_vclk = { + }; + + static struct clk_regmap g12a_vclk2 = { +- .data = &(struct clk_regmap_gate_data){ +- .offset = HHI_VIID_CLK_CNTL, +- .bit_idx = 19, ++ .data = &(struct meson_vclk_gate_data){ ++ .enable = { ++ .reg_off = HHI_VIID_CLK_CNTL, ++ .shift = 19, ++ .width = 1, ++ }, ++ .reset = { ++ .reg_off = HHI_VIID_CLK_CNTL, ++ .shift = 15, ++ .width = 1, ++ }, + }, + .hw.init = &(struct clk_init_data) { + .name = "vclk2", +- .ops = &clk_regmap_gate_ops, ++ .ops = &meson_vclk_gate_ops, + .parent_hws = (const struct clk_hw *[]) { &g12a_vclk2_div.hw }, + .num_parents = 1, +- .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3339,7 +3360,7 @@ static struct clk_regmap g12a_vclk2_div1 = { + .ops = &clk_regmap_gate_ops, + .parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw }, + .num_parents = 1, +- .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3353,7 +3374,7 @@ static struct clk_regmap g12a_vclk2_div2_en = { + .ops = &clk_regmap_gate_ops, + .parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw }, + .num_parents = 1, +- .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3367,7 +3388,7 @@ static struct clk_regmap g12a_vclk2_div4_en = { + .ops = &clk_regmap_gate_ops, + .parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw }, + .num_parents = 1, +- .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3381,7 +3402,7 @@ static struct clk_regmap g12a_vclk2_div6_en = { + .ops = &clk_regmap_gate_ops, + .parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw }, + .num_parents = 1, +- .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3395,7 +3416,7 @@ static struct clk_regmap g12a_vclk2_div12_en = { + .ops = &clk_regmap_gate_ops, + .parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw }, + .num_parents = 1, +- .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3461,6 +3482,7 @@ static struct clk_fixed_factor g12a_vclk2_div2 = { + &g12a_vclk2_div2_en.hw + }, + .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3474,6 +3496,7 @@ static struct clk_fixed_factor g12a_vclk2_div4 = { + &g12a_vclk2_div4_en.hw + }, + .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3487,6 +3510,7 @@ static struct clk_fixed_factor g12a_vclk2_div6 = { + &g12a_vclk2_div6_en.hw + }, + .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3500,6 +3524,7 @@ static struct clk_fixed_factor g12a_vclk2_div12 = { + &g12a_vclk2_div12_en.hw + }, + .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -3561,7 +3586,7 @@ static struct clk_regmap g12a_cts_encl_sel = { + .ops = &clk_regmap_mux_ops, + .parent_hws = g12a_cts_parent_hws, + .num_parents = ARRAY_SIZE(g12a_cts_parent_hws), +- .flags = CLK_SET_RATE_NO_REPARENT | CLK_GET_RATE_NOCACHE, ++ .flags = CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, + }, + }; + +@@ -3717,15 +3742,26 @@ static struct clk_regmap g12a_mipi_dsi_pxclk_sel = { + .ops = &clk_regmap_mux_ops, + .parent_hws = g12a_mipi_dsi_pxclk_parent_hws, + .num_parents = ARRAY_SIZE(g12a_mipi_dsi_pxclk_parent_hws), +- .flags = CLK_SET_RATE_NO_REPARENT, ++ .flags = CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, + }, + }; + ++/* ++ * FIXME: Force as bypass by forcing a single /1 table entry, and doensn't on boot value ++ * when setting a clock whith this node in the clock path, but doesn't garantee the divider ++ * is at /1 at boot until a rate is set. ++ */ ++static const struct clk_div_table g12a_mipi_dsi_pxclk_div_table[] = { ++ { .val = 0, .div = 1 }, ++ { /* sentinel */ }, ++}; ++ + static struct clk_regmap g12a_mipi_dsi_pxclk_div = { + .data = &(struct clk_regmap_div_data){ + .offset = HHI_MIPIDSI_PHY_CLK_CNTL, + .shift = 0, + .width = 7, ++ .table = g12a_mipi_dsi_pxclk_div_table, + }, + .hw.init = &(struct clk_init_data){ + .name = "mipi_dsi_pxclk_div", +-- +2.34.1 + diff --git a/projects/Amlogic/patches/linux/S922X/0004-arm64-meson-g12-common-add-the-MIPI-DSI-nodes.patch b/projects/Amlogic/patches/linux/S922X/0004-arm64-meson-g12-common-add-the-MIPI-DSI-nodes.patch new file mode 100755 index 000000000..4919b9085 --- /dev/null +++ b/projects/Amlogic/patches/linux/S922X/0004-arm64-meson-g12-common-add-the-MIPI-DSI-nodes.patch @@ -0,0 +1,114 @@ +From b584fdbb6a339fdf28ab8c1eb031262c0c66b5e2 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Wed, 3 Apr 2024 09:46:36 +0200 +Subject: [PATCH 04/44] arm64: meson: g12-common: add the MIPI DSI nodes + +Add the MIPI DSI Analog & Digital PHY nodes and the DSI control +nodes with proper port endpoint to the VPU. + +Signed-off-by: Neil Armstrong +--- + .../boot/dts/amlogic/meson-g12-common.dtsi | 70 +++++++++++++++++++ + 1 file changed, 70 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +index ff68b911b729..7300408262d5 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +@@ -1663,9 +1663,28 @@ pwrc: power-controller { + <250000000>, + <0>; /* Do Nothing */ + }; ++ ++ mipi_analog_dphy: phy { ++ compatible = "amlogic,g12a-mipi-dphy-analog"; ++ #phy-cells = <0>; ++ status = "disabled"; ++ }; + }; + }; + ++ mipi_dphy: phy@44000 { ++ compatible = "amlogic,axg-mipi-dphy"; ++ reg = <0x0 0x44000 0x0 0x2000>; ++ clocks = <&clkc CLKID_MIPI_DSI_PHY>; ++ clock-names = "pclk"; ++ resets = <&reset RESET_MIPI_DSI_PHY>; ++ reset-names = "phy"; ++ phys = <&mipi_analog_dphy>; ++ phy-names = "analog"; ++ #phy-cells = <0>; ++ status = "disabled"; ++ }; ++ + usb3_pcie_phy: phy@46000 { + compatible = "amlogic,g12a-usb3-pcie-phy"; + reg = <0x0 0x46000 0x0 0x2000>; +@@ -2152,6 +2171,15 @@ hdmi_tx_out: endpoint { + remote-endpoint = <&hdmi_tx_in>; + }; + }; ++ ++ /* DPI output port */ ++ dpi_port: port@2 { ++ reg = <2>; ++ ++ dpi_out: endpoint { ++ remote-endpoint = <&mipi_dsi_in>; ++ }; ++ }; + }; + + gic: interrupt-controller@ffc01000 { +@@ -2189,6 +2217,48 @@ gpio_intc: interrupt-controller@f080 { + amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>; + }; + ++ mipi_dsi: dsi@7000 { ++ compatible = "amlogic,meson-g12a-dw-mipi-dsi"; ++ reg = <0x0 0x7000 0x0 0x1000>; ++ resets = <&reset RESET_MIPI_DSI_HOST>; ++ reset-names = "top"; ++ clocks = <&clkc CLKID_MIPI_DSI_HOST>, ++ <&clkc CLKID_MIPI_DSI_PXCLK>, ++ <&clkc CLKID_CTS_ENCL>; ++ clock-names = "pclk", "bit", "px"; ++ phys = <&mipi_dphy>; ++ phy-names = "dphy"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "disabled"; ++ ++ assigned-clocks = <&clkc CLKID_MIPI_DSI_PXCLK_SEL>, ++ <&clkc CLKID_CTS_ENCL_SEL>, ++ <&clkc CLKID_VCLK2_SEL>; ++ assigned-clock-parents = <&clkc CLKID_GP0_PLL>, ++ <&clkc CLKID_VCLK2_DIV1>, ++ <&clkc CLKID_GP0_PLL>; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ /* VPU VENC Input */ ++ mipi_dsi_venc_port: port@0 { ++ reg = <0>; ++ ++ mipi_dsi_in: endpoint { ++ remote-endpoint = <&dpi_out>; ++ }; ++ }; ++ ++ /* DSI Output */ ++ mipi_dsi_panel_port: port@1 { ++ reg = <1>; ++ }; ++ }; ++ }; ++ + watchdog: watchdog@f0d0 { + compatible = "amlogic,meson-gxbb-wdt"; + reg = <0x0 0xf0d0 0x0 0x10>; +-- +2.34.1 + diff --git a/projects/Amlogic/patches/linux/S922X/0001-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch b/projects/Amlogic/patches/linux/S922X/0005-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch old mode 100644 new mode 100755 similarity index 98% rename from projects/Amlogic/patches/linux/S922X/0001-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch rename to projects/Amlogic/patches/linux/S922X/0005-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch index 55e8d2e22..e5b104cf2 --- a/projects/Amlogic/patches/linux/S922X/0001-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch +++ b/projects/Amlogic/patches/linux/S922X/0005-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch @@ -1,7 +1,7 @@ -From 846f398e1f213329a690a1f30e70b0ffa015b072 Mon Sep 17 00:00:00 2001 +From ee573e00af321704d2bd093efd8d7cb3976b11a3 Mon Sep 17 00:00:00 2001 From: spycat88 Date: Tue, 23 Jan 2024 23:28:55 +0000 -Subject: [PATCH 01/38] drm: panel: st7701: add odroid-go-ultra panel support +Subject: [PATCH 05/44] drm: panel: st7701: add odroid-go-ultra panel support --- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 162 +++++++++++++++++- diff --git a/projects/Amlogic/patches/linux/S922X/0002-arm64-meson-odroid-go-ultra-add-DSI-panel.patch b/projects/Amlogic/patches/linux/S922X/0006-arm64-meson-odroid-go-ultra-add-DSI-panel.patch old mode 100644 new mode 100755 similarity index 94% rename from projects/Amlogic/patches/linux/S922X/0002-arm64-meson-odroid-go-ultra-add-DSI-panel.patch rename to projects/Amlogic/patches/linux/S922X/0006-arm64-meson-odroid-go-ultra-add-DSI-panel.patch index d8372f210..6e656088d --- a/projects/Amlogic/patches/linux/S922X/0002-arm64-meson-odroid-go-ultra-add-DSI-panel.patch +++ b/projects/Amlogic/patches/linux/S922X/0006-arm64-meson-odroid-go-ultra-add-DSI-panel.patch @@ -1,7 +1,7 @@ -From 8cef09fb6dbe6e1b40e97e6559bb8009cb7b7ac9 Mon Sep 17 00:00:00 2001 +From 157e64dad5bd6b9965089b764850930404c88e8e Mon Sep 17 00:00:00 2001 From: spycat88 Date: Tue, 23 Jan 2024 23:41:40 +0000 -Subject: [PATCH 02/38] arm64: meson: odroid-go-ultra: add DSI panel +Subject: [PATCH 06/44] arm64: meson: odroid-go-ultra: add DSI panel --- .../amlogic/meson-g12b-odroid-go-ultra.dts | 66 +++++++++++++++++++ diff --git a/projects/Amlogic/patches/linux/S922X/0003-arm64-meson-odroid-go-ultra-correct-voltages.patch b/projects/Amlogic/patches/linux/S922X/0007-arm64-meson-odroid-go-ultra-correct-voltages.patch old mode 100644 new mode 100755 similarity index 94% rename from projects/Amlogic/patches/linux/S922X/0003-arm64-meson-odroid-go-ultra-correct-voltages.patch rename to projects/Amlogic/patches/linux/S922X/0007-arm64-meson-odroid-go-ultra-correct-voltages.patch index edcd1752d..d2b706ba2 --- a/projects/Amlogic/patches/linux/S922X/0003-arm64-meson-odroid-go-ultra-correct-voltages.patch +++ b/projects/Amlogic/patches/linux/S922X/0007-arm64-meson-odroid-go-ultra-correct-voltages.patch @@ -1,7 +1,7 @@ -From f1d0d7a64a37061fcacf38c65993b6e59dc7c3eb Mon Sep 17 00:00:00 2001 +From 263c479a06698696adc7ababb97bf312022fcdaf Mon Sep 17 00:00:00 2001 From: "Mauro (mdrjr) Ribeiro" Date: Tue, 23 Jan 2024 23:53:24 +0000 -Subject: [PATCH 03/38] arm64: meson: odroid-go-ultra: correct voltages +Subject: [PATCH 07/44] arm64: meson: odroid-go-ultra: correct voltages --- .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 16 +++++++--------- diff --git a/projects/Amlogic/patches/linux/S922X/0004-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch b/projects/Amlogic/patches/linux/S922X/0008-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch old mode 100644 new mode 100755 similarity index 93% rename from projects/Amlogic/patches/linux/S922X/0004-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch rename to projects/Amlogic/patches/linux/S922X/0008-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch index bcd1709ce..b024c4fbc --- a/projects/Amlogic/patches/linux/S922X/0004-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch +++ b/projects/Amlogic/patches/linux/S922X/0008-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch @@ -1,7 +1,7 @@ -From dc52d84e947b5c050236c6dc7929d457a8390d3b Mon Sep 17 00:00:00 2001 +From 0869f9c56b47e2c63be274d72c97c51e227c18e4 Mon Sep 17 00:00:00 2001 From: spycat88 Date: Wed, 24 Jan 2024 11:37:48 +0000 -Subject: [PATCH 04/38] arm64: meson: odroid-go-ultra: add over-clocking +Subject: [PATCH 08/44] arm64: meson: odroid-go-ultra: add over-clocking frequencies, specify as turbo mode so they are disabled by default and increase vddcpu_a voltage regulator as needed diff --git a/projects/Amlogic/patches/linux/S922X/0005-arm64-meson-odroid-go-ultra-add-joypad.patch b/projects/Amlogic/patches/linux/S922X/0012-arm64-meson-odroid-go-ultra-add-joypad.patch old mode 100644 new mode 100755 similarity index 97% rename from projects/Amlogic/patches/linux/S922X/0005-arm64-meson-odroid-go-ultra-add-joypad.patch rename to projects/Amlogic/patches/linux/S922X/0012-arm64-meson-odroid-go-ultra-add-joypad.patch index 61e508150..0a58ade74 --- a/projects/Amlogic/patches/linux/S922X/0005-arm64-meson-odroid-go-ultra-add-joypad.patch +++ b/projects/Amlogic/patches/linux/S922X/0012-arm64-meson-odroid-go-ultra-add-joypad.patch @@ -1,14 +1,14 @@ -From 0afa5e03b93b889c931b784eb728d94b227ec888 Mon Sep 17 00:00:00 2001 +From 8ec3462157e94af211573c3706d54d225ceec576 Mon Sep 17 00:00:00 2001 From: brooksytech <1673861+brooksytech@users.noreply.github.com> Date: Wed, 24 Jan 2024 21:57:34 +0000 -Subject: [PATCH 05/38] arm64: meson: odroid-go-ultra: add joypad +Subject: [PATCH 12/44] arm64: meson: odroid-go-ultra: add joypad --- .../amlogic/meson-g12b-odroid-go-ultra.dts | 202 ++++++++---------- 1 file changed, 93 insertions(+), 109 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts -index c3af3954a1e7..b15fa22943b4 100644 +index c3af3954a1e7..206044f8456b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts @@ -21,52 +21,6 @@ aliases { diff --git a/projects/Amlogic/patches/linux/S922X/0006-arm64-meson-odroid-disable-heartbeat.patch b/projects/Amlogic/patches/linux/S922X/0013-arm64-meson-odroid-disable-heartbeat.patch old mode 100644 new mode 100755 similarity index 85% rename from projects/Amlogic/patches/linux/S922X/0006-arm64-meson-odroid-disable-heartbeat.patch rename to projects/Amlogic/patches/linux/S922X/0013-arm64-meson-odroid-disable-heartbeat.patch index 9c2b357d4..ca8ade560 --- a/projects/Amlogic/patches/linux/S922X/0006-arm64-meson-odroid-disable-heartbeat.patch +++ b/projects/Amlogic/patches/linux/S922X/0013-arm64-meson-odroid-disable-heartbeat.patch @@ -1,7 +1,7 @@ -From 460402011bc82f511a32c8a7b4a504222a84a0e7 Mon Sep 17 00:00:00 2001 +From badcabb07a6e4f056834443039d054072f23d9e1 Mon Sep 17 00:00:00 2001 From: spycat88 Date: Wed, 24 Jan 2024 22:22:49 +0000 -Subject: [PATCH 06/38] arm64: meson: odroid: disable heartbeat +Subject: [PATCH 13/44] arm64: meson: odroid: disable heartbeat --- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +- @@ -9,7 +9,7 @@ Subject: [PATCH 06/38] arm64: meson: odroid: disable heartbeat 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts -index b15fa22943b4..677a859af4e8 100644 +index 206044f8456b..1d26387776e6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts @@ -194,7 +194,7 @@ leds { @@ -22,7 +22,7 @@ index b15fa22943b4..677a859af4e8 100644 }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi -index 09d959aefb18..35c68894637f 100644 +index 9e12a34b2840..fd41aaad2acc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi @@ -44,7 +44,7 @@ leds { diff --git a/projects/Amlogic/patches/linux/S922X/0007-arm64-meson-g12-common-add-mali-to-dts.patch b/projects/Amlogic/patches/linux/S922X/0014-arm64-meson-g12-common-add-mali-to-dts.patch old mode 100644 new mode 100755 similarity index 91% rename from projects/Amlogic/patches/linux/S922X/0007-arm64-meson-g12-common-add-mali-to-dts.patch rename to projects/Amlogic/patches/linux/S922X/0014-arm64-meson-g12-common-add-mali-to-dts.patch index dcbfb9ef6..d100f0e9b --- a/projects/Amlogic/patches/linux/S922X/0007-arm64-meson-g12-common-add-mali-to-dts.patch +++ b/projects/Amlogic/patches/linux/S922X/0014-arm64-meson-g12-common-add-mali-to-dts.patch @@ -1,7 +1,7 @@ -From 80fb3ace918b2b3dbbd7e2f4e1094034d818c1c4 Mon Sep 17 00:00:00 2001 +From 1de7a39ee1c2b6ec6c5ce375d6774ac703cc02a7 Mon Sep 17 00:00:00 2001 From: brooksytech <1673861+brooksytech@users.noreply.github.com> Date: Wed, 24 Jan 2024 23:56:58 +0000 -Subject: [PATCH 07/38] arm64: meson: g12-common: add mali to dts +Subject: [PATCH 14/44] arm64: meson: g12-common: add mali to dts --- .../arm64/boot/dts/amlogic/meson-g12-common.dtsi | 16 +++++++++++----- @@ -9,7 +9,7 @@ Subject: [PATCH 07/38] arm64: meson: g12-common: add mali to dts 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index b058ed78faf0..79ba8e95649c 100644 +index 7300408262d5..b31b077bd891 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2476,14 +2476,20 @@ dwc3: usb@ff500000 { diff --git a/projects/Amlogic/patches/linux/S922X/0008-arm64-meson-add-dt-for-powkiddy-rgb10-max-3-pro.patch b/projects/Amlogic/patches/linux/S922X/0015-arm64-meson-add-dt-for-powkiddy-rgb10-max-3-pro.patch old mode 100644 new mode 100755 similarity index 91% rename from projects/Amlogic/patches/linux/S922X/0008-arm64-meson-add-dt-for-powkiddy-rgb10-max-3-pro.patch rename to projects/Amlogic/patches/linux/S922X/0015-arm64-meson-add-dt-for-powkiddy-rgb10-max-3-pro.patch index b11b3826b..7a5fbe049 --- a/projects/Amlogic/patches/linux/S922X/0008-arm64-meson-add-dt-for-powkiddy-rgb10-max-3-pro.patch +++ b/projects/Amlogic/patches/linux/S922X/0015-arm64-meson-add-dt-for-powkiddy-rgb10-max-3-pro.patch @@ -1,7 +1,7 @@ -From bd137ddeb08ecc2f95ab6f6e1e2e1b60d403dfbd Mon Sep 17 00:00:00 2001 +From 7d53adc4da9bb4dc992b4247e9cf528e1c6fb288 Mon Sep 17 00:00:00 2001 From: spycat88 Date: Fri, 26 Jan 2024 17:55:02 +0000 -Subject: [PATCH 08/38] arm64: meson: add dt for powkiddy-rgb10-max-3-pro +Subject: [PATCH 15/44] arm64: meson: add dt for powkiddy-rgb10-max-3-pro --- .../meson-g12b-powkiddy-rgb10-max-3-pro.dts | 54 +++++++++++++++++++ @@ -10,7 +10,7 @@ Subject: [PATCH 08/38] arm64: meson: add dt for powkiddy-rgb10-max-3-pro diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3-pro.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3-pro.dts new file mode 100644 -index 000000000000..343e23900f79 +index 000000000000..9edbae10268c --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3-pro.dts @@ -0,0 +1,54 @@ diff --git a/projects/Amlogic/patches/linux/S922X/0009-power-rk818-Configure-rk808-clkout2-function.patch b/projects/Amlogic/patches/linux/S922X/0016-power-rk818-Configure-rk808-clkout2-function.patch old mode 100644 new mode 100755 similarity index 75% rename from projects/Amlogic/patches/linux/S922X/0009-power-rk818-Configure-rk808-clkout2-function.patch rename to projects/Amlogic/patches/linux/S922X/0016-power-rk818-Configure-rk808-clkout2-function.patch index 3dfaee1e5..50725e63b --- a/projects/Amlogic/patches/linux/S922X/0009-power-rk818-Configure-rk808-clkout2-function.patch +++ b/projects/Amlogic/patches/linux/S922X/0016-power-rk818-Configure-rk808-clkout2-function.patch @@ -1,7 +1,7 @@ -From b46a7e7cb350c0d4428af017440278cac8bf34d8 Mon Sep 17 00:00:00 2001 +From fff6d5ad0f054463f0fc67485b596e6239e13516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Mon, 4 Jan 2021 17:57:49 +0100 -Subject: [PATCH 09/38] power: rk818: Configure `rk808-clkout2` function +Subject: [PATCH 16/44] power: rk818: Configure `rk808-clkout2` function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,10 +15,10 @@ Signed-of-by: Kamil Trzciński 2 files changed, 3 insertions(+) diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c -index 5eda3c0dbbdf..95fe71faa77e 100644 +index b1ffc3b9e2be..2747a296a0a6 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c -@@ -281,6 +281,7 @@ static const struct rk808_reg_data rk818_pre_init_reg[] = { +@@ -250,6 +250,7 @@ static const struct rk808_reg_data rk818_pre_init_reg[] = { { RK818_H5V_EN_REG, BIT(0), RK818_H5V_EN }, { RK808_VB_MON_REG, MASK_ALL, VB_LO_ACT | VB_LO_SEL_3500MV }, @@ -27,18 +27,18 @@ index 5eda3c0dbbdf..95fe71faa77e 100644 static const struct regmap_irq rk805_irqs[] = { diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h -index 69cbea78b430..b9afafed4512 100644 +index 78e167a92483..4a44e8744331 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h -@@ -932,6 +932,8 @@ enum rk806_dvs_mode { +@@ -790,6 +790,8 @@ enum rk806_dvs_mode { #define VOUT_LO_INT BIT(0) #define CLK32KOUT2_EN BIT(0) +#define CLK32KOUT2_FUNC (0 << 1) +#define CLK32KOUT2_FUNC_MASK BIT(1) - #define TEMP105C 0x08 #define TEMP115C 0x0c + #define TEMP_HOTDIE_MSK 0x0c -- 2.34.1 diff --git a/projects/Amlogic/patches/linux/S922X/0010-power-supply-rk818-battery-Add-battery-driver-for-RK.patch b/projects/Amlogic/patches/linux/S922X/0017-power-supply-rk818-battery-Add-battery-driver-for-RK.patch old mode 100644 new mode 100755 similarity index 99% rename from projects/Amlogic/patches/linux/S922X/0010-power-supply-rk818-battery-Add-battery-driver-for-RK.patch rename to projects/Amlogic/patches/linux/S922X/0017-power-supply-rk818-battery-Add-battery-driver-for-RK.patch index 9213909a9..381a81209 --- a/projects/Amlogic/patches/linux/S922X/0010-power-supply-rk818-battery-Add-battery-driver-for-RK.patch +++ b/projects/Amlogic/patches/linux/S922X/0017-power-supply-rk818-battery-Add-battery-driver-for-RK.patch @@ -1,7 +1,7 @@ -From 6070124a15a2814c1608a2002c1b444e6caacec4 Mon Sep 17 00:00:00 2001 +From 302adba82133c44efee29d357bab89462d7cd52c Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Sun, 11 Jun 2023 18:29:24 +0200 -Subject: [PATCH 10/38] power: supply: rk818-battery: Add battery driver for +Subject: [PATCH 17/44] power: supply: rk818-battery: Add battery driver for RK818 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -23,10 +23,10 @@ Signed-of-by: Kamil Trzciński create mode 100644 drivers/power/supply/rk818_battery.h diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c -index 95fe71faa77e..3aeb2262afa0 100644 +index 2747a296a0a6..64b6e0e59e15 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c -@@ -131,6 +131,8 @@ static const struct mfd_cell rk817s[] = { +@@ -111,6 +111,8 @@ static const struct mfd_cell rk817s[] = { static const struct mfd_cell rk818s[] = { { .name = "rk808-clkout", }, { .name = "rk808-regulator", }, @@ -36,10 +36,10 @@ index 95fe71faa77e..3aeb2262afa0 100644 .name = "rk808-rtc", .num_resources = ARRAY_SIZE(rtc_resources), diff --git a/drivers/mfd/rk8xx-i2c.c b/drivers/mfd/rk8xx-i2c.c -index 69a6b297d723..a6bc1cfbaefc 100644 +index 75b5cf09d5a0..3d9632fb3554 100644 --- a/drivers/mfd/rk8xx-i2c.c +++ b/drivers/mfd/rk8xx-i2c.c -@@ -104,13 +104,47 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg) +@@ -75,13 +75,47 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg) return false; } @@ -3866,10 +3866,10 @@ index 000000000000..2f4430a98167 +#endif \ No newline at end of file diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h -index b9afafed4512..0a9ba1b7b092 100644 +index 4a44e8744331..e06ecffaf6bc 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h -@@ -280,6 +280,8 @@ enum rk818_reg { +@@ -138,6 +138,8 @@ enum rk818_reg { RK818_ID_OTG_SWITCH, }; @@ -3878,7 +3878,7 @@ index b9afafed4512..0a9ba1b7b092 100644 #define RK818_DCDC_EN_REG 0x23 #define RK818_LDO_EN_REG 0x24 #define RK818_SLEEP_SET_OFF_REG1 0x25 -@@ -326,13 +328,90 @@ enum rk818_reg { +@@ -184,13 +186,90 @@ enum rk818_reg { #define RK818_INT_STS_REG2 0x4e #define RK818_INT_STS_MSK_REG2 0x4f #define RK818_IO_POL_REG 0x50 diff --git a/projects/Amlogic/patches/linux/S922X/0011-power-supply-rk818-battery-Use-a-more-propper-compat.patch b/projects/Amlogic/patches/linux/S922X/0018-power-supply-rk818-battery-Use-a-more-propper-compat.patch old mode 100644 new mode 100755 similarity index 88% rename from projects/Amlogic/patches/linux/S922X/0011-power-supply-rk818-battery-Use-a-more-propper-compat.patch rename to projects/Amlogic/patches/linux/S922X/0018-power-supply-rk818-battery-Use-a-more-propper-compat.patch index d751b6432..d126a9952 --- a/projects/Amlogic/patches/linux/S922X/0011-power-supply-rk818-battery-Use-a-more-propper-compat.patch +++ b/projects/Amlogic/patches/linux/S922X/0018-power-supply-rk818-battery-Use-a-more-propper-compat.patch @@ -1,7 +1,7 @@ -From d6c950f05d46ec86091bfd684caf0ee8e0b03302 Mon Sep 17 00:00:00 2001 +From aebc99b0f9145bb9d47c73ce64693ef723c63705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Sun, 7 Nov 2021 19:30:07 +0100 -Subject: [PATCH 11/38] power: supply: rk818-battery: Use a more propper +Subject: [PATCH 18/44] power: supply: rk818-battery: Use a more propper compatible string Prefix with vendor name. diff --git a/projects/Amlogic/patches/linux/S922X/0012-power-supply-rk818-charger-Implement-charger-driver-.patch b/projects/Amlogic/patches/linux/S922X/0019-power-supply-rk818-charger-Implement-charger-driver-.patch old mode 100644 new mode 100755 similarity index 99% rename from projects/Amlogic/patches/linux/S922X/0012-power-supply-rk818-charger-Implement-charger-driver-.patch rename to projects/Amlogic/patches/linux/S922X/0019-power-supply-rk818-charger-Implement-charger-driver-.patch index d61720b2d..f6658a6b7 --- a/projects/Amlogic/patches/linux/S922X/0012-power-supply-rk818-charger-Implement-charger-driver-.patch +++ b/projects/Amlogic/patches/linux/S922X/0019-power-supply-rk818-charger-Implement-charger-driver-.patch @@ -1,7 +1,7 @@ -From e51f3912bfa4a4c216ca503302c2fa55abc60ca7 Mon Sep 17 00:00:00 2001 +From e642f1bae35b8ab7f6db133d152e424bb1913e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Sun, 7 Nov 2021 20:09:02 +0100 -Subject: [PATCH 12/38] power: supply: rk818-charger: Implement charger driver +Subject: [PATCH 19/44] power: supply: rk818-charger: Implement charger driver for RK818 PMIC For now this driver is just meant to watch Type-C power supply diff --git a/projects/Amlogic/patches/linux/S922X/0013-power-supply-rk818-charger-Change-charger-type-to-MA.patch b/projects/Amlogic/patches/linux/S922X/0020-power-supply-rk818-charger-Change-charger-type-to-MA.patch old mode 100644 new mode 100755 similarity index 87% rename from projects/Amlogic/patches/linux/S922X/0013-power-supply-rk818-charger-Change-charger-type-to-MA.patch rename to projects/Amlogic/patches/linux/S922X/0020-power-supply-rk818-charger-Change-charger-type-to-MA.patch index 15bd67b80..b4aa028a6 --- a/projects/Amlogic/patches/linux/S922X/0013-power-supply-rk818-charger-Change-charger-type-to-MA.patch +++ b/projects/Amlogic/patches/linux/S922X/0020-power-supply-rk818-charger-Change-charger-type-to-MA.patch @@ -1,7 +1,7 @@ -From 6bcb1a84beb9d369daa2b52c075f47517c311af6 Mon Sep 17 00:00:00 2001 +From 3c1508046c0054680475d856f461af47e47b7a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Thu, 13 Jan 2022 13:53:03 +0100 -Subject: [PATCH 13/38] power: supply: rk818-charger: Change charger type to +Subject: [PATCH 20/44] power: supply: rk818-charger: Change charger type to MAINS To un-confuse userspace. diff --git a/projects/Amlogic/patches/linux/S922X/0014-power-supply-rk818-battery-Report-charging-status-ba.patch b/projects/Amlogic/patches/linux/S922X/0021-power-supply-rk818-battery-Report-charging-status-ba.patch old mode 100644 new mode 100755 similarity index 94% rename from projects/Amlogic/patches/linux/S922X/0014-power-supply-rk818-battery-Report-charging-status-ba.patch rename to projects/Amlogic/patches/linux/S922X/0021-power-supply-rk818-battery-Report-charging-status-ba.patch index 003a33c00..2ad37fdf7 --- a/projects/Amlogic/patches/linux/S922X/0014-power-supply-rk818-battery-Report-charging-status-ba.patch +++ b/projects/Amlogic/patches/linux/S922X/0021-power-supply-rk818-battery-Report-charging-status-ba.patch @@ -1,7 +1,7 @@ -From f9885e82017f7d1d49644181f399a5165032e683 Mon Sep 17 00:00:00 2001 +From c1f960ec0b5e110aa7029b147d070114902e37ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Fri, 21 Jan 2022 11:38:00 +0100 -Subject: [PATCH 14/38] power: supply: rk818-battery: Report charging status +Subject: [PATCH 21/44] power: supply: rk818-battery: Report charging status based on charging current If the current is positive, battery is charging, if negative the battery diff --git a/projects/Amlogic/patches/linux/S922X/0015-power-supply-rk818-battery-Drop-dependency-on-frameb.patch b/projects/Amlogic/patches/linux/S922X/0022-power-supply-rk818-battery-Drop-dependency-on-frameb.patch old mode 100644 new mode 100755 similarity index 97% rename from projects/Amlogic/patches/linux/S922X/0015-power-supply-rk818-battery-Drop-dependency-on-frameb.patch rename to projects/Amlogic/patches/linux/S922X/0022-power-supply-rk818-battery-Drop-dependency-on-frameb.patch index be3cea3f9..440908830 --- a/projects/Amlogic/patches/linux/S922X/0015-power-supply-rk818-battery-Drop-dependency-on-frameb.patch +++ b/projects/Amlogic/patches/linux/S922X/0022-power-supply-rk818-battery-Drop-dependency-on-frameb.patch @@ -1,7 +1,7 @@ -From 55f7e483983aa7af8ee4c0f1372abb247c2d5c5d Mon Sep 17 00:00:00 2001 +From 7c930b83aee90136a3061bdd0626f3a75c42a357 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Tue, 17 May 2022 23:30:46 +0200 -Subject: [PATCH 15/38] power: supply: rk818-battery: Drop dependency on +Subject: [PATCH 22/44] power: supply: rk818-battery: Drop dependency on framebuffer It was bizarre anyway. Framebuffer is barely used on Linux anyway, diff --git a/projects/Amlogic/patches/linux/S922X/0016-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch b/projects/Amlogic/patches/linux/S922X/0023-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch old mode 100644 new mode 100755 similarity index 98% rename from projects/Amlogic/patches/linux/S922X/0016-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch rename to projects/Amlogic/patches/linux/S922X/0023-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch index 59cb59a89..3ef5b7c8d --- a/projects/Amlogic/patches/linux/S922X/0016-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch +++ b/projects/Amlogic/patches/linux/S922X/0023-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch @@ -1,7 +1,7 @@ -From 613dcb75931ab1805259ace440e8c536664efc94 Mon Sep 17 00:00:00 2001 +From 6a15e3e0c411654229eef72be04a19a61bc6ef07 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Sat, 4 Nov 2023 18:25:03 +0100 -Subject: [PATCH 16/38] power: supply: rk818-charger: Unify rk818-charger and +Subject: [PATCH 23/44] power: supply: rk818-charger: Unify rk818-charger and rk818-battery The BSP driver is still used, but there is now a one device handling diff --git a/projects/Amlogic/patches/linux/S922X/0017-power-supply-rk818-battery-Speed-up-battery-current-.patch b/projects/Amlogic/patches/linux/S922X/0024-power-supply-rk818-battery-Speed-up-battery-current-.patch old mode 100644 new mode 100755 similarity index 90% rename from projects/Amlogic/patches/linux/S922X/0017-power-supply-rk818-battery-Speed-up-battery-current-.patch rename to projects/Amlogic/patches/linux/S922X/0024-power-supply-rk818-battery-Speed-up-battery-current-.patch index e5f60183e..905cd5df8 --- a/projects/Amlogic/patches/linux/S922X/0017-power-supply-rk818-battery-Speed-up-battery-current-.patch +++ b/projects/Amlogic/patches/linux/S922X/0024-power-supply-rk818-battery-Speed-up-battery-current-.patch @@ -1,7 +1,7 @@ -From 8fe26bd275ca5e0b426a3430b822ed90c63d23d0 Mon Sep 17 00:00:00 2001 +From a2d1c9fda708dfae3576bfdf68d296d83525422c Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Fri, 27 May 2022 03:07:54 +0200 -Subject: [PATCH 17/38] power: supply: rk818-battery: Speed up battery current +Subject: [PATCH 24/44] power: supply: rk818-battery: Speed up battery current readout PMIC does averaging, driver does averaging on top of that averaging, diff --git a/projects/Amlogic/patches/linux/S922X/0018-power-supply-rk818-charger-Delay-applying-input-curr.patch b/projects/Amlogic/patches/linux/S922X/0025-power-supply-rk818-charger-Delay-applying-input-curr.patch old mode 100644 new mode 100755 similarity index 93% rename from projects/Amlogic/patches/linux/S922X/0018-power-supply-rk818-charger-Delay-applying-input-curr.patch rename to projects/Amlogic/patches/linux/S922X/0025-power-supply-rk818-charger-Delay-applying-input-curr.patch index acbc1de58..0c31d5ab9 --- a/projects/Amlogic/patches/linux/S922X/0018-power-supply-rk818-charger-Delay-applying-input-curr.patch +++ b/projects/Amlogic/patches/linux/S922X/0025-power-supply-rk818-charger-Delay-applying-input-curr.patch @@ -1,7 +1,7 @@ -From 1c9634a4aa3dbd35229e4c5790a2350281044d42 Mon Sep 17 00:00:00 2001 +From fc405dd4c01211adc53a264b3a7f36be33164d89 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Tue, 2 Aug 2022 09:37:05 +0200 -Subject: [PATCH 18/38] power: supply: rk818-charger: Delay applying input +Subject: [PATCH 25/44] power: supply: rk818-charger: Delay applying input current limit until first BC detection finishes When the phone boots for the first time, we only want to react to diff --git a/projects/Amlogic/patches/linux/S922X/0019-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch b/projects/Amlogic/patches/linux/S922X/0026-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch old mode 100644 new mode 100755 similarity index 94% rename from projects/Amlogic/patches/linux/S922X/0019-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch rename to projects/Amlogic/patches/linux/S922X/0026-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch index 973a86169..15c67627a --- a/projects/Amlogic/patches/linux/S922X/0019-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch +++ b/projects/Amlogic/patches/linux/S922X/0026-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch @@ -1,7 +1,7 @@ -From 6bb90b8a7c9e3c361cc374fd67227f5ef41df430 Mon Sep 17 00:00:00 2001 +From f869d08e5c748e58cd0a14122d64301dac62b9b2 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Thu, 10 Nov 2022 20:03:47 +0100 -Subject: [PATCH 19/38] power: supply: rk818-battery: Don't auto-poweroff the +Subject: [PATCH 26/44] power: supply: rk818-battery: Don't auto-poweroff the PMIC on low battery Just raise the interrupt. This avoids undervoltage shutdowns when diff --git a/projects/Amlogic/patches/linux/S922X/0020-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch b/projects/Amlogic/patches/linux/S922X/0027-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch old mode 100644 new mode 100755 similarity index 90% rename from projects/Amlogic/patches/linux/S922X/0020-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch rename to projects/Amlogic/patches/linux/S922X/0027-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch index b20868ee7..d26ba3782 --- a/projects/Amlogic/patches/linux/S922X/0020-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch +++ b/projects/Amlogic/patches/linux/S922X/0027-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch @@ -1,7 +1,7 @@ -From dbaf493115b94ed79cf294be10f748f10460153a Mon Sep 17 00:00:00 2001 +From 2a71f1bbe3a392604aa153853d76df8170800df9 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Thu, 10 Nov 2022 20:05:16 +0100 -Subject: [PATCH 20/38] power: supply: rk818-charger: Add support for +Subject: [PATCH 27/44] power: supply: rk818-charger: Add support for POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN Report total battery capacity. diff --git a/projects/Amlogic/patches/linux/S922X/0021-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch b/projects/Amlogic/patches/linux/S922X/0028-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch old mode 100644 new mode 100755 similarity index 86% rename from projects/Amlogic/patches/linux/S922X/0021-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch rename to projects/Amlogic/patches/linux/S922X/0028-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch index bd69fb950..f5d7d887e --- a/projects/Amlogic/patches/linux/S922X/0021-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch +++ b/projects/Amlogic/patches/linux/S922X/0028-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch @@ -1,7 +1,7 @@ -From aafcc4105d22978f6ab484b3544553faf4a2fa3a Mon Sep 17 00:00:00 2001 +From a4ca64019fc8d430163729a93cee36fff199492f Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Sun, 11 Dec 2022 10:39:22 +0100 -Subject: [PATCH 21/38] power: supply: rk818-battery: Don't reset dsoc to 0 on +Subject: [PATCH 28/44] power: supply: rk818-battery: Don't reset dsoc to 0 on rk818_vb_low_irq The interrupt fires at 3.4V vbat which is not equivalent to 0% charge. diff --git a/projects/Amlogic/patches/linux/S922X/0022-power-supply-rk817-charger-Add-input-current-limit-s.patch b/projects/Amlogic/patches/linux/S922X/0030-power-supply-rk817-charger-Add-input-current-limit-s.patch old mode 100644 new mode 100755 similarity index 96% rename from projects/Amlogic/patches/linux/S922X/0022-power-supply-rk817-charger-Add-input-current-limit-s.patch rename to projects/Amlogic/patches/linux/S922X/0030-power-supply-rk817-charger-Add-input-current-limit-s.patch index 44e8b6c94..d1169a054 --- a/projects/Amlogic/patches/linux/S922X/0022-power-supply-rk817-charger-Add-input-current-limit-s.patch +++ b/projects/Amlogic/patches/linux/S922X/0030-power-supply-rk817-charger-Add-input-current-limit-s.patch @@ -1,7 +1,7 @@ -From 27aa1963bd882ee3c8219a79dde8abf8e8fac2e9 Mon Sep 17 00:00:00 2001 +From 6c89b0c7be95632079c3b63954248bac6190d3bc Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Sun, 6 Aug 2023 02:55:22 +0200 -Subject: [PATCH 22/38] power: supply: rk817-charger: Add input current limit +Subject: [PATCH 30/44] power: supply: rk817-charger: Add input current limit setting This is useful for proper USB input current limiting. @@ -12,7 +12,7 @@ Signed-off-by: Ondrej Jirman 1 file changed, 99 insertions(+), 13 deletions(-) diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c -index 7ca91739c6cc..da344fcacae4 100644 +index 44af88045ac1..833b12cfcced 100644 --- a/drivers/power/supply/rk817_charger.c +++ b/drivers/power/supply/rk817_charger.c @@ -556,11 +556,72 @@ static int rk817_bat_get_prop(struct power_supply *ps, diff --git a/projects/Amlogic/patches/linux/S922X/0023-power-supply-rk817-charger-Take-input-current-limit-.patch b/projects/Amlogic/patches/linux/S922X/0031-power-supply-rk817-charger-Take-input-current-limit-.patch old mode 100644 new mode 100755 similarity index 93% rename from projects/Amlogic/patches/linux/S922X/0023-power-supply-rk817-charger-Take-input-current-limit-.patch rename to projects/Amlogic/patches/linux/S922X/0031-power-supply-rk817-charger-Take-input-current-limit-.patch index 4933b41b9..0d509a858 --- a/projects/Amlogic/patches/linux/S922X/0023-power-supply-rk817-charger-Take-input-current-limit-.patch +++ b/projects/Amlogic/patches/linux/S922X/0031-power-supply-rk817-charger-Take-input-current-limit-.patch @@ -1,7 +1,7 @@ -From 4138d97a800db0aa2e0208ccf64205ebf0e139f0 Mon Sep 17 00:00:00 2001 +From 3c8b1445f2997c7913609430eee8d30856fa2e13 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Thu, 7 Sep 2023 17:37:59 +0200 -Subject: [PATCH 23/38] power: supply: rk817-charger: Take input current limit +Subject: [PATCH 31/44] power: supply: rk817-charger: Take input current limit from parent supply This allows automatic input current limit setting based on USB PD. @@ -12,7 +12,7 @@ Signed-off-by: Ondrej Jirman 1 file changed, 36 insertions(+) diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c -index da344fcacae4..bf29c010298c 100644 +index 833b12cfcced..9de86fc8f3fa 100644 --- a/drivers/power/supply/rk817_charger.c +++ b/drivers/power/supply/rk817_charger.c @@ -53,6 +53,7 @@ struct rk817_charger { diff --git a/projects/Amlogic/patches/linux/S922X/0024-power-supply-rk817-charger-Propagate-proper-errors.patch b/projects/Amlogic/patches/linux/S922X/0032-power-supply-rk817-charger-Propagate-proper-errors.patch old mode 100644 new mode 100755 similarity index 87% rename from projects/Amlogic/patches/linux/S922X/0024-power-supply-rk817-charger-Propagate-proper-errors.patch rename to projects/Amlogic/patches/linux/S922X/0032-power-supply-rk817-charger-Propagate-proper-errors.patch index f9a540597..15f31962f --- a/projects/Amlogic/patches/linux/S922X/0024-power-supply-rk817-charger-Propagate-proper-errors.patch +++ b/projects/Amlogic/patches/linux/S922X/0032-power-supply-rk817-charger-Propagate-proper-errors.patch @@ -1,7 +1,7 @@ -From 34171dbfc742cca29b479b459f999dc634441a95 Mon Sep 17 00:00:00 2001 +From c9413ff87ad76b2384cf9031510f819e586fae71 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Thu, 7 Sep 2023 17:43:00 +0200 -Subject: [PATCH 24/38] power: supply: rk817-charger: Propagate proper errors +Subject: [PATCH 32/44] power: supply: rk817-charger: Propagate proper errors Without propagating the correct error code, defered probe doesn't work. @@ -11,7 +11,7 @@ Signed-off-by: Ondrej Jirman 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c -index bf29c010298c..47d190f4ba40 100644 +index 9de86fc8f3fa..241fff9bc2ab 100644 --- a/drivers/power/supply/rk817_charger.c +++ b/drivers/power/supply/rk817_charger.c @@ -1250,13 +1250,13 @@ static int rk817_charger_probe(struct platform_device *pdev) diff --git a/projects/Amlogic/patches/linux/S922X/0025-power-supply-rk817-charger-Add-support-for-runtime-c.patch b/projects/Amlogic/patches/linux/S922X/0033-power-supply-rk817-charger-Add-support-for-runtime-c.patch old mode 100644 new mode 100755 similarity index 96% rename from projects/Amlogic/patches/linux/S922X/0025-power-supply-rk817-charger-Add-support-for-runtime-c.patch rename to projects/Amlogic/patches/linux/S922X/0033-power-supply-rk817-charger-Add-support-for-runtime-c.patch index 97c48d7d1..5439370ab --- a/projects/Amlogic/patches/linux/S922X/0025-power-supply-rk817-charger-Add-support-for-runtime-c.patch +++ b/projects/Amlogic/patches/linux/S922X/0033-power-supply-rk817-charger-Add-support-for-runtime-c.patch @@ -1,7 +1,7 @@ -From fe940b15b6e83a77346df9d0349999fe67874a1a Mon Sep 17 00:00:00 2001 +From b4612269aff943bce08b81ddd72707cbaebb36d9 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Sat, 13 Jan 2024 16:41:44 +0100 -Subject: [PATCH 25/38] power: supply: rk817-charger: Add support for runtime +Subject: [PATCH 33/44] power: supply: rk817-charger: Add support for runtime change of charger limits This is useful for speeding up, or slowing down charging or for dealing @@ -13,7 +13,7 @@ Signed-off-by: Ondrej Jirman 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c -index 47d190f4ba40..ec4bb47ab43e 100644 +index 241fff9bc2ab..d7acb998a140 100644 --- a/drivers/power/supply/rk817_charger.c +++ b/drivers/power/supply/rk817_charger.c @@ -557,6 +557,69 @@ static int rk817_bat_get_prop(struct power_supply *ps, diff --git a/projects/Amlogic/patches/linux/S922X/0026-power-supply-rk818-battery-charger-clear-unused-vari.patch b/projects/Amlogic/patches/linux/S922X/0034-power-supply-rk818-battery-charger-clear-unused-vari.patch old mode 100644 new mode 100755 similarity index 90% rename from projects/Amlogic/patches/linux/S922X/0026-power-supply-rk818-battery-charger-clear-unused-vari.patch rename to projects/Amlogic/patches/linux/S922X/0034-power-supply-rk818-battery-charger-clear-unused-vari.patch index 534e84325..84737ab00 --- a/projects/Amlogic/patches/linux/S922X/0026-power-supply-rk818-battery-charger-clear-unused-vari.patch +++ b/projects/Amlogic/patches/linux/S922X/0034-power-supply-rk818-battery-charger-clear-unused-vari.patch @@ -1,7 +1,7 @@ -From d7222d9b19ce558191e46d26b2c87b6995a23113 Mon Sep 17 00:00:00 2001 +From 37f568856e1139a8304d975318e8297c7d82a1fe Mon Sep 17 00:00:00 2001 From: "Mauro (mdrjr) Ribeiro" Date: Wed, 31 Jan 2024 11:59:50 -0300 -Subject: [PATCH 26/38] power: supply: rk818-battery/charger: clear unused +Subject: [PATCH 34/44] power: supply: rk818-battery/charger: clear unused variables --- diff --git a/projects/Amlogic/patches/linux/S922X/0027-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch b/projects/Amlogic/patches/linux/S922X/0035-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch old mode 100644 new mode 100755 similarity index 93% rename from projects/Amlogic/patches/linux/S922X/0027-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch rename to projects/Amlogic/patches/linux/S922X/0035-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch index e022a5cea..8e74f25a4 --- a/projects/Amlogic/patches/linux/S922X/0027-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch +++ b/projects/Amlogic/patches/linux/S922X/0035-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch @@ -1,7 +1,7 @@ -From db0b140e626a3f43330053b3839ea48b8593bcb7 Mon Sep 17 00:00:00 2001 +From 6339706441d1479708df3294877d55b6805cdcc2 Mon Sep 17 00:00:00 2001 From: "Mauro (mdrjr) Ribeiro" Date: Wed, 31 Jan 2024 18:36:49 +0000 -Subject: [PATCH 27/38] arm64: meson: odroid-go-ultra: add battery and charger +Subject: [PATCH 35/44] arm64: meson: odroid-go-ultra: add battery and charger nodes --- @@ -9,7 +9,7 @@ Subject: [PATCH 27/38] arm64: meson: odroid-go-ultra: add battery and charger 1 file changed, 52 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts -index 677a859af4e8..d90ecb6355f0 100644 +index 1d26387776e6..f45991a499c3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts @@ -25,6 +25,26 @@ chosen { diff --git a/projects/Amlogic/patches/linux/S922X/0028-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch b/projects/Amlogic/patches/linux/S922X/0036-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch old mode 100644 new mode 100755 similarity index 84% rename from projects/Amlogic/patches/linux/S922X/0028-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch rename to projects/Amlogic/patches/linux/S922X/0036-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch index 0f8521069..ffaa62810 --- a/projects/Amlogic/patches/linux/S922X/0028-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch +++ b/projects/Amlogic/patches/linux/S922X/0036-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch @@ -1,7 +1,7 @@ -From ad1ba8d26f1333e6353746a73ed4f6f9a41f2061 Mon Sep 17 00:00:00 2001 +From 6f4ac5c34912fd8fe6b453e0e402a5dc8f4e64a4 Mon Sep 17 00:00:00 2001 From: ckkim Date: Thu, 20 Apr 2023 16:18:40 +0900 -Subject: [PATCH 28/38] ASoC: meson: axg-card: limit the volume to prevent +Subject: [PATCH 36/44] ASoC: meson: axg-card: limit the volume to prevent clipping of output signal --- @@ -9,7 +9,7 @@ Subject: [PATCH 28/38] ASoC: meson: axg-card: limit the volume to prevent 1 file changed, 7 insertions(+) diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c -index 8c5605c1e34e..9243edb59485 100644 +index 3180aa4d3a15..e17a9418bde4 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -59,6 +59,13 @@ static int axg_card_tdm_dai_init(struct snd_soc_pcm_runtime *rtd) diff --git a/projects/Amlogic/patches/linux/S922X/0029-power-supply-rk818_charger-change-syfs-node-name-so-.patch b/projects/Amlogic/patches/linux/S922X/0037-power-supply-rk818_charger-change-syfs-node-name-so-.patch old mode 100644 new mode 100755 similarity index 86% rename from projects/Amlogic/patches/linux/S922X/0029-power-supply-rk818_charger-change-syfs-node-name-so-.patch rename to projects/Amlogic/patches/linux/S922X/0037-power-supply-rk818_charger-change-syfs-node-name-so-.patch index a6228445a..33c93d28c --- a/projects/Amlogic/patches/linux/S922X/0029-power-supply-rk818_charger-change-syfs-node-name-so-.patch +++ b/projects/Amlogic/patches/linux/S922X/0037-power-supply-rk818_charger-change-syfs-node-name-so-.patch @@ -1,7 +1,7 @@ -From 9cc468cd64055caa0d93e299f9d635a8944e6956 Mon Sep 17 00:00:00 2001 +From c21702b1d3506071635539c0fd8bee17ffb272e3 Mon Sep 17 00:00:00 2001 From: spycat88 Date: Wed, 31 Jan 2024 20:18:22 +0000 -Subject: [PATCH 29/38] power: supply: rk818_charger: change syfs node name so +Subject: [PATCH 37/44] power: supply: rk818_charger: change syfs node name so ES can read battery status --- diff --git a/projects/Amlogic/patches/linux/S922X/0030-arm64-meson-odroid-go-ultra-add-headphone-detection.patch b/projects/Amlogic/patches/linux/S922X/0038-arm64-meson-odroid-go-ultra-add-headphone-detection.patch old mode 100644 new mode 100755 similarity index 66% rename from projects/Amlogic/patches/linux/S922X/0030-arm64-meson-odroid-go-ultra-add-headphone-detection.patch rename to projects/Amlogic/patches/linux/S922X/0038-arm64-meson-odroid-go-ultra-add-headphone-detection.patch index 1fd178695..9bd0d76ec --- a/projects/Amlogic/patches/linux/S922X/0030-arm64-meson-odroid-go-ultra-add-headphone-detection.patch +++ b/projects/Amlogic/patches/linux/S922X/0038-arm64-meson-odroid-go-ultra-add-headphone-detection.patch @@ -1,17 +1,17 @@ -From ece5bf71cc19b8c9cb25356e03a8660b0052617a Mon Sep 17 00:00:00 2001 +From 4b8d36069dbe393e882da689d1816ba241d087c3 Mon Sep 17 00:00:00 2001 From: "Mauro (mdrjr) Ribeiro" Date: Wed, 31 Jan 2024 20:56:40 +0000 -Subject: [PATCH 30/38] arm64: meson: odroid-go-ultra: add headphone detection +Subject: [PATCH 38/44] arm64: meson: odroid-go-ultra: add headphone detection --- - arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 7 +++++++ - 1 file changed, 7 insertions(+) + .../arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts -index d90ecb6355f0..0cd23564d656 100644 +index f45991a499c3..9d6f3be69321 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts -@@ -67,6 +67,13 @@ volume-down-button { +@@ -67,6 +67,14 @@ volume-down-button { linux,code = ; gpios = <&gpio GPIOX_9 GPIO_ACTIVE_LOW>; }; @@ -22,9 +22,10 @@ index d90ecb6355f0..0cd23564d656 100644 + linux,code = ; + gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>; + }; ++ }; - joypad: odroid-go-ultra-joypad { + joypad: gou_joypad { -- 2.34.1 diff --git a/projects/Amlogic/patches/linux/S922X/0038-power-supply-core-return-EAGAIN-on-uninitialized-rea.patch b/projects/Amlogic/patches/linux/S922X/0038-power-supply-core-return-EAGAIN-on-uninitialized-rea.patch deleted file mode 100644 index f14ab84e9..000000000 --- a/projects/Amlogic/patches/linux/S922X/0038-power-supply-core-return-EAGAIN-on-uninitialized-rea.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a00da4418b4bd71b809c0ebdd7d1b53f54f11421 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Thu, 4 Jul 2024 10:52:08 +0200 -Subject: [PATCH 38/38] power: supply: core: return -EAGAIN on uninitialized - read temp - -If the thermal core tries to update the temperature from an -uninitialized power supply, it will swawn the following warning: -thermal thermal_zoneXX: failed to read out thermal zone (-19) - -But reading from an uninitialized power supply should not be -considered as a fatal error, but the thermal core expects -the -EAGAIN error to be returned in this particular case. - -So convert -ENODEV as -EAGAIN to express the fact that reading -temperature from an uninitialized power supply shouldn't be -a fatal error, but should indicate to the thermal zone it should -retry later. - -It notably removes such messages on Qualcomm platforms using the -qcom_battmgr driver spawning warnings until the aDSP firmware -gets up and the battery manager reports valid data. - -Link: https://lore.kernel.org/all/2ed4c630-204a-4f80-a37f-f2ca838eb455@linaro.org/ -Fixes: 5bc28b93a36e ("power_supply: power_supply_read_temp only if use_cnt > 0") -Fixes: 3be330bf8860 ("power_supply: Register battery as a thermal zone") -Signed-off-by: Neil Armstrong ---- - drivers/power/supply/power_supply_core.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c -index fefe938c9342..88f0b20183ac 100644 ---- a/drivers/power/supply/power_supply_core.c -+++ b/drivers/power/supply/power_supply_core.c -@@ -1287,8 +1287,13 @@ static int power_supply_read_temp(struct thermal_zone_device *tzd, - WARN_ON(tzd == NULL); - psy = thermal_zone_device_priv(tzd); - ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &val); -+ /* -+ * The thermal core expects -EAGAIN as non-fatal error, -+ * convert -ENODEV as -EAGAIN since -ENODEV is returned -+ * when a power supply device isn't initialized -+ */ - if (ret) -- return ret; -+ return ret == -ENODEV ? -EAGAIN : ret; - - /* Convert tenths of degree Celsius to milli degree Celsius. */ - *temp = val.intval * 100; --- -2.34.1 - diff --git a/projects/Amlogic/patches/linux/S922X/0031-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch b/projects/Amlogic/patches/linux/S922X/0039-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch old mode 100644 new mode 100755 similarity index 89% rename from projects/Amlogic/patches/linux/S922X/0031-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch rename to projects/Amlogic/patches/linux/S922X/0039-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch index 52a2ed216..75c507bb3 --- a/projects/Amlogic/patches/linux/S922X/0031-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch +++ b/projects/Amlogic/patches/linux/S922X/0039-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch @@ -1,7 +1,7 @@ -From cbd21cb8c202c4b0056884a1239b017f6caeba82 Mon Sep 17 00:00:00 2001 +From b95234b4178cab46d6eb171c2a7cd56c242a3f74 Mon Sep 17 00:00:00 2001 From: ckkim Date: Thu, 20 Apr 2023 16:21:09 +0900 -Subject: [PATCH 31/38] arm64: dts: amlogic: odroid-go ultra: Improve sound +Subject: [PATCH 39/44] arm64: dts: amlogic: odroid-go ultra: Improve sound output quality --- @@ -9,10 +9,10 @@ Subject: [PATCH 31/38] arm64: dts: amlogic: odroid-go ultra: Improve sound 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts -index 0cd23564d656..1398115177d1 100644 +index 9d6f3be69321..dd64c97df5bd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts -@@ -236,22 +236,9 @@ vdd_sys: regulator-vdd-sys { +@@ -237,22 +237,9 @@ vdd_sys: regulator-vdd-sys { sound { compatible = "amlogic,axg-sound-card"; model = "Odroid GO Ultra"; @@ -38,7 +38,7 @@ index 0cd23564d656..1398115177d1 100644 assigned-clocks = <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>, -@@ -266,13 +253,10 @@ dai-link-0 { +@@ -267,13 +254,10 @@ dai-link-0 { }; dai-link-1 { @@ -53,7 +53,7 @@ index 0cd23564d656..1398115177d1 100644 mclk-fs = <256>; codec-0 { -@@ -280,12 +264,6 @@ codec-0 { +@@ -281,12 +265,6 @@ codec-0 { }; }; }; @@ -66,7 +66,7 @@ index 0cd23564d656..1398115177d1 100644 }; &arb { -@@ -762,29 +740,24 @@ &sd_emmc_c { +@@ -763,29 +741,24 @@ &sd_emmc_c { &tdmif_b { diff --git a/projects/Amlogic/patches/linux/S922X/0032-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch b/projects/Amlogic/patches/linux/S922X/0040-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch old mode 100644 new mode 100755 similarity index 84% rename from projects/Amlogic/patches/linux/S922X/0032-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch rename to projects/Amlogic/patches/linux/S922X/0040-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch index 219c97217..a06ad5001 --- a/projects/Amlogic/patches/linux/S922X/0032-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch +++ b/projects/Amlogic/patches/linux/S922X/0040-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch @@ -1,14 +1,14 @@ -From 4bfa137b1fb879896c345f65a0b15cc11b9cb62e Mon Sep 17 00:00:00 2001 +From 184ec78821692f7a5c5b59f9e16df36d1959c4bd Mon Sep 17 00:00:00 2001 From: brooksytech <1673861+brooksytech@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:03:03 +0000 -Subject: [PATCH 32/38] arm64: meson: g12-common: remove lower freq gpu opps +Subject: [PATCH 40/44] arm64: meson: g12-common: remove lower freq gpu opps --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 79ba8e95649c..bf804d4864fe 100644 +index b31b077bd891..2631b19d8cf6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -62,18 +62,6 @@ efuse: efuse { diff --git a/projects/Amlogic/patches/linux/S922X/0033-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch b/projects/Amlogic/patches/linux/S922X/0041-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch old mode 100644 new mode 100755 similarity index 89% rename from projects/Amlogic/patches/linux/S922X/0033-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch rename to projects/Amlogic/patches/linux/S922X/0041-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch index e9313008f..17b108263 --- a/projects/Amlogic/patches/linux/S922X/0033-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch +++ b/projects/Amlogic/patches/linux/S922X/0041-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch @@ -1,7 +1,7 @@ -From d2b4aadb4d3138a742b52280934e88c6c3d45e60 Mon Sep 17 00:00:00 2001 +From 83b4a5d121788f8ff47794dd945ac82cea346570 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 17 Apr 2022 04:37:48 +0000 -Subject: [PATCH 33/38] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls +Subject: [PATCH 41/44] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls to device 0 On SoC sound devices utilizing codec2codec DAI links with a HDMI codec @@ -25,10 +25,10 @@ Signed-off-by: Anssi Hannula 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c -index 6f73b3c2c205..4653351cc4b9 100644 +index 41103e5c43ce..0db7fe63911e 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c -@@ -2577,7 +2577,10 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream, +@@ -2581,7 +2581,10 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream, knew.name = "Playback Channel Map"; else knew.name = "Capture Channel Map"; diff --git a/projects/Amlogic/patches/linux/S922X/0034-arm64-meson-odroid-n2-add-support-for-overclocking.patch b/projects/Amlogic/patches/linux/S922X/0042-arm64-meson-odroid-n2-add-support-for-overclocking.patch old mode 100644 new mode 100755 similarity index 95% rename from projects/Amlogic/patches/linux/S922X/0034-arm64-meson-odroid-n2-add-support-for-overclocking.patch rename to projects/Amlogic/patches/linux/S922X/0042-arm64-meson-odroid-n2-add-support-for-overclocking.patch index 802f9771f..4d28c3f63 --- a/projects/Amlogic/patches/linux/S922X/0034-arm64-meson-odroid-n2-add-support-for-overclocking.patch +++ b/projects/Amlogic/patches/linux/S922X/0042-arm64-meson-odroid-n2-add-support-for-overclocking.patch @@ -1,7 +1,7 @@ -From 39fe4d54ca44a9deb59ab0f06212dcb0e4447530 Mon Sep 17 00:00:00 2001 +From 56283996bde298454c0e83a6d8cafc232343b0f4 Mon Sep 17 00:00:00 2001 From: spycat88 Date: Sun, 4 Feb 2024 09:48:31 +0000 -Subject: [PATCH 34/38] arm64: meson: odroid-n2*: add support for overclocking +Subject: [PATCH 42/44] arm64: meson: odroid-n2*: add support for overclocking --- .../dts/amlogic/meson-g12b-odroid-n2-plus.dts | 24 ++++++++++++++++++ diff --git a/projects/Amlogic/patches/linux/S922X/0035-power-reset-add-the-Powkiddy-RGB10-Max-3-Pro-to-the-.patch b/projects/Amlogic/patches/linux/S922X/0043-power-reset-add-the-Powkiddy-RGB10-Max-3-Pro-to-the-.patch old mode 100644 new mode 100755 similarity index 91% rename from projects/Amlogic/patches/linux/S922X/0035-power-reset-add-the-Powkiddy-RGB10-Max-3-Pro-to-the-.patch rename to projects/Amlogic/patches/linux/S922X/0043-power-reset-add-the-Powkiddy-RGB10-Max-3-Pro-to-the-.patch index 3142a5486..a835542be --- a/projects/Amlogic/patches/linux/S922X/0035-power-reset-add-the-Powkiddy-RGB10-Max-3-Pro-to-the-.patch +++ b/projects/Amlogic/patches/linux/S922X/0043-power-reset-add-the-Powkiddy-RGB10-Max-3-Pro-to-the-.patch @@ -1,7 +1,7 @@ -From 7ede6fded192186e221603705298710714948707 Mon Sep 17 00:00:00 2001 +From 1ec813703b6ac258893753b9134c1c0856ac119a Mon Sep 17 00:00:00 2001 From: spycat88 Date: Wed, 6 Mar 2024 19:40:45 +0000 -Subject: [PATCH 35/38] power: reset: add the Powkiddy RGB10-Max-3-Pro to the +Subject: [PATCH 43/44] power: reset: add the Powkiddy RGB10-Max-3-Pro to the Odroid Go Ultra poweroff driver --- diff --git a/projects/Amlogic/patches/linux/S922X/0036-arm64-dts-amlogic-meson-g12b-odroid-add-support-for-.patch b/projects/Amlogic/patches/linux/S922X/0044-arm64-dts-amlogic-meson-g12b-odroid-add-support-for-.patch old mode 100644 new mode 100755 similarity index 79% rename from projects/Amlogic/patches/linux/S922X/0036-arm64-dts-amlogic-meson-g12b-odroid-add-support-for-.patch rename to projects/Amlogic/patches/linux/S922X/0044-arm64-dts-amlogic-meson-g12b-odroid-add-support-for-.patch index 7151dc9b9..fb1751c4e --- a/projects/Amlogic/patches/linux/S922X/0036-arm64-dts-amlogic-meson-g12b-odroid-add-support-for-.patch +++ b/projects/Amlogic/patches/linux/S922X/0044-arm64-dts-amlogic-meson-g12b-odroid-add-support-for-.patch @@ -1,15 +1,15 @@ -From c567da469b39f28f5fbf9da425e6b1cb2901d0f8 Mon Sep 17 00:00:00 2001 +From a4e81f28176469d952920e59a54def348c3147fb Mon Sep 17 00:00:00 2001 From: spycat88 Date: Fri, 15 Mar 2024 19:49:19 +0000 -Subject: [PATCH 36/38] arm64: dts: amlogic: meson-g12b-odroid: add support for - gpio power off +Subject: [PATCH 44/44] arm64: dts: amlogic: meson-g12b-odroid: add support + for gpio power off --- arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi -index 35c68894637f..bbb3ed950679 100644 +index 09d959aefb18..910caa80d7c1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi @@ -38,6 +38,17 @@ fan: gpio-fan { diff --git a/projects/Amlogic/patches/linux/S922X/0037-Revert-power-supply-core-ease-special-formatting-imp.patch b/projects/Amlogic/patches/linux/S922X/0045-Revert-power-supply-core-ease-special-formatting-imp.patch old mode 100644 new mode 100755 similarity index 80% rename from projects/Amlogic/patches/linux/S922X/0037-Revert-power-supply-core-ease-special-formatting-imp.patch rename to projects/Amlogic/patches/linux/S922X/0045-Revert-power-supply-core-ease-special-formatting-imp.patch index 29ecc2066..f0997f6f0 --- a/projects/Amlogic/patches/linux/S922X/0037-Revert-power-supply-core-ease-special-formatting-imp.patch +++ b/projects/Amlogic/patches/linux/S922X/0045-Revert-power-supply-core-ease-special-formatting-imp.patch @@ -1,7 +1,7 @@ -From 754c1afd52a5415e0149d15d4dec443ecc045fcd Mon Sep 17 00:00:00 2001 +From 6a27a420ff3830226aa930d9ed7109d9a6e68d52 Mon Sep 17 00:00:00 2001 From: spycat88 Date: Sat, 13 Apr 2024 17:16:30 +0100 -Subject: [PATCH 37/38] Revert "power: supply: core: ease special formatting +Subject: [PATCH 45/45] Revert "power: supply: core: ease special formatting implementations" This reverts commit 521d75b4174e9cbfad73e7d0ac34fd6461b542d7. @@ -10,10 +10,10 @@ This reverts commit 521d75b4174e9cbfad73e7d0ac34fd6461b542d7. 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c -index b86e11bdc07e..e9110dba126a 100644 +index 0d2c3724d0bc..bdbeaece7f13 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c -@@ -298,6 +298,11 @@ static ssize_t power_supply_show_property(struct device *dev, +@@ -315,6 +315,11 @@ static ssize_t power_supply_show_property(struct device *dev, } } @@ -25,7 +25,7 @@ index b86e11bdc07e..e9110dba126a 100644 switch (psp) { case POWER_SUPPLY_PROP_USB_TYPE: ret = power_supply_show_usb_type(dev, psy->desc, -@@ -311,12 +316,7 @@ static ssize_t power_supply_show_property(struct device *dev, +@@ -327,12 +332,7 @@ static ssize_t power_supply_show_property(struct device *dev, ret = sysfs_emit(buf, "%s\n", value.strval); break; default: diff --git a/projects/PC/devices/AMD64/linux/linux.x86_64.conf b/projects/PC/devices/AMD64/linux/linux.x86_64.conf index b4430bf51..071d47382 100644 --- a/projects/PC/devices/AMD64/linux/linux.x86_64.conf +++ b/projects/PC/devices/AMD64/linux/linux.x86_64.conf @@ -6074,8 +6074,8 @@ CONFIG_USB_PWC=m CONFIG_USB_PWC_INPUT_EVDEV=y CONFIG_USB_S2255=m CONFIG_VIDEO_USBTV=m -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +# CONFIG_USB_VIDEO_CLASS is not set +# CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set # # Analog TV USB devices diff --git a/projects/Rockchip/devices/RK3566/linux/linux.aarch64.conf b/projects/Rockchip/devices/RK3566/linux/linux.aarch64.conf index 76f8cc451..39ffb7eea 100644 --- a/projects/Rockchip/devices/RK3566/linux/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3566/linux/linux.aarch64.conf @@ -4081,7 +4081,7 @@ CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_USB_PWC is not set # CONFIG_USB_S2255 is not set CONFIG_VIDEO_USBTV=m -CONFIG_USB_VIDEO_CLASS=y +# CONFIG_USB_VIDEO_CLASS is not set # CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set # diff --git a/projects/Rockchip/devices/RK3588/linux/linux.aarch64.conf b/projects/Rockchip/devices/RK3588/linux/linux.aarch64.conf index 5a24993a9..bb3c45e1a 100644 --- a/projects/Rockchip/devices/RK3588/linux/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3588/linux/linux.aarch64.conf @@ -4103,7 +4103,7 @@ CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices # -CONFIG_USB_VIDEO_CLASS=y +# CONFIG_USB_VIDEO_CLASS is not set # CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set # CONFIG_USB_GSPCA is not set # CONFIG_USB_PWC is not set diff --git a/projects/Rockchip/patches/linux/RK3566/000-rk3566-dtsi.patch b/projects/Rockchip/patches/linux/RK3566/000-rk3566-dtsi.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/001-fix-anbernic-model-names.patch b/projects/Rockchip/patches/linux/RK3566/001-fix-anbernic-model-names.patch new file mode 100755 index 000000000..aac0fbffa --- /dev/null +++ b/projects/Rockchip/patches/linux/RK3566/001-fix-anbernic-model-names.patch @@ -0,0 +1,60 @@ +diff -rupN linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts +--- linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts 2023-10-03 23:48:15.144113656 +0000 ++++ linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts 2023-10-03 23:48:55.102040451 +0000 +@@ -8,7 +8,7 @@ + #include "rk3566-anbernic-rg353x.dtsi" + + / { +- model = "RG353P"; ++ model = "Anbernic RG353P"; + compatible = "anbernic,rg353p", "rockchip,rk3566"; + + aliases { +diff -rupN linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts +--- linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts 2023-10-03 23:48:15.144113656 +0000 ++++ linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts 2023-10-03 23:49:18.163158275 +0000 +@@ -8,7 +8,7 @@ + #include "rk3566-anbernic-rg353x.dtsi" + + / { +- model = "RG353PS"; ++ model = "Anbernic RG353PS"; + compatible = "anbernic,rg353ps", "rockchip,rk3566"; + + aliases { +diff -rupN linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts +--- linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts 2023-10-03 23:48:15.144113656 +0000 ++++ linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts 2023-10-03 23:49:09.254725978 +0000 +@@ -8,7 +8,7 @@ + #include "rk3566-anbernic-rg353x.dtsi" + + / { +- model = "RG353V"; ++ model = "Anbernic RG353V"; + compatible = "anbernic,rg353v", "rockchip,rk3566"; + + aliases { +diff -rupN linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts +--- linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts 2023-10-03 23:48:15.144113656 +0000 ++++ linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts 2023-10-03 23:49:30.947779716 +0000 +@@ -8,7 +8,7 @@ + #include "rk3566-anbernic-rg353x.dtsi" + + / { +- model = "RG353VS"; ++ model = "Anbernic RG353VS"; + compatible = "anbernic,rg353vs", "rockchip,rk3566"; + + aliases { +diff -rupN linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts +--- linux-6.6-rc3.orig/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts 2023-10-03 23:48:15.144113656 +0000 ++++ linux-6.6-rc3/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts 2023-10-03 23:49:41.912313646 +0000 +@@ -8,7 +8,7 @@ + #include "rk3566-anbernic-rgxx3.dtsi" + + / { +- model = "RG503"; ++ model = "Anbernic RG503"; + compatible = "anbernic,rg503", "rockchip,rk3566"; + + aliases { diff --git a/projects/Rockchip/patches/linux/RK3566/002-rk817-power-driver-names.patch b/projects/Rockchip/patches/linux/RK3566/002-rk817-power-driver-names.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/003-anbernic-v2-panel-init-seq.patch b/projects/Rockchip/patches/linux/RK3566/003-anbernic-v2-panel-init-seq.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/004-fix-8821cs-sdio-errors.patch b/projects/Rockchip/patches/linux/RK3566/004-fix-8821cs-sdio-errors.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/005-anbernic-input.patch b/projects/Rockchip/patches/linux/RK3566/005-anbernic-input.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/007-rk2023-display-mode.patch b/projects/Rockchip/patches/linux/RK3566/007-rk2023-display-mode.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/017-fix-powkiddy-model-names.patch b/projects/Rockchip/patches/linux/RK3566/017-fix-powkiddy-model-names.patch new file mode 100755 index 000000000..6540f5e32 --- /dev/null +++ b/projects/Rockchip/patches/linux/RK3566/017-fix-powkiddy-model-names.patch @@ -0,0 +1,39 @@ +diff --git a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb10max3.dts b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb10max3.dts +index e5a474e681dd..8ae45b281487 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb10max3.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb10max3.dts +@@ -8,7 +8,7 @@ + #include "rk3566-powkiddy-rk2023.dtsi" + + / { +- model = "Powkiddy RGB10MAX3"; ++ model = "Powkiddy RGB10 Max 3"; + compatible = "powkiddy,rgb10max3", "rockchip,rk3566"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30.dts b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30.dts +index 1f567a14ac84..952b1b285f3b 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30.dts +@@ -8,7 +8,7 @@ + #include "rk3566-powkiddy-rk2023.dtsi" + + / { +- model = "RGB30"; ++ model = "Powkiddy RGB30"; + compatible = "powkiddy,rgb30", "rockchip,rk3566"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts +index bc9933d9e262..72890f747ee3 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts +@@ -8,7 +8,7 @@ + #include "rk3566-powkiddy-rk2023.dtsi" + + / { +- model = "RK2023"; ++ model = "Powkiddy RK2023"; + compatible = "powkiddy,rk2023", "rockchip,rk3566"; + }; + diff --git a/projects/Rockchip/patches/linux/RK3566/018-powkiddy-wifi-input.patch b/projects/Rockchip/patches/linux/RK3566/018-powkiddy-wifi-input.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/019-rk3566-dt-for-mali-driver.patch b/projects/Rockchip/patches/linux/RK3566/019-rk3566-dt-for-mali-driver.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/026-rgb10max3-swap-shoulders-triggers.patch b/projects/Rockchip/patches/linux/RK3566/026-rgb10max3-swap-shoulders-triggers.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/027-rgb30-panel-timings.patch b/projects/Rockchip/patches/linux/RK3566/027-rgb30-panel-timings.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/028-fix-8821cs-sdio-errors-x55.patch b/projects/Rockchip/patches/linux/RK3566/028-fix-8821cs-sdio-errors-x55.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/030-powkiddy-x55-input.patch b/projects/Rockchip/patches/linux/RK3566/030-powkiddy-x55-input.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/030-rgb20sx-rgb30r2.patch b/projects/Rockchip/patches/linux/RK3566/030-rgb20sx-rgb30r2.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/032-bluetooth-fix-encryption-key-size.patch b/projects/Rockchip/patches/linux/RK3566/032-bluetooth-fix-encryption-key-size.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/034-arc-panel.patch b/projects/Rockchip/patches/linux/RK3566/034-arc-panel.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/035-linear-backlight.patch b/projects/Rockchip/patches/linux/RK3566/035-linear-backlight.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/038-device-tree-power-savings.patch b/projects/Rockchip/patches/linux/RK3566/038-device-tree-power-savings.patch old mode 100644 new mode 100755 diff --git a/projects/Rockchip/patches/linux/RK3566/039-system-power-controller-anbernic.patch b/projects/Rockchip/patches/linux/RK3566/039-system-power-controller-anbernic.patch deleted file mode 100644 index 40c125c9b..000000000 --- a/projects/Rockchip/patches/linux/RK3566/039-system-power-controller-anbernic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi -index 18b8c2e7befa..dacb182261ca 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi -@@ -265,6 +265,7 @@ rk817: pmic@20 { - pinctrl-names = "default"; - pinctrl-0 = <&i2s1m0_mclk>, <&pmic_int_l>; - wakeup-source; -+ rockchip,system-power-controller; - - vcc1-supply = <&vcc_sys>; - vcc2-supply = <&vcc_sys>; diff --git a/projects/Rockchip/patches/linux/RK3566/040-rk356x-change-GPU-to-coarse_demand.patch b/projects/Rockchip/patches/linux/RK3566/040-rk356x-change-GPU-to-coarse_demand.patch old mode 100644 new mode 100755