Skip to content

Commit

Permalink
kernel: bump 6.6 to 6.6.71
Browse files Browse the repository at this point in the history
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, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3

Signed-off-by: John Audia <therealgraysky@proton.me>
  • Loading branch information
graysky2 committed Jan 10, 2025
1 parent 17b0d13 commit 5a8cfce
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 20 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.6
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,7 @@ 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

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;
Expand All @@ -44,7 +35,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
}

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;

Expand All @@ -71,7 +62,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
.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 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,14 @@ 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,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");
Expand All @@ -123,9 +122,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
}

/* 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 */
Expand Down

0 comments on commit 5a8cfce

Please sign in to comment.