colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: clk: rk3288: Drop use of SCLK_MAC_PLL

Browse Source 
The SCLK_MAC_PLL id is not exported or referenced upstream. It is also
not referenced in vendor U-Boot or vendor kernel 4.4, 4.19, 5.10 or 6.1.

Relax the check for parent id SCLK_MAC_PLL when using internal clock
source for gmac to allow use of clock/rk3288-cru.h from dts/upstream.

All in-tree and upstream rk3288 DTs use an external clock as parent,
so no functional change to boards is expected with this change.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Jonas Karlman
2024-11-09 21:04:10 +00:00
committed by Tom Rini
parent 2247b8aa20
commit c63eae2817
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/clk/rockchip/clk_rk3288.c
View File

@@ -903,11 +903,11 @@ static int __maybe_unused rk3288_gmac_set_parent(struct clk *clk, struct clk *pa
int ret; int ret;
/* /*
* If the requested parent is in the same clock-controller and * If the requested parent is in the same clock-controller the
* the id is SCLK_MAC_PLL ("mac_pll_src"), switch to the internal * likely parent is the unexported SCLK_MAC_PLL ("mac_pll_src"),
* clock. * switch to the internal clock.
*/ */
if ((parent->dev == clk->dev) && (parent->id == SCLK_MAC_PLL)) { if (parent->dev == clk->dev) {
debug("%s: switching GAMC to SCLK_MAC_PLL\n", __func__); debug("%s: switching GAMC to SCLK_MAC_PLL\n", __func__);
rk_clrsetreg(&cru->cru_clksel_con[21], RMII_EXTCLK_MASK, 0); rk_clrsetreg(&cru->cru_clksel_con[21], RMII_EXTCLK_MASK, 0);
return 0; return 0;