Add a clock driver for the imx8mq
v5 cover Add a clock driver for the imx8mq
This is a DM clock driver for the imx8mq based on the linux kernel driver and the u-boot imx8mm clock driver.
It also removes some code duplication in the imx8m[nmp] clock drivers.
Changes since V4
Rebased onto [1] so patch 4 of 4 was dropped.
Added CLK_COMPOSITE_CCF
Fixed const* clock definitions
Changes since v3:
Fixed driver spelling
Moved rate macros out of the header into the dot c
Changes since v2:
Added kernel commit IDs
Re-factored rate table code to remove duplication Remove duplicate code by creating a common clk-imx8m
Changes since v1:
More verbose clock driver description
Added forgotten dt-bindings
Synced PLL frequencies with mainline kernel
[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
Angus Ainslie (3):
dt-bindings: imx8mq-clock: add mainline definitions
clk: imx8mq: Add a clock driver for the imx8mq
clk: imx8m: reduce rate table duplication
drivers/clk/imx/Kconfig | 18 + drivers/clk/imx/Makefile | 2 + drivers/clk/imx/clk-imx8mm.c | 60 +--- drivers/clk/imx/clk-imx8mn.c | 60 +--- drivers/clk/imx/clk-imx8mp.c | 65 +--- drivers/clk/imx/clk-imx8mq.c | 440 +++++++++++++++++++++++ drivers/clk/imx/clk-pll14xx.c | 61 ++++ drivers/clk/imx/clk.h | 4 + include/dt-bindings/clock/imx8mq-clock.h | 16 +- 9 files changed, 560 insertions(+), 166 deletions(-) create mode 100644 drivers/clk/imx/clk-imx8mq.c
Signature · 1 line
2.25.1
PATCH v5 1/3 dt-bindings: imx8mq-clock: add mainline definitions
Sync the clock ids with the mainline kernel
077de6e1c9f ("clk: imx8mq: add PLL monitor output")
--- include/dt-bindings/clock/imx8mq-clock.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
include/dt-bindings/clock/imx8mq-clock.h +15 -1
@@ -431,6 +431,20 @@#define IMX8MQ_CLK_A53_CORE 289 -#define IMX8MQ_CLK_END 290 +#define IMX8MQ_CLK_MON_AUDIO_PLL1_DIV 290 +#define IMX8MQ_CLK_MON_AUDIO_PLL2_DIV 291 +#define IMX8MQ_CLK_MON_VIDEO_PLL1_DIV 292 +#define IMX8MQ_CLK_MON_GPU_PLL_DIV 293 +#define IMX8MQ_CLK_MON_VPU_PLL_DIV 294 +#define IMX8MQ_CLK_MON_ARM_PLL_DIV 295 +#define IMX8MQ_CLK_MON_SYS_PLL1_DIV 296 +#define IMX8MQ_CLK_MON_SYS_PLL2_DIV 297 +#define IMX8MQ_CLK_MON_SYS_PLL3_DIV 298 +#define IMX8MQ_CLK_MON_DRAM_PLL_DIV 299 +#define IMX8MQ_CLK_MON_VIDEO_PLL2_DIV 300 +#define IMX8MQ_CLK_MON_SEL 301 +#define IMX8MQ_CLK_MON_CLK2_OUT 302 + +#define IMX8MQ_CLK_END 303#endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */
Signature · 1 line
2.25.1
PATCH v5 2/3 clk: imx8mq: Add a clock driver for the imx8mq
In reply to Angus AinslieThis is a DM clock driver based off the imx8mm u-boot driver and the linux kernel driver.
All of the PLLs and clocks are initialized so the subsystems below are functional and tested.
1) USB host and peripheral
2) ECSPI
3) UART
4) I2C all busses
5) USDHC for eMMC support
6) USB storage
7) GPIO
8) DRAM
--- drivers/clk/imx/Kconfig | 18 ++ drivers/clk/imx/Makefile | 2 + drivers/clk/imx/clk-imx8mq.c | 487 +++++++++++++++++++++++++++++++++++ 3 files changed, 507 insertions(+) create mode 100644 drivers/clk/imx/clk-imx8mq.c
drivers/clk/imx/Kconfig +18 -0
@@ -71,6 +71,24 @@ config CLK_IMX8MP help This enables support clock driver for i.MX8MP platforms. +config SPL_CLK_IMX8MQ + bool "SPL clock support for i.MX8MQ" + depends on ARCH_IMX8M && SPL + select SPL_CLK + select SPL_CLK_CCF + select SPL_CLK_COMPOSITE_CCF + help + This enables SPL DM/DTS support for clock driver in i.MX8MQ + +config CLK_IMX8MQ + bool "Clock support for i.MX8MQ" + depends on ARCH_IMX8M + select CLK + select CLK_CCF + select CLK_COMPOSITE_CCF + help + This enables support clock driver for i.MX8MQ platforms. + config SPL_CLK_IMXRT1020 bool "SPL clock support for i.MXRT1020" depends on ARCH_IMXRT && SPL
drivers/clk/imx/Makefile +2 -0
@@ -16,6 +16,8 @@ obj-$(CONFIG_$(SPL_TPL_)CLK_IMX8MN) += clk-imx8mn.o clk-pll14xx.o \ clk-composite-8m.o obj-$(CONFIG_$(SPL_TPL_)CLK_IMX8MP) += clk-imx8mp.o clk-pll14xx.o \ clk-composite-8m.o +obj-$(CONFIG_$(SPL_TPL_)CLK_IMX8MQ) += clk-imx8mq.o clk-pll14xx.o \ + clk-composite-8m.o obj-$(CONFIG_$(SPL_TPL_)CLK_IMXRT1020) += clk-imxrt1020.o obj-$(CONFIG_$(SPL_TPL_)CLK_IMXRT1050) += clk-imxrt1050.o
drivers/clk/imx/clk-imx8mq.c new file +487 -0
487 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v5 3/3 clk: imx8m: reduce rate table duplication
In reply to Angus AinslieRe-factor the imx8m[nmpq] rate tables into the common pll1416x clock driver.
43cdaa1567ad3 ("clk: imx8mm: Move 1443X/1416X PLL clock structure to common place")
--- drivers/clk/imx/clk-imx8mm.c | 60 +++----------------------------- drivers/clk/imx/clk-imx8mn.c | 60 +++----------------------------- drivers/clk/imx/clk-imx8mp.c | 65 ++++++----------------------------- drivers/clk/imx/clk-imx8mq.c | 59 ++++--------------------------- drivers/clk/imx/clk-pll14xx.c | 61 ++++++++++++++++++++++++++++++++ drivers/clk/imx/clk.h | 4 +++ 6 files changed, 91 insertions(+), 218 deletions(-)
drivers/clk/imx/clk-imx8mm.c +5 -55
@@ -15,56 +15,6 @@#include "clk.h" -#define PLL_1416X_RATE (_rate, _m, _p, _s) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - } - -#define PLL_1443X_RATE (_rate, _m, _p, _s, _k) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - .kdiv = (_k), \ - } - -static const struct imx_pll14xx_rate_table imx8mm_pll1416x_tbl[] = { -PLL_1416X_RATE (1800000000U ,225 ,3 ,0 ), -PLL_1416X_RATE (1600000000U ,200 ,3 ,0 ), -PLL_1416X_RATE (1200000000U ,300 ,3 ,1 ), -PLL_1416X_RATE (1000000000U ,250 ,3 ,1 ), -PLL_1416X_RATE (800000000U ,200 ,3 ,1 ), -PLL_1416X_RATE (750000000U ,250 ,2 ,2 ), -PLL_1416X_RATE (700000000U ,350 ,3 ,2 ), -PLL_1416X_RATE (600000000U ,300 ,3 ,2 ), -}; - -static const struct imx_pll14xx_rate_table imx8mm_drampll_tbl[] = { -PLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ), -}; - -static struct imx_pll14xx_clk imx8mm_dram_pll__initdata = { - .type =PLL_1443X , - .rate_table = imx8mm_drampll_tbl, - .rate_count =ARRAY_SIZE (imx8mm_drampll_tbl), -}; - -static struct imx_pll14xx_clk imx8mm_arm_pll__initdata = { - .type =PLL_1416X , - .rate_table = imx8mm_pll1416x_tbl, - .rate_count =ARRAY_SIZE (imx8mm_pll1416x_tbl), -}; - -static struct imx_pll14xx_clk imx8mm_sys_pll__initdata = { - .type =PLL_1416X , - .rate_table = imx8mm_pll1416x_tbl, - .rate_count =ARRAY_SIZE (imx8mm_pll1416x_tbl), -}; -static const char *pll_ref_sels[] = {"clock-osc-24m" ,"dummy" ,"dummy" ,"dummy" , };static const char *dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *arm_pll_bypass_sels[] = {"arm_pll" ,"arm_pll_ref_sel" , };
@@ -164,19 +114,19 @@ static int imx8mm_clk_probe(struct udevice *dev)clk_dm (IMX8MM_DRAM_PLL ,imx_clk_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , - base +0x50 , &imx8mm_dram_pll)); + base +0x50 , &imx_1443x_dram_pll));clk_dm (IMX8MM_ARM_PLL ,imx_clk_pll14xx ("arm_pll" ,"arm_pll_ref_sel" , - base +0x84 , &imx8mm_arm_pll)); + base +0x84 , &imx_1416x_pll));clk_dm (IMX8MM_SYS_PLL1 ,imx_clk_pll14xx ("sys_pll1" ,"sys_pll1_ref_sel" , - base +0x94 , &imx8mm_sys_pll)); + base +0x94 , &imx_1416x_pll));clk_dm (IMX8MM_SYS_PLL2 ,imx_clk_pll14xx ("sys_pll2" ,"sys_pll2_ref_sel" , - base +0x104 , &imx8mm_sys_pll)); + base +0x104 , &imx_1416x_pll));clk_dm (IMX8MM_SYS_PLL3 ,imx_clk_pll14xx ("sys_pll3" ,"sys_pll3_ref_sel" , - base +0x114 , &imx8mm_sys_pll)); + base +0x114 , &imx_1416x_pll));/* PLL bypass out */ clk_dm(IMX8MM_DRAM_PLL_BYPASS,
drivers/clk/imx/clk-imx8mn.c +5 -55
80 lines not on this page · raw message
drivers/clk/imx/clk-imx8mp.c +10 -55
77 lines not on this page · raw message
drivers/clk/imx/clk-imx8mq.c +6 -53
85 lines not on this page · raw message
drivers/clk/imx/clk-pll14xx.c +61 -0
67 lines not on this page · raw message
drivers/clk/imx/clk.h +4 -0
@@ -41,6 +41,10 @@ struct imx_pll14xx_clk {int flags; }; +extern struct imx_pll14xx_clk imx_1416x_pll; +extern struct imx_pll14xx_clk imx_1443x_pll; +extern struct imx_pll14xx_clk imx_1443x_dram_pll; +struct clk *imx_clk_pll14xx (const char *name,const char *parent_name,void __iomem *base,const struct imx_pll14xx_clk *pll_clk);
Signature · 1 line
2.25.1
Re: [PATCH v5 3/3] clk: imx8m: reduce rate table duplication
Quoted 6 lines · Angus Ainslie
Re-factor the imx8m[nmpq] rate tables into the common pll1416x clock driver.
43cdaa1567ad3("clk: imx8mm: Move 1443X/1416X PLL clock structure to common place")
I did a clk dump before this series and after this series then compared the outputs to look for changes on an imx8mm. None were identified.
Quoted 447 lines
Signed-off-by Angus Ainslie <[email protected]>--- drivers/clk/imx/clk-imx8mm.c | 60 +++----------------------------- drivers/clk/imx/clk-imx8mn.c | 60 +++----------------------------- drivers/clk/imx/clk-imx8mp.c | 65 ++++++----------------------------- drivers/clk/imx/clk-imx8mq.c | 59 ++++--------------------------- drivers/clk/imx/clk-pll14xx.c | 61 ++++++++++++++++++++++++++++++++ drivers/clk/imx/clk.h | 4 +++ 6 files changed, 91 insertions(+), 218 deletions(-)drivers/clk/imx/clk-imx8mm.c +5
-55@@ -15,56 +15,6 @@#include "clk.h" -#define PLL_1416X_RATE (_rate, _m, _p, _s) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - } - -#define PLL_1443X_RATE (_rate, _m, _p, _s, _k) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - .kdiv = (_k), \ - } - -static const struct imx_pll14xx_rate_table imx8mm_pll1416x_tbl[] = { -PLL_1416X_RATE (1800000000U ,225 ,3 ,0 ), -PLL_1416X_RATE (1600000000U ,200 ,3 ,0 ), -PLL_1416X_RATE (1200000000U ,300 ,3 ,1 ), -PLL_1416X_RATE (1000000000U ,250 ,3 ,1 ), -PLL_1416X_RATE (800000000U ,200 ,3 ,1 ), -PLL_1416X_RATE (750000000U ,250 ,2 ,2 ), -PLL_1416X_RATE (700000000U ,350 ,3 ,2 ), -PLL_1416X_RATE (600000000U ,300 ,3 ,2 ), -}; - -static const struct imx_pll14xx_rate_table imx8mm_drampll_tbl[] = { -PLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ), -}; - -static struct imx_pll14xx_clk imx8mm_dram_pll__initdata = { - .type =PLL_1443X , - .rate_table = imx8mm_drampll_tbl, - .rate_count =ARRAY_SIZE (imx8mm_drampll_tbl), -}; - -static struct imx_pll14xx_clk imx8mm_arm_pll__initdata = { - .type =PLL_1416X , - .rate_table = imx8mm_pll1416x_tbl, - .rate_count =ARRAY_SIZE (imx8mm_pll1416x_tbl), -}; - -static struct imx_pll14xx_clk imx8mm_sys_pll__initdata = { - .type =PLL_1416X , - .rate_table = imx8mm_pll1416x_tbl, - .rate_count =ARRAY_SIZE (imx8mm_pll1416x_tbl), -}; -static const char *pll_ref_sels[] = {"clock-osc-24m" ,"dummy" ,"dummy" ,"dummy" , };static const char *dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *arm_pll_bypass_sels[] = {"arm_pll" ,"arm_pll_ref_sel" , };@@ -164,19 +114,19 @@ static int imx8mm_clk_probe(struct udevice *dev)clk_dm (IMX8MM_DRAM_PLL ,imx_clk_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , - base +0x50 , &imx8mm_dram_pll)); + base +0x50 , &imx_1443x_dram_pll));clk_dm (IMX8MM_ARM_PLL ,imx_clk_pll14xx ("arm_pll" ,"arm_pll_ref_sel" , - base +0x84 , &imx8mm_arm_pll)); + base +0x84 , &imx_1416x_pll));clk_dm (IMX8MM_SYS_PLL1 ,imx_clk_pll14xx ("sys_pll1" ,"sys_pll1_ref_sel" , - base +0x94 , &imx8mm_sys_pll)); + base +0x94 , &imx_1416x_pll));clk_dm (IMX8MM_SYS_PLL2 ,imx_clk_pll14xx ("sys_pll2" ,"sys_pll2_ref_sel" , - base +0x104 , &imx8mm_sys_pll)); + base +0x104 , &imx_1416x_pll));clk_dm (IMX8MM_SYS_PLL3 ,imx_clk_pll14xx ("sys_pll3" ,"sys_pll3_ref_sel" , - base +0x114 , &imx8mm_sys_pll)); + base +0x114 , &imx_1416x_pll));/* PLL bypass out */ clk_dm(IMX8MM_DRAM_PLL_BYPASS,drivers/clk/imx/clk-imx8mn.c +5
-55@@ -15,56 +15,6 @@#include "clk.h" -#define PLL_1416X_RATE (_rate, _m, _p, _s) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - } - -#define PLL_1443X_RATE (_rate, _m, _p, _s, _k) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - .kdiv = (_k), \ - } - -static const struct imx_pll14xx_rate_table imx8mn_pll1416x_tbl[] = { -PLL_1416X_RATE (1800000000U ,225 ,3 ,0 ), -PLL_1416X_RATE (1600000000U ,200 ,3 ,0 ), -PLL_1416X_RATE (1200000000U ,300 ,3 ,1 ), -PLL_1416X_RATE (1000000000U ,250 ,3 ,1 ), -PLL_1416X_RATE (800000000U ,200 ,3 ,1 ), -PLL_1416X_RATE (750000000U ,250 ,2 ,2 ), -PLL_1416X_RATE (700000000U ,350 ,3 ,2 ), -PLL_1416X_RATE (600000000U ,300 ,3 ,2 ), -}; - -static const struct imx_pll14xx_rate_table imx8mn_drampll_tbl[] = { -PLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ), -}; - -static struct imx_pll14xx_clk imx8mn_dram_pll__initdata = { - .type =PLL_1443X , - .rate_table = imx8mn_drampll_tbl, - .rate_count =ARRAY_SIZE (imx8mn_drampll_tbl), -}; - -static struct imx_pll14xx_clk imx8mn_arm_pll__initdata = { - .type =PLL_1416X , - .rate_table = imx8mn_pll1416x_tbl, - .rate_count =ARRAY_SIZE (imx8mn_pll1416x_tbl), -}; - -static struct imx_pll14xx_clk imx8mn_sys_pll__initdata = { - .type =PLL_1416X , - .rate_table = imx8mn_pll1416x_tbl, - .rate_count =ARRAY_SIZE (imx8mn_pll1416x_tbl), -}; -static const char *pll_ref_sels[] = {"clock-osc-24m" ,"dummy" ,"dummy" ,"dummy" , };static const char *dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *arm_pll_bypass_sels[] = {"arm_pll" ,"arm_pll_ref_sel" , };@@ -172,19 +122,19 @@ static int imx8mn_clk_probe(struct udevice *dev)clk_dm (IMX8MN_DRAM_PLL ,imx_clk_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , - base +0x50 , &imx8mn_dram_pll)); + base +0x50 , &imx_1443x_dram_pll));clk_dm (IMX8MN_ARM_PLL ,imx_clk_pll14xx ("arm_pll" ,"arm_pll_ref_sel" , - base +0x84 , &imx8mn_arm_pll)); + base +0x84 , &imx_1416x_pll));clk_dm (IMX8MN_SYS_PLL1 ,imx_clk_pll14xx ("sys_pll1" ,"sys_pll1_ref_sel" , - base +0x94 , &imx8mn_sys_pll)); + base +0x94 , &imx_1416x_pll));clk_dm (IMX8MN_SYS_PLL2 ,imx_clk_pll14xx ("sys_pll2" ,"sys_pll2_ref_sel" , - base +0x104 , &imx8mn_sys_pll)); + base +0x104 , &imx_1416x_pll));clk_dm (IMX8MN_SYS_PLL3 ,imx_clk_pll14xx ("sys_pll3" ,"sys_pll3_ref_sel" , - base +0x114 , &imx8mn_sys_pll)); + base +0x114 , &imx_1416x_pll));/* PLL bypass out */ clk_dm(IMX8MN_DRAM_PLL_BYPASS,drivers/clk/imx/clk-imx8mp.c +10
-55@@ -15,56 +15,6 @@#include "clk.h" -#define PLL_1416X_RATE (_rate, _m, _p, _s) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - } - -#define PLL_1443X_RATE (_rate, _m, _p, _s, _k) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - .kdiv = (_k), \ - } - -static const struct imx_pll14xx_rate_table imx8mp_pll1416x_tbl[] = { -PLL_1416X_RATE (1800000000U ,225 ,3 ,0 ), -PLL_1416X_RATE (1600000000U ,200 ,3 ,0 ), -PLL_1416X_RATE (1200000000U ,300 ,3 ,1 ), -PLL_1416X_RATE (1000000000U ,250 ,3 ,1 ), -PLL_1416X_RATE (800000000U ,200 ,3 ,1 ), -PLL_1416X_RATE (750000000U ,250 ,2 ,2 ), -PLL_1416X_RATE (700000000U ,350 ,3 ,2 ), -PLL_1416X_RATE (600000000U ,300 ,3 ,2 ), -}; - -static const struct imx_pll14xx_rate_table imx8mp_drampll_tbl[] = { -PLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ), -}; - -static struct imx_pll14xx_clk imx8mp_dram_pll__initdata = { - .type =PLL_1443X , - .rate_table = imx8mp_drampll_tbl, - .rate_count =ARRAY_SIZE (imx8mp_drampll_tbl), -}; - -static struct imx_pll14xx_clk imx8mp_arm_pll__initdata = { - .type =PLL_1416X , - .rate_table = imx8mp_pll1416x_tbl, - .rate_count =ARRAY_SIZE (imx8mp_pll1416x_tbl), -}; - -static struct imx_pll14xx_clk imx8mp_sys_pll__initdata = { - .type =PLL_1416X , - .rate_table = imx8mp_pll1416x_tbl, - .rate_count =ARRAY_SIZE (imx8mp_pll1416x_tbl), -}; -static const char *pll_ref_sels[] = {"clock-osc-24m" ,"dummy" ,"dummy" ,"dummy" , };static const char *dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *arm_pll_bypass_sels[] = {"arm_pll" ,"arm_pll_ref_sel" , };@@ -198,11 +148,16 @@ static int imx8mp_clk_probe(struct udevice *dev)clk_dm (IMX8MP_SYS_PLL2_REF_SEL ,imx_clk_mux ("sys_pll2_ref_sel" , base +0x104 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)));clk_dm (IMX8MP_SYS_PLL3_REF_SEL ,imx_clk_mux ("sys_pll3_ref_sel" , base +0x114 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels))); -clk_dm (IMX8MP_DRAM_PLL ,imx_clk_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , base +0x50 , &imx8mp_dram_pll)); -clk_dm (IMX8MP_ARM_PLL ,imx_clk_pll14xx ("arm_pll" ,"arm_pll_ref_sel" , base +0x84 , &imx8mp_arm_pll)); -clk_dm (IMX8MP_SYS_PLL1 ,imx_clk_pll14xx ("sys_pll1" ,"sys_pll1_ref_sel" , base +0x94 , &imx8mp_sys_pll)); -clk_dm (IMX8MP_SYS_PLL2 ,imx_clk_pll14xx ("sys_pll2" ,"sys_pll2_ref_sel" , base +0x104 , &imx8mp_sys_pll)); -clk_dm (IMX8MP_SYS_PLL3 ,imx_clk_pll14xx ("sys_pll3" ,"sys_pll3_ref_sel" , base +0x114 , &imx8mp_sys_pll)); +clk_dm (IMX8MP_DRAM_PLL ,imx_clk_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , base +0x50 , + &imx_1443x_dram_pll)); +clk_dm (IMX8MP_ARM_PLL ,imx_clk_pll14xx ("arm_pll" ,"arm_pll_ref_sel" , base +0x84 , + &imx_1416x_pll)); +clk_dm (IMX8MP_SYS_PLL1 ,imx_clk_pll14xx ("sys_pll1" ,"sys_pll1_ref_sel" , base +0x94 , + &imx_1416x_pll)); +clk_dm (IMX8MP_SYS_PLL2 ,imx_clk_pll14xx ("sys_pll2" ,"sys_pll2_ref_sel" , base +0x104 , + &imx_1416x_pll)); +clk_dm (IMX8MP_SYS_PLL3 ,imx_clk_pll14xx ("sys_pll3" ,"sys_pll3_ref_sel" , base +0x114 , + &imx_1416x_pll));clk_dm (IMX8MP_DRAM_PLL_BYPASS ,imx_clk_mux_flags ("dram_pll_bypass" , base +0x50 ,4 ,1 , dram_pll_bypass_sels,ARRAY_SIZE (dram_pll_bypass_sels),CLK_SET_RATE_PARENT ));clk_dm (IMX8MP_ARM_PLL_BYPASS ,imx_clk_mux_flags ("arm_pll_bypass" , base +0x84 ,4 ,1 , arm_pll_bypass_sels,ARRAY_SIZE (arm_pll_bypass_sels),CLK_SET_RATE_PARENT ));drivers/clk/imx/clk-imx8mq.c +6
-53@@ -16,53 +16,6 @@#include "clk.h" -#define PLL_1416X_RATE (_rate, _m, _p, _s) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - } - -#define PLL_1443X_RATE (_rate, _m, _p, _s, _k) \ - { \ - .rate = (_rate), \ - .mdiv = (_m), \ - .pdiv = (_p), \ - .sdiv = (_s), \ - .kdiv = (_k), \ - } - -static const struct imx_pll14xx_rate_table imx8mq_pll1416x_tbl[] = { -PLL_1416X_RATE (1800000000U ,225 ,3 ,0 ), -PLL_1416X_RATE (1600000000U ,200 ,3 ,0 ), -PLL_1416X_RATE (1200000000U ,300 ,3 ,1 ), -PLL_1416X_RATE (1000000000U ,250 ,3 ,1 ), -PLL_1416X_RATE (800000000U ,200 ,3 ,1 ), -PLL_1416X_RATE (750000000U ,250 ,2 ,2 ), -PLL_1416X_RATE (700000000U ,350 ,3 ,2 ), -PLL_1416X_RATE (600000000U ,300 ,3 ,2 ), -}; - -const struct imx_pll14xx_rate_table imx8mq_pll1443x_tbl[] = { -PLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ), -PLL_1443X_RATE (594000000U ,198 ,2 ,2 ,0 ), -PLL_1443X_RATE (393216000U ,262 ,2 ,3 ,9437 ), -PLL_1443X_RATE (361267200U ,361 ,3 ,3 ,17511 ), -}; - -static struct imx_pll14xx_clk imx8mq_1416x_pll__initdata = { - .type =PLL_1416X , - .rate_table = imx8mq_pll1416x_tbl, - .rate_count =ARRAY_SIZE (imx8mq_pll1416x_tbl), -}; - -static struct imx_pll14xx_clk imx8mq_1443x_pll__initdata = { - .type =PLL_1443X , - .rate_table = imx8mq_pll1443x_tbl, - .rate_count =ARRAY_SIZE (imx8mq_pll1443x_tbl), -}; -static const char *const pll_ref_sels[] = {"clock-osc-25m" ,"clock-osc-27m" ,"clock-phy-27m" ,"dummy" , };static const char *const arm_pll_bypass_sels[] = {"arm_pll" ,"arm_pll_ref_sel" , };static const char *const gpu_pll_bypass_sels[] = {"gpu_pll" ,"gpu_pll_ref_sel" , };@@ -199,13 +152,13 @@ static int imx8mq_clk_probe(struct udevice *dev)clk_dm (IMX8MQ_ARM_PLL ,imx_clk_pll14xx ("arm_pll" ,"arm_pll_ref_sel" , - base +0x28 , &imx8mq_1416x_pll)); + base +0x28 , &imx_1416x_pll));clk_dm (IMX8MQ_GPU_PLL ,imx_clk_pll14xx ("gpu_pll" ,"gpu_pll_ref_sel" , - base +0x18 , &imx8mq_1416x_pll)); + base +0x18 , &imx_1416x_pll));clk_dm (IMX8MQ_VPU_PLL ,imx_clk_pll14xx ("vpu_pll" ,"vpu_pll_ref_sel" , - base +0x20 , &imx8mq_1416x_pll)); + base +0x20 , &imx_1416x_pll));clk_dm (IMX8MQ_SYS1_PLL1 ,clk_register_fixed_rate (NULL ,"sys1_pll" ,800000000 ));@@ -215,13 +168,13 @@ static int imx8mq_clk_probe(struct udevice *dev) clk_register_fixed_rate(NULL, "sys3_pll", 1000000000));clk_dm (IMX8MQ_AUDIO_PLL1 ,imx_clk_pll14xx ("audio_pll1" ,"audio_pll1_ref_sel" , - base +0x0 , &imx8mq_1443x_pll)); + base +0x0 , &imx_1443x_pll));clk_dm (IMX8MQ_AUDIO_PLL2 ,imx_clk_pll14xx ("audio_pll2" ,"audio_pll2_ref_sel" , - base +0x8 , &imx8mq_1443x_pll)); + base +0x8 , &imx_1443x_pll));clk_dm (IMX8MQ_VIDEO_PLL1 ,imx_clk_pll14xx ("video_pll1" ,"video_pll1_ref_sel" , - base +0x10 , &imx8mq_1443x_pll)); + base +0x10 , &imx_1443x_pll));/* PLL bypass out */ clk_dm(IMX8MQ_ARM_PLL_BYPASS,drivers/clk/imx/clk-pll14xx.c +61
-0@@ -52,6 +52,67 @@ struct clk_pll14xx {#define to_clk_pll14xx (_clk) container_of(_clk, struct clk_pll14xx, clk) +#define PLL_1416X_RATE (_rate, _m, _p, _s) \ + { \ + .rate = (_rate), \ + .mdiv = (_m), \ + .pdiv = (_p), \ + .sdiv = (_s), \ + } + +#define PLL_1443X_RATE (_rate, _m, _p, _s, _k) \ + { \ + .rate = (_rate), \ + .mdiv = (_m), \ + .pdiv = (_p), \ + .sdiv = (_s), \ + .kdiv = (_k), \ + } + +static const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { +PLL_1416X_RATE (1800000000U ,225 ,3 ,0 ), +PLL_1416X_RATE (1600000000U ,200 ,3 ,0 ), +PLL_1416X_RATE (1500000000U ,375 ,3 ,1 ), +PLL_1416X_RATE (1400000000U ,350 ,3 ,1 ), +PLL_1416X_RATE (1200000000U ,300 ,3 ,1 ), +PLL_1416X_RATE (1000000000U ,250 ,3 ,1 ), +PLL_1416X_RATE (800000000U ,200 ,3 ,1 ), +PLL_1416X_RATE (750000000U ,250 ,2 ,2 ), +PLL_1416X_RATE (700000000U ,350 ,3 ,2 ), +PLL_1416X_RATE (600000000U ,300 ,3 ,2 ), +}; + +const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { +PLL_1443X_RATE (1039500000U ,173 ,2 ,1 ,16384 ), +PLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ), +PLL_1443X_RATE (594000000U ,198 ,2 ,2 ,0 ), +PLL_1443X_RATE (519750000U ,173 ,2 ,2 ,16384 ), +PLL_1443X_RATE (393216000U ,262 ,2 ,3 ,9437 ), +PLL_1443X_RATE (361267200U ,361 ,3 ,3 ,17511 ), +}; + +struct imx_pll14xx_clk imx_1443x_pll__initdata = { + .type =PLL_1443X , + .rate_table = imx_pll1443x_tbl, + .rate_count =ARRAY_SIZE (imx_pll1443x_tbl), +}; +EXPORT_SYMBOL_GPL (imx_1443x_pll); + +struct imx_pll14xx_clk imx_1443x_dram_pll__initdata = { + .type =PLL_1443X , + .rate_table = imx_pll1443x_tbl, + .rate_count =ARRAY_SIZE (imx_pll1443x_tbl), + .flags =CLK_GET_RATE_NOCACHE , +}; +EXPORT_SYMBOL_GPL (imx_1443x_dram_pll); + +struct imx_pll14xx_clk imx_1416x_pll__initdata = { + .type =PLL_1416X , + .rate_table = imx_pll1416x_tbl, + .rate_count =ARRAY_SIZE (imx_pll1416x_tbl), +}; +EXPORT_SYMBOL_GPL (imx_1416x_pll); +static const struct imx_pll14xx_rate_table *imx_get_pll_settings (struct clk_pll14xx *pll,unsigned long rate) {drivers/clk/imx/clk.h +4
-1@@ -41,6 +41,10 @@ struct imx_pll14xx_clk {int flags; }; +extern struct imx_pll14xx_clk imx_1416x_pll; +extern struct imx_pll14xx_clk imx_1443x_pll; +extern struct imx_pll14xx_clk imx_1443x_dram_pll; +struct clk *imx_clk_pll14xx (const char *name,const char *parent_name,void __iomem *base,const struct imx_pll14xx_clk *pll_clk); --2.25.1
Re: [PATCH v5 3/3] clk: imx8m: reduce rate table duplication
Quoted 5 lines · Adam Ford
Quoted 4 lines · Angus Ainslie
Re-factor the imx8m[nmpq] rate tables into the common pll1416x clock driver.
Quoted 8 lines
Quoted 2 lines
43cdaa1567ad3("clk: imx8mm: Move 1443X/1416X PLL clock structure to common place")I did a clk dump before this series and after this series then compared the outputs to look for changes on an imx8mm. None were identified.
Thanks Adam