dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

clk: zynqmp: Fix gem tx/rx/ref clock handling

Browse Source 
gemX_ref clock IDs starts at number 104. Till now it was at gemX_tx
location which wasn't correct.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/d073e159b6316707306092a62bccb876cd89a602.1635506016.git.michal.simek@xilinx.com
This commit is contained in:
Michal Simek
2021-10-29 13:13:38 +02:00
parent e959ade02c
commit 0e789d26b7
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/clk/clk_zynqmp.c
View File

@@ -130,8 +130,8 @@ enum zynqmp_clk {
csu_spb, csu_pll, pcap, csu_spb, csu_pll, pcap,
iou_switch, iou_switch,
gem_tsu_ref, gem_tsu, gem_tsu_ref, gem_tsu,
gem0_ref, gem1_ref, gem2_ref, gem3_ref,
gem0_tx, gem1_tx, gem2_tx, gem3_tx, gem0_tx, gem1_tx, gem2_tx, gem3_tx,
gem0_rx, gem1_rx, gem2_rx, gem3_rx,
qspi_ref, qspi_ref,
sdio0_ref, sdio1_ref, sdio0_ref, sdio1_ref,
uart0_ref, uart1_ref, uart0_ref, uart1_ref,
@@ -144,6 +144,8 @@ enum zynqmp_clk {
ams_ref, ams_ref,
pl0, pl1, pl2, pl3, pl0, pl1, pl2, pl3,
wdt, wdt,
gem0_ref = 104,
gem1_ref, gem2_ref, gem3_ref,
clk_max, clk_max,
}; };
@@ -161,14 +163,18 @@ static const char * const clk_names[clk_max] = {
"usb1_bus_ref", "usb3_dual_ref", "usb0", "usb1_bus_ref", "usb3_dual_ref", "usb0",
"usb1", "cpu_r5", "cpu_r5_core", "csu_spb", "usb1", "cpu_r5", "cpu_r5_core", "csu_spb",
"csu_pll", "pcap", "iou_switch", "gem_tsu_ref", "csu_pll", "pcap", "iou_switch", "gem_tsu_ref",
"gem_tsu", "gem0_ref", "gem1_ref", "gem2_ref", "gem_tsu", "gem0_tx", "gem1_tx", "gem2_tx",
"gem3_ref", "gem0_tx", "gem1_tx", "gem2_tx", "gem3_tx", "gem0_rx", "gem1_rx", "gem2_rx",
"gem3_tx", "qspi_ref", "sdio0_ref", "sdio1_ref", "gem3_rx", "qspi_ref", "sdio0_ref", "sdio1_ref",
"uart0_ref", "uart1_ref", "spi0_ref", "uart0_ref", "uart1_ref", "spi0_ref",
"spi1_ref", "nand_ref", "i2c0_ref", "i2c1_ref", "spi1_ref", "nand_ref", "i2c0_ref", "i2c1_ref",
"can0_ref", "can1_ref", "can0", "can1", "can0_ref", "can1_ref", "can0", "can1",
"dll_ref", "adma_ref", "timestamp_ref", "dll_ref", "adma_ref", "timestamp_ref",
"ams_ref", "pl0", "pl1", "pl2", "pl3", "wdt" "ams_ref", "pl0", "pl1", "pl2", "pl3", "wdt",
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, "gem0_ref", "gem1_ref", "gem2_ref", "gem3_ref",
}; };
static const u32 pll_src[][4] = { static const u32 pll_src[][4] = {
@@ -258,12 +264,16 @@ static u32 zynqmp_clk_get_register(enum zynqmp_clk id)
return CRL_APB_USB3_DUAL_REF_CTRL; return CRL_APB_USB3_DUAL_REF_CTRL;
case gem_tsu_ref: case gem_tsu_ref:
return CRL_APB_GEM_TSU_REF_CTRL; return CRL_APB_GEM_TSU_REF_CTRL;
case gem0_tx:
case gem0_ref: case gem0_ref:
return CRL_APB_GEM0_REF_CTRL; return CRL_APB_GEM0_REF_CTRL;
case gem1_tx:
case gem1_ref: case gem1_ref:
return CRL_APB_GEM1_REF_CTRL; return CRL_APB_GEM1_REF_CTRL;
case gem2_tx:
case gem2_ref: case gem2_ref:
return CRL_APB_GEM2_REF_CTRL; return CRL_APB_GEM2_REF_CTRL;
case gem3_tx:
case gem3_ref: case gem3_ref:
return CRL_APB_GEM3_REF_CTRL; return CRL_APB_GEM3_REF_CTRL;
case usb0_bus_ref: case usb0_bus_ref:
@@ -665,6 +675,7 @@ static ulong zynqmp_clk_get_rate(struct clk *clk)
case gem_tsu_ref: case gem_tsu_ref:
case pl0 ... pl3: case pl0 ... pl3:
case gem0_ref ... gem3_ref: case gem0_ref ... gem3_ref:
case gem0_tx ... gem3_tx:
case qspi_ref ... can1_ref: case qspi_ref ... can1_ref:
case usb0_bus_ref ... usb3_dual_ref: case usb0_bus_ref ... usb3_dual_ref:
two_divs = true; two_divs = true;
@@ -698,6 +709,7 @@ static ulong zynqmp_clk_set_rate(struct clk *clk, ulong rate)
switch (id) { switch (id) {
case gem0_ref ... gem3_ref: case gem0_ref ... gem3_ref:
case gem0_tx ... gem3_tx:
case qspi_ref ... can1_ref: case qspi_ref ... can1_ref:
case usb0_bus_ref ... usb3_dual_ref: case usb0_bus_ref ... usb3_dual_ref:
return zynqmp_clk_set_peripheral_rate(priv, id, return zynqmp_clk_set_peripheral_rate(priv, id,
@@ -809,6 +821,7 @@ static int zynqmp_clk_enable(struct clk *clk)
clkact_shift = 25; clkact_shift = 25;
mask = 0x1; mask = 0x1;
break; break;
case gem0_tx ... gem3_tx:
case gem0_ref ... gem3_ref: case gem0_ref ... gem3_ref:
clkact_shift = 25; clkact_shift = 25;
mask = 0x3; mask = 0x3;