From b7546728bcb2c800da7e32bd0bf37fab2609179a Mon Sep 17 00:00:00 2001 From: John Audia Date: Fri, 10 Jan 2025 16:01:56 -0500 Subject: [PATCH] kernel: bump 6.6 to 6.6.71 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 --- include/kernel-6.6 | 4 ++-- ...ework-clock-handling-for-different-clock.patch | 15 +++------------ ...c-mtk-sd-add-support-for-AN7581-MMC-Host.patch | 11 +++++------ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 1cda04d0c587ef..f034d0754cca75 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -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 diff --git a/target/linux/airoha/patches-6.6/110-01-clk-en7523-Rework-clock-handling-for-different-clock.patch b/target/linux/airoha/patches-6.6/110-01-clk-en7523-Rework-clock-handling-for-different-clock.patch index 7333ebbdf2607e..c55ff92a810272 100644 --- a/target/linux/airoha/patches-6.6/110-01-clk-en7523-Rework-clock-handling-for-different-clock.patch +++ b/target/linux/airoha/patches-6.6/110-01-clk-en7523-Rework-clock-handling-for-different-clock.patch @@ -26,16 +26,7 @@ Signed-off-by: Christian Marangi 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 - - 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, -@@ -587,8 +586,6 @@ static void en7581_register_clocks(struc +@@ -587,8 +588,6 @@ static void en7581_register_clocks(struc hw = en7523_register_pcie_clk(dev, base); clk_data->hws[EN7523_CLK_PCIE] = hw; @@ -44,7 +35,7 @@ Signed-off-by: Christian Marangi } static int en7523_reset_update(struct reset_controller_dev *rcdev, -@@ -702,21 +699,24 @@ static int en7523_clk_probe(struct platf +@@ -702,21 +701,24 @@ static int en7523_clk_probe(struct platf struct clk_hw_onecell_data *clk_data; int r; @@ -71,7 +62,7 @@ Signed-off-by: Christian Marangi .pcie_ops = { .is_enabled = en7523_pci_is_enabled, .prepare = en7523_pci_prepare, -@@ -726,6 +726,8 @@ static const struct en_clk_soc_data en75 +@@ -726,6 +728,8 @@ static const struct en_clk_soc_data en75 }; static const struct en_clk_soc_data en7581_data = { diff --git a/target/linux/airoha/patches-6.6/111-mmc-mtk-sd-add-support-for-AN7581-MMC-Host.patch b/target/linux/airoha/patches-6.6/111-mmc-mtk-sd-add-support-for-AN7581-MMC-Host.patch index 24c4dbde786584..c6689fdf975acf 100644 --- a/target/linux/airoha/patches-6.6/111-mmc-mtk-sd-add-support-for-AN7581-MMC-Host.patch +++ b/target/linux/airoha/patches-6.6/111-mmc-mtk-sd-add-support-for-AN7581-MMC-Host.patch @@ -103,15 +103,14 @@ Signed-off-by: Christian Marangi 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,14 @@ 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"); @@ -123,9 +122,9 @@ Signed-off-by: Christian Marangi } /* Support for SDIO eint irq ? */ -@@ -2825,6 +2855,12 @@ static int msdc_drv_probe(struct platfor +@@ -2815,6 +2846,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 */