diff --git a/linux/latest/0001-manjaro-linux b/linux/latest/0001-manjaro-linux index a0c8cc6e..439c8609 160000 --- a/linux/latest/0001-manjaro-linux +++ b/linux/latest/0001-manjaro-linux @@ -1 +1 @@ -Subproject commit a0c8cc6e65a6072da989f98fa93bb3fd01f3f44e +Subproject commit 439c860905110fff331fe3b2e5af0f696fd24d73 diff --git a/linux/latest/0021-rockpi-4b/0014-add-possibility-of-disabling-rk808-rtc.patch b/linux/latest/0021-rockpi-4b/0014-add-possibility-of-disabling-rk808-rtc.patch deleted file mode 100644 index 8da9758e..00000000 --- a/linux/latest/0021-rockpi-4b/0014-add-possibility-of-disabling-rk808-rtc.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Piotr Szczepanik -Date: Sun, 24 Jan 2021 16:14:06 +0100 -Subject: [PATCH] add possibility of disabling rk808-rtc - -To disable rk808-rtc driver from loading for specific board -add the following stanza to rk808 node in device tree: - - rtc { - compatible = "rk808-rtc"; - status = "disabled"; - } - -This is needed for roc-rk3399-pc plus (a.k.a. Station P1). -Without the change rk808's rtc is initialised and used for time keeping -although there is another rtc (hym8563) that should be actually used. - -Signed-off-by: Piotr Szczepanik -Signed-off-by: Yuntian Zhang ---- - drivers/mfd/mfd-core.c | 2 +- - drivers/mfd/rk808.c | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c -index 684a011a63..81ba5740ce 100644 ---- a/drivers/mfd/mfd-core.c -+++ b/drivers/mfd/mfd-core.c -@@ -215,7 +215,7 @@ static int mfd_add_device(struct device *parent, int id, - } - - if (!pdev->dev.of_node) -- pr_warn("%s: Failed to locate of_node [id: %d]\n", -+ pr_debug("%s: Failed to locate of_node [id: %d]\n", - cell->name, platform_id); - } - -diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c -index 4142b638e5..3358cf3695 100644 ---- a/drivers/mfd/rk808.c -+++ b/drivers/mfd/rk808.c -@@ -147,6 +147,7 @@ { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, }, - { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, }, - { - .name = "rk808-rtc", -+ .of_compatible = "rk808-rtc", - .num_resources = ARRAY_SIZE(rtc_resources), - .resources = rtc_resources, - .id = PLATFORM_DEVID_NONE, --- -2.36.1 - diff --git a/linux/latest/0021-rockpi-4b/0015-change-the-way-that-BUCK1-and-BUCK2-of-rk808-PMIC-se.patch b/linux/latest/0021-rockpi-4b/0015-change-the-way-that-BUCK1-and-BUCK2-of-rk808-PMIC-se.patch deleted file mode 100644 index f2090a68..00000000 --- a/linux/latest/0021-rockpi-4b/0015-change-the-way-that-BUCK1-and-BUCK2-of-rk808-PMIC-se.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Stephen -Date: Thu, 3 Mar 2022 11:28:33 +0000 -Subject: [PATCH] change the way that BUCK1 and BUCK2 of rk808 PMIC set voltage - -It allows to change the hardcoded max. 100mV per one change -to any multiple of 12.5mV while keeping the 100mV default. - -It was observed that making the steps smaller (eg. 50mV = 4 * 12.5mV) -makes the NanoPi M4V2 running stable. - -One can configure the max number of steps per single change using -the "max-buck-steps-per-change" property of rk808 node in device tree. - -Below example ensures that voltage is not changed in jumps larger than 50mV: - -&rk808 { - max-buck-steps-per-change = <4>; -} - -Be aware that changing this parameter affects the time taken to switch between -OPPs of LiTTLE cores of rk3399. - -For overclocked LiTTLE cores with base 408MHz @ 0.825V -and max. 1.5GHz @ 1.2V it will take 7 steps of 50mV (at least 65uS each - caused by i2c), -the final 25mV step and 1uS to settle: 7 x 65uS + 1uS = 456uS. - -With default setting it would be 3 steps of 100mV (at least 65uS each - caused by i2c), -the final 75mV step and 1uS to settle: 3 x 65uS + 1uS = 196uS. - -Signed-off-by: Piotr Szczepanik - -Signed-off-by: Stephen -Signed-off-by: Yuntian Zhang ---- - drivers/regulator/rk808-regulator.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c -index 127dc2e2e6..92aef20975 100644 ---- a/drivers/regulator/rk808-regulator.c -+++ b/drivers/regulator/rk808-regulator.c -@@ -156,6 +156,7 @@ - - struct rk808_regulator_data { - struct gpio_desc *dvs_gpio[2]; -+ unsigned max_buck_steps_per_change; - }; - - static const struct linear_range rk808_ldo3_voltage_ranges[] = { -@@ -241,7 +242,8 @@ static int rk808_buck1_2_get_voltage_sel_regmap(struct regulator_dev *rdev) - } - - static int rk808_buck1_2_i2c_set_voltage_sel(struct regulator_dev *rdev, -- unsigned sel) -+ unsigned sel, -+ int max_steps) - { - int ret, delta_sel; - unsigned int old_sel, tmp, val, mask = rdev->desc->vsel_mask; -@@ -260,8 +262,8 @@ static int rk808_buck1_2_i2c_set_voltage_sel(struct regulator_dev *rdev, - * the risk of overshoot. Put it into a multi-step, can effectively - * avoid this problem, a step is 100mv here. - */ -- while (delta_sel > MAX_STEPS_ONE_TIME) { -- old_sel += MAX_STEPS_ONE_TIME; -+ while (delta_sel > max_steps) { -+ old_sel += max_steps; - val = old_sel << (ffs(mask) - 1); - val |= tmp; - -@@ -295,12 +297,13 @@ static int rk808_buck1_2_set_voltage_sel(struct regulator_dev *rdev, - struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev); - int id = rdev_get_id(rdev); - struct gpio_desc *gpio = pdata->dvs_gpio[id]; -+ int max_steps = pdata->max_buck_steps_per_change; - unsigned int reg = rdev->desc->vsel_reg; - unsigned old_sel; - int ret, gpio_level; - - if (!gpio) -- return rk808_buck1_2_i2c_set_voltage_sel(rdev, sel); -+ return rk808_buck1_2_i2c_set_voltage_sel(rdev, sel, max_steps); - - gpio_level = gpiod_get_value(gpio); - if (gpio_level == 0) { -@@ -1278,6 +1281,12 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev, - 0 : tmp); - } - -+ tmp = of_property_read_u32(client_dev->of_node, "max-buck-steps-per-change", &pdata->max_buck_steps_per_change); -+ if (tmp) { -+ pdata->max_buck_steps_per_change = MAX_STEPS_ONE_TIME; -+ } -+ dev_info(dev, "max buck steps per change: %d\n", pdata->max_buck_steps_per_change); -+ - dt_parse_end: - of_node_put(np); - return ret; --- -2.36.1 - diff --git a/linux/latest/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch b/linux/latest/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch index b87bb036..da832269 100644 --- a/linux/latest/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch +++ b/linux/latest/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch @@ -22,8 +22,8 @@ index f231280cd..3b5a15e47 100644 +subdir-y += overlays + # SPDX-License-Identifier: GPL-2.0 + dtb-$(CONFIG_ARCH_MESON) += amlogic-c3-c302x-aw409.dtb dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j100.dtb diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 971b1f0ae..66aba816d 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile @@ -79,7 +79,7 @@ index 190d781e8..8744bb077 100644 + PHONY += $(subdirs) $(subdirs): - $(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@) + $(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@)) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 3fb6a99e7..a1a073d1d 100644 --- a/scripts/Makefile.lib diff --git a/linux/latest/0100-vendor/0003-Revert-kbuild-Disallow-DTB-overlays-to-built-from-.d.patch b/linux/latest/0100-vendor/0003-Revert-kbuild-Disallow-DTB-overlays-to-built-from-.d.patch new file mode 100644 index 00000000..bc7ad3c5 --- /dev/null +++ b/linux/latest/0100-vendor/0003-Revert-kbuild-Disallow-DTB-overlays-to-built-from-.d.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: bsp +Date: Thu, 28 Sep 2023 18:00:40 +0800 +Subject: [PATCH 1/1] Revert "kbuild: Disallow DTB overlays to built from .dts + named source files" + +This reverts commit 81d362732bac05f656cdc4bbe776ac20cfd30c45. +--- + scripts/Makefile.lib | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index 68d0134bdbf9d..100a386fcd717 100644 +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -418,6 +418,9 @@ endif + $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE + $(call if_changed_dep,dtb) + ++$(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE ++ $(call if_changed_dep,dtc) ++ + $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE + $(call if_changed_dep,dtc) + +-- +2.42.0 + diff --git a/linux/latest/fork.conf b/linux/latest/fork.conf index 6c24c703..e795648f 100644 --- a/linux/latest/fork.conf +++ b/linux/latest/fork.conf @@ -1,5 +1,5 @@ BSP_GIT="https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git" -BSP_TAG="v6.4.13" +BSP_TAG="v6.5.5" SUPPORTED_BOARDS=("latest" #"radxa-cm3-io-latest" "radxa-cm3-sodimm-io-latest" "radxa-e25-latest" #"radxa-zero-latest" "radxa-zero-2pro-latest" diff --git a/linux/stable/0020-radxa-zero/0013-Prefer-FHD-for-meson.patch b/linux/stable/0020-radxa-zero/0013-Prefer-FHD-for-meson.patch index a41f8464..7427acd7 100644 --- a/linux/stable/0020-radxa-zero/0013-Prefer-FHD-for-meson.patch +++ b/linux/stable/0020-radxa-zero/0013-Prefer-FHD-for-meson.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: bsp +From: ZHANG Yuntian Date: Wed, 12 Jul 2023 16:34:21 +0800 Subject: [PATCH] Prefer FHD for meson @@ -21,7 +21,7 @@ index 739e0d40cca6..d74e002bf7e8 100644 struct detailed_mode_closure { @@ -233,6 +235,12 @@ static const struct edid_quirk { - EDID_QUIRK('S', 'V', 'R', 0x1019, EDID_QUIRK_NON_DESKTOP), + EDID_QUIRK('A', 'U', 'O', 0x1111, EDID_QUIRK_NON_DESKTOP), }; +static const struct connector_quirk { diff --git a/linux/stable/0020-radxa-zero/0017-Rename-ZERO-2.patch b/linux/stable/0020-radxa-zero/0017-Rename-ZERO-2.patch index a1131b35..2ce6b5ec 100644 --- a/linux/stable/0020-radxa-zero/0017-Rename-ZERO-2.patch +++ b/linux/stable/0020-radxa-zero/0017-Rename-ZERO-2.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: bsp +From: ZHANG Yuntian Date: Wed, 27 Sep 2023 19:15:30 +0800 Subject: [PATCH 1/1] Rename ZERO 2 diff --git a/linux/stable/fork.conf b/linux/stable/fork.conf index b90bbb71..e3d5f896 100644 --- a/linux/stable/fork.conf +++ b/linux/stable/fork.conf @@ -1,5 +1,5 @@ BSP_GIT="https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git" -BSP_TAG="v6.1.54" +BSP_TAG="v6.1.55" SUPPORTED_BOARDS=("stable" "radxa-zero" "radxa-zero-2pro" #"radxa-cm3-io-stable" "radxa-cm3-sodimm-io-stable" "radxa-e25-stable"