Add USB clocks to Exynos7885
Subsystems (5)
v2 cover Add USB clocks to Exynos7885
This set of patches adds the clocks necessary for USB on the Exynos7885 SoC.
While at it, also fix some issues with the existing driver/bindings.
This set was split from a previous set containing clk, phy, and usb patches [1].
Changes in v2:
- Split from full patchset.
- Added Cc-stable tags and fixes tag to update CLKS_NR_FSYS patch
- Blank line fixes
[1] https://lore.kernel.org/linux-samsung-soc/[email protected]/
David Virag (7):
dt-bindings: clock: exynos7885: Fix duplicated binding
dt-bindings: clock: exynos7885: Add CMU_TOP PLL MUX indices
dt-bindings: clock: exynos7885: Add indices for USB clocks
clk: samsung: exynos7885: Update CLKS_NR_FSYS after bindings fix
clk: samsung: exynos7885: Add missing MUX clocks from PLLs in CMU_TOP
clk: samsung: clk-pll: Add support for pll_1418x
clk: samsung: exynos7885: Add USB related clocks to CMU_FSYS
drivers/clk/samsung/clk-exynos7885.c | 93 ++++++++++++++++++++------ drivers/clk/samsung/clk-pll.c | 20 ++++-- drivers/clk/samsung/clk-pll.h | 1 + include/dt-bindings/clock/exynos7885.h | 32 ++++++--- 4 files changed, 111 insertions(+), 35 deletions(-)
Signature · 1 line
2.46.0
PATCH v2 1/7 dt-bindings: clock: exynos7885: Fix duplicated binding
The numbering in Exynos7885's FSYS CMU bindings has 4 duplicated by accident, with the rest of the bindings continuing with 5.
Fix this by moving CLK_MOUT_FSYS_USB30DRD_USER to the end as 11.
Since CLK_MOUT_FSYS_USB30DRD_USER is not used in any device tree as of now, and there are no other clocks affected (maybe apart from CLK_MOUT_FSYS_MMC_SDIO_USER which the number was shared with, also not used in a device tree), this is the least impactful way to solve this problem.
--- include/dt-bindings/clock/exynos7885.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/dt-bindings/clock/exynos7885.h +1 -1
@@ -136,12 +136,12 @@#define CLK_MOUT_FSYS_MMC_CARD_USER 2#define CLK_MOUT_FSYS_MMC_EMBD_USER 3#define CLK_MOUT_FSYS_MMC_SDIO_USER 4 -#define CLK_MOUT_FSYS_USB30DRD_USER 4#define CLK_GOUT_MMC_CARD_ACLK 5#define CLK_GOUT_MMC_CARD_SDCLKIN 6#define CLK_GOUT_MMC_EMBD_ACLK 7#define CLK_GOUT_MMC_EMBD_SDCLKIN 8#define CLK_GOUT_MMC_SDIO_ACLK 9#define CLK_GOUT_MMC_SDIO_SDCLKIN 10 +#define CLK_MOUT_FSYS_USB30DRD_USER 11#endif /* _DT_BINDINGS_CLOCK_EXYNOS_7885_H */
Signature · 1 line
2.46.0
Krzysztof Kozlowski
AppliedRe: (subset) [PATCH v2 1/7] dt-bindings: clock: exynos7885: Fix duplicated binding
Quoted 5 lines · David Virag
The numbering in Exynos7885's FSYS CMU bindings has 4 duplicated by accident, with the rest of the bindings continuing with 5.
Fix this by moving
CLK_MOUT_FSYS_USB30DRD_USERto the end as 11.
Quoted 7 lines
Since
CLK_MOUT_FSYS_USB30DRD_USERis not used in any device tree as of now, and there are no other clocks affected (maybe apart fromCLK_MOUT_FSYS_MMC_SDIO_USERwhich the number was shared with, also not used in a device tree), this is the least impactful way to solve this problem.[...]
Applied, thanks!
[1/7] dt-bindings: clock: exynos7885: Fix duplicated binding
https://git.kernel.org/krzk/linux/c/abf3a3ea9acb5c886c8729191a670744ecd42024
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>
PATCH v2 2/7 dt-bindings: clock: exynos7885: Add CMU_TOP PLL MUX indices
In reply to David ViragAdd indices for missing MUX clocks from PLLs in CMU_TOP.
--- include/dt-bindings/clock/exynos7885.h | 2 ++ 1 file changed, 2 insertions(+)
include/dt-bindings/clock/exynos7885.h +2 -0
@@ -69,6 +69,8 @@#define CLK_GOUT_FSYS_MMC_EMBD 58#define CLK_GOUT_FSYS_MMC_SDIO 59#define CLK_GOUT_FSYS_USB30DRD 60 +#define CLK_MOUT_SHARED0_PLL 61 +#define CLK_MOUT_SHARED1_PLL 62/* CMU_CORE */ #define CLK_MOUT_CORE_BUS_USER 1
Signature · 1 line
2.46.0
Krzysztof Kozlowski
AppliedRe: (subset) [PATCH v2 2/7] dt-bindings: clock: exynos7885: Add CMU_TOP PLL MUX indices
Quoted 3 lines · David Virag
Add indices for missing MUX clocks from PLLs in
CMU_TOP.
Applied, thanks!
[2/7] dt-bindings: clock: exynos7885: Add CMU_TOP PLL MUX indices
https://git.kernel.org/krzk/linux/c/59baa83e30f82b74b4c7dc07c20eac9899b6c0c6
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>
PATCH v2 3/7 dt-bindings: clock: exynos7885: Add indices for USB clocks
In reply to David ViragExynos7885 SoC has a DWC3 USB Controller with Exynos USB PHY which in theory supports USB3 SuperSpeed, but is only used as USB2 in all known devices.
These, of course, need some clocks.
Add indices for these clocks.
--- include/dt-bindings/clock/exynos7885.h | 30 ++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-)
include/dt-bindings/clock/exynos7885.h +19 -11
@@ -134,16 +134,24 @@#define CLK_GOUT_WDT1_PCLK 43/* CMU_FSYS */ -#define CLK_MOUT_FSYS_BUS_USER 1 -#define CLK_MOUT_FSYS_MMC_CARD_USER 2 -#define CLK_MOUT_FSYS_MMC_EMBD_USER 3 -#define CLK_MOUT_FSYS_MMC_SDIO_USER 4 -#define CLK_GOUT_MMC_CARD_ACLK 5 -#define CLK_GOUT_MMC_CARD_SDCLKIN 6 -#define CLK_GOUT_MMC_EMBD_ACLK 7 -#define CLK_GOUT_MMC_EMBD_SDCLKIN 8 -#define CLK_GOUT_MMC_SDIO_ACLK 9 -#define CLK_GOUT_MMC_SDIO_SDCLKIN 10 -#define CLK_MOUT_FSYS_USB30DRD_USER 11 +#define CLK_MOUT_FSYS_BUS_USER 1 +#define CLK_MOUT_FSYS_MMC_CARD_USER 2 +#define CLK_MOUT_FSYS_MMC_EMBD_USER 3 +#define CLK_MOUT_FSYS_MMC_SDIO_USER 4 +#define CLK_GOUT_MMC_CARD_ACLK 5 +#define CLK_GOUT_MMC_CARD_SDCLKIN 6 +#define CLK_GOUT_MMC_EMBD_ACLK 7 +#define CLK_GOUT_MMC_EMBD_SDCLKIN 8 +#define CLK_GOUT_MMC_SDIO_ACLK 9 +#define CLK_GOUT_MMC_SDIO_SDCLKIN 10 +#define CLK_MOUT_FSYS_USB30DRD_USER 11 +#define CLK_MOUT_USB_PLL 12 +#define CLK_FOUT_USB_PLL 13 +#define CLK_FSYS_USB20PHY_CLKCORE 14 +#define CLK_FSYS_USB30DRD_ACLK_20PHYCTRL 15 +#define CLK_FSYS_USB30DRD_ACLK_30PHYCTRL_0 16 +#define CLK_FSYS_USB30DRD_ACLK_30PHYCTRL_1 17 +#define CLK_FSYS_USB30DRD_BUS_CLK_EARLY 18 +#define CLK_FSYS_USB30DRD_REF_CLK 19#endif /* _DT_BINDINGS_CLOCK_EXYNOS_7885_H */
Signature · 1 line
2.46.0
Krzysztof Kozlowski
AppliedRe: (subset) [PATCH v2 3/7] dt-bindings: clock: exynos7885: Add indices for USB clocks
Quoted 8 lines · David Virag
Exynos7885 SoC has a DWC3 USB Controller with Exynos USB PHY which in theory supports USB3 SuperSpeed, but is only used as USB2 in all known devices.
These, of course, need some clocks.
Add indices for these clocks.[...]
Applied, thanks!
[3/7] dt-bindings: clock: exynos7885: Add indices for USB clocks
https://git.kernel.org/krzk/linux/c/b9dee49cc6f9efa97eee059d03b704dec0f45658
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>
PATCH v2 4/7 clk: samsung: exynos7885: Update CLKS_NR_FSYS after bindings fix
In reply to David ViragUpdate CLKS_NR_FSYS to the proper value after a fix in DT bindings. This should always be the last clock in a CMU + 1.
--- drivers/clk/samsung/clk-exynos7885.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/samsung/clk-exynos7885.c +1 -1
@@ -20,7 +20,7 @@#define CLKS_NR_TOP (CLK_GOUT_FSYS_USB30DRD + 1)#define CLKS_NR_CORE (CLK_GOUT_TREX_P_CORE_PCLK_P_CORE + 1)#define CLKS_NR_PERI (CLK_GOUT_WDT1_PCLK + 1) -#define CLKS_NR_FSYS (CLK_GOUT_MMC_SDIO_SDCLKIN + 1) +#define CLKS_NR_FSYS (CLK_MOUT_FSYS_USB30DRD_USER + 1)/* ---- CMU_TOP ------------------------------------------------------------- */
Signature · 1 line
2.46.0
Krzysztof Kozlowski
AppliedRe: (subset) [PATCH v2 4/7] clk: samsung: exynos7885: Update CLKS_NR_FSYS after bindings fix
Quoted 4 lines · David Virag
Update
CLKS_NR_FSYSto the proper value after a fix in DT bindings. This should always be the last clock in a CMU + 1.
Applied, thanks!
[4/7] clk: samsung: exynos7885: Update CLKS_NR_FSYS after bindings fix
https://git.kernel.org/krzk/linux/c/217a5f23c290c349ceaa37a6f2c014ad4c2d5759
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>
PATCH v2 5/7 clk: samsung: exynos7885: Add missing MUX clocks from PLLs in CMU_TOP
In reply to David ViragIn Exynos7885 (and seemingly all modern Exynos SoCs) all PLLs have a MUX attached to them controlled by bit 4 in the PLL's CON0 register.
These MUXes can select between OSCCLK or the PLL's output, essentially making the PLL bypassable.
These weren't modeled in the driver because the vendor provided drivers didn't model it properly, instead setting them when updating the PMS values.
Not having them modeled didn't cause any problems in this case, since these MUXes were set to the PLL's output by default, but this is not the case everywhere in this SoC.
--- drivers/clk/samsung/clk-exynos7885.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/clk/samsung/clk-exynos7885.c +16 -6
@@ -17,7 +17,7 @@#include "clk-exynos-arm64.h" /* NOTE: Must be equal to the last clock ID increased by one */ -#define CLKS_NR_TOP (CLK_GOUT_FSYS_USB30DRD + 1) +#define CLKS_NR_TOP (CLK_MOUT_SHARED1_PLL + 1)#define CLKS_NR_CORE (CLK_GOUT_TREX_P_CORE_PCLK_P_CORE + 1)#define CLKS_NR_PERI (CLK_GOUT_WDT1_PCLK + 1)#define CLKS_NR_FSYS (CLK_MOUT_FSYS_USB30DRD_USER + 1)
@@ -162,6 +162,10 @@ static const struct samsung_pll_clock top_pll_clks[] __initconst = { NULL), }; +/* List of parent clocks for Muxes in CMU_TOP */ +PNAME (mout_shared0_pll_p) = {"oscclk" ,"fout_shared0_pll" }; +PNAME (mout_shared1_pll_p) = {"oscclk" ,"fout_shared1_pll" }; +/* List of parent clocks for Muxes in CMU_TOP: for CMU_CORE */ PNAME (mout_core_bus_p) = {"dout_shared0_div2" ,"dout_shared1_div2" ,"dout_shared0_div3" ,"dout_shared0_div3" };
@@ -189,6 +193,12 @@ PNAME(mout_fsys_mmc_sdio_p) = { "dout_shared0_div2", "dout_shared1_div2" };PNAME (mout_fsys_usb30drd_p) = {"dout_shared0_div4" ,"dout_shared1_div4" };static const struct samsung_mux_clock top_mux_clks[]__initconst = { +/* TOP */ +MUX (CLK_MOUT_SHARED0_PLL ,"mout_shared0_pll" , mout_shared0_pll_p, +PLL_CON0_PLL_SHARED0 ,4 ,1 ), +MUX (CLK_MOUT_SHARED1_PLL ,"mout_shared1_pll" , mout_shared1_pll_p, +PLL_CON0_PLL_SHARED1 ,4 ,1 ), +/* CORE */ MUX (CLK_MOUT_CORE_BUS ,"mout_core_bus" , mout_core_bus_p,CLK_CON_MUX_MUX_CLKCMU_CORE_BUS ,0 ,2 ),
@@ -232,17 +242,17 @@ static const struct samsung_mux_clock top_mux_clks[] __initconst = {static const struct samsung_div_clock top_div_clks[]__initconst = {/* TOP */ -DIV (CLK_DOUT_SHARED0_DIV2 ,"dout_shared0_div2" ,"fout_shared0_pll" , +DIV (CLK_DOUT_SHARED0_DIV2 ,"dout_shared0_div2" ,"mout_shared0_pll" ,CLK_CON_DIV_PLL_SHARED0_DIV2 ,0 ,1 ), -DIV (CLK_DOUT_SHARED0_DIV3 ,"dout_shared0_div3" ,"fout_shared0_pll" , +DIV (CLK_DOUT_SHARED0_DIV3 ,"dout_shared0_div3" ,"mout_shared0_pll" ,CLK_CON_DIV_PLL_SHARED0_DIV3 ,0 ,2 ),DIV (CLK_DOUT_SHARED0_DIV4 ,"dout_shared0_div4" ,"dout_shared0_div2" ,CLK_CON_DIV_PLL_SHARED0_DIV4 ,0 ,1 ), -DIV (CLK_DOUT_SHARED0_DIV5 ,"dout_shared0_div5" ,"fout_shared0_pll" , +DIV (CLK_DOUT_SHARED0_DIV5 ,"dout_shared0_div5" ,"mout_shared0_pll" ,CLK_CON_DIV_PLL_SHARED0_DIV5 ,0 ,3 ), -DIV (CLK_DOUT_SHARED1_DIV2 ,"dout_shared1_div2" ,"fout_shared1_pll" , +DIV (CLK_DOUT_SHARED1_DIV2 ,"dout_shared1_div2" ,"mout_shared1_pll" ,CLK_CON_DIV_PLL_SHARED1_DIV2 ,0 ,1 ), -DIV (CLK_DOUT_SHARED1_DIV3 ,"dout_shared1_div3" ,"fout_shared1_pll" , +DIV (CLK_DOUT_SHARED1_DIV3 ,"dout_shared1_div3" ,"mout_shared1_pll" ,CLK_CON_DIV_PLL_SHARED1_DIV3 ,0 ,2 ),DIV (CLK_DOUT_SHARED1_DIV4 ,"dout_shared1_div4" ,"dout_shared1_div2" ,CLK_CON_DIV_PLL_SHARED1_DIV4 ,0 ,1 ),
Signature · 1 line
2.46.0
Krzysztof Kozlowski
AppliedRe: (subset) [PATCH v2 5/7] clk: samsung: exynos7885: Add missing MUX clocks from PLLs in CMU_TOP
Quoted 11 lines · David Virag
In Exynos7885 (and seemingly all modern Exynos SoCs) all PLLs have a MUX attached to them controlled by bit 4 in the PLL's CON0 register.
These MUXes can select between OSCCLK or the PLL's output, essentially making the PLL bypassable.
These weren't modeled in the driver because the vendor provided drivers didn't model it properly, instead setting them when updating the PMS values.
[...]
Applied, thanks!
[5/7] clk: samsung: exynos7885: Add missing MUX clocks from PLLs in CMU_TOP
https://git.kernel.org/krzk/linux/c/cc9e3e375f4f2e244695040aa416d16ef6d26ddd
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>
PATCH v2 6/7 clk: samsung: clk-pll: Add support for pll_1418x
In reply to David Viragpll1418x is used in Exynos7885 SoC for USB PHY clock. Operation-wise it is very similar to pll0822x, except that MDIV is only 9 bits wide instead of 10, and we use the CON1 register in the PLL macro's "con" parameter instead of CON3 like this:
PLL(pll_1418x, CLK_FOUT_USB_PLL, "fout_usb_pll", "oscclk", PLL_LOCKTIME_PLL_USB, PLL_CON0_PLL_USB, pll_usb_rate_table),
Technically the PLL should work fine with pll0822x code if the PLL tables are correct, but it's more "correct" to actually update the mask.
--- drivers/clk/samsung/clk-pll.c | 20 ++++++++++++++++---- drivers/clk/samsung/clk-pll.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-)
drivers/clk/samsung/clk-pll.c +16 -4
@@ -430,6 +430,9 @@ static const struct clk_ops samsung_pll36xx_clk_min_ops = {#define PLL0822X_LOCK_STAT_SHIFT (29)#define PLL0822X_ENABLE_SHIFT (31) +/* PLL1418x is similar to PLL0822x, except that MDIV is one bit smaller */ +#define PLL1418X_MDIV_MASK (0x1FF) +static unsigned long samsung_pll0822x_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {
@@ -438,7 +441,10 @@ static unsigned long samsung_pll0822x_recalc_rate(struct clk_hw *hw,u64 fvco = parent_rate; pll_con3 =readl_relaxed (pll->con_reg); - mdiv = (pll_con3 >>PLL0822X_MDIV_SHIFT ) &PLL0822X_MDIV_MASK ; +if (pll->type != pll_1418x) + mdiv = (pll_con3 >>PLL0822X_MDIV_SHIFT ) &PLL0822X_MDIV_MASK ; +else + mdiv = (pll_con3 >>PLL0822X_MDIV_SHIFT ) &PLL1418X_MDIV_MASK ; pdiv = (pll_con3 >>PLL0822X_PDIV_SHIFT ) &PLL0822X_PDIV_MASK ; sdiv = (pll_con3 >>PLL0822X_SDIV_SHIFT ) &PLL0822X_SDIV_MASK ;
@@ -468,9 +474,14 @@ static int samsung_pll0822x_set_rate(struct clk_hw *hw, unsigned long drate,/* Change PLL PMS values */ pll_con3 =readl_relaxed (pll->con_reg); - pll_con3 &= ~((PLL0822X_MDIV_MASK <<PLL0822X_MDIV_SHIFT ) | - (PLL0822X_PDIV_MASK <<PLL0822X_PDIV_SHIFT ) | - (PLL0822X_SDIV_MASK <<PLL0822X_SDIV_SHIFT )); +if (pll->type != pll_1418x) + pll_con3 &= ~((PLL0822X_MDIV_MASK <<PLL0822X_MDIV_SHIFT ) | + (PLL0822X_PDIV_MASK <<PLL0822X_PDIV_SHIFT ) | + (PLL0822X_SDIV_MASK <<PLL0822X_SDIV_SHIFT )); +else + pll_con3 &= ~((PLL1418X_MDIV_MASK <<PLL0822X_MDIV_SHIFT ) | + (PLL0822X_PDIV_MASK <<PLL0822X_PDIV_SHIFT ) | + (PLL0822X_SDIV_MASK <<PLL0822X_SDIV_SHIFT )); pll_con3 |= (rate->mdiv <<PLL0822X_MDIV_SHIFT ) | (rate->pdiv <<PLL0822X_PDIV_SHIFT ) | (rate->sdiv <<PLL0822X_SDIV_SHIFT );
@@ -1317,6 +1328,7 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx, init.ops = &samsung_pll35xx_clk_ops;break ;case pll_1417x: +case pll_1418x:case pll_0818x:case pll_0822x:case pll_0516x:
drivers/clk/samsung/clk-pll.h +1 -0
@@ -30,6 +30,7 @@ enum samsung_pll_type { pll_2650x, pll_2650xx, pll_1417x, + pll_1418x, pll_1450x, pll_1451x, pll_1452x,
Signature · 1 line
2.46.0
Krzysztof Kozlowski
maintainerRe: [PATCH v2 6/7] clk: samsung: clk-pll: Add support for pll_1418x
Quoted 45 lines · David Virag
pll1418x is used in Exynos7885 SoC for USB PHY clock. Operation-wise it is very similar to pll0822x, except that MDIV is only 9 bits wide instead of 10, and we use the CON1 register in the PLL macro's "con" parameter instead of CON3 like this:
PLL(pll_1418x, CLK_FOUT_USB_PLL, "fout_usb_pll", "oscclk", PLL_LOCKTIME_PLL_USB, PLL_CON0_PLL_USB, pll_usb_rate_table),Technically the PLL should work fine with pll0822x code if the PLL tables are correct, but it's more "correct" to actually update the mask.
Signed-off-by David Virag <[email protected]>--- drivers/clk/samsung/clk-pll.c | 20 ++++++++++++++++---- drivers/clk/samsung/clk-pll.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-)drivers/clk/samsung/clk-pll.c +7
-1@@ -430,6 +430,9 @@ static const struct clk_ops samsung_pll36xx_clk_min_ops = {#define PLL0822X_LOCK_STAT_SHIFT (29)#define PLL0822X_ENABLE_SHIFT (31) +/* PLL1418x is similar to PLL0822x, except that MDIV is one bit smaller */ +#define PLL1418X_MDIV_MASK (0x1FF) +static unsigned long samsung_pll0822x_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {@@ -438,7 +441,10 @@ static unsigned long samsung_pll0822x_recalc_rate(struct clk_hw *hw,u64 fvco = parent_rate; pll_con3 =readl_relaxed (pll->con_reg); - mdiv = (pll_con3 >>PLL0822X_MDIV_SHIFT ) &PLL0822X_MDIV_MASK ; +if (pll->type != pll_1418x) + mdiv = (pll_con3 >>PLL0822X_MDIV_SHIFT ) &PLL0822X_MDIV_MASK ; +else + mdiv = (pll_con3 >>PLL0822X_MDIV_SHIFT ) &PLL1418X_MDIV_MASK ; pdiv = (pll_con3 >>PLL0822X_PDIV_SHIFT ) &PLL0822X_PDIV_MASK ; sdiv = (pll_con3 >>PLL0822X_SDIV_SHIFT ) &PLL0822X_SDIV_MASK ;
drivers/clk/samsung/clk-pll.c static int samsung_pll0822x_set_rate(struct clk_hw *hw, unsigned long drate, · line 480
Quoted 10 lines
drivers/clk/samsung/clk-pll.c +4
-3@@ -468,9 +474,14 @@ static int samsung_pll0822x_set_rate(struct clk_hw *hw, unsigned long drate,/* Change PLL PMS values */ pll_con3 =readl_relaxed (pll->con_reg); - pll_con3 &= ~((PLL0822X_MDIV_MASK <<PLL0822X_MDIV_SHIFT ) | - (PLL0822X_PDIV_MASK <<PLL0822X_PDIV_SHIFT ) | - (PLL0822X_SDIV_MASK <<PLL0822X_SDIV_SHIFT )); +if (pll->type != pll_1418x) + pll_con3 &= ~((PLL0822X_MDIV_MASK <<PLL0822X_MDIV_SHIFT ) | + (PLL0822X_PDIV_MASK <<PLL0822X_PDIV_SHIFT ) | + (PLL0822X_SDIV_MASK <<PLL0822X_SDIV_SHIFT ));
I think this part could be simpler. If I read it correctly, only mdiv mask is different, so create local variable mdiv_mask and set it in if-else block accordingly to the type. Then here you have non-conditional code:pll_con3 &= ~((mdiv_mask << PLL0822X_MDIV_SHIFT) |
Best regards,
Krzysztof
PATCH v2 7/7 clk: samsung: exynos7885: Add USB related clocks to CMU_FSYS
In reply to David ViragExynos7885 SoC has a DWC3 USB Controller with Exynos USB PHY which in theory supports USB3 SuperSpeed, but is only used as USB2 in all known devices.
These clocks are needed for everything related to USB.
While at it, also remove the CLK_SET_RATE_PARENT capability of CLK_MOUT_FSYS_USB30DRD_USER, since it's not actually needed.
--- drivers/clk/samsung/clk-exynos7885.c | 71 ++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 14 deletions(-)
drivers/clk/samsung/clk-exynos7885.c +57 -14
@@ -20,7 +20,7 @@#define CLKS_NR_TOP (CLK_MOUT_SHARED1_PLL + 1)#define CLKS_NR_CORE (CLK_GOUT_TREX_P_CORE_PCLK_P_CORE + 1)#define CLKS_NR_PERI (CLK_GOUT_WDT1_PCLK + 1) -#define CLKS_NR_FSYS (CLK_MOUT_FSYS_USB30DRD_USER + 1) +#define CLKS_NR_FSYS (CLK_FSYS_USB30DRD_REF_CLK + 1)/* ---- CMU_TOP ------------------------------------------------------------- */
@@ -686,30 +686,56 @@ static const struct samsung_cmu_info core_cmu_info __initconst = {/* ---- CMU_FSYS ------------------------------------------------------------ */ /* Register Offset definitions for CMU_FSYS (0x13400000) */ -#define PLL_CON0_MUX_CLKCMU_FSYS_BUS_USER 0x0100 -#define PLL_CON0_MUX_CLKCMU_FSYS_MMC_CARD_USER 0x0120 -#define PLL_CON0_MUX_CLKCMU_FSYS_MMC_EMBD_USER 0x0140 -#define PLL_CON0_MUX_CLKCMU_FSYS_MMC_SDIO_USER 0x0160 -#define PLL_CON0_MUX_CLKCMU_FSYS_USB30DRD_USER 0x0180 -#define CLK_CON_GAT_GOUT_FSYS_MMC_CARD_I_ACLK 0x2030 -#define CLK_CON_GAT_GOUT_FSYS_MMC_CARD_SDCLKIN 0x2034 -#define CLK_CON_GAT_GOUT_FSYS_MMC_EMBD_I_ACLK 0x2038 -#define CLK_CON_GAT_GOUT_FSYS_MMC_EMBD_SDCLKIN 0x203c -#define CLK_CON_GAT_GOUT_FSYS_MMC_SDIO_I_ACLK 0x2040 -#define CLK_CON_GAT_GOUT_FSYS_MMC_SDIO_SDCLKIN 0x2044 +#define PLL_LOCKTIME_PLL_USB 0x0000 +#define PLL_CON0_MUX_CLKCMU_FSYS_BUS_USER 0x0100 +#define PLL_CON0_MUX_CLKCMU_FSYS_MMC_CARD_USER 0x0120 +#define PLL_CON0_MUX_CLKCMU_FSYS_MMC_EMBD_USER 0x0140 +#define PLL_CON0_MUX_CLKCMU_FSYS_MMC_SDIO_USER 0x0160 +#define PLL_CON0_MUX_CLKCMU_FSYS_USB30DRD_USER 0x0180 +#define PLL_CON0_PLL_USB 0x01a0 +#define CLK_CON_GAT_CLK_FSYS_USB20PHY_CLKCORE 0x200c +#define CLK_CON_GAT_GOUT_FSYS_MMC_CARD_I_ACLK 0x2030 +#define CLK_CON_GAT_GOUT_FSYS_MMC_CARD_SDCLKIN 0x2034 +#define CLK_CON_GAT_GOUT_FSYS_MMC_EMBD_I_ACLK 0x2038 +#define CLK_CON_GAT_GOUT_FSYS_MMC_EMBD_SDCLKIN 0x203c +#define CLK_CON_GAT_GOUT_FSYS_MMC_SDIO_I_ACLK 0x2040 +#define CLK_CON_GAT_GOUT_FSYS_MMC_SDIO_SDCLKIN 0x2044 +#define CLK_CON_GAT_GOUT_FSYS_USB30DRD_ACLK_20PHYCTRL 0x2068 +#define CLK_CON_GAT_GOUT_FSYS_USB30DRD_ACLK_30PHYCTRL_0 0x206c +#define CLK_CON_GAT_GOUT_FSYS_USB30DRD_ACLK_30PHYCTRL_1 0x2070 +#define CLK_CON_GAT_GOUT_FSYS_USB30DRD_BUS_CLK_EARLY 0x2074 +#define CLK_CON_GAT_GOUT_FSYS_USB30DRD_REF_CLK 0x2078static const unsigned long fsys_clk_regs[]__initconst = { +PLL_LOCKTIME_PLL_USB ,PLL_CON0_MUX_CLKCMU_FSYS_BUS_USER ,PLL_CON0_MUX_CLKCMU_FSYS_MMC_CARD_USER ,PLL_CON0_MUX_CLKCMU_FSYS_MMC_EMBD_USER ,PLL_CON0_MUX_CLKCMU_FSYS_MMC_SDIO_USER ,PLL_CON0_MUX_CLKCMU_FSYS_USB30DRD_USER , +PLL_CON0_PLL_USB , +CLK_CON_GAT_CLK_FSYS_USB20PHY_CLKCORE ,CLK_CON_GAT_GOUT_FSYS_MMC_CARD_I_ACLK ,CLK_CON_GAT_GOUT_FSYS_MMC_CARD_SDCLKIN ,CLK_CON_GAT_GOUT_FSYS_MMC_EMBD_I_ACLK ,CLK_CON_GAT_GOUT_FSYS_MMC_EMBD_SDCLKIN ,CLK_CON_GAT_GOUT_FSYS_MMC_SDIO_I_ACLK ,CLK_CON_GAT_GOUT_FSYS_MMC_SDIO_SDCLKIN , +CLK_CON_GAT_GOUT_FSYS_USB30DRD_ACLK_20PHYCTRL , +CLK_CON_GAT_GOUT_FSYS_USB30DRD_ACLK_30PHYCTRL_0 , +CLK_CON_GAT_GOUT_FSYS_USB30DRD_ACLK_30PHYCTRL_1 , +CLK_CON_GAT_GOUT_FSYS_USB30DRD_BUS_CLK_EARLY , +CLK_CON_GAT_GOUT_FSYS_USB30DRD_REF_CLK , +}; + +static const struct samsung_pll_rate_table pll_usb_rate_table[]__initconst = { +PLL_35XX_RATE (26 *MHZ ,50000000U ,400 ,13 ,4 ), +}; + +static const struct samsung_pll_clock fsys_pll_clks[]__initconst = { +PLL (pll_1418x,CLK_FOUT_USB_PLL ,"fout_usb_pll" ,"oscclk" , +PLL_LOCKTIME_PLL_USB ,PLL_CON0_PLL_USB , + pll_usb_rate_table), };/* List of parent clocks for Muxes in CMU_FSYS */
@@ -718,6 +744,7 @@ PNAME(mout_fsys_mmc_card_user_p) = { "oscclk", "dout_fsys_mmc_card" };PNAME (mout_fsys_mmc_embd_user_p) = {"oscclk" ,"dout_fsys_mmc_embd" };PNAME (mout_fsys_mmc_sdio_user_p) = {"oscclk" ,"dout_fsys_mmc_sdio" };PNAME (mout_fsys_usb30drd_user_p) = {"oscclk" ,"dout_fsys_usb30drd" }; +PNAME (mout_usb_pll_p) = {"oscclk" ,"fout_usb_pll" };static const struct samsung_mux_clock fsys_mux_clks[]__initconst = { MUX(CLK_MOUT_FSYS_BUS_USER, "mout_fsys_bus_user", mout_fsys_bus_user_p,
@@ -731,12 +758,16 @@ static const struct samsung_mux_clock fsys_mux_clks[] __initconst = { MUX_F(CLK_MOUT_FSYS_MMC_SDIO_USER, "mout_fsys_mmc_sdio_user", mout_fsys_mmc_sdio_user_p, PLL_CON0_MUX_CLKCMU_FSYS_MMC_SDIO_USER, 4, 1, CLK_SET_RATE_PARENT, 0), -MUX_F (CLK_MOUT_FSYS_USB30DRD_USER ,"mout_fsys_usb30drd_user" , + MUX(CLK_MOUT_FSYS_USB30DRD_USER, "mout_fsys_usb30drd_user", mout_fsys_usb30drd_user_p, PLL_CON0_MUX_CLKCMU_FSYS_USB30DRD_USER, - 4, 1, CLK_SET_RATE_PARENT, 0), + 4, 1), +nMUX_F (CLK_MOUT_USB_PLL ,"mout_usb_pll" , mout_usb_pll_p, + PLL_CON0_PLL_USB, 4, 1, CLK_SET_RATE_PARENT, 0), };static const struct samsung_gate_clock fsys_gate_clks[]__initconst = { +GATE (CLK_FSYS_USB20PHY_CLKCORE ,"clk_fsys_usb20phy_clkcore" ,"mout_usb_pll" , +CLK_CON_GAT_CLK_FSYS_USB20PHY_CLKCORE ,21 ,CLK_SET_RATE_PARENT ,0 ),GATE (CLK_GOUT_MMC_CARD_ACLK ,"gout_mmc_card_aclk" ,"mout_fsys_bus_user" ,CLK_CON_GAT_GOUT_FSYS_MMC_CARD_I_ACLK ,21 ,0 ,0 ), GATE(CLK_GOUT_MMC_CARD_SDCLKIN, "gout_mmc_card_sdclkin",
@@ -752,9 +783,21 @@ static const struct samsung_gate_clock fsys_gate_clks[] __initconst = {GATE (CLK_GOUT_MMC_SDIO_SDCLKIN ,"gout_mmc_sdio_sdclkin" ,"mout_fsys_mmc_sdio_user" ,CLK_CON_GAT_GOUT_FSYS_MMC_SDIO_SDCLKIN ,21 ,CLK_SET_RATE_PARENT ,0 ), +GATE (CLK_FSYS_USB30DRD_ACLK_20PHYCTRL ,"clk_fsys_usb30drd_aclk_20phyctrl" , +"mout_fsys_bus_user" ,CLK_CON_GAT_GOUT_FSYS_USB30DRD_ACLK_20PHYCTRL ,21 ,0 ,0 ), +GATE (CLK_FSYS_USB30DRD_ACLK_30PHYCTRL_0 ,"clk_fsys_usb30drd_aclk_30phyctrl_0" , +"mout_fsys_bus_user" ,CLK_CON_GAT_GOUT_FSYS_USB30DRD_ACLK_30PHYCTRL_0 ,21 ,0 ,0 ), +GATE (CLK_FSYS_USB30DRD_ACLK_30PHYCTRL_1 ,"clk_fsys_usb30drd_aclk_30phyctrl_1" , +"mout_fsys_bus_user" ,CLK_CON_GAT_GOUT_FSYS_USB30DRD_ACLK_30PHYCTRL_1 ,21 ,0 ,0 ), +GATE (CLK_FSYS_USB30DRD_BUS_CLK_EARLY ,"clk_fsys_usb30drd_bus_clk_early" , +"mout_fsys_bus_user" ,CLK_CON_GAT_GOUT_FSYS_USB30DRD_BUS_CLK_EARLY ,21 ,0 ,0 ), +GATE (CLK_FSYS_USB30DRD_REF_CLK ,"clk_fsys_usb30drd_ref_clk" ,"mout_fsys_usb30drd_user" , + CLK_CON_GAT_GOUT_FSYS_USB30DRD_REF_CLK, 21, 0, 0), };static const struct samsung_cmu_info fsys_cmu_info__initconst = { + .pll_clks = fsys_pll_clks, + .nr_pll_clks =ARRAY_SIZE (fsys_pll_clks), .mux_clks = fsys_mux_clks, .nr_mux_clks =ARRAY_SIZE (fsys_mux_clks), .gate_clks = fsys_gate_clks,
Signature · 1 line
2.46.0