diff --git a/config/kernel/linux-meson64-current.config b/config/kernel/linux-meson64-current.config index 2d0f6e770..9c7864475 100644 --- a/config/kernel/linux-meson64-current.config +++ b/config/kernel/linux-meson64-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.16 Kernel Configuration +# Linux/arm64 5.10.43 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -225,6 +225,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set # CONFIG_EMBEDDED is not set @@ -429,6 +430,7 @@ CONFIG_SETEND_EMULATION=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y +CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM64_VHE=y @@ -8427,7 +8429,6 @@ CONFIG_RESET_SCMI=y CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PHY_MIPI_DPHY=y CONFIG_PHY_XGENE=y -CONFIG_USB_LGM_PHY=m CONFIG_PHY_MESON8B_USB2=y CONFIG_PHY_MESON_GXL_USB2=y CONFIG_PHY_MESON_G12A_USB2=y diff --git a/config/kernel/linux-meson64-edge.config b/config/kernel/linux-meson64-edge.config index 3d7cdf3da..f91c4bd47 100644 --- a/config/kernel/linux-meson64-edge.config +++ b/config/kernel/linux-meson64-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.12.4 Kernel Configuration +# Linux/arm64 5.12.13 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -3396,7 +3396,6 @@ CONFIG_WLCORE_SPI=m CONFIG_WLCORE_SDIO=m CONFIG_WILINK_PLATFORM_DATA=y CONFIG_RTL8723DU=m -CONFIG_RTL8723DS=m CONFIG_RTL8822BU=m CONFIG_RTL8188EU=m CONFIG_RTL8821CU=m diff --git a/patch/kernel/archive/meson64-5.12/0015-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch b/patch/kernel/archive/meson64-5.12/0015-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch index 1971b9f68..52c08ff7a 100644 --- a/patch/kernel/archive/meson64-5.12/0015-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch +++ b/patch/kernel/archive/meson64-5.12/0015-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch @@ -45,18 +45,18 @@ index bdf1f98dfad8..6570146cabc5 100644 } /* Get dr_mode */ -@@ -772,13 +772,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) +@@ -775,13 +775,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) ret = priv->drvdata->usb_init(priv); if (ret) -- goto err_disable_clks; +- goto err_disable_regulator; + goto err_rearm; /* Init PHYs */ for (i = 0 ; i < PHY_COUNT ; ++i) { ret = phy_init(priv->phys[i]); if (ret) -- goto err_disable_clks; +- goto err_disable_regulator; + goto err_rearm; }