From 87b8ad6ae7c7ebf0e67b1f02bcf2ef85ab52d3bc Mon Sep 17 00:00:00 2001 From: Igor Date: Sun, 19 Mar 2023 21:05:51 +0100 Subject: [PATCH] Bump sunxi to latest versions --- config/kernel/linux-sunxi-current.config | 7 +----- config/kernel/linux-sunxi-edge.config | 7 +----- config/kernel/linux-sunxi-legacy.config | 4 +--- config/kernel/linux-sunxi64-current.config | 9 +------ config/kernel/linux-sunxi64-edge.config | 9 +------ config/kernel/linux-sunxi64-legacy.config | 4 +--- .../families/include/sunxi64_common.inc | 6 ++--- .../sources/families/include/sunxi_common.inc | 6 ++--- ...rtc-sun6i-Add-Allwinner-H616-support.patch | 3 +-- ...rtc-sun6i-Add-Allwinner-H616-support.patch | 24 ++++++++++++------- patch/kernel/archive/sunxi-6.1/series.armbian | 2 +- patch/kernel/archive/sunxi-6.1/series.conf | 2 +- ...rtc-sun6i-Add-Allwinner-H616-support.patch | 24 ++++++++++++------- patch/kernel/archive/sunxi-6.2/series.armbian | 2 +- patch/kernel/archive/sunxi-6.2/series.conf | 10 ++++---- patch/kernel/archive/sunxi-6.2/series.megous | 8 +++---- 16 files changed, 57 insertions(+), 70 deletions(-) diff --git a/config/kernel/linux-sunxi-current.config b/config/kernel/linux-sunxi-current.config index 0b7dbf6ba3..e6bb8bed5c 100644 --- a/config/kernel/linux-sunxi-current.config +++ b/config/kernel/linux-sunxi-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.14 Kernel Configuration +# Linux/arm 6.1.20 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" CONFIG_CC_IS_GCC=y @@ -1469,7 +1469,6 @@ CONFIG_NET_SCH_INGRESS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -3571,8 +3570,6 @@ CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NCT6683=m -CONFIG_SENSORS_NCT6775_CORE=m -CONFIG_SENSORS_NCT6775=m # CONFIG_SENSORS_NCT6775_I2C is not set CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -4948,8 +4945,6 @@ CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_GM12U320 is not set # CONFIG_DRM_PANEL_MIPI_DBI is not set diff --git a/config/kernel/linux-sunxi-edge.config b/config/kernel/linux-sunxi-edge.config index feffe16b39..508020927f 100644 --- a/config/kernel/linux-sunxi-edge.config +++ b/config/kernel/linux-sunxi-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.2.2 Kernel Configuration +# Linux/arm 6.2.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" CONFIG_CC_IS_GCC=y @@ -1485,7 +1485,6 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -3682,7 +3681,6 @@ CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775_CORE=m -CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -5086,9 +5084,6 @@ CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y CONFIG_DRM_LOGICVC=m -CONFIG_DRM_MXS=y -# CONFIG_DRM_MXSFB is not set -CONFIG_DRM_IMX_LCDIF=m # CONFIG_DRM_ARCPGU is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_PANEL_MIPI_DBI=m diff --git a/config/kernel/linux-sunxi-legacy.config b/config/kernel/linux-sunxi-legacy.config index e69b16bfc5..0004d8f5e9 100644 --- a/config/kernel/linux-sunxi-legacy.config +++ b/config/kernel/linux-sunxi-legacy.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.15.98 Kernel Configuration +# Linux/arm 5.15.103 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" CONFIG_CC_IS_GCC=y @@ -1475,7 +1475,6 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -4863,7 +4862,6 @@ CONFIG_DRM_DW_HDMI_CEC=m # CONFIG_DRM_IMX is not set CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y -# CONFIG_DRM_MXSFB is not set # CONFIG_DRM_ARCPGU is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_SIMPLEDRM=m diff --git a/config/kernel/linux-sunxi64-current.config b/config/kernel/linux-sunxi64-current.config index a9f11fa507..43bc829644 100644 --- a/config/kernel/linux-sunxi64-current.config +++ b/config/kernel/linux-sunxi64-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.15 Kernel Configuration +# Linux/arm64 6.1.20 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" CONFIG_CC_IS_GCC=y @@ -1548,7 +1548,6 @@ CONFIG_DEFAULT_NET_SCH="pfifo_fast" # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -4915,9 +4914,6 @@ CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_HISI_KIRIN is not set CONFIG_DRM_LOGICVC=m -CONFIG_DRM_MXS=y -# CONFIG_DRM_MXSFB is not set -CONFIG_DRM_IMX_LCDIF=m # CONFIG_DRM_ARCPGU is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_PANEL_MIPI_DBI=m @@ -7436,9 +7432,6 @@ CONFIG_TMPFS_XATTR=y CONFIG_ARCH_SUPPORTS_HUGETLBFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y diff --git a/config/kernel/linux-sunxi64-edge.config b/config/kernel/linux-sunxi64-edge.config index 035ab8333b..3b568aa16b 100644 --- a/config/kernel/linux-sunxi64-edge.config +++ b/config/kernel/linux-sunxi64-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.2.2 Kernel Configuration +# Linux/arm64 6.2.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" CONFIG_CC_IS_GCC=y @@ -1552,7 +1552,6 @@ CONFIG_DEFAULT_NET_SCH="pfifo_fast" # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -4941,9 +4940,6 @@ CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_HISI_KIRIN is not set CONFIG_DRM_LOGICVC=m -CONFIG_DRM_MXS=y -# CONFIG_DRM_MXSFB is not set -CONFIG_DRM_IMX_LCDIF=m # CONFIG_DRM_ARCPGU is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_PANEL_MIPI_DBI=m @@ -7474,9 +7470,6 @@ CONFIG_TMPFS_XATTR=y CONFIG_ARCH_SUPPORTS_HUGETLBFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y diff --git a/config/kernel/linux-sunxi64-legacy.config b/config/kernel/linux-sunxi64-legacy.config index 656234ea3b..888ac3f1e2 100644 --- a/config/kernel/linux-sunxi64-legacy.config +++ b/config/kernel/linux-sunxi64-legacy.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.98 Kernel Configuration +# Linux/arm64 5.15.103 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" CONFIG_CC_IS_GCC=y @@ -1520,7 +1520,6 @@ CONFIG_DEFAULT_NET_SCH="pfifo_fast" # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -4791,7 +4790,6 @@ CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_HISI_KIRIN is not set -# CONFIG_DRM_MXSFB is not set # CONFIG_DRM_ARCPGU is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_SIMPLEDRM=m diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 6f9ca81ef8..bf64d6d475 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -21,17 +21,17 @@ case $BRANCH in legacy) export KERNEL_MAJOR_MINOR="5.15" # Major and minor versions of this kernel. - export KERNELBRANCH="tag:v5.15.98" + export KERNELBRANCH="tag:v5.15.103" ;; current) export KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. - export KERNELBRANCH="tag:v6.1.15" + export KERNELBRANCH="tag:v6.1.20" ;; edge) export KERNEL_MAJOR_MINOR="6.2" # Major and minor versions of this kernel. - export KERNELBRANCH="tag:v6.2.2" + export KERNELBRANCH="tag:v6.2.7" ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 8101d3ff88..2096935bab 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -22,17 +22,17 @@ case $BRANCH in legacy) export KERNEL_MAJOR_MINOR="5.15" # Major and minor versions of this kernel. - export KERNELBRANCH="tag:v5.15.98" + export KERNELBRANCH="tag:v5.15.103" ;; current) export KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. - export KERNELBRANCH="tag:v6.1.15" + export KERNELBRANCH="tag:v6.1.20" ;; edge) export KERNEL_MAJOR_MINOR="6.2" # Major and minor versions of this kernel. - export KERNELBRANCH="tag:v6.2.2" + export KERNELBRANCH="tag:v6.2.7" ;; esac diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch index f6cd691fe0..81ef027408 100644 --- a/patch/kernel/archive/sunxi-5.15/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch @@ -17,7 +17,7 @@ diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c index 0215900b5..81feda651 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c -@@ -396,6 +396,23 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node) +@@ -396,6 +396,22 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node) CLK_OF_DECLARE_DRIVER(sun50i_h6_rtc_clk, "allwinner,sun50i-h6-rtc", sun50i_h6_rtc_clk_init); @@ -26,7 +26,6 @@ index 0215900b5..81feda651 100644 + .fixed_prescaler = 32, + .has_prescaler = 1, + .has_out_clk = 1, -+ .export_iosc = 1, + .no_ext_losc = 1, +}; + diff --git a/patch/kernel/archive/sunxi-6.1/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch b/patch/kernel/archive/sunxi-6.1/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch index 58f249f4bf..81ef027408 100644 --- a/patch/kernel/archive/sunxi-6.1/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch +++ b/patch/kernel/archive/sunxi-6.1/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch @@ -1,7 +1,7 @@ -From 8b02ef81a3303339628d66b5c85a42e9effe87d8 Mon Sep 17 00:00:00 2001 +From 06990583634891b1c6d8dfd0388f2272be8918cb Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Wed, 21 Apr 2021 12:46:43 +0100 -Subject: [PATCH 057/170] drv:rtc: sun6i: Add Allwinner H616 support +Subject: [PATCH 10/50] drv:rtc: sun6i: Add Allwinner H616 support The H616 RTC changes its day storage to the newly introduced linear day scheme, so pair the new compatible string with this feature flag. @@ -10,14 +10,14 @@ for future expansion we must thus ignore any provided clock for now. Signed-off-by: Andre Przywara --- - drivers/rtc/rtc-sun6i.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) + drivers/rtc/rtc-sun6i.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c -index ae9f502f2..5c6b6fcee 100644 +index 0215900b5..81feda651 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c -@@ -397,6 +397,23 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node) +@@ -396,6 +396,22 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node) CLK_OF_DECLARE_DRIVER(sun50i_h6_rtc_clk, "allwinner,sun50i-h6-rtc", sun50i_h6_rtc_clk_init); @@ -26,7 +26,6 @@ index ae9f502f2..5c6b6fcee 100644 + .fixed_prescaler = 32, + .has_prescaler = 1, + .has_out_clk = 1, -+ .export_iosc = 1, + .no_ext_losc = 1, +}; + @@ -41,6 +40,15 @@ index ae9f502f2..5c6b6fcee 100644 /* * The R40 user manual is self-conflicting on whether the prescaler is * fixed or configurable. The clock diagram shows it as fixed, but there +@@ -842,6 +859,8 @@ static const struct of_device_id sun6i_rtc_dt_ids[] = { + { .compatible = "allwinner,sun8i-v3-rtc" }, + { .compatible = "allwinner,sun50i-h5-rtc" }, + { .compatible = "allwinner,sun50i-h6-rtc" }, ++ { .compatible = "allwinner,sun50i-h616-rtc", ++ .data = (void *)RTC_LINEAR_DAY }, + { /* sentinel */ }, + }; + MODULE_DEVICE_TABLE(of, sun6i_rtc_dt_ids); -- -2.35.3 +2.34.1 diff --git a/patch/kernel/archive/sunxi-6.1/series.armbian b/patch/kernel/archive/sunxi-6.1/series.armbian index 07ab32a6e9..af46cb4290 100644 --- a/patch/kernel/archive/sunxi-6.1/series.armbian +++ b/patch/kernel/archive/sunxi-6.1/series.armbian @@ -45,7 +45,7 @@ patches.armbian/drv-mfd-axp20x-add-sysfs-interface.patch patches.armbian/drv-spi-spidev-Add-armbian-spi-dev-compatible.patch patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch - patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch +- patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch patches.armbian/drv-thermal-sun8i_thermal-Add-for-H616.patch patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch diff --git a/patch/kernel/archive/sunxi-6.1/series.conf b/patch/kernel/archive/sunxi-6.1/series.conf index 6e0a6085fa..375e85d8d0 100644 --- a/patch/kernel/archive/sunxi-6.1/series.conf +++ b/patch/kernel/archive/sunxi-6.1/series.conf @@ -449,7 +449,7 @@ patches.armbian/drv-mfd-axp20x-add-sysfs-interface.patch patches.armbian/drv-spi-spidev-Add-armbian-spi-dev-compatible.patch patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch - patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch +- patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch patches.armbian/drv-thermal-sun8i_thermal-Add-for-H616.patch patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch diff --git a/patch/kernel/archive/sunxi-6.2/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch b/patch/kernel/archive/sunxi-6.2/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch index daf7f52347..81ef027408 100644 --- a/patch/kernel/archive/sunxi-6.2/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch +++ b/patch/kernel/archive/sunxi-6.2/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch @@ -1,7 +1,7 @@ -From 30876e121ba7cdc4516c2b201cc0a4a63be574ba Mon Sep 17 00:00:00 2001 +From 06990583634891b1c6d8dfd0388f2272be8918cb Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Wed, 21 Apr 2021 12:46:43 +0100 -Subject: [PATCH 043/153] drv:rtc: sun6i: Add Allwinner H616 support +Subject: [PATCH 10/50] drv:rtc: sun6i: Add Allwinner H616 support The H616 RTC changes its day storage to the newly introduced linear day scheme, so pair the new compatible string with this feature flag. @@ -10,14 +10,14 @@ for future expansion we must thus ignore any provided clock for now. Signed-off-by: Andre Przywara --- - drivers/rtc/rtc-sun6i.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) + drivers/rtc/rtc-sun6i.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c -index fbfd23463..43f849711 100644 +index 0215900b5..81feda651 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c -@@ -397,6 +397,23 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node) +@@ -396,6 +396,22 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node) CLK_OF_DECLARE_DRIVER(sun50i_h6_rtc_clk, "allwinner,sun50i-h6-rtc", sun50i_h6_rtc_clk_init); @@ -26,7 +26,6 @@ index fbfd23463..43f849711 100644 + .fixed_prescaler = 32, + .has_prescaler = 1, + .has_out_clk = 1, -+ .export_iosc = 1, + .no_ext_losc = 1, +}; + @@ -41,6 +40,15 @@ index fbfd23463..43f849711 100644 /* * The R40 user manual is self-conflicting on whether the prescaler is * fixed or configurable. The clock diagram shows it as fixed, but there +@@ -842,6 +859,8 @@ static const struct of_device_id sun6i_rtc_dt_ids[] = { + { .compatible = "allwinner,sun8i-v3-rtc" }, + { .compatible = "allwinner,sun50i-h5-rtc" }, + { .compatible = "allwinner,sun50i-h6-rtc" }, ++ { .compatible = "allwinner,sun50i-h616-rtc", ++ .data = (void *)RTC_LINEAR_DAY }, + { /* sentinel */ }, + }; + MODULE_DEVICE_TABLE(of, sun6i_rtc_dt_ids); -- -2.35.3 +2.34.1 diff --git a/patch/kernel/archive/sunxi-6.2/series.armbian b/patch/kernel/archive/sunxi-6.2/series.armbian index bb80398002..c008d9cce7 100644 --- a/patch/kernel/archive/sunxi-6.2/series.armbian +++ b/patch/kernel/archive/sunxi-6.2/series.armbian @@ -63,7 +63,7 @@ patches.armbian/drv-mfd-axp20x-add-sysfs-interface.patch patches.armbian/drv-spi-spidev-Add-armbian-spi-dev-compatible.patch patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch - patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch +- patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch patches.armbian/drv-thermal-sun8i_thermal-Add-for-H616.patch patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch diff --git a/patch/kernel/archive/sunxi-6.2/series.conf b/patch/kernel/archive/sunxi-6.2/series.conf index 1cf0eef4d9..4a3bf6b9af 100644 --- a/patch/kernel/archive/sunxi-6.2/series.conf +++ b/patch/kernel/archive/sunxi-6.2/series.conf @@ -49,7 +49,7 @@ patches.megous/media-ov5640-Don-t-powerup-the-sensor-during-driver-probe.patch patches.megous/media-ov5640-set-default-ae-target-lower.patch patches.megous/media-ov5640-Improve-error-reporting.patch - patches.megous/media-ov5640-Implement-autofocus.patch +- patches.megous/media-ov5640-Implement-autofocus.patch patches.megous/media-ov5640-Improve-firmware-load-time.patch patches.megous/media-ov5640-Fix-focus-commands-blocking-until-complete.patch patches.megous/media-ov5640-Report-analogue-gain-as-supported-for-libcamera.patch @@ -186,7 +186,7 @@ patches.megous/of-property-fw_devlink-Support-allwinner-sram-links.patch patches.megous/drm-rockchip-Fix-panic-on-reboot-when-DRM-device-fails-to-bind.patch patches.megous/arm64-dts-rockchip-rk356x-Fix-PCIe-register-map-and-ranges.patch - patches.megous/fs-f2fs-Revert-code-to-v6.1.12-and-forward-port.patch +- patches.megous/fs-f2fs-Revert-code-to-v6.1.12-and-forward-port.patch - patches.megous/dt-bindings-net-bluetooth-Add-rtl8723bs-bluetooth.patch - patches.megous/Bluetooth-Add-new-quirk-for-broken-local-ext-features-max_page.patch - patches.megous/Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch @@ -390,8 +390,8 @@ patches.megous/iio-af8133j-Add-runtime-power-management.patch patches.megous/iio-af8133j-Add-support-for-buffer.patch patches.megous/iio-af8133j-Avoid-compiler-warning.patch - patches.megous/wifi-rtw89-fix-potential-leak-in-rtw89_append_probe_req_ie.patch - patches.megous/wifi-rtw89-Add-missing-check-for-alloc_workqueue.patch +- patches.megous/wifi-rtw89-fix-potential-leak-in-rtw89_append_probe_req_ie.patch +- patches.megous/wifi-rtw89-Add-missing-check-for-alloc_workqueue.patch patches.megous/wifi-rtw89-fix-null-vif-pointer-when-get-management-frame-date-.patch patches.megous/wifi-rtw89-correct-register-definitions-of-digital-CFO-and-spur.patch @@ -459,7 +459,7 @@ patches.armbian/drv-mfd-axp20x-add-sysfs-interface.patch patches.armbian/drv-spi-spidev-Add-armbian-spi-dev-compatible.patch patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch - patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch +- patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch patches.armbian/drv-thermal-sun8i_thermal-Add-for-H616.patch patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch diff --git a/patch/kernel/archive/sunxi-6.2/series.megous b/patch/kernel/archive/sunxi-6.2/series.megous index 01952c3d50..9059756220 100644 --- a/patch/kernel/archive/sunxi-6.2/series.megous +++ b/patch/kernel/archive/sunxi-6.2/series.megous @@ -52,7 +52,7 @@ patches.megous/media-ov5640-Implement-autofocus.patch patches.megous/media-ov5640-Improve-firmware-load-time.patch patches.megous/media-ov5640-Fix-focus-commands-blocking-until-complete.patch - patches.megous/media-ov5640-Report-analogue-gain-as-supported-for-libcamera.patch +- patches.megous/media-ov5640-Report-analogue-gain-as-supported-for-libcamera.patch patches.megous/media-ov5640-Add-read-only-property-for-vblank.patch patches.megous/media-sun6i-csi-capture-Use-subdev-operation-to-access-bridge-f.patch patches.megous/media-sun6i-csi-subdev-Use-subdev-active-state-to-store-active-.patch @@ -186,7 +186,7 @@ patches.megous/of-property-fw_devlink-Support-allwinner-sram-links.patch patches.megous/drm-rockchip-Fix-panic-on-reboot-when-DRM-device-fails-to-bind.patch patches.megous/arm64-dts-rockchip-rk356x-Fix-PCIe-register-map-and-ranges.patch - patches.megous/fs-f2fs-Revert-code-to-v6.1.12-and-forward-port.patch +- patches.megous/fs-f2fs-Revert-code-to-v6.1.12-and-forward-port.patch - patches.megous/dt-bindings-net-bluetooth-Add-rtl8723bs-bluetooth.patch - patches.megous/Bluetooth-Add-new-quirk-for-broken-local-ext-features-max_page.patch - patches.megous/Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch @@ -390,7 +390,7 @@ patches.megous/iio-af8133j-Add-runtime-power-management.patch patches.megous/iio-af8133j-Add-support-for-buffer.patch patches.megous/iio-af8133j-Avoid-compiler-warning.patch - patches.megous/wifi-rtw89-fix-potential-leak-in-rtw89_append_probe_req_ie.patch - patches.megous/wifi-rtw89-Add-missing-check-for-alloc_workqueue.patch +- patches.megous/wifi-rtw89-fix-potential-leak-in-rtw89_append_probe_req_ie.patch +- patches.megous/wifi-rtw89-Add-missing-check-for-alloc_workqueue.patch patches.megous/wifi-rtw89-fix-null-vif-pointer-when-get-management-frame-date-.patch patches.megous/wifi-rtw89-correct-register-definitions-of-digital-CFO-and-spur.patch