kernel: bump 6.6 to 6.6.71
authorJohn Audia <therealgraysky@proton.me>
Fri, 10 Jan 2025 21:01:56 +0000 (16:01 -0500)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 12 Jan 2025 20:43:44 +0000 (21:43 +0100)
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.71

Manually rebased:
airoha/patches-6.6/110-01-clk-en7523-Rework-clock-handling-for-different-clock.patch
airoha/patches-6.6/111-mmc-mtk-sd-add-support-for-AN7581-MMC-Host.patch

All other patches automatically rebased.

Build system: x86/64
Build-tested: bcm27xx/bcm2712
Run-tested: bcm27xx/bcm2712

Signed-off-by: John Audia <therealgraysky@proton.me>
[ fix manually rebased patch ]
Link: https://github.com/openwrt/openwrt/pull/17568
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 3f87c5ac4221deb37d4c3e730e692eef8f9c9ffe)

include/kernel-6.6
target/linux/airoha/patches-6.6/110-01-clk-en7523-Rework-clock-handling-for-different-clock.patch
target/linux/airoha/patches-6.6/111-mmc-mtk-sd-add-support-for-AN7581-MMC-Host.patch

index 1cda04d0c587ef75d0bd8fff6ed21bfd68a8a3cd..f034d0754cca75b2c561f7a4d4060a97498a1849 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .70
-LINUX_KERNEL_HASH-6.6.70 = 84d23ee07fb26febbcb6d1295ba15efdc67ac382b4137b2c8853146c10fd2f97
+LINUX_VERSION-6.6 = .71
+LINUX_KERNEL_HASH-6.6.71 = 219715ba2dcfa6539fba09ad3f9212772f3507189eb60d77f8e89b06c32e724e
index 7333ebbdf2607e0ace7ea8c8008483b797115619..187715a5cc3302c5abf40da0ba0b927dc14746e9 100644 (file)
@@ -26,15 +26,15 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
        const struct clk_ops pcie_ops;
        int (*hw_init)(struct platform_device *pdev,
                       struct clk_hw_onecell_data *clk_data);
-@@ -525,8 +526,6 @@ static void en7523_register_clocks(struc
+@@ -504,8 +505,6 @@ static void en7523_register_clocks(struc
+       u32 rate;
+       int i;
  
-       hw = en7523_register_pcie_clk(dev, np_base);
-       clk_data->hws[EN7523_CLK_PCIE] = hw;
--
 -      clk_data->num = EN7523_NUM_CLOCKS;
- }
- static int en7523_clk_hw_init(struct platform_device *pdev,
+-
+       for (i = 0; i < ARRAY_SIZE(en7523_base_clks); i++) {
+               const struct en_clk_desc *desc = &en7523_base_clks[i];
+               u32 reg = desc->div_reg ? desc->div_reg : desc->base_reg;
 @@ -587,8 +586,6 @@ static void en7581_register_clocks(struc
  
        hw = en7523_register_pcie_clk(dev, base);
index 24c4dbde786584b986df4ad924c7db87ed2748da..d116bb9ee054621c56abc368f0a6fbf125f3434a 100644 (file)
@@ -103,29 +103,27 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  
        host->bus_clk = devm_clk_get_optional(&pdev->dev, "bus_clk");
        if (IS_ERR(host->bus_clk))
-@@ -2740,11 +2767,14 @@ static int msdc_drv_probe(struct platfor
-               goto host_free;
+@@ -2731,10 +2758,13 @@ static int msdc_drv_probe(struct platfor
+               return PTR_ERR(host->pins_default);
        }
  
 -      host->pins_uhs = pinctrl_lookup_state(host->pinctrl, "state_uhs");
 -      if (IS_ERR(host->pins_uhs)) {
--              ret = PTR_ERR(host->pins_uhs);
 -              dev_err(&pdev->dev, "Cannot find pinctrl uhs!\n");
--              goto host_free;
+-              return PTR_ERR(host->pins_uhs);
 +      /* AN7581 doesn't have state_uhs pins */
 +      if (!device_is_compatible(&pdev->dev, "airoha,an7581-mmc")) {
 +              host->pins_uhs = pinctrl_lookup_state(host->pinctrl, "state_uhs");
 +              if (IS_ERR(host->pins_uhs)) {
-+                      ret = PTR_ERR(host->pins_uhs);
 +                      dev_err(&pdev->dev, "Cannot find pinctrl uhs!\n");
-+                      goto host_free;
++                      return PTR_ERR(host->pins_uhs);
 +              }
        }
  
        /* Support for SDIO eint irq ? */
-@@ -2825,6 +2855,12 @@ static int msdc_drv_probe(struct platfor
+@@ -2815,6 +2845,12 @@ static int msdc_drv_probe(struct platfor
                dev_err(&pdev->dev, "Cannot ungate clocks!\n");
-               goto release_mem;
+               goto release_clk;
        }
 +
 +      /* AN7581 without regulator require tune to OCR values */