ipq806x: 6.1: refresh kernel patches

Refresh ipq806x kernel patches with make target/linux/refresh.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch b/target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch
index 41c102e30a396779cec9cb1916757b7c93538e35..384eee6215bce50b7afb0191d17cc6bf8503fab9 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch
+++ b/target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch
@@ -19,11 +19,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  arch/arm/mach-qcom/Kconfig | 13 +++++++++++++
  2 files changed, 15 insertions(+), 1 deletion(-)
 
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 1af63e17b4ad..0818d35973ad 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -282,6 +282,7 @@ config PHYS_OFFSET
+@@ -283,6 +283,7 @@ config PHYS_OFFSET
        default 0x30000000 if ARCH_S3C24XX
        default 0xa0000000 if ARCH_IOP32X || ARCH_PXA
        default 0xc0000000 if ARCH_EP93XX || ARCH_SA1100
@@ -31,7 +29,7 @@ index 1af63e17b4ad..0818d35973ad 100644
        default 0
        help
          Please provide the physical address corresponding to the
-@@ -1701,7 +1702,7 @@ config CRASH_DUMP
+@@ -1702,7 +1703,7 @@ config CRASH_DUMP
  
  config AUTO_ZRELADDR
        bool "Auto calculation of the decompressed kernel image address" if !ARCH_MULTIPLATFORM
@@ -40,8 +38,6 @@ index 1af63e17b4ad..0818d35973ad 100644
        help
          ZRELADDR is the physical address where the decompressed kernel
          image will be placed. If AUTO_ZRELADDR is selected, the address
-diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
-index 12a812e61c16..b11b6e391ff0 100644
 --- a/arch/arm/mach-qcom/Kconfig
 +++ b/arch/arm/mach-qcom/Kconfig
 @@ -46,4 +46,17 @@ config ARCH_MDM9615
@@ -62,6 +58,3 @@ index 12a812e61c16..b11b6e391ff0 100644
 +        disable AUTO_ZRELADDR.
 +
  endif
--- 
-2.37.2
-

diff --git a/target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
index 7d6819229595af41d78fdf94811d03c100306871..e40b43b968d9323c56b0eeaad60f14bd04ef6e23 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
+++ b/target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1727,6 +1727,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1586,6 +1586,17 @@ 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.
  
@@ -248,7 +248,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  }
 --- a/init/main.c
 +++ b/init/main.c
-@@ -113,6 +113,10 @@
+@@ -114,6 +114,10 @@
  
  #include <kunit/test.h>
  
@@ -259,7 +259,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  static int kernel_init(void *);
  
  extern void init_IRQ(void);
-@@ -992,6 +996,18 @@ asmlinkage __visible void __init __no_sa
+@@ -994,6 +998,18 @@ asmlinkage __visible void __init __no_sa
        pr_notice("Kernel command line: %s\n", saved_command_line);
        /* parameters may set static keys */
        jump_label_init();

diff --git a/target/linux/ipq806x/patches-6.1/107-10-ARM-dts-qcom-add-saw-for-l2-cache-and-kraitcc-for.patch b/target/linux/ipq806x/patches-6.1/107-10-ARM-dts-qcom-add-saw-for-l2-cache-and-kraitcc-for.patch
index 0417572be0205e93ddb45f90671e7fc4e9ba9c4f..0a594b268886db0e4637a3bd839b245eb20c9244 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/107-10-ARM-dts-qcom-add-saw-for-l2-cache-and-kraitcc-for.patch
+++ b/target/linux/ipq806x/patches-6.1/107-10-ARM-dts-qcom-add-saw-for-l2-cache-and-kraitcc-for.patch
@@ -29,7 +29,7 @@ Tested-by: Jonathan McDowell <noodles@earth.li>
                cxo_board: cxo_board {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
-@@ -490,6 +490,17 @@
+@@ -575,15 +581,30 @@
                        clocks = <&gcc PLL8_VOTE>, <&pxo_board>;
                        clock-names = "pll8_vote", "pxo";
                        clock-output-names = "acpu_l2_aux";
@@ -47,8 +47,6 @@ Tested-by: Jonathan McDowell <noodles@earth.li>
                };
  
                acc0: clock-controller@2088000 {
-@@ -503,17 +509,25 @@
-               acc0: clock-controller@2088000 {
                        compatible = "qcom,kpss-acc-v1";
                        reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
 +                      clock-output-names = "acpu0_aux";
@@ -63,7 +61,7 @@ Tested-by: Jonathan McDowell <noodles@earth.li>
                        reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
                        regulator;
                };
- 
+@@ -591,14 +612,24 @@
                acc1: clock-controller@2098000 {
                        compatible = "qcom,kpss-acc-v1";
                        reg = <0x02098000 0x1000>, <0x02008000 0x1000>;
@@ -73,10 +71,6 @@ Tested-by: Jonathan McDowell <noodles@earth.li>
 +                      #clock-cells = <0>;
                };
  
-               saw1: regulator@2099000 {
-@@ -531,11 +545,17 @@
-               };
- 
                saw1: regulator@2099000 {
 -                      compatible = "qcom,saw2";
 +                      compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";

diff --git a/target/linux/ipq806x/patches-6.1/107-13-ARM-dts-qcom-add-opp-table-for-cpu-and-l2-for-ipq.patch b/target/linux/ipq806x/patches-6.1/107-13-ARM-dts-qcom-add-opp-table-for-cpu-and-l2-for-ipq.patch
index f3c8f18f1de35d5a7449c21d9073dd5f84fc5216..16e924b303d047258bb32750fd52cd0dac271482 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/107-13-ARM-dts-qcom-add-opp-table-for-cpu-and-l2-for-ipq.patch
+++ b/target/linux/ipq806x/patches-6.1/107-13-ARM-dts-qcom-add-opp-table-for-cpu-and-l2-for-ipq.patch
@@ -127,7 +127,7 @@ Tested-by: Jonathan McDowell <noodles@earth.li>
 +      };
 +
        thermal-zones {
-               tsens_tz_sensor0 {
+               sensor0-thermal {
                        polling-delay-passive = <0>;
 --- a/arch/arm/boot/dts/qcom-ipq8065.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8065.dtsi

diff --git a/target/linux/ipq806x/patches-6.1/108-01-ARM-dts-qcom-fix-wrong-nad_pins-definition-for-ipq80.patch b/target/linux/ipq806x/patches-6.1/108-01-ARM-dts-qcom-fix-wrong-nad_pins-definition-for-ipq80.patch
index d3f821a6a0ffb4ccc0e3ee2e7cce26264bc216bb..6be9334e7d7f6ab5809075814070bbef15381da7 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/108-01-ARM-dts-qcom-fix-wrong-nad_pins-definition-for-ipq80.patch
+++ b/target/linux/ipq806x/patches-6.1/108-01-ARM-dts-qcom-fix-wrong-nad_pins-definition-for-ipq80.patch
@@ -12,7 +12,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -559,12 +559,9 @@
+@@ -599,12 +599,9 @@
                        };
  
                        nand_pins: nand_pins {

diff --git a/target/linux/ipq806x/patches-6.1/108-02-ARM-dts-qcom-add-MDIO-dedicated-controller-node-for-.patch b/target/linux/ipq806x/patches-6.1/108-02-ARM-dts-qcom-add-MDIO-dedicated-controller-node-for-.patch
index 4a57fc0330b18c048842c2b0d2bad7a5ce520c58..a35bb3874fe9e081383a433930b5edf825f40e67 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/108-02-ARM-dts-qcom-add-MDIO-dedicated-controller-node-for-.patch
+++ b/target/linux/ipq806x/patches-6.1/108-02-ARM-dts-qcom-add-MDIO-dedicated-controller-node-for-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
-@@ -24,73 +24,6 @@
+@@ -25,73 +25,6 @@
                device_type = "memory";
        };
  
@@ -89,7 +89,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
        mdio1: mdio-1 {
                status = "okay";
                compatible = "virtual,mdio-gpio";
-@@ -220,6 +153,73 @@
+@@ -222,6 +155,73 @@
        status = "okay";
  };
  
@@ -165,8 +165,8 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
  
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -1446,6 +1446,20 @@
-                       };
+@@ -476,6 +476,20 @@
+                       snps,blen = <16 0 0 0 0 0 0>;
                };
  
 +              mdio0: mdio@37000000 {

diff --git a/target/linux/ipq806x/patches-6.1/110-01-thermal-qcom-tsens-init-debugfs-only-with-successful.patch b/target/linux/ipq806x/patches-6.1/110-01-thermal-qcom-tsens-init-debugfs-only-with-successful.patch
index 4caa2a9560e26e268aaf50c9f356caccf94e0bc5..c9b20a0222095d52d7585bfbc28024acbbbf49a9 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/110-01-thermal-qcom-tsens-init-debugfs-only-with-successful.patch
+++ b/target/linux/ipq806x/patches-6.1/110-01-thermal-qcom-tsens-init-debugfs-only-with-successful.patch
@@ -16,7 +16,7 @@ Acked-by: Thara Gopinath <thara.gopinath@linaro.org>
 
 --- a/drivers/thermal/qcom/tsens.c
 +++ b/drivers/thermal/qcom/tsens.c
-@@ -917,8 +917,6 @@ int __init init_common(struct tsens_priv
+@@ -918,8 +918,6 @@ int __init init_common(struct tsens_priv
        if (tsens_version(priv) >= VER_0_1)
                tsens_enable_irq(priv);
  
@@ -25,7 +25,7 @@ Acked-by: Thara Gopinath <thara.gopinath@linaro.org>
  err_put_device:
        put_device(&op->dev);
        return ret;
-@@ -1163,7 +1161,12 @@ static int tsens_probe(struct platform_d
+@@ -1156,7 +1154,12 @@ static int tsens_probe(struct platform_d
                }
        }
  

diff --git a/target/linux/ipq806x/patches-6.1/110-02-thermal-qcom-tsens-simplify-debugfs-init-function.patch b/target/linux/ipq806x/patches-6.1/110-02-thermal-qcom-tsens-simplify-debugfs-init-function.patch
index add2ab4598767e689bc522c983a5949648fdebda..0fbc4bd8cad85f550fb05fd83015508546b468f5 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/110-02-thermal-qcom-tsens-simplify-debugfs-init-function.patch
+++ b/target/linux/ipq806x/patches-6.1/110-02-thermal-qcom-tsens-simplify-debugfs-init-function.patch
@@ -17,7 +17,7 @@ Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
 
 --- a/drivers/thermal/qcom/tsens.c
 +++ b/drivers/thermal/qcom/tsens.c
-@@ -691,7 +691,7 @@ static int dbg_version_show(struct seq_f
+@@ -692,7 +692,7 @@ static int dbg_version_show(struct seq_f
                        return ret;
                seq_printf(s, "%d.%d.%d\n", maj_ver, min_ver, step_ver);
        } else {
@@ -26,7 +26,7 @@ Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
        }
  
        return 0;
-@@ -703,21 +703,17 @@ DEFINE_SHOW_ATTRIBUTE(dbg_sensors);
+@@ -704,21 +704,17 @@ DEFINE_SHOW_ATTRIBUTE(dbg_sensors);
  static void tsens_debug_init(struct platform_device *pdev)
  {
        struct tsens_priv *priv = platform_get_drvdata(pdev);

diff --git a/target/linux/ipq806x/patches-6.1/114-01-devfreq-qcom-Add-L2-Krait-Cache-devfreq-scaling-driv.patch b/target/linux/ipq806x/patches-6.1/114-01-devfreq-qcom-Add-L2-Krait-Cache-devfreq-scaling-driv.patch
index af90393e2d5f3f9427dd2ff71f67e37dc3a73a6d..9de73288799c197b0fa4a53d4197ed0bc3b23a25 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/114-01-devfreq-qcom-Add-L2-Krait-Cache-devfreq-scaling-driv.patch
+++ b/target/linux/ipq806x/patches-6.1/114-01-devfreq-qcom-Add-L2-Krait-Cache-devfreq-scaling-driv.patch
@@ -21,9 +21,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 
 --- a/drivers/devfreq/Kconfig
 +++ b/drivers/devfreq/Kconfig
-@@ -132,6 +132,17 @@ config ARM_RK3399_DMC_DEVFREQ
-         It sets the frequency for the memory controller and reads the usage counts
-         from hardware.
+@@ -151,6 +151,17 @@ config ARM_SUN8I_A33_MBUS_DEVFREQ
+         This adds the DEVFREQ driver for the MBUS controller in some
+         Allwinner sun8i (A33 through H3) and sun50i (A64 and H5) SoCs.
  
 +config ARM_KRAIT_CACHE_DEVFREQ
 +      tristate "Scaling support for Krait CPU Cache Devfreq"
@@ -41,9 +41,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  endif # PM_DEVFREQ
 --- a/drivers/devfreq/Makefile
 +++ b/drivers/devfreq/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ)    += imx
- obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ)  += imx8m-ddrc.o
+@@ -15,6 +15,7 @@ obj-$(CONFIG_ARM_MEDIATEK_CCI_DEVFREQ)       +
  obj-$(CONFIG_ARM_RK3399_DMC_DEVFREQ)  += rk3399_dmc.o
+ obj-$(CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ)      += sun8i-a33-mbus.o
  obj-$(CONFIG_ARM_TEGRA_DEVFREQ)               += tegra30-devfreq.o
 +obj-$(CONFIG_ARM_KRAIT_CACHE_DEVFREQ) += krait-cache-devfreq.o
  

diff --git a/target/linux/ipq806x/patches-6.1/114-02-ARM-dts-qcom-add-krait-cache-compatible-for-ipq806x-.patch b/target/linux/ipq806x/patches-6.1/114-02-ARM-dts-qcom-add-krait-cache-compatible-for-ipq806x-.patch
index f42729fd50936df64d23575d807035427b5e743b..3a6c28179336f6ea3af97120a86a40735ad99fa3 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/114-02-ARM-dts-qcom-add-krait-cache-compatible-for-ipq806x-.patch
+++ b/target/linux/ipq806x/patches-6.1/114-02-ARM-dts-qcom-add-krait-cache-compatible-for-ipq806x-.patch
@@ -31,9 +31,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
        };
  
        opp_table_l2: opp_table_l2 {
-@@ -470,6 +460,16 @@
-               ranges;
-               compatible = "simple-bus";
+@@ -1410,6 +1400,16 @@
+                       #reset-cells = <1>;
+               };
  
 +              L2: l2-cache {
 +                      compatible = "cache", "qcom,krait-cache";

diff --git a/target/linux/ipq806x/patches-6.1/115-01-devfreq-add-ipq806x-fabric-scaling-driver.patch b/target/linux/ipq806x/patches-6.1/115-01-devfreq-add-ipq806x-fabric-scaling-driver.patch
index 340c58a0c1888e8da26e9ea2c0b0d2e4b004ddd5..c9cd3ebdf7377baa6ecec884cbeeb86bc641c617 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/115-01-devfreq-add-ipq806x-fabric-scaling-driver.patch
+++ b/target/linux/ipq806x/patches-6.1/115-01-devfreq-add-ipq806x-fabric-scaling-driver.patch
@@ -15,7 +15,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 
 --- a/drivers/devfreq/Kconfig
 +++ b/drivers/devfreq/Kconfig
-@@ -143,6 +143,17 @@ config ARM_KRAIT_CACHE_DEVFREQ
+@@ -162,6 +162,17 @@ config ARM_KRAIT_CACHE_DEVFREQ
          based on the max frequency across all core and the range set in the device
          dts. If provided this scale also the regulator attached to the l2 cache.
  
@@ -35,8 +35,8 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  endif # PM_DEVFREQ
 --- a/drivers/devfreq/Makefile
 +++ b/drivers/devfreq/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ) +=
- obj-$(CONFIG_ARM_RK3399_DMC_DEVFREQ)  += rk3399_dmc.o
+@@ -16,6 +16,7 @@ obj-$(CONFIG_ARM_RK3399_DMC_DEVFREQ) +=
+ obj-$(CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ)      += sun8i-a33-mbus.o
  obj-$(CONFIG_ARM_TEGRA_DEVFREQ)               += tegra30-devfreq.o
  obj-$(CONFIG_ARM_KRAIT_CACHE_DEVFREQ) += krait-cache-devfreq.o
 +obj-$(CONFIG_ARM_IPQ806X_FAB_DEVFREQ) += ipq806x-fab-devfreq.o

diff --git a/target/linux/ipq806x/patches-6.1/115-02-ARM-dts-qcom-add-fab-scaling-node-for-ipq806x.patch b/target/linux/ipq806x/patches-6.1/115-02-ARM-dts-qcom-add-fab-scaling-node-for-ipq806x.patch
index f4de1dbb52c9f96828f59b91e2bb86cd5cd24fb1..a324b6facf34c90642fc22cad4b46a54fc2fdb74 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/115-02-ARM-dts-qcom-add-fab-scaling-node-for-ipq806x.patch
+++ b/target/linux/ipq806x/patches-6.1/115-02-ARM-dts-qcom-add-fab-scaling-node-for-ipq806x.patch
@@ -30,9 +30,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +      };
 +
        thermal-zones {
-               tsens_tz_sensor0 {
+               sensor0-thermal {
                        polling-delay-passive = <0>;
-@@ -470,6 +482,13 @@
+@@ -1410,6 +1422,13 @@
                        operating-points-v2 = <&opp_table_l2>;
                };
  

diff --git a/target/linux/ipq806x/patches-6.1/120-v6.2-clk-qcom-kpss-xcc-register-it-as-clk-provider.patch b/target/linux/ipq806x/patches-6.1/120-v6.2-clk-qcom-kpss-xcc-register-it-as-clk-provider.patch
index 41201544f6571d852ff399ef1fa73eded07280c5..9395f1b241e7c096b6fb1d77b34d33e28e2636f7 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/120-v6.2-clk-qcom-kpss-xcc-register-it-as-clk-provider.patch
+++ b/target/linux/ipq806x/patches-6.1/120-v6.2-clk-qcom-kpss-xcc-register-it-as-clk-provider.patch
@@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20221108211734.3707-1-ansuelsmth@gmail.com
  drivers/clk/qcom/kpss-xcc.c | 13 +++++++++----
  1 file changed, 9 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/clk/qcom/kpss-xcc.c b/drivers/clk/qcom/kpss-xcc.c
-index b1b370274ec4..97358c98c6c9 100644
 --- a/drivers/clk/qcom/kpss-xcc.c
 +++ b/drivers/clk/qcom/kpss-xcc.c
-@@ -31,12 +31,13 @@ MODULE_DEVICE_TABLE(of, kpss_xcc_match_table);
+@@ -31,12 +31,13 @@ MODULE_DEVICE_TABLE(of, kpss_xcc_match_t
  
  static int kpss_xcc_driver_probe(struct platform_device *pdev)
  {
@@ -32,7 +30,7 @@ index b1b370274ec4..97358c98c6c9 100644
        if (!id)
                return -ENODEV;
  
-@@ -45,7 +46,7 @@ static int kpss_xcc_driver_probe(struct platform_device *pdev)
+@@ -45,7 +46,7 @@ static int kpss_xcc_driver_probe(struct
                return PTR_ERR(base);
  
        if (id->data) {
@@ -41,7 +39,7 @@ index b1b370274ec4..97358c98c6c9 100644
                                                  "clock-output-names",
                                                  0, &name))
                        return -ENODEV;
-@@ -55,12 +56,16 @@ static int kpss_xcc_driver_probe(struct platform_device *pdev)
+@@ -55,12 +56,16 @@ static int kpss_xcc_driver_probe(struct
                base += 0x28;
        }
  
@@ -60,6 +58,3 @@ index b1b370274ec4..97358c98c6c9 100644
  }
  
  static struct platform_driver kpss_xcc_driver = {
--- 
-2.37.2
-

diff --git a/target/linux/ipq806x/patches-6.1/121-v6.2-01-clk-qcom-krait-cc-use-devm-variant-for-clk-notifier-.patch b/target/linux/ipq806x/patches-6.1/121-v6.2-01-clk-qcom-krait-cc-use-devm-variant-for-clk-notifier-.patch
index d3d1ea17f5a520b22856198c56bd23dcb69e8248..65c1fc17f2127976ee6fa769760ba999f3ff6989 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/121-v6.2-01-clk-qcom-krait-cc-use-devm-variant-for-clk-notifier-.patch
+++ b/target/linux/ipq806x/patches-6.1/121-v6.2-01-clk-qcom-krait-cc-use-devm-variant-for-clk-notifier-.patch
@@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20221108215827.30475-1-ansuelsmth@gmail.com
  drivers/clk/qcom/krait-cc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
-index e91275663973..33a78b7de0bd 100644
 --- a/drivers/clk/qcom/krait-cc.c
 +++ b/drivers/clk/qcom/krait-cc.c
-@@ -64,7 +64,7 @@ static int krait_notifier_register(struct device *dev, struct clk *clk,
+@@ -62,7 +62,7 @@ static int krait_notifier_register(struc
        int ret = 0;
  
        mux->clk_nb.notifier_call = krait_notifier_cb;
@@ -27,6 +25,3 @@ index e91275663973..33a78b7de0bd 100644
        if (ret)
                dev_err(dev, "failed to register clock notifier: %d\n", ret);
  
--- 
-2.37.2
-

diff --git a/target/linux/ipq806x/patches-6.1/122-01-clk-qcom-krait-cc-handle-qsb-clock-defined-in-DTS.patch b/target/linux/ipq806x/patches-6.1/122-01-clk-qcom-krait-cc-handle-qsb-clock-defined-in-DTS.patch
index a8bf748258fe4a8a0b996e9150cef01ab7efd78f..c30c245d0a55f679467fc5f18d9fb4517e3e3803 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/122-01-clk-qcom-krait-cc-handle-qsb-clock-defined-in-DTS.patch
+++ b/target/linux/ipq806x/patches-6.1/122-01-clk-qcom-krait-cc-handle-qsb-clock-defined-in-DTS.patch
@@ -12,20 +12,18 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  drivers/clk/qcom/krait-cc.c | 14 +++++++++++---
  1 file changed, 11 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
-index 84f0048961f5..f1d64b16cac3 100644
 --- a/drivers/clk/qcom/krait-cc.c
 +++ b/drivers/clk/qcom/krait-cc.c
-@@ -305,7 +305,7 @@ static int krait_cc_probe(struct platform_device *pdev)
+@@ -348,7 +348,7 @@ static int krait_cc_probe(struct platfor
  {
        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 *clk;
-       struct clk **clks;
-@@ -315,11 +315,19 @@ static int krait_cc_probe(struct platform_device *pdev)
+       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;
  
@@ -47,6 +45,3 @@ index 84f0048961f5..f1d64b16cac3 100644
        if (!id->data) {
                clk = clk_register_fixed_factor(dev, "acpu_aux",
                                                "gpll0_vote", 0, 1, 2);
--- 
-2.37.2
-

diff --git a/target/linux/ipq806x/patches-6.1/122-02-clk-qcom-krait-cc-register-REAL-qsb-fixed-clock.patch b/target/linux/ipq806x/patches-6.1/122-02-clk-qcom-krait-cc-register-REAL-qsb-fixed-clock.patch
index da082759cf857b95882381b38b96c87bb21cb8d5..e2f78f79fb1a06f456badd1141b495bda0e6728a 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/122-02-clk-qcom-krait-cc-register-REAL-qsb-fixed-clock.patch
+++ b/target/linux/ipq806x/patches-6.1/122-02-clk-qcom-krait-cc-register-REAL-qsb-fixed-clock.patch
@@ -14,8 +14,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  drivers/clk/qcom/krait-cc.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
-index f1d64b16cac3..e91275663973 100644
 --- a/drivers/clk/qcom/krait-cc.c
 +++ b/drivers/clk/qcom/krait-cc.c
 @@ -25,6 +25,8 @@ enum {
@@ -27,7 +25,7 @@ index f1d64b16cac3..e91275663973 100644
  static unsigned int sec_mux_map[] = {
        2,
        0,
-@@ -322,7 +324,7 @@ static int krait_cc_probe(struct platform_device *pdev)
+@@ -364,7 +366,7 @@ static int krait_cc_probe(struct platfor
         */
        clk = clk_get(dev, "qsb");
        if (IS_ERR(clk))
@@ -36,6 +34,3 @@ index f1d64b16cac3..e91275663973 100644
        if (IS_ERR(clk))
                return PTR_ERR(clk);
  
--- 
-2.37.2
-

diff --git a/target/linux/ipq806x/patches-6.1/122-03-clk-qcom-krait-cc-drop-pr_info-and-use-dev_info.patch b/target/linux/ipq806x/patches-6.1/122-03-clk-qcom-krait-cc-drop-pr_info-and-use-dev_info.patch
index e25627d86f63cb787bc9f5f82e996dbdc1248cb6..d95a63fc44fd8a5b3fa02c904e7775963f58fd95 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/122-03-clk-qcom-krait-cc-drop-pr_info-and-use-dev_info.patch
+++ b/target/linux/ipq806x/patches-6.1/122-03-clk-qcom-krait-cc-drop-pr_info-and-use-dev_info.patch
@@ -10,12 +10,10 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  drivers/clk/qcom/krait-cc.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
-index b71067a49ee7..e4fb3ff2b5b5 100644
 --- a/drivers/clk/qcom/krait-cc.c
 +++ b/drivers/clk/qcom/krait-cc.c
-@@ -391,25 +391,25 @@ static int krait_cc_probe(struct platform_device *pdev)
-       cur_rate = clk_get_rate(l2_pri_mux_clk);
+@@ -423,25 +423,25 @@ static int krait_cc_probe(struct platfor
+       cur_rate = clk_get_rate(clks[l2_mux]);
        aux_rate = 384000000;
        if (cur_rate < aux_rate) {
 -              pr_info("L2 @ Undefined rate. Forcing new rate.\n");
@@ -44,6 +42,3 @@ index b71067a49ee7..e4fb3ff2b5b5 100644
        }
  
        of_clk_add_provider(dev->of_node, krait_of_get, clks);
--- 
-2.37.2
-

diff --git a/target/linux/ipq806x/patches-6.1/122-04-clk-qcom-krait-cc-rework-mux-reset-logic-and-reset-h.patch b/target/linux/ipq806x/patches-6.1/122-04-clk-qcom-krait-cc-rework-mux-reset-logic-and-reset-h.patch
index 7a19c965c2d4f761d53083df6015a5d192ac26ca..8f88e069912218cf4d519cccbf6da92dc1a28c31 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/122-04-clk-qcom-krait-cc-rework-mux-reset-logic-and-reset-h.patch
+++ b/target/linux/ipq806x/patches-6.1/122-04-clk-qcom-krait-cc-rework-mux-reset-logic-and-reset-h.patch
@@ -17,8 +17,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  drivers/clk/qcom/krait-cc.c | 50 +++++++++++++++++--------------------
  1 file changed, 23 insertions(+), 27 deletions(-)
 
-diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
-index 717eff44b6a4..90dee71e7c38 100644
 --- a/drivers/clk/qcom/krait-cc.c
 +++ b/drivers/clk/qcom/krait-cc.c
 @@ -25,7 +25,9 @@ enum {
@@ -32,16 +30,16 @@ index 717eff44b6a4..90dee71e7c38 100644
  
  static unsigned int sec_mux_map[] = {
        2,
-@@ -317,7 +319,7 @@ static int krait_cc_probe(struct platform_device *pdev)
+@@ -350,7 +352,7 @@ static int krait_cc_probe(struct platfor
  {
        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 *clk;
-       struct clk **clks;
-@@ -397,28 +399,29 @@ static int krait_cc_probe(struct platform_device *pdev)
+       struct clk_hw *mux, *l2_pri_mux;
+       struct clk *clk, **clks;
+@@ -420,28 +422,29 @@ static int krait_cc_probe(struct platfor
         * two different rates to force a HFPLL reinit under all
         * circumstances.
         */
@@ -88,5 +86,3 @@ index 717eff44b6a4..90dee71e7c38 100644
        }
  
        of_clk_add_provider(dev->of_node, krait_of_get, clks);
- 
-

diff --git a/target/linux/ipq806x/patches-6.1/123-clk-qcom-gcc-ipq806x-remove-cc_register_board-for.patch b/target/linux/ipq806x/patches-6.1/123-clk-qcom-gcc-ipq806x-remove-cc_register_board-for.patch
index 20e7440ace88ec56d2e607d1b895897a8a3b8e06..0df29a07877d35160a7e8cd564b709a47995deea 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/123-clk-qcom-gcc-ipq806x-remove-cc_register_board-for.patch
+++ b/target/linux/ipq806x/patches-6.1/123-clk-qcom-gcc-ipq806x-remove-cc_register_board-for.patch
@@ -14,7 +14,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 
 --- a/drivers/clk/qcom/gcc-ipq806x.c
 +++ b/drivers/clk/qcom/gcc-ipq806x.c
-@@ -3384,14 +3384,6 @@ static int gcc_ipq806x_probe(struct plat
+@@ -3386,14 +3386,6 @@ static int gcc_ipq806x_probe(struct plat
        struct regmap *regmap;
        int ret;
  

diff --git a/target/linux/ipq806x/patches-6.1/131-6.2-ARM-dts-qcom-ipq8064-disable-mmc-ddr-1_8v-for-sdcc1.patch b/target/linux/ipq806x/patches-6.1/131-6.2-ARM-dts-qcom-ipq8064-disable-mmc-ddr-1_8v-for-sdcc1.patch
index 8493f380fe06eaf80b746081e5b638e2e6cc8a7c..e5424210858477b41197cabe8358bf2dd9601f39 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/131-6.2-ARM-dts-qcom-ipq8064-disable-mmc-ddr-1_8v-for-sdcc1.patch
+++ b/target/linux/ipq806x/patches-6.1/131-6.2-ARM-dts-qcom-ipq8064-disable-mmc-ddr-1_8v-for-sdcc1.patch
@@ -18,7 +18,7 @@ Link: https://lore.kernel.org/r/20221024233817.27410-1-ansuelsmth@gmail.com
 
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -1529,7 +1529,6 @@
+@@ -932,7 +932,6 @@
                                non-removable;
                                cap-sd-highspeed;
                                cap-mmc-highspeed;

diff --git a/target/linux/ipq806x/patches-6.1/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq806x/patches-6.1/850-soc-add-qualcomm-syscon.patch
index ec9027ae47b0c39b7b10f5f348b64fdcac3e658c..397c4481ab1956c99cf72d2e8101d70d7ddd8f4f 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/850-soc-add-qualcomm-syscon.patch
+++ b/target/linux/ipq806x/patches-6.1/850-soc-add-qualcomm-syscon.patch
@@ -2,9 +2,9 @@ From: Christian Lamparter <chunkeey@googlemail.com>
 Subject: SoC: add qualcomm syscon
 --- a/drivers/soc/qcom/Makefile
 +++ b/drivers/soc/qcom/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_QCOM_SMP2P)     += smp2p.o
- obj-$(CONFIG_QCOM_SMSM)       += smsm.o
- obj-$(CONFIG_QCOM_SOCINFO)    += socinfo.o
+@@ -23,6 +23,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
 +obj-$(CONFIG_QCOM_TCSR)        += qcom_tcsr.o
  obj-$(CONFIG_QCOM_APR) += apr.o
@@ -12,9 +12,9 @@ Subject: SoC: add qualcomm syscon
  obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
 --- a/drivers/soc/qcom/Kconfig
 +++ b/drivers/soc/qcom/Kconfig
-@@ -190,6 +190,13 @@ config QCOM_SOCINFO
-        Say yes here to support the Qualcomm socinfo driver, providing
-        information about the SoC to user space.
+@@ -213,6 +213,13 @@ config QCOM_STATS
+         various SoC level low power modes statistics and export to debugfs
+         interface.
  
 +config QCOM_TCSR
 +      tristate "QCOM Top Control and Status Registers"

diff --git a/target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch
index 09022dca464a21beca1f8b7452b90467c7dab8d8..6361cfcbd918f26417de5ed08546634345fe05b1 100644 (file)
--- a/target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch
+++ b/target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1740,6 +1740,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
+@@ -1599,6 +1599,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
  
  endchoice
  
@@ -17,7 +17,7 @@
        default ""
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1162,6 +1162,17 @@ int __init early_init_dt_scan_chosen(uns
+@@ -1187,6 +1187,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));