diff options
author | yanhong.wang <yanhong.wang@starfivetech.com> | 2022-08-03 10:59:08 +0300 |
---|---|---|
committer | Yanhong Wang <yanhong.wang@linux.starfivetech.com> | 2022-10-18 11:24:37 +0300 |
commit | 20f3a9aeb57d6237a1a19ae519e23f06d98f88ef (patch) | |
tree | 55db095c91972712b4e3bd5dd37b51ed903ae336 | |
parent | 7cfc3f2f617c075416bcad33642b6aa2967f3bf1 (diff) | |
download | u-boot-20f3a9aeb57d6237a1a19ae519e23f06d98f88ef.tar.xz |
clk:jh7110: update apb_bus clk relationship
The previous definition of apb_bus clock relationship is incorrect,so
update it.
Signed-off-by: yanhong.wang <yanhong.wang@starfivetech.com>
-rw-r--r-- | drivers/clk/starfive/clk-jh7110.c | 33 | ||||
-rw-r--r-- | include/dt-bindings/clock/starfive-jh7110-clkgen.h | 51 |
2 files changed, 33 insertions, 51 deletions
diff --git a/drivers/clk/starfive/clk-jh7110.c b/drivers/clk/starfive/clk-jh7110.c index 5c44f6a6cb..17831954f1 100644 --- a/drivers/clk/starfive/clk-jh7110.c +++ b/drivers/clk/starfive/clk-jh7110.c @@ -58,11 +58,6 @@ static const char *gmac5_tx_sels[2] = { [1] = "gmac1_rmii_rtx", }; -static const char *aon_apb_func_sels[2] = { - [0] = "osc_div4", - [1] = "osc", -}; - static const char *u0_dw_gmac5_axi64_clk_tx_sels[2] = { [0] = "gmac0_gtxclk", [1] = "gmac0_rmii_rtx", @@ -399,18 +394,16 @@ static int jh7110_clk_init(struct udevice *dev) starfive_clk_divider(priv->sys, "apb_bus_func", "stg_axiahb", SYS_OFFSET(JH7110_APB_BUS_FUNC), 4)); - clk_dm(JH7110_OSC_DIV4, - starfive_clk_divider(priv->aon, - "osc_div4", "osc", - AON_OFFSET(JH7110_OSC_DIV4), 3)); - clk_dm(JH7110_AON_APB_FUNC, - starfive_clk_mux(priv->aon, "aon_apb_func", - AON_OFFSET(JH7110_AON_APB_FUNC), 1, - aon_apb_func_sels, ARRAY_SIZE(aon_apb_func_sels))); + clk_dm(JH7110_PCLK2_MUX_FUNC_PCLK, + starfive_clk_fix_factor(priv->sys, + "u2_pclk_mux_func_pclk", "apb_bus_func", 1, 1)); + clk_dm(JH7110_U2_PCLK_MUX_PCLK, + starfive_clk_fix_factor(priv->sys, + "u2_pclk_mux_pclk", "u2_pclk_mux_func_pclk", 1, 1)); clk_dm(JH7110_APB_BUS, starfive_clk_fix_factor(priv->sys, - "apb_bus", "aon_apb_func", 1, 1)); + "apb_bus", "u2_pclk_mux_pclk", 1, 1)); clk_dm(JH7110_APB0, starfive_clk_gate(priv->sys, "apb0", "apb_bus", @@ -421,13 +414,6 @@ static int jh7110_clk_init(struct udevice *dev) clk_dm(JH7110_AON_APB, starfive_clk_fix_factor(priv->sys, "aon_apb", "apb_bus_func", 1, 1)); - - /*hifi4*/ - clk_dm(JH7110_HIFI4_CORE, - starfive_clk_divider(priv->sys, - "hifi4_core", "bus_root", - SYS_OFFSET(JH7110_HIFI4_CORE), 4)); - /*QSPI*/ clk_dm(JH7110_QSPI_CLK_AHB, starfive_clk_gate(priv->sys, @@ -582,11 +568,6 @@ static int jh7110_clk_init(struct udevice *dev) clk_dm(JH7110_STG_APB, starfive_clk_fix_factor(priv->stg, "stg_apb", "apb_bus", 1, 1)); - - clk_dm(JH7110_HIFI4_CLK_CORE, - starfive_clk_gate(priv->stg, - "u0_hifi4_clk_core", "hifi4_core", - STG_OFFSET(JH7110_HIFI4_CLK_CORE))); /*USB*/ clk_dm(JH7110_USB0_CLK_USB_APB, starfive_clk_gate(priv->stg, diff --git a/include/dt-bindings/clock/starfive-jh7110-clkgen.h b/include/dt-bindings/clock/starfive-jh7110-clkgen.h index b8ba0237db..1228a8c94b 100644 --- a/include/dt-bindings/clock/starfive-jh7110-clkgen.h +++ b/include/dt-bindings/clock/starfive-jh7110-clkgen.h @@ -249,7 +249,7 @@ #define JH7110_RTC_HMS_CLK_OSC32K 231 #define JH7110_RTC_HMS_CLK_CAL 232 -#define JH7110_CLK_AON_REG_END 233 +#define JH7110_CLK_REG_END 233 /* sys other */ #define JH7110_PLL0_OUT 233 @@ -336,38 +336,39 @@ #define JH7110_E2_DEBUG_SYSTEMJTAG_TCK 314 #define JH7110_JTAG_CERTIFICATION_TCK 315 #define JH7110_SEC_SKP_CLK 316 +#define JH7110_U2_PCLK_MUX_PCLK 317 -#define JH7110_CLK_SYS_END 317 +#define JH7110_CLK_SYS_END 318 /* stg other */ -#define JH7110_PCIE0_CLK_AXI_SLV0 317 -#define JH7110_PCIE0_CLK_AXI_SLV 318 -#define JH7110_PCIE0_CLK_OSC 319 -#define JH7110_PCIE1_CLK_AXI_SLV0 320 -#define JH7110_PCIE1_CLK_AXI_SLV 321 -#define JH7110_PCIE1_CLK_OSC 322 -#define JH7110_E2_IRQ_SYNC_CLK_CORE 323 -#define JH7110_STG_CRG_PCLK 324 -#define JH7110_STG_SYSCON_PCLK 325 +#define JH7110_PCIE0_CLK_AXI_SLV0 318 +#define JH7110_PCIE0_CLK_AXI_SLV 319 +#define JH7110_PCIE0_CLK_OSC 320 +#define JH7110_PCIE1_CLK_AXI_SLV0 321 +#define JH7110_PCIE1_CLK_AXI_SLV 322 +#define JH7110_PCIE1_CLK_OSC 323 +#define JH7110_E2_IRQ_SYNC_CLK_CORE 324 +#define JH7110_STG_CRG_PCLK 325 +#define JH7110_STG_SYSCON_PCLK 326 -#define JH7110_CLK_STG_END 326 +#define JH7110_CLK_STG_END 327 /* aon other */ -#define JH7110_U0_GMAC5_CLK_PTP 326 -#define JH7110_U0_GMAC5_CLK_RMII 327 -#define JH7110_AON_SYSCON_PCLK 328 -#define JH7110_AON_IOMUX_PCLK 329 -#define JH7110_AON_CRG_PCLK 330 -#define JH7110_PMU_CLK_APB 331 -#define JH7110_PMU_CLK_WKUP 332 -#define JH7110_RTC_HMS_CLK_OSC32K_G 333 -#define JH7110_32K_OUT 334 -#define JH7110_RESET0_CTRL_CLK_SRC 335 +#define JH7110_U0_GMAC5_CLK_PTP 327 +#define JH7110_U0_GMAC5_CLK_RMII 328 +#define JH7110_AON_SYSCON_PCLK 329 +#define JH7110_AON_IOMUX_PCLK 330 +#define JH7110_AON_CRG_PCLK 331 +#define JH7110_PMU_CLK_APB 332 +#define JH7110_PMU_CLK_WKUP 333 +#define JH7110_RTC_HMS_CLK_OSC32K_G 334 +#define JH7110_32K_OUT 335 +#define JH7110_RESET0_CTRL_CLK_SRC 336 /* aon other and source */ -#define JH7110_PCLK_MUX_FUNC_PCLK 336 -#define JH7110_PCLK_MUX_BIST_PCLK 337 +#define JH7110_PCLK_MUX_FUNC_PCLK 337 +#define JH7110_PCLK_MUX_BIST_PCLK 338 -#define JH7110_CLK_END 338 +#define JH7110_CLK_END 339 /* sys external clocks */ #define JH7110_OSC (JH7110_CLK_END + 0) |