Add USB clocks to Exynos7885
Subsystems (3)
v3 cover Add USB clocks to Exynos7885
This set of patches adds the clocks necessary for USB on the Exynos7885 SoC.
Earlier versions of the set also contained some fixes for issues with the existing driver/bindings, which have been applied now.
Changes in v2:
- Split from full patchset.
- Added Cc-stable tags and fixes tag to update CLKS_NR_FSYS patch
- Blank line fixes
Changes in v3:
- Remove already applied patches
- Simplify PLL support patch
David Virag (2):
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 | 71 ++++++++++++++++++++++------ drivers/clk/samsung/clk-pll.c | 18 +++++-- drivers/clk/samsung/clk-pll.h | 1 + 3 files changed, 73 insertions(+), 17 deletions(-)
Signature · 1 line
2.46.0
PATCH v3 1/2 clk: samsung: clk-pll: Add support for pll_1418x
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.
---
Changes in v2:
- None
Changes in v3:
- Simplify set_rate part
drivers/clk/samsung/clk-pll.c | 18 +++++++++++++++--- drivers/clk/samsung/clk-pll.h | 1 + 2 files changed, 16 insertions(+), 3 deletions(-)
drivers/clk/samsung/clk-pll.c +15 -3
@@ -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 ;
@@ -456,7 +462,12 @@ static int samsung_pll0822x_set_rate(struct clk_hw *hw, unsigned long drate, {const struct samsung_pll_rate_table *rate;struct samsung_clk_pll *pll =to_clk_pll (hw); -u32 pll_con3; +u32 mdiv_mask, pll_con3; + +if (pll->type != pll_1418x) + mdiv_mask =PLL0822X_MDIV_MASK ; +else + mdiv_mask =PLL1418X_MDIV_MASK ;/* Get required rate settings from table */ rate =samsung_get_pll_settings (pll, drate);
@@ -468,7 +479,7 @@ 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 ) | + pll_con3 &= ~((mdiv_mask <<PLL0822X_MDIV_SHIFT ) | (PLL0822X_PDIV_MASK <<PLL0822X_PDIV_SHIFT ) | (PLL0822X_SDIV_MASK <<PLL0822X_SDIV_SHIFT )); pll_con3 |= (rate->mdiv << PLL0822X_MDIV_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
PATCH v3 2/2 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.
---
Changes in v2:
- Remove unnecessary blank lines
Changes in v3:
- None
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
Krzysztof Kozlowski
AppliedQuoted 6 lines · David Virag
This set of patches adds the clocks necessary for USB on the Exynos7885 SoC.
Earlier versions of the set also contained some fixes for issues with the existing driver/bindings, which have been applied now.
Quoted 6 lines
Changes in v2:
- Split from full patchset.
- Added Cc-stable tags and fixes tag to updateCLKS_NR_FSYSpatch
- Blank line fixes[...]
Applied, thanks!
[1/2] clk: samsung: clk-pll: Add support for pll_1418x
https://git.kernel.org/krzk/linux/c/4e39e5b84361924006f4d7cf81e049a2793079a6 [2/2] clk: samsung: exynos7885: Add USB related clocks to CMU_FSYS https://git.kernel.org/krzk/linux/c/011a9de99793c3a2ee612ff3e0ce293dcbea6df0
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>