Skip to content

Commit 3ecfc24

Browse files
AnsuelAnsuel
committed
airoha: an7581: sync patch with upstream version and tag them
Sync patch with upstream version and tag them. Minor changes done to Pinctrl patch to support older kernel. Patch automatically refreshed with make target/linux/refresh. Signed-off-by: Christian Marangi <[email protected]> (cherry picked from commit a5d23e3)
1 parent 585eb0d commit 3ecfc24

8 files changed

+52
-41
lines changed

target/linux/airoha/patches-6.6/103-watchdog-Add-support-for-Airoha-EN7851-watchdog.patch renamed to target/linux/airoha/patches-6.6/032-v6.13-watchdog-Add-support-for-Airoha-EN7851-watchdog.patch

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
From 4019d58ca5b249e4cf79169cc0c6a4ff5275c155 Mon Sep 17 00:00:00 2001
1+
From 3cf67f3769b8227ca75ca7102180a2e270ee01aa Mon Sep 17 00:00:00 2001
22
From: Christian Marangi <[email protected]>
3-
Date: Fri, 5 Jul 2024 19:12:12 +0200
4-
Subject: [PATCH v2 2/2] watchdog: Add support for Airoha EN7851 watchdog
3+
Date: Fri, 11 Oct 2024 12:43:53 +0200
4+
Subject: [PATCH] watchdog: Add support for Airoha EN7851 watchdog
55

66
Add support for Airoha EN7851 watchdog. This is a very basic watchdog
77
with no pretimeout support, max timeout is 28 seconds and it ticks based
88
on half the SoC BUS clock.
99

1010
Signed-off-by: Christian Marangi <[email protected]>
11+
Reviewed-by: Guenter Roeck <[email protected]>
12+
Link: https://lore.kernel.org/r/[email protected]
13+
Signed-off-by: Guenter Roeck <[email protected]>
14+
Signed-off-by: Wim Van Sebroeck <[email protected]>
1115
---
12-
Changes v2:
13-
- Drop clock-frequency implementation
14-
- Add missing bitfield.h header
15-
- Attach BUS clock
16-
1716
drivers/watchdog/Kconfig | 8 ++
1817
drivers/watchdog/Makefile | 1 +
1918
drivers/watchdog/airoha_wdt.c | 216 ++++++++++++++++++++++++++++++++++

target/linux/airoha/patches-6.6/106-01-clk-en7523-remove-REG_PCIE-_-MEM-MEM_MASK-configurat.patch renamed to target/linux/airoha/patches-6.6/033-01-v6.13-clk-en7523-remove-REG_PCIE-_-MEM-MEM_MASK-configurat.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 64e497f372dfca3e6be9fe05a0f9b874ea8604d2 Mon Sep 17 00:00:00 2001
1+
From c31d1cdd7bff1d2c13d435bb9d0c76bfaa332097 Mon Sep 17 00:00:00 2001
22
From: Lorenzo Bianconi <[email protected]>
3-
Date: Tue, 3 Sep 2024 23:39:46 +0200
3+
Date: Tue, 12 Nov 2024 01:08:49 +0100
44
Subject: [PATCH 1/6] clk: en7523: remove REG_PCIE*_{MEM,MEM_MASK}
55
configuration
66

@@ -12,6 +12,8 @@ This patch does not introduce any backward incompatibility since the dts
1212
for EN7581 SoC is not upstream yet.
1313

1414
Signed-off-by: Lorenzo Bianconi <[email protected]>
15+
Link: https://lore.kernel.org/r/[email protected]
16+
Signed-off-by: Stephen Boyd <[email protected]>
1517
---
1618
drivers/clk/clk-en7523.c | 18 ------------------
1719
1 file changed, 18 deletions(-)

target/linux/airoha/patches-6.6/106-02-clk-en7523-move-clock_register-in-hw_init-callback.patch renamed to target/linux/airoha/patches-6.6/033-02-v6.13-clk-en7523-move-clock_register-in-hw_init-callback.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 0dd8a6df58a4a8cf1f341249e7358b3bb51f52ad Mon Sep 17 00:00:00 2001
1+
From b8bdfc666bc5f58caf46e67b615132fccbaca3d4 Mon Sep 17 00:00:00 2001
22
From: Lorenzo Bianconi <[email protected]>
3-
Date: Tue, 3 Sep 2024 23:39:47 +0200
3+
Date: Tue, 12 Nov 2024 01:08:50 +0100
44
Subject: [PATCH 2/6] clk: en7523: move clock_register in hw_init callback
55

66
Move en7523_register_clocks routine in hw_init callback.
@@ -11,6 +11,8 @@ EN7523 and EN7581 SoCs in order to access chip-scu IO region
1111
miscellaneous registers needed by multiple devices (clock, pinctrl ..).
1212

1313
Signed-off-by: Lorenzo Bianconi <[email protected]>
14+
Link: https://lore.kernel.org/r/[email protected]
15+
Signed-off-by: Stephen Boyd <[email protected]>
1416
---
1517
drivers/clk/clk-en7523.c | 82 ++++++++++++++++++++++++----------------
1618
1 file changed, 50 insertions(+), 32 deletions(-)

target/linux/airoha/patches-6.6/106-03-clk-en7523-introduce-chip_scu-regmap.patch renamed to target/linux/airoha/patches-6.6/033-03-v6.13-clk-en7523-introduce-chip_scu-regmap.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From f849bcb746abeaafa63b4f02f1d8bb22703fc645 Mon Sep 17 00:00:00 2001
1+
From f72fc22038dd544fa4d39c06e8c81c09c0041ed4 Mon Sep 17 00:00:00 2001
22
From: Lorenzo Bianconi <[email protected]>
3-
Date: Tue, 3 Sep 2024 23:39:48 +0200
3+
Date: Tue, 12 Nov 2024 01:08:51 +0100
44
Subject: [PATCH 3/6] clk: en7523: introduce chip_scu regmap
55

66
Introduce chip_scu regmap pointer since EN7581 SoC will access chip-scu
@@ -9,6 +9,8 @@ for EN7581 SoC. This patch does not introduce any backward incompatibility
99
since the dts for EN7581 SoC is not upstream yet.
1010

1111
Signed-off-by: Lorenzo Bianconi <[email protected]>
12+
Link: https://lore.kernel.org/r/[email protected]
13+
Signed-off-by: Stephen Boyd <[email protected]>
1214
---
1315
drivers/clk/clk-en7523.c | 81 ++++++++++++++++++++++++++++++----------
1416
1 file changed, 61 insertions(+), 20 deletions(-)

target/linux/airoha/patches-6.6/106-04-clk-en7523-fix-estimation-of-fixed-rate-for-EN7581.patch renamed to target/linux/airoha/patches-6.6/033-04-v6.13-clk-en7523-fix-estimation-of-fixed-rate-for-EN7581.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From b9ea4918216ca0c2511446c531d3f8163ac1466d Mon Sep 17 00:00:00 2001
1+
From f98eded9e9ab048c88ff59c5523e703a6ced5523 Mon Sep 17 00:00:00 2001
22
From: Lorenzo Bianconi <[email protected]>
3-
Date: Tue, 3 Sep 2024 23:39:49 +0200
3+
Date: Tue, 12 Nov 2024 01:08:52 +0100
44
Subject: [PATCH 4/6] clk: en7523: fix estimation of fixed rate for EN7581
55

66
Introduce en7581_base_clks array in order to define per-SoC fixed-rate
@@ -9,6 +9,8 @@ clocks
99

1010
Fixes: 66bc47326ce2 ("clk: en7523: Add EN7581 support")
1111
Signed-off-by: Lorenzo Bianconi <[email protected]>
12+
Link: https://lore.kernel.org/r/[email protected]
13+
Signed-off-by: Stephen Boyd <[email protected]>
1214
---
1315
drivers/clk/clk-en7523.c | 105 ++++++++++++++++++++++++++++++++++++++-
1416
1 file changed, 103 insertions(+), 2 deletions(-)

target/linux/airoha/patches-6.6/106-05-clk-en7523-move-en7581_reset_register-in-en7581_clk_.patch renamed to target/linux/airoha/patches-6.6/033-05-v6.13-clk-en7523-move-en7581_reset_register-in-en7581_clk_.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 2c5b1a5b68973947a6919d9c951f9b3e0d84f347 Mon Sep 17 00:00:00 2001
1+
From 82e6bf912d5846646892becea659b39d178d79e3 Mon Sep 17 00:00:00 2001
22
From: Lorenzo Bianconi <[email protected]>
3-
Date: Tue, 3 Sep 2024 23:39:50 +0200
3+
Date: Tue, 12 Nov 2024 01:08:53 +0100
44
Subject: [PATCH 5/6] clk: en7523: move en7581_reset_register() in
55
en7581_clk_hw_init()
66

@@ -9,6 +9,8 @@ feature is supported just by EN7581 SoC.
99
Get rid of reset struct in en_clk_soc_data data struct.
1010

1111
Signed-off-by: Lorenzo Bianconi <[email protected]>
12+
Link: https://lore.kernel.org/r/[email protected]
13+
Signed-off-by: Stephen Boyd <[email protected]>
1214
---
1315
drivers/clk/clk-en7523.c | 93 ++++++++++++++--------------------------
1416
1 file changed, 33 insertions(+), 60 deletions(-)

target/linux/airoha/patches-6.6/106-06-clk-en7523-map-io-region-in-a-single-block.patch renamed to target/linux/airoha/patches-6.6/033-06-v6.13-clk-en7523-map-io-region-in-a-single-block.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
From 665a59f4836c3d7813a9d8bfb9680d93adb4626e Mon Sep 17 00:00:00 2001
1+
From a9eaf305017a5ebe73ab34e85bd5414055a88f29 Mon Sep 17 00:00:00 2001
22
From: Lorenzo Bianconi <[email protected]>
3-
Date: Tue, 3 Sep 2024 23:39:51 +0200
3+
Date: Tue, 12 Nov 2024 01:08:54 +0100
44
Subject: [PATCH 6/6] clk: en7523: map io region in a single block
55

66
Map all clock-controller memory region in a single block.
77
This patch does not introduce any backward incompatibility since the dts
88
for EN7581 SoC is not upstream yet.
99

1010
Signed-off-by: Lorenzo Bianconi <[email protected]>
11+
Link: https://lore.kernel.org/r/[email protected]
12+
Signed-off-by: Stephen Boyd <[email protected]>
1113
---
1214
drivers/clk/clk-en7523.c | 32 +++++++++++++-------------------
1315
1 file changed, 13 insertions(+), 19 deletions(-)

target/linux/airoha/patches-6.6/107-pinctrl-airoha-Add-support-for-EN7581-SoC.patch renamed to target/linux/airoha/patches-6.6/034-v6.13-pinctrl-airoha-Add-support-for-EN7581-SoC.patch

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 21cb14f3e6d12d666a9ec0fd7cc01d722b04e514 Mon Sep 17 00:00:00 2001
1+
From 1c8ace2d0725c1c8d5012f8a56c5fb31805aad27 Mon Sep 17 00:00:00 2001
22
From: Lorenzo Bianconi <[email protected]>
3-
Date: Wed, 16 Oct 2024 12:07:33 +0200
4-
Subject: [PATCH 1/2] pinctrl: airoha: Add support for EN7581 SoC
3+
Date: Wed, 23 Oct 2024 01:20:05 +0200
4+
Subject: [PATCH] pinctrl: airoha: Add support for EN7581 SoC
55

66
Introduce pinctrl driver for EN7581 SoC. Current EN7581 pinctrl driver
77
supports the following functionalities:
@@ -15,8 +15,10 @@ Tested-by: Benjamin Larsson <[email protected]>
1515
Co-developed-by: Benjamin Larsson <[email protected]>
1616
Signed-off-by: Benjamin Larsson <[email protected]>
1717
Reviewed-by: Linus Walleij <[email protected]>
18-
Signed-off-by: Lorenzo Bianconi <[email protected]>
1918
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
19+
Signed-off-by: Lorenzo Bianconi <[email protected]>
20+
Link: https://lore.kernel.org/[email protected]
21+
Signed-off-by: Linus Walleij <[email protected]>
2022
---
2123
MAINTAINERS | 7 +
2224
drivers/pinctrl/mediatek/Kconfig | 17 +-
@@ -25,24 +27,22 @@ Reviewed-by: AngeloGioacchino Del Regno <[email protected]
2527
4 files changed, 2994 insertions(+), 1 deletion(-)
2628
create mode 100644 drivers/pinctrl/mediatek/pinctrl-airoha.c
2729

28-
# diff --git a/MAINTAINERS b/MAINTAINERS
29-
# index 8a6ea49e1a9d..ca4a78737dc6 100644
30-
# --- a/MAINTAINERS
31-
# +++ b/MAINTAINERS
32-
# @@ -18331,6 +18331,13 @@ F: drivers/pinctrl/
33-
# F: include/dt-bindings/pinctrl/
34-
# F: include/linux/pinctrl/
30+
--- a/MAINTAINERS
31+
+++ b/MAINTAINERS
32+
@@ -16870,6 +16870,13 @@ F: drivers/pinctrl/
33+
F: include/dt-bindings/pinctrl/
34+
F: include/linux/pinctrl/
3535

36-
# +PIN CONTROLLER - AIROHA
37-
# +M: Lorenzo Bianconi <[email protected]>
38-
# +L: [email protected] (moderated for non-subscribers)
39-
# +S: Maintained
40-
# +F: Documentation/devicetree/bindings/pinctrl/airoha,en7581-pinctrl.yaml
41-
# +F: drivers/pinctrl/mediatek/pinctrl-airoha.c
42-
# +
43-
# PIN CONTROLLER - AMD
44-
# M: Basavaraj Natikar <[email protected]>
45-
# M: Shyam Sundar S K <[email protected]>
36+
+PIN CONTROLLER - AIROHA
37+
+M: Lorenzo Bianconi <[email protected]>
38+
+L: [email protected] (moderated for non-subscribers)
39+
+S: Maintained
40+
+F: Documentation/devicetree/bindings/pinctrl/airoha,en7581-pinctrl.yaml
41+
+F: drivers/pinctrl/mediatek/pinctrl-airoha.c
42+
+
43+
PIN CONTROLLER - AMD
44+
M: Basavaraj Natikar <[email protected]>
45+
M: Shyam Sundar S K <[email protected]>
4646
--- a/drivers/pinctrl/mediatek/Kconfig
4747
+++ b/drivers/pinctrl/mediatek/Kconfig
4848
@@ -1,6 +1,6 @@

0 commit comments

Comments
 (0)