clk: en7523: Rework clock handling for different clock numbers
Subsystems (2)
PATCH v5 1/4 clk: en7523: Rework clock handling for different clock numbers
Airoha EN7581 SoC have additional clock compared to EN7523 but current driver permits to only support up to EN7523 clock numbers.
To handle this, rework the clock handling and permit to declare the clocks number in match_data and alloca clk_data based on the compatible match_data.
---
Changes v5:
- Set clk_data->num before accessing hws to follow counted_by Changes v4:
- Move to patch 1 (improve bisectability)
Changes v3:
- Rework num_clocks for en7523
Changes v2:
- Add this patch
drivers/clk/clk-en7523.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/clk/clk-en7523.c +8 -6
@@ -75,6 +75,7 @@ struct en_rst_data { };struct en_clk_soc_data { +u32 num_clocks;const struct clk_ops pcie_ops;int (*hw_init)(struct platform_device *pdev,struct clk_hw_onecell_data *clk_data);
@@ -504,8 +505,6 @@ static void en7523_register_clocks(struct device *dev, struct clk_hw_onecell_datu32 rate;int i; - clk_data->num =EN7523_NUM_CLOCKS ; -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(struct device *dev, struct clk_hw_onecell_dat hw =en7523_register_pcie_clk (dev, base); clk_data->hws[EN7523_CLK_PCIE ] = hw; - - clk_data->num =EN7523_NUM_CLOCKS ; } static int en7523_reset_update(struct reset_controller_dev *rcdev,
@@ -702,13 +699,15 @@ static int en7523_clk_probe(struct platform_device *pdev)struct clk_hw_onecell_data *clk_data;int r; + soc_data =device_get_match_data (&pdev->dev); + clk_data =devm_kzalloc (&pdev->dev, -struct_size (clk_data, hws,EN7523_NUM_CLOCKS ), +struct_size (clk_data, hws, soc_data->num_clocks),GFP_KERNEL );if (!clk_data)return -ENOMEM ; - soc_data =device_get_match_data (&pdev->dev); + clk_data->num = soc_data->num_clocks; r = soc_data->hw_init (pdev, clk_data);if (r)return r;
@@ -717,6 +716,7 @@ static int en7523_clk_probe(struct platform_device *pdev) }static const struct en_clk_soc_data en7523_data = { + .num_clocks =ARRAY_SIZE (en7523_base_clks) +1 , .pcie_ops = { .is_enabled = en7523_pci_is_enabled, .prepare = en7523_pci_prepare,
@@ -726,6 +726,8 @@ static const struct en_clk_soc_data en7523_data = { };static const struct en_clk_soc_data en7581_data = { +/* We increment num_clocks by 1 to account for additional PCIe clock */ + .num_clocks =ARRAY_SIZE (en7581_base_clks) +1 , .pcie_ops = { .is_enabled = en7581_pci_is_enabled, .enable = en7581_pci_enable,
Signature · 1 line
2.45.2
PATCH v5 2/4 dt-bindings: clock: drop NUM_CLOCKS define for EN7581
Drop NUM_CLOCKS define for EN7581 include. This is not a binding and should not be placed here. Value is derived internally in the user driver.
---
Changes v5:
- Add ack tag
Changes v4:
- Move to patch 2 (improves bisectability)
Changes v3:
- Add this patch
include/dt-bindings/clock/en7523-clk.h | 2 -- 1 file changed, 2 deletions(-)
include/dt-bindings/clock/en7523-clk.h +0 -2
@@ -12,6 +12,4 @@#define EN7523_CLK_CRYPTO 6#define EN7523_CLK_PCIE 7 -#define EN7523_NUM_CLOCKS 8 -#endif /* _DT_BINDINGS_CLOCK_AIROHA_EN7523_H_ */
Signature · 1 line
2.45.2
Re: [PATCH v5 2/4] dt-bindings: clock: drop NUM_CLOCKS define for EN7581
Quoting Christian Marangi (2025-01-12 05:39:38)
Quoted 7 lines
Drop
NUM_CLOCKSdefine for EN7581 include. This is not a binding and should not be placed here. Value is derived internally in the user driver.Signed-off-by Christian Marangi <[email protected]>---
Applied to clk-next
Stephen Boyd
maintainerRe: [PATCH v5 2/4] dt-bindings: clock: drop NUM_CLOCKS define for EN7581
In reply to Christian MarangiSubject says EN7581....
Quoting Christian Marangi (2025-01-12 05:39:38)
Quoted 22 lines
Drop
NUM_CLOCKSdefine for EN7581 include. This is not a binding and should not be placed here. Value is derived internally in the user driver.Signed-off-by Christian Marangi <[email protected]>---
Changes v5:
- Add ack tag
Changes v4:
- Move to patch 2 (improves bisectability)
Changes v3:
- Add this patchinclude/dt-bindings/clock/en7523-clk.h | 2 -- 1 file changed, 2 deletions(-)include/dt-bindings/clock/en7523-clk.h +0
-0
include/dt-bindings/clock/en7523-clk.h line 15
Quoted 4 lines
include/dt-bindings/clock/en7523-clk.h +0
-1@@ -12,6 +12,4 @@#define EN7523_CLK_CRYPTO 6#define EN7523_CLK_PCIE 7 -#define EN7523_NUM_CLOCKS 8
But this is EN7523
drivers/clk/clk-en7523.c:539:25: error: ‘EN7523_NUM_CLOCKS’ undeclared (first use in this function)
539 | clk_data->num = EN7523_NUM_CLOCKS;
| ^~~~~~~~~~~~~~~~~Re: [PATCH v5 2/4] dt-bindings: clock: drop NUM_CLOCKS define for EN7581
Quoted 28 lines · Stephen Boyd
Subject says EN7581....
Quoting Christian Marangi (2025-01-12 05:39:38)
Quoted 25 lines
Drop
NUM_CLOCKSdefine for EN7581 include. This is not a binding and should not be placed here. Value is derived internally in the user driver.Signed-off-by Christian Marangi <[email protected]>---
Changes v5:
- Add ack tag
Changes v4:
- Move to patch 2 (improves bisectability)
Changes v3:
- Add this patchinclude/dt-bindings/clock/en7523-clk.h | 2 -- 1 file changed, 2 deletions(-)include/dt-bindings/clock/en7523-clk.h +0
-0@@ -12,6 +12,4 @@#define EN7523_CLK_CRYPTO 6#define EN7523_CLK_PCIE 7
Quoted 7 lines
include/dt-bindings/clock/en7523-clk.h line 15
Quoted 1 line
include/dt-bindings/clock/en7523-clk.h +0
-1-#define EN7523_NUM_CLOCKS 8But this is EN7523
drivers/clk/clk-en7523.c:539:25: error: ‘EN7523_NUM_CLOCKS’ undeclared (first use in this function)539 | clk_data->num = EN7523_NUM_CLOCKS; | ^~~~~~~~~~~~~~~~~
Hi Stephen,
the same define is used for both EN7523 and EN7581, do you want me to resubmit with a better description?
Both clock are updated so no regression.
Signature · 1 line
Ansuel
Stephen Boyd
maintainerRe: [PATCH v5 2/4] dt-bindings: clock: drop NUM_CLOCKS define for EN7581
Quoting Christian Marangi (2025-01-13 13:37:56)
Quoted 37 lines · Stephen Boyd
Quoted 28 lines
Subject says EN7581....
Quoting Christian Marangi (2025-01-12 05:39:38)
Quoted 25 lines
Drop
NUM_CLOCKSdefine for EN7581 include. This is not a binding and should not be placed here. Value is derived internally in the user driver.Signed-off-by Christian Marangi <[email protected]>---
Changes v5:
- Add ack tag
Changes v4:
- Move to patch 2 (improves bisectability)
Changes v3:
- Add this patchinclude/dt-bindings/clock/en7523-clk.h | 2 -- 1 file changed, 2 deletions(-)include/dt-bindings/clock/en7523-clk.h +0
-0@@ -12,6 +12,4 @@#define EN7523_CLK_CRYPTO 6#define EN7523_CLK_PCIE 7Quoted 7 lines
include/dt-bindings/clock/en7523-clk.h line 15
Quoted 1 line
include/dt-bindings/clock/en7523-clk.h +0
-1-#define EN7523_NUM_CLOCKS 8But this is EN7523
drivers/clk/clk-en7523.c:539:25: error: ‘EN7523_NUM_CLOCKS’ undeclared (first use in this function)539 | clk_data->num = EN7523_NUM_CLOCKS; | ^~~~~~~~~~~~~~~~~
Quoted 7 lines
Hi Stephen,
the same define is used for both EN7523 and EN7581, do you want me to resubmit with a better description?
Both clock are updated so no regression.
Please resubmit the entire patchset. It doesn't compile.
Re: [PATCH v5 2/4] dt-bindings: clock: drop NUM_CLOCKS define for EN7581
Quoted 40 lines · Stephen Boyd
Quoting Christian Marangi (2025-01-13 13:37:56)
Quoted 39 lines · Stephen Boyd
Quoted 28 lines
Subject says EN7581....
Quoting Christian Marangi (2025-01-12 05:39:38)
Quoted 25 lines
Drop
NUM_CLOCKSdefine for EN7581 include. This is not a binding and should not be placed here. Value is derived internally in the user driver.Signed-off-by Christian Marangi <[email protected]>---
Changes v5:
- Add ack tag
Changes v4:
- Move to patch 2 (improves bisectability)
Changes v3:
- Add this patchinclude/dt-bindings/clock/en7523-clk.h | 2 -- 1 file changed, 2 deletions(-)include/dt-bindings/clock/en7523-clk.h +0
-0@@ -12,6 +12,4 @@#define EN7523_CLK_CRYPTO 6#define EN7523_CLK_PCIE 7Quoted 7 lines
include/dt-bindings/clock/en7523-clk.h line 15
Quoted 1 line
include/dt-bindings/clock/en7523-clk.h +0
-1-#define EN7523_NUM_CLOCKS 8But this is EN7523
drivers/clk/clk-en7523.c:539:25: error: ‘EN7523_NUM_CLOCKS’ undeclared (first use in this function)539 | clk_data->num = EN7523_NUM_CLOCKS; | ^~~~~~~~~~~~~~~~~Hi Stephen,
Quoted 7 lines
Quoted 5 lines
the same define is used for both EN7523 and EN7581, do you want me to resubmit with a better description?
Both clock are updated so no regression.
Please resubmit the entire patchset. It doesn't compile.
Hope I don't get annoying and sorry for this extra mail.
I can't repro the compile error, it seems patch 1 of this series wasn't applied and changes were tested only with patch 2?
Patch 2 depends on patch 1 as we drop the define.
Signature · 1 line
Ansuel
Stephen Boyd
maintainerRe: [PATCH v5 2/4] dt-bindings: clock: drop NUM_CLOCKS define for EN7581
Quoting Christian Marangi (2025-01-13 14:17:49)
Quoted 5 lines · Stephen Boyd
Quoted 2 lines
Please resubmit the entire patchset. It doesn't compile.
Hope I don't get annoying and sorry for this extra mail.
No worries.
Quoted 6 lines
I can't repro the compile error, it seems patch 1 of this series wasn't applied and changes were tested only with patch 2?
Patch 2 depends on patch 1 as we drop the define.
I applied the first patch, but on top of v6.13-rc1 like all other patches that don't tell me their base.
What's the base of the patch series? Please resend with a cover letter and use --base=<commitish> when formatting the patch series. When I applied the first patch I got this diffstat
drivers/clk/clk-en7523.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
so I suspect I'm missing something in clk-fixes for this patch series. Please call out dependencies in the cover letter.
Re: [PATCH v5 2/4] dt-bindings: clock: drop NUM_CLOCKS define for EN7581
Quoted 23 lines · Stephen Boyd
Quoting Christian Marangi (2025-01-13 14:17:49)
Quoted 5 lines · Stephen Boyd
Quoted 2 lines
Please resubmit the entire patchset. It doesn't compile.
Hope I don't get annoying and sorry for this extra mail.
No worries.
Quoted 6 lines
I can't repro the compile error, it seems patch 1 of this series wasn't applied and changes were tested only with patch 2?
Patch 2 depends on patch 1 as we drop the define.
I applied the first patch, but on top of v6.13-rc1 like all other patches that don't tell me their base.
What's the base of the patch series? Please resend with a cover letter and use --base=<commitish> when formatting the patch series. When I applied the first patch I got this diffstat
Quoted 5 lines
drivers/clk/clk-en7523.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)so I suspect I'm missing something in clk-fixes for this patch series. Please call out dependencies in the cover letter.
Indeed v6.13-rc1 didn't had the counted_by fix. I referenced the clk-next base branch and sent v6 with the cover letter. Hope it's clear now.
Signature · 1 line
Ansuel
PATCH v5 3/4 dt-bindings: clock: add ID for eMMC for EN7581
In reply to Christian MarangiAdd ID for eMMC for EN7581. This is to control clock selection of eMMC between 200MHz and 150MHz.
---
Changes v4:
- Move to patch 3
Changes v3:
- Add ack tag
Changes v2:
- Drop additional define for EN7581_NUM_CLOCKS
include/dt-bindings/clock/en7523-clk.h | 2 ++ 1 file changed, 2 insertions(+)
include/dt-bindings/clock/en7523-clk.h +2 -0
@@ -12,4 +12,6 @@#define EN7523_CLK_CRYPTO 6#define EN7523_CLK_PCIE 7 +#define EN7581_CLK_EMMC 8 +#endif /* _DT_BINDINGS_CLOCK_AIROHA_EN7523_H_ */
Signature · 1 line
2.45.2
Re: [PATCH v5 3/4] dt-bindings: clock: add ID for eMMC for EN7581
Quoting Christian Marangi (2025-01-12 05:39:39)
Quoted 6 lines
Add ID for eMMC for EN7581. This is to control clock selection of eMMC between 200MHz and 150MHz.
Signed-off-by Christian Marangi <[email protected]>Acked-by Conor Dooley <[email protected]>---
Applied to clk-next
PATCH v5 4/4 clk: en7523: Add clock for eMMC for EN7581
In reply to Christian MarangiAdd clock for eMMC for EN7581. This is used to give info of the current eMMC source clock and to switch it from 200MHz or 150MHz.
---
Changes v4:
- Move to patch 4
Changes v2:
- Rename emmc_base to emmc7581_base to make it more clear
drivers/clk/clk-en7523.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/clk/clk-en7523.c +10 -0
@@ -91,6 +91,7 @@ static const u32 emi7581_base[] = { 540000000, 480000000, 400000000, 300000000 }static const u32 bus7581_base[] = {600000000 ,540000000 };static const u32 npu7581_base[] = {800000000 ,750000000 ,720000000 ,600000000 };static const u32 crypto_base[] = {540000000 ,480000000 }; +static const u32 emmc7581_base[] = {200000000 ,150000000 };static const struct en_clk_desc en7523_base_clks[] = { {
@@ -281,6 +282,15 @@ static const struct en_clk_desc en7581_base_clks[] = { .base_shift = 0, .base_values = crypto_base, .n_base_values = ARRAY_SIZE(crypto_base), + }, { + .id = EN7581_CLK_EMMC, + .name = "emmc", + + .base_reg = REG_CRYPTO_CLKSRC2, + .base_bits = 1, + .base_shift = 12, + .base_values = emmc7581_base, + .n_base_values = ARRAY_SIZE(emmc7581_base), } };
Signature · 1 line
2.45.2
Re: [PATCH v5 4/4] clk: en7523: Add clock for eMMC for EN7581
Quoting Christian Marangi (2025-01-12 05:39:40)
Quoted 5 lines
Add clock for eMMC for EN7581. This is used to give info of the current eMMC source clock and to switch it from 200MHz or 150MHz.
Signed-off-by Christian Marangi <[email protected]>---
Applied to clk-next
Quoting Christian Marangi (2025-01-12 05:39:37)
Quoted 9 lines
Airoha EN7581 SoC have additional clock compared to EN7523 but current driver permits to only support up to EN7523 clock numbers.
To handle this, rework the clock handling and permit to declare the clocks number in
match_dataand allocaclk_databased on the compatiblematch_data.Signed-off-by Christian Marangi <[email protected]>---
Applied to clk-next