catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

ipq806x: refresh 6.12 kernel patches

Browse Source 
Remove upstreamed:
901-mtd-spi-nor-n25q064a-wp.patch [1]

Manually rebased:
107-10-ARM-dts-qcom-add-saw-for-l2-cache-and-kraitcc-for.patch
108-01-ARM-dts-qcom-fix-wrong-nad_pins-definition-for-ipq80.patch
122-01-clk-qcom-krait-cc-handle-qsb-clock-defined-in-DTS.patch
122-04-clk-qcom-krait-cc-rework-mux-reset-logic-and-reset-h.patch
902-ARM-decompressor-support-for-ATAGs-rootblock-parsing.patch

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=86fd0e6410b453fed93cf8085de1e5b0cfdbb6b9

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18989
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Shiji Yang 2025-05-31 23:36:16 +08:00 committed by Christian Marangi
parent a33d59f7af
commit 621d480e0e
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG Key ID: AC001D09ADBFEAD7
14 changed files with 44 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
target/linux/ipq806x/patches-6.12/107-10-ARM-dts-qcom-add-saw-for-l2-cache-and-kraitcc-for.patch
View File

@ -29,23 +29,22 @@ Tested-by: Jonathan McDowell <noodles@earth.li>
cxo_board: cxo_board {
compatible = "fixed-clock";
#clock-cells = <0>;
@@ -587,7 +593,7 @@
@@ -570,7 +576,7 @@
};
saw0: regulator@2089000 {
- compatible = "qcom,saw2";
+ compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
saw0: power-manager@2089000 {
- compatible = "qcom,ipq8064-saw2-cpu", "qcom,saw2";
+ compatible = "qcom,ipq8064-saw2-cpu", "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
regulator;
};
@@ -602,11 +608,27 @@
};
saw1: regulator@2099000 {
- compatible = "qcom,saw2";
+ compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
@@ -584,10 +590,26 @@
};
saw1: power-manager@2099000 {
- compatible = "qcom,ipq8064-saw2-cpu", "qcom,saw2";
+ compatible = "qcom,ipq8064-saw2-cpu", "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
regulator;
};
+ saw_l2: regulator@02012000 {

6
target/linux/ipq806x/patches-6.12/108-01-ARM-dts-qcom-fix-wrong-nad_pins-definition-for-ipq80.patch
View File

@ -12,11 +12,11 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
@@ -600,12 +600,9 @@
@@ -588,12 +588,9 @@
};
nand_pins: nand_pins {
- mux {
nand_pins: nand-state {
- nand-pins {
+ disable {
pins = "gpio34", "gpio35", "gpio36",
- "gpio37", "gpio38", "gpio39",

6
target/linux/ipq806x/patches-6.12/108-02-ARM-dts-qcom-add-MDIO-dedicated-controller-node-for-.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts
@@ -25,131 +25,6 @@
@@ -52,131 +52,6 @@
device_type = "memory";
};
@ -147,7 +147,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
mdio1: mdio-1 {
status = "okay";
compatible = "virtual,mdio-gpio";
@@ -337,6 +212,131 @@
@@ -336,6 +211,131 @@
status = "okay";
};
@ -281,7 +281,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
@@ -1429,6 +1429,20 @@
@@ -1438,6 +1438,20 @@
status = "disabled";
};

2
target/linux/ipq806x/patches-6.12/114-02-ARM-dts-qcom-add-krait-cache-compatible-for-ipq806x-.patch
View File

@ -32,7 +32,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
};
opp_table_l2: opp_table_l2 {
@@ -1392,6 +1381,17 @@
@@ -1401,6 +1390,17 @@
#reset-cells = <1>;
};

2
target/linux/ipq806x/patches-6.12/115-02-ARM-dts-qcom-add-fab-scaling-node-for-ipq806x.patch
View File

@ -32,7 +32,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
thermal-zones {
sensor0-thermal {
polling-delay-passive = <0>;
@@ -1392,6 +1404,13 @@
@@ -1401,6 +1413,13 @@
operating-points-v2 = <&opp_table_l2>;
};

10
target/linux/ipq806x/patches-6.12/122-01-clk-qcom-krait-cc-handle-qsb-clock-defined-in-DTS.patch
View File

@ -14,18 +14,16 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
--- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c
@@ -348,7 +348,7 @@ static int krait_cc_probe(struct platfor
@@ -347,17 +347,25 @@ MODULE_DEVICE_TABLE(of, krait_cc_match_t
static int krait_cc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
const struct of_device_id *id;
- unsigned long cur_rate, aux_rate;
+ unsigned long cur_rate, aux_rate, qsb_rate;
int cpu;
struct clk_hw *mux, *l2_pri_mux;
struct clk *clk, **clks;
@@ -357,11 +357,19 @@ static int krait_cc_probe(struct platfor
if (!id)
return -ENODEV;
bool unique_aux = !!device_get_match_data(dev);
- /* Rate is 1 because 0 causes problems for __clk_mux_determine_rate */
- clk = clk_register_fixed_rate(dev, "qsb", NULL, 0, 1);
@ -42,6 +40,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+ qsb_rate = clk_get_rate(clk);
+
if (!id->data) {
if (!unique_aux) {
clk = clk_register_fixed_factor(dev, "acpu_aux",
"gpll0_vote", 0, 1, 2);

2
target/linux/ipq806x/patches-6.12/122-02-clk-qcom-krait-cc-register-REAL-qsb-fixed-clock.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
static unsigned int sec_mux_map[] = {
2,
0,
@@ -364,7 +366,7 @@ static int krait_cc_probe(struct platfor
@@ -360,7 +362,7 @@ static int krait_cc_probe(struct platfor
*/
clk = clk_get(dev, "qsb");
if (IS_ERR(clk))

2
target/linux/ipq806x/patches-6.12/122-03-clk-qcom-krait-cc-drop-pr_info-and-use-dev_info.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
--- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c
@@ -423,25 +423,25 @@ static int krait_cc_probe(struct platfor
@@ -419,25 +419,25 @@ static int krait_cc_probe(struct platfor
cur_rate = clk_get_rate(clks[l2_mux]);
aux_rate = 384000000;
if (cur_rate < aux_rate) {

6
target/linux/ipq806x/patches-6.12/122-04-clk-qcom-krait-cc-rework-mux-reset-logic-and-reset-h.patch
View File

@ -30,16 +30,16 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
static unsigned int sec_mux_map[] = {
2,
@@ -350,7 +352,7 @@ static int krait_cc_probe(struct platfor
@@ -349,7 +351,7 @@ MODULE_DEVICE_TABLE(of, krait_cc_match_t
static int krait_cc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
const struct of_device_id *id;
- unsigned long cur_rate, aux_rate, qsb_rate;
+ unsigned long cur_rate, qsb_rate;
int cpu;
struct clk_hw *mux, *l2_pri_mux;
struct clk *clk, **clks;
@@ -420,28 +422,29 @@ static int krait_cc_probe(struct platfor
@@ -416,28 +418,29 @@ static int krait_cc_probe(struct platfor
* two different rates to force a HFPLL reinit under all
* circumstances.
*/

4
target/linux/ipq806x/patches-6.12/850-soc-add-qualcomm-syscon.patch
View File

@ -2,7 +2,7 @@ From: Christian Lamparter <chunkeey@googlemail.com>
Subject: SoC: add qualcomm syscon
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_QCOM_SOCINFO) += socinfo.o
@@ -32,6 +32,7 @@ obj-$(CONFIG_QCOM_SOCINFO) += socinfo.o
obj-$(CONFIG_QCOM_SPM) += spm.o
obj-$(CONFIG_QCOM_STATS) += qcom_stats.o
obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
@ -12,7 +12,7 @@ Subject: SoC: add qualcomm syscon
obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) += kryo-l2-accessors.o
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -252,6 +252,13 @@ config QCOM_STATS
@@ -247,6 +247,13 @@ config QCOM_STATS
various SoC level low power modes statistics and export to debugfs
interface.

4
target/linux/ipq806x/patches-6.12/900-arm-add-cmdline-override.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1568,6 +1568,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
@@ -1505,6 +1505,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
endchoice
@ -17,7 +17,7 @@
default ""
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1190,6 +1190,17 @@ int __init early_init_dt_scan_chosen(cha
@@ -1053,6 +1053,17 @@ int __init early_init_dt_scan_chosen(cha
if (p != NULL && l > 0)
strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE));

10
target/linux/ipq806x/patches-6.12/901-02-ARM-decompressor-add-option-to-ignore-MEM-ATAGs.patch
View File

@ -20,9 +20,9 @@ Acked-by: Linus Walleij <linus.walleij@linaro.org>
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1549,6 +1549,18 @@ config ARM_ATAG_DTB_COMPAT
bootloaders, this option allows zImage to extract the information
from the ATAG list and store it at run time into the appended DTB.
@@ -1523,6 +1523,18 @@ config CMDLINE
time by entering them here. As a minimum, you should specify the
memory size and the root device (e.g., mem=64M root=/dev/nfs).
+config ARM_ATAG_DTB_COMPAT_IGNORE_MEM
+ bool "Ignore MEM ATAG information from bootloader"
@ -37,8 +37,8 @@ Acked-by: Linus Walleij <linus.walleij@linaro.org>
+ node in the appended DTB should NOT be augumented.
+
choice
prompt "Kernel command line type" if ARM_ATAG_DTB_COMPAT
default ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER
prompt "Kernel command line type"
depends on CMDLINE != ""
--- a/arch/arm/boot/compressed/atags_to_fdt.c
+++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -170,6 +170,10 @@ int atags_to_fdt(void *atag_list, void *

29
target/linux/ipq806x/patches-6.12/901-mtd-spi-nor-n25q064a-wp.patch
View File

@ -1,29 +0,0 @@
From 1e019e728800d4033b4b3b1b5570f5da5ed309f2 Mon Sep 17 00:00:00 2001
From: Brian Norris <computersforpeace@gmail.com>
Date: Thu, 15 Dec 2022 01:49:20 -0800
Subject: [PATCH] mtd: spi-nor: micron-st: Add n25q064a WP support
These flash chips are used on Google / TP-Link / ASUS OnHub devices, and
OnHub devices are write-protected by default (same as any other
ChromeOS/Chromebook system).
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
Submitted upstream at:
https://lore.kernel.org/linux-mtd/20240726185825.142733-1-computersforpeace@gmail.com/
https://patchwork.ozlabs.org/project/linux-mtd/patch/20240726185825.142733-1-computersforpeace@gmail.com/
drivers/mtd/spi-nor/micron-st.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/mtd/spi-nor/micron-st.c
+++ b/drivers/mtd/spi-nor/micron-st.c
@@ -183,6 +183,8 @@ static const struct flash_info st_nor_pa
{ "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128)
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
{ "n25q064a", INFO(0x20bb17, 0, 64 * 1024, 128)
+ FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4BIT_BP |
+ SPI_NOR_BP3_SR_BIT6)
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
{ "n25q128a11", INFO(0x20bb18, 0, 64 * 1024, 256)
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4BIT_BP |

16
target/linux/ipq806x/patches-6.12/902-ARM-decompressor-support-for-ATAGs-rootblock-parsing.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1578,6 +1578,16 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
@@ -1503,6 +1503,16 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.
@ -169,18 +169,18 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
*ptr = '\0';
--- a/init/main.c
+++ b/init/main.c
@@ -28,6 +28,7 @@
#include <linux/initrd.h>
#include <linux/memblock.h>
#include <linux/acpi.h>
+#include <linux/of.h>
@@ -31,6 +31,7 @@
#include <linux/bootconfig.h>
#include <linux/console.h>
#include <linux/nmi.h>
@@ -931,6 +932,17 @@ void start_kernel(void)
+#include <linux/of.h>
#include <linux/percpu.h>
#include <linux/kmod.h>
#include <linux/kprobes.h>
@@ -961,6 +962,17 @@ void start_kernel(void)
pr_notice("Kernel command line: %s\n", saved_command_line);
/* parameters may set static keys */
jump_label_init();
+
+ /* Show bootloader's original command line for reference */
+ if (IS_ENABLED(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) && of_chosen) {