667b131ad1
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.76
Manually rebased:
bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch
imx/patches-6.6/600-PCI-imx6-Start-link-at-max-gen-first-for-IMX8MM-and-IMX8MP.patch
Removed upstreamed:
bcm27xx/patches-6.6/950-1446-media-i2c-ov9282-Correct-the-exposure-offset.patch[1]
bcm47xx/patches-6.6/701-bgmac-reduce-max-frame-size-to-support-just-MTU-1500.patch[2]
bcm53xx/patches-6.6/700-bgmac-reduce-max-frame-size-to-support-just-MTU-1500.patch[3]
ramips/patches-6.6/003-v6.14-clk-ralink-mtmips-remove-duplicated-xtal-clock-for-Ralink.patch[4]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.76&id=11c7649c9ec3dcaf0a7760551ad30747d9e02d81
2, 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.76&id=5e6e723675e54ced5200bcc367e2526badc4070c
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.76&id=d0edcd0d18d700d76c61c091a24568b8b8c3b387
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>
Link: https://github.com/openwrt/openwrt/pull/17822
(cherry picked from commit 84e370f16c)
Link: https://github.com/openwrt/openwrt/pull/17987
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From: Shiji Yang <yangshiji66@outlook.com>
|
|
Date: Wed, 13 Mar 2024 22:36:31 +0800
|
|
Subject: [PATCH] mfd: syscon: support skip reset control for syscon devices
|
|
|
|
Some platform device drivers(e.g. ag71xx) expect exclusive reset
|
|
control. Fetching reset controller for syscon[1] will break these
|
|
drivers. This patch introduces a new property 'syscon-no-reset'
|
|
to skip it.
|
|
|
|
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?id=7d1e3bd94828ad9fc86f55253cd6fec8edd65394
|
|
|
|
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
|
|
---
|
|
drivers/mfd/syscon.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/mfd/syscon.c
|
|
+++ b/drivers/mfd/syscon.c
|
|
@@ -53,7 +53,7 @@ static struct syscon *of_syscon_register
|
|
int ret;
|
|
struct regmap_config syscon_config = syscon_regmap_config;
|
|
struct resource res;
|
|
- struct reset_control *reset;
|
|
+ struct reset_control *reset = NULL;
|
|
|
|
WARN_ON(!mutex_is_locked(&syscon_list_lock));
|
|
|
|
@@ -133,7 +133,8 @@ static struct syscon *of_syscon_register
|
|
goto err_attach_clk;
|
|
}
|
|
|
|
- reset = of_reset_control_get_optional_exclusive(np, NULL);
|
|
+ if (!of_property_read_bool(np, "syscon-no-reset"))
|
|
+ reset = of_reset_control_get_optional_exclusive(np, NULL);
|
|
if (IS_ERR(reset)) {
|
|
ret = PTR_ERR(reset);
|
|
goto err_attach_clk;
|