Update gmac clocks and devicetree for sam9x7 mpu
Subsystems (3)
v3 cover Update gmac clocks and devicetree for sam9x7 mpu
This series updates the GMAC clock configuration for the SAM9X7 family. The current clock definitions contain inconsistencies around the GMAC peripheral and its associated generic clock IDs, which lead to incorrect wiring in both the clock driver and the devicetree.
Changelog:
v2 -> v3:
- Rework patch 1 and 3 based on Claudiu's comments
v1 -> v2:
- Add only one patch for devicetree with detailed description
Mihai Sain (4):
clk: at91: sam9x7: Remove gmac peripheral clock with ID 67
clk: at91: sam9x7: Rename macb0_clk to gmac_clk
clk: at91: sam9x7: Fix gmac_gclk clock definition
ARM: dts: microchip: sam9x7: fix GMAC clock configuration
arch/arm/boot/dts/microchip/sam9x7.dtsi | 6 +++--- drivers/clk/at91/sam9x7.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-)
base-commit: 11439c4635edd669ae435eec308f4ab8a0804808
Signature · 1 line
2.53.0
PATCH v3 1/4 clk: at91: sam9x7: Remove gmac peripheral clock with ID 67
According with datasheet [1] table 12.1 the instance ID 67 is reserved. This change drops the gmactsu_clk entry from
the SAM9X7 clock description table.
--- drivers/clk/at91/sam9x7.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/at91/sam9x7.c +0 -1
@@ -420,7 +420,6 @@ static const struct { { .n = "lvdsc_clk", .id = 56, }, { .n = "pit64b1_clk", .id = 58, }, { .n = "puf_clk", .id = 59, }, - { .n = "gmactsu_clk", .id = 67, }, }; /*
Signature · 1 line
2.53.0
PATCH v3 2/4 clk: at91: sam9x7: Rename macb0_clk to gmac_clk
In reply to Mihai SainUpdate the peripheral clock name for ID 24 from macb0_clk to gmac_clk to match the actual GMAC hardware block present on SAM9X7 SoCs. This aligns the clock naming with the device tree and avoids confusion with legacy MACB controllers.
--- drivers/clk/at91/sam9x7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/sam9x7.c +1 -1
@@ -387,7 +387,7 @@ static const struct { { .n = "dma0_clk", .id = 20, }, { .n = "uhphs_clk", .id = 22, }, { .n = "udphs_clk", .id = 23, }, - { .n = "macb0_clk", .id = 24, }, + { .n = "gmac_clk", .id = 24, }, { .n = "lcd_clk", .id = 25, }, { .n = "sdmmc1_clk", .id = 26, }, { .n = "ssc_clk", .id = 28, },
Signature · 1 line
2.53.0
PATCH v3 3/4 clk: at91: sam9x7: Fix gmac_gclk clock definition
In reply to Mihai SainAccording with datasheet [1] table 12.1 the instance ID 24 is used for gmac generic clock.
This patch adds the correct gmac_gclk entry at ID 24, aligned with the SoC clock layout, and removes the old misplaced 67 entry.
--- drivers/clk/at91/sam9x7.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/clk/at91/sam9x7.c +9 -9
@@ -568,6 +568,15 @@ static const struct { .pp_chg_id = INT_MIN, }, + { + .n = "gmac_gclk", + .id = 24, + .pp = { "audiopll_divpmcck", "plla_div2pmcck", }, + .pp_mux_table = { 6, 8, }, + .pp_count =2 , + .pp_chg_id = INT_MIN, + }, + { .n ="lcd_gclk" , .id = 25,
@@ -701,15 +710,6 @@ static const struct { .pp_count = 1, .pp_chg_id = INT_MIN, }, - - { - .n = "gmac_gclk", - .id = 67, - .pp = { "audiopll_divpmcck", "plla_div2pmcck", }, - .pp_mux_table = { 6, 8, }, - .pp_count = 2, - .pp_chg_id = INT_MIN, - }, };static void __init sam9x7_pmc_setup (struct device_node *np)
Signature · 1 line
2.53.0
Claudiu Beznea
maintainerRe: [PATCH 3/4] clk: at91: sam9x7: Fix gmac_gclk clock definition
Hi, Mihai,
Quoted 5 lines · Mihai Sain
According with datasheet [1] table 12.1 the instance ID 24 is used for gmac generic clock.
This patch adds the correctgmac_gclkentry at ID 24, aligned with the SoC clock layout, and removes the old misplaced 67 entry.
Something is wrong with this patch and the next one. I suppose it's the missing version number in title as I cannot grab it with b4. Can you please re-send?
Thank you,
Claudiu
PATCH v3 4/4 ARM: dts: microchip: sam9x7: fix GMAC clock configuration
In reply to Mihai SainThe GMAC node incorrectly listed four clocks, including a separate tx_clk and a TSU GCK clock sourced from ID 67.
According to the SAM9X7 clocking scheme, the GMAC uses only three
clocks: HCLK, PCLK, and the TSU GCK derived from the GMAC peripheral clock (ID 24).
This patch removes the unused tx_clk, updates the clock-names accordingly, and corrects the assigned clock to use GCK 24 instead of GCK 67. This aligns the device tree with the actual hardware clock topology and prevents misconfiguration of the GMAC clock tree.
[root@SAM9X75 ~]$ cat /sys/kernel/debug/clk/clk_summary | grep gmac
gmac_gclk 1 1 1 266666666 0 0 50000 Y f802c000.ethernet tsu_clk
f802c000.ethernet tsu_clk
gmac_clk 2 2 0 266666666 0 0 50000 Y f802c000.ethernet hclk
f802c000.ethernet pclk--- arch/arm/boot/dts/microchip/sam9x7.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/microchip/sam9x7.dtsi +3 -3
@@ -990,9 +990,9 @@ gmac: ethernet@f802c000 { <62 IRQ_TYPE_LEVEL_HIGH 3>, /* Queue 3 */ <63 IRQ_TYPE_LEVEL_HIGH 3>, /* Queue 4 */ <64 IRQ_TYPE_LEVEL_HIGH 3>; /* Queue 5 */ - clocks = <&pmc PMC_TYPE_PERIPHERAL 24>, <&pmc PMC_TYPE_PERIPHERAL 24>, <&pmc PMC_TYPE_GCK 24>, <&pmc PMC_TYPE_GCK 67>; - clock-names = "hclk", "pclk", "tx_clk", "tsu_clk"; - assigned-clocks = <&pmc PMC_TYPE_GCK 67>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 24>, <&pmc PMC_TYPE_PERIPHERAL 24>, <&pmc PMC_TYPE_GCK 24>; + clock-names = "hclk", "pclk", "tsu_clk"; + assigned-clocks = <&pmc PMC_TYPE_GCK 24>; assigned-clock-rates = <266666666>; status = "disabled"; };
Signature · 1 line
2.53.0