clk: mediatek: mt8188: fix clocks
Subsystems (2)
v2 cover clk: mediatek: mt8188: fix clocks
I recently submitted the clock driver for MT8188. I naively submitted a driver that was ported from the kernel driver, and mostly work to boot a kernel.
Recently David Lechner, added support for the clk dump command for Mediatek clock drivers, so I used it to check the MT8188 and found several issues fixed on this series:
- removed topckgen_cg, gates are now part of topckgen
- fixed several parents clocks
- added missing fixed clocks
While at it, I also refactored a bit the driver to improve readability, and future additions to it.
Cheers
Julien
---
Changes in v2:
- Add the CLK_TOP_FULL_NR_CLK macro and fix initialization of mt8188_id_top_offs_map
- Rebased on master
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Julien Stephan (5):
clk: mediatek: mt8188: remove separate topckgen-cg driver
clk: mediatek: mt8188: fix circular clock dependency
clk: mediatek: mt8188: add missing fixed clock
clk: mediatek: mt8188: fix some clock parents
clk: mediatek: mt8188: refactor driver to improve readability
drivers/clk/mediatek/clk-mt8188.c | 631 ++++++++++++++++++-------------------- 1 file changed, 295 insertions(+), 336 deletions(-)
---
base-commit: cbc75552aec49fa190f3ac1ad8e198ac3a2e4ef2
change-id: 20260116-mt8188-fix-clock-7a30fe9e3cc0
Best regards,
Signature · 1 line
Julien Stephan <[email protected]>
PATCH v2 1/5 clk: mediatek: mt8188: remove separate topckgen-cg driver
Remove the separate topckgen-cg driver for handling clock gates in the topckgen address space.
Commit 8aeeeff50d46 ("clk: mediatek: allow gates in topckgen drivers") added support for gates in topckgen driver.
This commit fixes MT8188 driver, the same way commit ba207d7f54f9 ("clk:
mediatek: mt8365: remove separate topckgen-cg driver") does for MT8365.
--- drivers/clk/mediatek/clk-mt8188.c | 177 ++++++++++++++++---------------------- 1 file changed, 76 insertions(+), 101 deletions(-)
drivers/clk/mediatek/clk-mt8188.c +76 -101
@@ -1328,26 +1328,26 @@ static const int mt8188_id_offs_map[] = {-1 ,/* CLK_TOP_APLL12_CK_DIV3 */ -1 ,/* CLK_TOP_APLL12_CK_DIV4 */ -1 ,/* CLK_TOP_APLL12_CK_DIV9 */ --1 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP0 */ --1 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP1 */ --1 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO0 */ --1 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO1 */ --1 ,/* CLK_TOP_CFGREG_CLOCK_ISP_AXI_GALS */ --1 ,/* CLK_TOP_CFGREG_F26M_VPP0 */ --1 ,/* CLK_TOP_CFGREG_F26M_VPP1 */ --1 ,/* CLK_TOP_CFGREG_F26M_VDO0 */ --1 ,/* CLK_TOP_CFGREG_F26M_VDO1 */ --1 ,/* CLK_TOP_CFGREG_AUD_F26M_AUD */ --1 ,/* CLK_TOP_CFGREG_UNIPLL_SES */ --1 ,/* CLK_TOP_CFGREG_F_PCIE_PHY_REF */ --1 ,/* CLK_TOP_SSUSB_TOP_REF */ --1 ,/* CLK_TOP_SSUSB_PHY_REF */ --1 ,/* CLK_TOP_SSUSB_TOP_P1_REF */ --1 ,/* CLK_TOP_SSUSB_PHY_P1_REF */ --1 ,/* CLK_TOP_SSUSB_TOP_P2_REF */ --1 ,/* CLK_TOP_SSUSB_PHY_P2_REF */ --1 ,/* CLK_TOP_SSUSB_TOP_P3_REF */ --1 ,/* CLK_TOP_SSUSB_PHY_P3_REF */ +187 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP0 */ +188 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP1 */ +189 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO0 */ +190 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO1 */ +191 ,/* CLK_TOP_CFGREG_CLOCK_ISP_AXI_GALS */ +192 ,/* CLK_TOP_CFGREG_F26M_VPP0 */ +193 ,/* CLK_TOP_CFGREG_F26M_VPP1 */ +194 ,/* CLK_TOP_CFGREG_F26M_VDO0 */ +195 ,/* CLK_TOP_CFGREG_F26M_VDO1 */ +196 ,/* CLK_TOP_CFGREG_AUD_F26M_AUD */ +197 ,/* CLK_TOP_CFGREG_UNIPLL_SES */ +198 ,/* CLK_TOP_CFGREG_F_PCIE_PHY_REF */ +199 ,/* CLK_TOP_SSUSB_TOP_REF */ +200 ,/* CLK_TOP_SSUSB_PHY_REF */ +201 ,/* CLK_TOP_SSUSB_TOP_P1_REF */ +202 ,/* CLK_TOP_SSUSB_PHY_P1_REF */ +203 ,/* CLK_TOP_SSUSB_TOP_P2_REF */ +204 ,/* CLK_TOP_SSUSB_PHY_P2_REF */ +205 ,/* CLK_TOP_SSUSB_TOP_P3_REF */ +223 ,/* CLK_TOP_SSUSB_PHY_P3_REF */ -1 ,/* CLK_TOP_NR_CLK */ -1 ,/* CLK_TOP_ADSPPLL */ -1, /* CLK_TOP_CLK13M */
@@ -1359,6 +1359,59 @@ static const int mt8188_id_offs_map[] = { -1, /* CLK_TOP_ULPOSC_CK1 */ }; +static const struct mtk_gate_regs top0_cg_regs = { + .set_ofs =0x238 , + .clr_ofs =0x238 , + .sta_ofs =0x238 , +}; + +static const struct mtk_gate_regs top1_cg_regs = { + .set_ofs =0x250 , + .clr_ofs =0x250 , + .sta_ofs =0x250 , +}; + +#define GATE_TOP0 (_id, _parent, _shift) { \ + .id = _id, \ + .parent = _parent, \ + .regs = &top0_cg_regs, \ + .shift = _shift, \ + .flags = CLK_GATE_NO_SETCLR | CLK_PARENT_TOPCKGEN, \ + } + +#define GATE_TOP1 (_id, _parent, _shift) { \ + .id = _id, \ + .parent = _parent, \ + .regs = &top1_cg_regs, \ + .shift = _shift, \ + .flags = CLK_GATE_NO_SETCLR_INV | CLK_PARENT_TOPCKGEN, \ + } + +static const struct mtk_gate topckgen_cg_clks[] = { +/* TOP0 */ +GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_EN_VPP0 ,CLK_TOP_VPP ,0 ), +GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_EN_VPP1 ,CLK_TOP_VPP ,1 ), +GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_EN_VDO0 ,CLK_TOP_VPP ,2 ), +GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_EN_VDO1 ,CLK_TOP_VPP ,3 ), +GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_ISP_AXI_GALS ,CLK_TOP_VPP ,4 ), +GATE_TOP0 (CLK_TOP_CFGREG_F26M_VPP0 ,CLK_TOP_CLK26M ,5 ), +GATE_TOP0 (CLK_TOP_CFGREG_F26M_VPP1 ,CLK_TOP_CLK26M ,6 ), +GATE_TOP0 (CLK_TOP_CFGREG_F26M_VDO0 ,CLK_TOP_CLK26M ,7 ), +GATE_TOP0 (CLK_TOP_CFGREG_F26M_VDO1 ,CLK_TOP_CLK26M ,8 ), +GATE_TOP0 (CLK_TOP_CFGREG_AUD_F26M_AUD ,CLK_TOP_CLK26M ,9 ), +GATE_TOP0 (CLK_TOP_CFGREG_UNIPLL_SES ,CLK_TOP_UNIVPLL_D2 ,15 ), +GATE_TOP0 (CLK_TOP_CFGREG_F_PCIE_PHY_REF ,CLK_TOP_CLK26M ,18 ), +/* TOP1 */ +GATE_TOP1 (CLK_TOP_SSUSB_TOP_REF ,CLK_TOP_CLK26M ,0 ), +GATE_TOP1 (CLK_TOP_SSUSB_PHY_REF ,CLK_TOP_CLK26M ,1 ), +GATE_TOP1 (CLK_TOP_SSUSB_TOP_P1_REF ,CLK_TOP_CLK26M ,2 ), +GATE_TOP1 (CLK_TOP_SSUSB_PHY_P1_REF ,CLK_TOP_CLK26M ,3 ), +GATE_TOP1 (CLK_TOP_SSUSB_TOP_P2_REF ,CLK_TOP_CLK26M ,4 ), +GATE_TOP1 (CLK_TOP_SSUSB_PHY_P2_REF ,CLK_TOP_CLK26M ,5 ), +GATE_TOP1 (CLK_TOP_SSUSB_TOP_P3_REF ,CLK_TOP_CLK26M ,6 ), +GATE_TOP1 (CLK_TOP_SSUSB_PHY_P3_REF ,CLK_TOP_CLK26M ,7 ), +}; +static const struct mtk_clk_tree mt8188_topckgen_clk_tree = { .xtal_rate =26 *MHZ , .xtal2_rate =26 *MHZ ,
@@ -1366,12 +1419,15 @@ static const struct mtk_clk_tree mt8188_topckgen_clk_tree = { .id_offs_map_size = ARRAY_SIZE(mt8188_id_offs_map), .fdivs_offs = 8, /* CLK_TOP_MAINPLL_D3 */ .muxes_offs = 87, /* CLK_TOP_AXI */ + .gates_offs = 187, /* CLK_TOP_CFGREG_CLOCK_EN_VPP0 */ .fclks = top_fixed_clks, .fdivs = top_fixed_divs, .muxes = top_muxes, + .gates = topckgen_cg_clks, .num_fclks = ARRAY_SIZE(top_fixed_clks), .num_fdivs = ARRAY_SIZE(top_fixed_divs), .num_muxes = ARRAY_SIZE(top_muxes), + .num_gates = ARRAY_SIZE(topckgen_cg_clks), };static const struct mtk_gate_regs infra_ao0_cg_regs = {
@@ -1574,64 +1630,6 @@ static const struct mtk_clk_tree mt8188_pericfg_ao_clk_tree = { .xtal2_rate = 26 * MHZ, }; -static const struct mtk_gate_regs top0_cg_regs = { - .set_ofs =0x238 , - .clr_ofs =0x238 , - .sta_ofs =0x238 , -}; - -static const struct mtk_gate_regs top1_cg_regs = { - .set_ofs =0x250 , - .clr_ofs =0x250 , - .sta_ofs =0x250 , -}; - -#define GATE_TOP0 (_id, _parent, _shift) { \ - .id = _id, \ - .parent = _parent, \ - .regs = &top0_cg_regs, \ - .shift = _shift, \ - .flags = CLK_GATE_NO_SETCLR | CLK_PARENT_TOPCKGEN, \ - } - -#define GATE_TOP1 (_id, _parent, _shift) { \ - .id = _id, \ - .parent = _parent, \ - .regs = &top1_cg_regs, \ - .shift = _shift, \ - .flags = CLK_GATE_NO_SETCLR_INV | CLK_PARENT_TOPCKGEN, \ - } - -static const struct mtk_gate topckgen_cg_clks[] = { -/* TOP0 */ -GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_EN_VPP0 ,CLK_TOP_VPP ,0 ), -GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_EN_VPP1 ,CLK_TOP_VPP ,1 ), -GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_EN_VDO0 ,CLK_TOP_VPP ,2 ), -GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_EN_VDO1 ,CLK_TOP_VPP ,3 ), -GATE_TOP0 (CLK_TOP_CFGREG_CLOCK_ISP_AXI_GALS ,CLK_TOP_VPP ,4 ), -GATE_TOP0 (CLK_TOP_CFGREG_F26M_VPP0 ,CLK_TOP_CLK26M ,5 ), -GATE_TOP0 (CLK_TOP_CFGREG_F26M_VPP1 ,CLK_TOP_CLK26M ,6 ), -GATE_TOP0 (CLK_TOP_CFGREG_F26M_VDO0 ,CLK_TOP_CLK26M ,7 ), -GATE_TOP0 (CLK_TOP_CFGREG_F26M_VDO1 ,CLK_TOP_CLK26M ,8 ), -GATE_TOP0 (CLK_TOP_CFGREG_AUD_F26M_AUD ,CLK_TOP_CLK26M ,9 ), -GATE_TOP0 (CLK_TOP_CFGREG_UNIPLL_SES ,CLK_TOP_UNIVPLL_D2 ,15 ), -GATE_TOP0 (CLK_TOP_CFGREG_F_PCIE_PHY_REF ,CLK_TOP_CLK26M ,18 ), -/* TOP1 */ -GATE_TOP1 (CLK_TOP_SSUSB_TOP_REF ,CLK_TOP_CLK26M ,0 ), -GATE_TOP1 (CLK_TOP_SSUSB_PHY_REF ,CLK_TOP_CLK26M ,1 ), -GATE_TOP1 (CLK_TOP_SSUSB_TOP_P1_REF ,CLK_TOP_CLK26M ,2 ), -GATE_TOP1 (CLK_TOP_SSUSB_PHY_P1_REF ,CLK_TOP_CLK26M ,3 ), -GATE_TOP1 (CLK_TOP_SSUSB_TOP_P2_REF ,CLK_TOP_CLK26M ,4 ), -GATE_TOP1 (CLK_TOP_SSUSB_PHY_P2_REF ,CLK_TOP_CLK26M ,5 ), -GATE_TOP1 (CLK_TOP_SSUSB_TOP_P3_REF ,CLK_TOP_CLK26M ,6 ), -GATE_TOP1 (CLK_TOP_SSUSB_PHY_P3_REF ,CLK_TOP_CLK26M ,7 ), -}; - -static const struct mtk_clk_tree mt8188_topckgen_cg_clk_tree = { - .xtal_rate =26 *MHZ , - .xtal2_rate =26 *MHZ , -}; -static const struct mtk_gate_regs imp_iic_wrap_cg_regs = { .set_ofs =0xe08 , .clr_ofs =0xe04 ,
@@ -1687,14 +1685,6 @@ static int mt8188_topckgen_probe(struct udevice *dev)return mtk_common_clk_init (dev, &mt8188_topckgen_clk_tree); } -static int mt8188_topckgen_cg_probe (struct udevice *dev) -{ -return mtk_common_clk_gate_init (dev, &mt8188_topckgen_cg_clk_tree, - topckgen_cg_clks, -ARRAY_SIZE (topckgen_cg_clks), -CLK_TOP_CFGREG_CLOCK_EN_VPP0 ); -} -static int mt8188_infracfg_ao_probe (struct udevice *dev) { return mtk_common_clk_gate_init(dev, &mt8188_infracfg_ao_clk_tree,
@@ -1740,11 +1730,6 @@ static const struct udevice_id mt8188_topckgen_compat[] = { { } }; -static const struct udevice_id mt8188_topckgen_cg_compat[] = { - { .compatible ="mediatek,mt8188-topckgen-cg" , }, - { } -}; -static const struct udevice_id mt8188_infracfg_ao_compat[] = { { .compatible ="mediatek,mt8188-infracfg-ao" , }, { }
@@ -1790,16 +1775,6 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = { .flags = DM_FLAG_PRE_RELOC, }; -U_BOOT_DRIVER (mtk_clk_topckgen_cg) = { - .name ="mt8188-topckgen-cg" , - .id =UCLASS_CLK , - .of_match = mt8188_topckgen_cg_compat, - .probe = mt8188_topckgen_cg_probe, - .priv_auto =sizeof (struct mtk_cg_priv ), - .ops = &mtk_clk_gate_ops, - .flags =DM_FLAG_PRE_RELOC , -}; -U_BOOT_DRIVER (mtk_clk_infracfg_ao) = { .name ="mt8188-infracfg-ao" , .id =UCLASS_CLK ,
Signature · 1 line
2.52.0
PATCH v2 2/5 clk: mediatek: mt8188: fix circular clock dependency
In reply to Julien StephanFACTOR1(CLK_TOP_APLL1_D4, CLK_TOP_APLL1, 1, 3)
--> CLK_TOP_APLL1_D4 declares CLK_TOP_APLL1 as it's parents
MUX_GATE(CLK_TOP_APLL1, apll1_parents, 0x0F8, 0, 4, 7) --> CLK_TOP_APLL1 declares apll1_parents as it's parents
static const int apll1_parents[] = {
CLK_TOP_CLK26M,
CLK_TOP_APLL1_D4
};--> CLK_TOP_APLL1_D4 is a parent of CLK_TOP_APLL1
Fix this, by correctly setting CLK_TOP_APLL1_DX parent to CLK_APMIXED_APLLX
--- drivers/clk/mediatek/clk-mt8188.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt8188.c +7 -7
@@ -148,13 +148,13 @@ static const struct mtk_fixed_factor top_fixed_divs[] = {FACTOR1 (CLK_TOP_UNIVPLL_192M_D10 ,CLK_TOP_UNIVPLL_192M ,1 ,10 ),FACTOR1 (CLK_TOP_UNIVPLL_192M_D16 ,CLK_TOP_UNIVPLL_192M ,1 ,16 ),FACTOR1 (CLK_TOP_UNIVPLL_192M_D32 ,CLK_TOP_UNIVPLL_192M ,1 ,32 ), -FACTOR1 (CLK_TOP_APLL1_D3 ,CLK_TOP_APLL1 ,1 ,3 ), -FACTOR1 (CLK_TOP_APLL1_D4 ,CLK_TOP_APLL1 ,1 ,4 ), -FACTOR1 (CLK_TOP_APLL2_D3 ,CLK_TOP_APLL2 ,1 ,3 ), -FACTOR1 (CLK_TOP_APLL2_D4 ,CLK_TOP_APLL2 ,1 ,4 ), -FACTOR1 (CLK_TOP_APLL3_D4 ,CLK_TOP_APLL3 ,1 ,4 ), -FACTOR1 (CLK_TOP_APLL4_D4 ,CLK_TOP_APLL4 ,1 ,4 ), -FACTOR1 (CLK_TOP_APLL5_D4 ,CLK_TOP_APLL5 ,1 ,4 ), +FACTOR0 (CLK_TOP_APLL1_D3 ,CLK_APMIXED_APLL1 ,1 ,3 ), +FACTOR0 (CLK_TOP_APLL1_D4 ,CLK_APMIXED_APLL1 ,1 ,4 ), +FACTOR0 (CLK_TOP_APLL2_D3 ,CLK_APMIXED_APLL2 ,1 ,3 ), +FACTOR0 (CLK_TOP_APLL2_D4 ,CLK_APMIXED_APLL2 ,1 ,4 ), +FACTOR0 (CLK_TOP_APLL3_D4 ,CLK_APMIXED_APLL3 ,1 ,4 ), +FACTOR0 (CLK_TOP_APLL4_D4 ,CLK_APMIXED_APLL4 ,1 ,4 ), +FACTOR0 (CLK_TOP_APLL5_D4 ,CLK_APMIXED_APLL5 ,1 ,4 ),FACTOR0 (CLK_TOP_MMPLL_D4 ,CLK_APMIXED_MMPLL ,1 ,4 ),FACTOR1 (CLK_TOP_MMPLL_D4_D2 ,CLK_TOP_MMPLL_D4 ,1 ,2 ), FACTOR0(CLK_TOP_MMPLL_D5, CLK_APMIXED_MMPLL, 1, 5),
Signature · 1 line
2.52.0
PATCH v2 3/5 clk: mediatek: mt8188: add missing fixed clock
In reply to Julien StephanCLK_TOP_CLK13M was missing, add it.
--- drivers/clk/mediatek/clk-mt8188.c | 391 +++++++++++++++++++------------------- 1 file changed, 196 insertions(+), 195 deletions(-)
drivers/clk/mediatek/clk-mt8188.c +196 -195
@@ -98,6 +98,7 @@ static const struct mtk_fixed_clk top_fixed_clks[] = {FIXED_CLK0 (CLK_TOP_466M_FMEM ,533000000 ),FIXED_CLK0 (CLK_TOP_PEXTP_PIPE ,250000000 ),FIXED_CLK0 (CLK_TOP_DSI_PHY ,500000000 ), +FIXED_CLK0 (CLK_TOP_CLK13M ,130000000 ),FIXED_CLK0 (CLK_TOP_CLK26M ,260000000 ), FIXED_CLK0(CLK_TOP_CLK32K, 32000), };
@@ -1143,180 +1144,180 @@ static const struct mtk_composite top_muxes[] = { };static const int mt8188_id_offs_map[] = { -87 ,/* CLK_TOP_AXI */ -88 ,/* CLK_TOP_SPM */ -89 ,/* CLK_TOP_SCP */ -90 ,/* CLK_TOP_BUS_AXIMEM */ -91 ,/* CLK_TOP_VPP */ -92 ,/* CLK_TOP_ETHDR */ -93 ,/* CLK_TOP_IPE */ -94 ,/* CLK_TOP_CAM */ -95 ,/* CLK_TOP_CCU */ -96 ,/* CLK_TOP_CCU_AHB */ -97 ,/* CLK_TOP_IMG */ -98 ,/* CLK_TOP_CAMTM */ -99 ,/* CLK_TOP_DSP */ -100 ,/* CLK_TOP_DSP1 */ -101 ,/* CLK_TOP_DSP2 */ -102 ,/* CLK_TOP_DSP3 */ -103 ,/* CLK_TOP_DSP4 */ -104 ,/* CLK_TOP_DSP5 */ -105 ,/* CLK_TOP_DSP6 */ -106 ,/* CLK_TOP_DSP7 */ -107 ,/* CLK_TOP_MFG_CORE_TMP */ -108 ,/* CLK_TOP_CAMTG */ -109 ,/* CLK_TOP_CAMTG2 */ -110 ,/* CLK_TOP_CAMTG3 */ -111 ,/* CLK_TOP_UART */ -112 ,/* CLK_TOP_SPI */ -113 ,/* CLK_TOP_MSDC50_0_HCLK */ -114 ,/* CLK_TOP_MSDC50_0 */ -115 ,/* CLK_TOP_MSDC30_1 */ -116 ,/* CLK_TOP_MSDC30_2 */ -117 ,/* CLK_TOP_INTDIR */ -118 ,/* CLK_TOP_AUD_INTBUS */ -119 ,/* CLK_TOP_AUDIO_H */ -120 ,/* CLK_TOP_PWRAP_ULPOSC */ -121 ,/* CLK_TOP_ATB */ -122 ,/* CLK_TOP_SSPM */ -123 ,/* CLK_TOP_DP */ -124 ,/* CLK_TOP_EDP */ -125 ,/* CLK_TOP_DPI */ -126 ,/* CLK_TOP_DISP_PWM0 */ -127 ,/* CLK_TOP_DISP_PWM1 */ -128 ,/* CLK_TOP_USB_TOP */ -129 ,/* CLK_TOP_SSUSB_XHCI */ -130 ,/* CLK_TOP_USB_TOP_2P */ -131 ,/* CLK_TOP_SSUSB_XHCI_2P */ -132 ,/* CLK_TOP_USB_TOP_3P */ -133 ,/* CLK_TOP_SSUSB_XHCI_3P */ -134 ,/* CLK_TOP_I2C */ -135 ,/* CLK_TOP_SENINF */ -136 ,/* CLK_TOP_SENINF1 */ -137 ,/* CLK_TOP_GCPU */ -138 ,/* CLK_TOP_VENC */ -139 ,/* CLK_TOP_VDEC */ -140 ,/* CLK_TOP_PWM */ -141 ,/* CLK_TOP_MCUPM */ -142 ,/* CLK_TOP_SPMI_P_MST */ -143 ,/* CLK_TOP_SPMI_M_MST */ -144 ,/* CLK_TOP_DVFSRC */ -145 ,/* CLK_TOP_TL */ -146 ,/* CLK_TOP_AES_MSDCFDE */ -147 ,/* CLK_TOP_DSI_OCC */ -148 ,/* CLK_TOP_WPE_VPP */ -149 ,/* CLK_TOP_HDCP */ -150 ,/* CLK_TOP_HDCP_24M */ -151 ,/* CLK_TOP_HDMI_APB */ -152 ,/* CLK_TOP_SNPS_ETH_250M */ -153 ,/* CLK_TOP_SNPS_ETH_62P4M_PTP */ -154 ,/* CLK_TOP_SNPS_ETH_50M_RMII */ -155 ,/* CLK_TOP_ADSP */ -156 ,/* CLK_TOP_AUDIO_LOCAL_BUS */ -157 ,/* CLK_TOP_ASM_H */ -158 ,/* CLK_TOP_ASM_L */ -159 ,/* CLK_TOP_APLL1 */ -160 ,/* CLK_TOP_APLL2 */ -161 ,/* CLK_TOP_APLL3 */ -162 ,/* CLK_TOP_APLL4 */ -163 ,/* CLK_TOP_APLL5 */ -164 ,/* CLK_TOP_I2SO1 */ -165 ,/* CLK_TOP_I2SO2 */ -166 ,/* CLK_TOP_I2SI1 */ -167 ,/* CLK_TOP_I2SI2 */ -168 ,/* CLK_TOP_DPTX */ -169 ,/* CLK_TOP_AUD_IEC */ -170 ,/* CLK_TOP_A1SYS_HP */ -171 ,/* CLK_TOP_A2SYS */ -172 ,/* CLK_TOP_A3SYS */ -173 ,/* CLK_TOP_A4SYS */ -174 ,/* CLK_TOP_ECC */ -175 ,/* CLK_TOP_SPINOR */ -176 ,/* CLK_TOP_ULPOSC */ -177 ,/* CLK_TOP_SRCK */ +88 ,/* CLK_TOP_AXI */ +89 ,/* CLK_TOP_SPM */ +90 ,/* CLK_TOP_SCP */ +91 ,/* CLK_TOP_BUS_AXIMEM */ +92 ,/* CLK_TOP_VPP */ +93 ,/* CLK_TOP_ETHDR */ +94 ,/* CLK_TOP_IPE */ +95 ,/* CLK_TOP_CAM */ +96 ,/* CLK_TOP_CCU */ +97 ,/* CLK_TOP_CCU_AHB */ +98 ,/* CLK_TOP_IMG */ +99 ,/* CLK_TOP_CAMTM */ +100 ,/* CLK_TOP_DSP */ +101 ,/* CLK_TOP_DSP1 */ +102 ,/* CLK_TOP_DSP2 */ +103 ,/* CLK_TOP_DSP3 */ +104 ,/* CLK_TOP_DSP4 */ +105 ,/* CLK_TOP_DSP5 */ +106 ,/* CLK_TOP_DSP6 */ +107 ,/* CLK_TOP_DSP7 */ +108 ,/* CLK_TOP_MFG_CORE_TMP */ +109 ,/* CLK_TOP_CAMTG */ +110 ,/* CLK_TOP_CAMTG2 */ +111 ,/* CLK_TOP_CAMTG3 */ +112 ,/* CLK_TOP_UART */ +113 ,/* CLK_TOP_SPI */ +114 ,/* CLK_TOP_MSDC50_0_HCLK */ +115 ,/* CLK_TOP_MSDC50_0 */ +116 ,/* CLK_TOP_MSDC30_1 */ +117 ,/* CLK_TOP_MSDC30_2 */ +118 ,/* CLK_TOP_INTDIR */ +119 ,/* CLK_TOP_AUD_INTBUS */ +120 ,/* CLK_TOP_AUDIO_H */ +121 ,/* CLK_TOP_PWRAP_ULPOSC */ +122 ,/* CLK_TOP_ATB */ +123 ,/* CLK_TOP_SSPM */ +124 ,/* CLK_TOP_DP */ +125 ,/* CLK_TOP_EDP */ +126 ,/* CLK_TOP_DPI */ +127 ,/* CLK_TOP_DISP_PWM0 */ +128 ,/* CLK_TOP_DISP_PWM1 */ +129 ,/* CLK_TOP_USB_TOP */ +130 ,/* CLK_TOP_SSUSB_XHCI */ +131 ,/* CLK_TOP_USB_TOP_2P */ +132 ,/* CLK_TOP_SSUSB_XHCI_2P */ +133 ,/* CLK_TOP_USB_TOP_3P */ +134 ,/* CLK_TOP_SSUSB_XHCI_3P */ +135 ,/* CLK_TOP_I2C */ +136 ,/* CLK_TOP_SENINF */ +137 ,/* CLK_TOP_SENINF1 */ +138 ,/* CLK_TOP_GCPU */ +139 ,/* CLK_TOP_VENC */ +140 ,/* CLK_TOP_VDEC */ +141 ,/* CLK_TOP_PWM */ +142 ,/* CLK_TOP_MCUPM */ +143 ,/* CLK_TOP_SPMI_P_MST */ +144 ,/* CLK_TOP_SPMI_M_MST */ +145 ,/* CLK_TOP_DVFSRC */ +146 ,/* CLK_TOP_TL */ +147 ,/* CLK_TOP_AES_MSDCFDE */ +148 ,/* CLK_TOP_DSI_OCC */ +149 ,/* CLK_TOP_WPE_VPP */ +150 ,/* CLK_TOP_HDCP */ +151 ,/* CLK_TOP_HDCP_24M */ +152 ,/* CLK_TOP_HDMI_APB */ +153 ,/* CLK_TOP_SNPS_ETH_250M */ +154 ,/* CLK_TOP_SNPS_ETH_62P4M_PTP */ +155 ,/* CLK_TOP_SNPS_ETH_50M_RMII */ +156 ,/* CLK_TOP_ADSP */ +157 ,/* CLK_TOP_AUDIO_LOCAL_BUS */ +158 ,/* CLK_TOP_ASM_H */ +159 ,/* CLK_TOP_ASM_L */ +160 ,/* CLK_TOP_APLL1 */ +161 ,/* CLK_TOP_APLL2 */ +162 ,/* CLK_TOP_APLL3 */ +163 ,/* CLK_TOP_APLL4 */ +164 ,/* CLK_TOP_APLL5 */ +165 ,/* CLK_TOP_I2SO1 */ +166 ,/* CLK_TOP_I2SO2 */ +167 ,/* CLK_TOP_I2SI1 */ +168 ,/* CLK_TOP_I2SI2 */ +169 ,/* CLK_TOP_DPTX */ +170 ,/* CLK_TOP_AUD_IEC */ +171 ,/* CLK_TOP_A1SYS_HP */ +172 ,/* CLK_TOP_A2SYS */ +173 ,/* CLK_TOP_A3SYS */ +174 ,/* CLK_TOP_A4SYS */ +175 ,/* CLK_TOP_ECC */ +176 ,/* CLK_TOP_SPINOR */ +177 ,/* CLK_TOP_ULPOSC */ +178 ,/* CLK_TOP_SRCK */ -1 ,/* CLK_TOP_MFG_CK_FAST_REF */ -8 ,/* CLK_TOP_MAINPLL_D3 */ -9 ,/* CLK_TOP_MAINPLL_D4 */ -10 ,/* CLK_TOP_MAINPLL_D4_D2 */ -11 ,/* CLK_TOP_MAINPLL_D4_D4 */ -12 ,/* CLK_TOP_MAINPLL_D4_D8 */ -13 ,/* CLK_TOP_MAINPLL_D5 */ -14 ,/* CLK_TOP_MAINPLL_D5_D2 */ -15 ,/* CLK_TOP_MAINPLL_D5_D4 */ -16 ,/* CLK_TOP_MAINPLL_D5_D8 */ -17 ,/* CLK_TOP_MAINPLL_D6 */ -18 ,/* CLK_TOP_MAINPLL_D6_D2 */ -19 ,/* CLK_TOP_MAINPLL_D6_D4 */ -20 ,/* CLK_TOP_MAINPLL_D6_D8 */ -21 ,/* CLK_TOP_MAINPLL_D7 */ -22 ,/* CLK_TOP_MAINPLL_D7_D2 */ -23 ,/* CLK_TOP_MAINPLL_D7_D4 */ -24 ,/* CLK_TOP_MAINPLL_D7_D8 */ -25 ,/* CLK_TOP_MAINPLL_D9 */ -26 ,/* CLK_TOP_UNIVPLL_D2 */ -27 ,/* CLK_TOP_UNIVPLL_D3 */ -28 ,/* CLK_TOP_UNIVPLL_D4 */ -29 ,/* CLK_TOP_UNIVPLL_D4_D2 */ -30 ,/* CLK_TOP_UNIVPLL_D4_D4 */ -31 ,/* CLK_TOP_UNIVPLL_D4_D8 */ -32 ,/* CLK_TOP_UNIVPLL_D5 */ -33 ,/* CLK_TOP_UNIVPLL_D5_D2 */ -34 ,/* CLK_TOP_UNIVPLL_D5_D4 */ -35 ,/* CLK_TOP_UNIVPLL_D5_D8 */ -36 ,/* CLK_TOP_UNIVPLL_D6 */ -37 ,/* CLK_TOP_UNIVPLL_D6_D2 */ -38 ,/* CLK_TOP_UNIVPLL_D6_D4 */ -39 ,/* CLK_TOP_UNIVPLL_D6_D8 */ -40 ,/* CLK_TOP_UNIVPLL_D7 */ -41 ,/* CLK_TOP_UNIVPLL_192M */ -42 ,/* CLK_TOP_UNIVPLL_192M_D4 */ -43 ,/* CLK_TOP_UNIVPLL_192M_D8 */ -44 ,/* CLK_TOP_UNIVPLL_192M_D10 */ -45 ,/* CLK_TOP_UNIVPLL_192M_D16 */ -46 ,/* CLK_TOP_UNIVPLL_192M_D32 */ -47 ,/* CLK_TOP_APLL1_D3 */ -48 ,/* CLK_TOP_APLL1_D4 */ -49 ,/* CLK_TOP_APLL2_D3 */ -50 ,/* CLK_TOP_APLL2_D4 */ -51 ,/* CLK_TOP_APLL3_D4 */ -52 ,/* CLK_TOP_APLL4_D4 */ -53 ,/* CLK_TOP_APLL5_D4 */ -54 ,/* CLK_TOP_MMPLL_D4 */ -55 ,/* CLK_TOP_MMPLL_D4_D2 */ -56 ,/* CLK_TOP_MMPLL_D5 */ -57 ,/* CLK_TOP_MMPLL_D5_D2 */ -58 ,/* CLK_TOP_MMPLL_D5_D4 */ -59 ,/* CLK_TOP_MMPLL_D6 */ -60 ,/* CLK_TOP_MMPLL_D6_D2 */ -61 ,/* CLK_TOP_MMPLL_D7 */ +9 ,/* CLK_TOP_MAINPLL_D3 */ +10 ,/* CLK_TOP_MAINPLL_D4 */ +11 ,/* CLK_TOP_MAINPLL_D4_D2 */ +12 ,/* CLK_TOP_MAINPLL_D4_D4 */ +13 ,/* CLK_TOP_MAINPLL_D4_D8 */ +14 ,/* CLK_TOP_MAINPLL_D5 */ +15 ,/* CLK_TOP_MAINPLL_D5_D2 */ +16 ,/* CLK_TOP_MAINPLL_D5_D4 */ +17 ,/* CLK_TOP_MAINPLL_D5_D8 */ +18 ,/* CLK_TOP_MAINPLL_D6 */ +19 ,/* CLK_TOP_MAINPLL_D6_D2 */ +20 ,/* CLK_TOP_MAINPLL_D6_D4 */ +21 ,/* CLK_TOP_MAINPLL_D6_D8 */ +22 ,/* CLK_TOP_MAINPLL_D7 */ +23 ,/* CLK_TOP_MAINPLL_D7_D2 */ +24 ,/* CLK_TOP_MAINPLL_D7_D4 */ +25 ,/* CLK_TOP_MAINPLL_D7_D8 */ +26 ,/* CLK_TOP_MAINPLL_D9 */ +27 ,/* CLK_TOP_UNIVPLL_D2 */ +28 ,/* CLK_TOP_UNIVPLL_D3 */ +29 ,/* CLK_TOP_UNIVPLL_D4 */ +30 ,/* CLK_TOP_UNIVPLL_D4_D2 */ +31 ,/* CLK_TOP_UNIVPLL_D4_D4 */ +32 ,/* CLK_TOP_UNIVPLL_D4_D8 */ +33 ,/* CLK_TOP_UNIVPLL_D5 */ +34 ,/* CLK_TOP_UNIVPLL_D5_D2 */ +35 ,/* CLK_TOP_UNIVPLL_D5_D4 */ +36 ,/* CLK_TOP_UNIVPLL_D5_D8 */ +37 ,/* CLK_TOP_UNIVPLL_D6 */ +38 ,/* CLK_TOP_UNIVPLL_D6_D2 */ +39 ,/* CLK_TOP_UNIVPLL_D6_D4 */ +40 ,/* CLK_TOP_UNIVPLL_D6_D8 */ +41 ,/* CLK_TOP_UNIVPLL_D7 */ +42 ,/* CLK_TOP_UNIVPLL_192M */ +43 ,/* CLK_TOP_UNIVPLL_192M_D4 */ +44 ,/* CLK_TOP_UNIVPLL_192M_D8 */ +45 ,/* CLK_TOP_UNIVPLL_192M_D10 */ +46 ,/* CLK_TOP_UNIVPLL_192M_D16 */ +47 ,/* CLK_TOP_UNIVPLL_192M_D32 */ +48 ,/* CLK_TOP_APLL1_D3 */ +49 ,/* CLK_TOP_APLL1_D4 */ +50 ,/* CLK_TOP_APLL2_D3 */ +51 ,/* CLK_TOP_APLL2_D4 */ +52 ,/* CLK_TOP_APLL3_D4 */ +53 ,/* CLK_TOP_APLL4_D4 */ +54 ,/* CLK_TOP_APLL5_D4 */ +55 ,/* CLK_TOP_MMPLL_D4 */ +56 ,/* CLK_TOP_MMPLL_D4_D2 */ +57 ,/* CLK_TOP_MMPLL_D5 */ +58 ,/* CLK_TOP_MMPLL_D5_D2 */ +59 ,/* CLK_TOP_MMPLL_D5_D4 */ +60 ,/* CLK_TOP_MMPLL_D6 */ +61 ,/* CLK_TOP_MMPLL_D6_D2 */ +62 ,/* CLK_TOP_MMPLL_D7 */ 62 ,/* CLK_TOP_MMPLL_D9 */ -1 ,/* CLK_TOP_TVDPLL1 */ -63 ,/* CLK_TOP_TVDPLL1_D2 */ -64 ,/* CLK_TOP_TVDPLL1_D4 */ -65 ,/* CLK_TOP_TVDPLL1_D8 */ -66 ,/* CLK_TOP_TVDPLL1_D16 */ +64 ,/* CLK_TOP_TVDPLL1_D2 */ +65 ,/* CLK_TOP_TVDPLL1_D4 */ +66 ,/* CLK_TOP_TVDPLL1_D8 */ +67 ,/* CLK_TOP_TVDPLL1_D16 */ -1 ,/* CLK_TOP_TVDPLL2 */ -67 ,/* CLK_TOP_TVDPLL2_D2 */ -68 ,/* CLK_TOP_TVDPLL2_D4 */ -69 ,/* CLK_TOP_TVDPLL2_D8 */ -70 ,/* CLK_TOP_TVDPLL2_D16 */ -72 ,/* CLK_TOP_MSDCPLL_D2 */ -73 ,/* CLK_TOP_MSDCPLL_D16 */ +68 ,/* CLK_TOP_TVDPLL2_D2 */ +69 ,/* CLK_TOP_TVDPLL2_D4 */ +70 ,/* CLK_TOP_TVDPLL2_D8 */ +71 ,/* CLK_TOP_TVDPLL2_D16 */ +73 ,/* CLK_TOP_MSDCPLL_D2 */ +74 ,/* CLK_TOP_MSDCPLL_D16 */ -1 ,/* CLK_TOP_ETHPLL */ -74 ,/* CLK_TOP_ETHPLL_D2 */ -75 ,/* CLK_TOP_ETHPLL_D4 */ -76 ,/* CLK_TOP_ETHPLL_D8 */ -77 ,/* CLK_TOP_ETHPLL_D10 */ -78 ,/* CLK_TOP_ADSPPLL_D2 */ -79 ,/* CLK_TOP_ADSPPLL_D4 */ -80 ,/* CLK_TOP_ADSPPLL_D8 */ +75 ,/* CLK_TOP_ETHPLL_D2 */ +76 ,/* CLK_TOP_ETHPLL_D4 */ +77 ,/* CLK_TOP_ETHPLL_D8 */ +78 ,/* CLK_TOP_ETHPLL_D10 */ +79 ,/* CLK_TOP_ADSPPLL_D2 */ +80 ,/* CLK_TOP_ADSPPLL_D4 */ +81 ,/* CLK_TOP_ADSPPLL_D8 */ 0 ,/* CLK_TOP_ULPOSC1 */ -81 ,/* CLK_TOP_ULPOSC1_D2 */ -82 ,/* CLK_TOP_ULPOSC1_D4 */ -83 ,/* CLK_TOP_ULPOSC1_D8 */ -84 ,/* CLK_TOP_ULPOSC1_D7 */ -85 ,/* CLK_TOP_ULPOSC1_D10 */ -86 ,/* CLK_TOP_ULPOSC1_D16 */ +82 ,/* CLK_TOP_ULPOSC1_D2 */ +83 ,/* CLK_TOP_ULPOSC1_D4 */ +84 ,/* CLK_TOP_ULPOSC1_D8 */ +85 ,/* CLK_TOP_ULPOSC1_D7 */ +86 ,/* CLK_TOP_ULPOSC1_D10 */ +87 ,/* CLK_TOP_ULPOSC1_D16 */ 1 ,/* CLK_TOP_MPHONE_SLAVE_BCK */ 2 ,/* CLK_TOP_PAD_FPC */ 3 ,/* CLK_TOP_466M_FMEM */
@@ -1328,33 +1329,33 @@ static const int mt8188_id_offs_map[] = {-1 ,/* CLK_TOP_APLL12_CK_DIV3 */ -1 ,/* CLK_TOP_APLL12_CK_DIV4 */ -1 ,/* CLK_TOP_APLL12_CK_DIV9 */ -187 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP0 */ -188 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP1 */ -189 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO0 */ -190 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO1 */ -191 ,/* CLK_TOP_CFGREG_CLOCK_ISP_AXI_GALS */ -192 ,/* CLK_TOP_CFGREG_F26M_VPP0 */ -193 ,/* CLK_TOP_CFGREG_F26M_VPP1 */ -194 ,/* CLK_TOP_CFGREG_F26M_VDO0 */ -195 ,/* CLK_TOP_CFGREG_F26M_VDO1 */ -196 ,/* CLK_TOP_CFGREG_AUD_F26M_AUD */ -197 ,/* CLK_TOP_CFGREG_UNIPLL_SES */ -198 ,/* CLK_TOP_CFGREG_F_PCIE_PHY_REF */ -199 ,/* CLK_TOP_SSUSB_TOP_REF */ -200 ,/* CLK_TOP_SSUSB_PHY_REF */ -201 ,/* CLK_TOP_SSUSB_TOP_P1_REF */ -202 ,/* CLK_TOP_SSUSB_PHY_P1_REF */ -203 ,/* CLK_TOP_SSUSB_TOP_P2_REF */ -204 ,/* CLK_TOP_SSUSB_PHY_P2_REF */ -205 ,/* CLK_TOP_SSUSB_TOP_P3_REF */ -223 ,/* CLK_TOP_SSUSB_PHY_P3_REF */ +188 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP0 */ +189 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP1 */ +190 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO0 */ +191 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO1 */ +192 ,/* CLK_TOP_CFGREG_CLOCK_ISP_AXI_GALS */ +193 ,/* CLK_TOP_CFGREG_F26M_VPP0 */ +194 ,/* CLK_TOP_CFGREG_F26M_VPP1 */ +195 ,/* CLK_TOP_CFGREG_F26M_VDO0 */ +196 ,/* CLK_TOP_CFGREG_F26M_VDO1 */ +197 ,/* CLK_TOP_CFGREG_AUD_F26M_AUD */ +198 ,/* CLK_TOP_CFGREG_UNIPLL_SES */ +199 ,/* CLK_TOP_CFGREG_F_PCIE_PHY_REF */ +200 ,/* CLK_TOP_SSUSB_TOP_REF */ +201 ,/* CLK_TOP_SSUSB_PHY_REF */ +202 ,/* CLK_TOP_SSUSB_TOP_P1_REF */ +203 ,/* CLK_TOP_SSUSB_PHY_P1_REF */ +204 ,/* CLK_TOP_SSUSB_TOP_P2_REF */ +205 ,/* CLK_TOP_SSUSB_PHY_P2_REF */ +206 ,/* CLK_TOP_SSUSB_TOP_P3_REF */ +207 ,/* CLK_TOP_SSUSB_PHY_P3_REF */ -1 ,/* CLK_TOP_NR_CLK */ -1 ,/* CLK_TOP_ADSPPLL */ --1 ,/* CLK_TOP_CLK13M */ -6 ,/* CLK_TOP_CLK26M */ -7 ,/* CLK_TOP_CLK32K */ +6 ,/* CLK_TOP_CLK13M */ +7 ,/* CLK_TOP_CLK26M */ +8 ,/* CLK_TOP_CLK32K */ -1 ,/* CLK_TOP_IMGPLL */ -71 ,/* CLK_TOP_MSDCPLL */ +72 ,/* CLK_TOP_MSDCPLL */ -1 ,/* CLK_TOP_ULPOSC1_CK1 */ -1, /* CLK_TOP_ULPOSC_CK1 */ };
@@ -1417,9 +1418,9 @@ static const struct mtk_clk_tree mt8188_topckgen_clk_tree = { .xtal2_rate = 26 * MHZ, .id_offs_map = mt8188_id_offs_map, .id_offs_map_size = ARRAY_SIZE(mt8188_id_offs_map), - .fdivs_offs = 8, /* CLK_TOP_MAINPLL_D3 */ - .muxes_offs = 87, /* CLK_TOP_AXI */ - .gates_offs = 187, /* CLK_TOP_CFGREG_CLOCK_EN_VPP0 */ + .fdivs_offs = 9, /* CLK_TOP_MAINPLL_D3 */ + .muxes_offs = 88, /* CLK_TOP_AXI */ + .gates_offs = 188, /* CLK_TOP_CFGREG_CLOCK_EN_VPP0 */ .fclks = top_fixed_clks, .fdivs = top_fixed_divs, .muxes = top_muxes,
Signature · 1 line
2.52.0
PATCH v2 4/5 clk: mediatek: mt8188: fix some clock parents
In reply to Julien StephanFix a number of clock parent definitions for MT8188 clocks.
--- drivers/clk/mediatek/clk-mt8188.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)
drivers/clk/mediatek/clk-mt8188.c +15 -19
@@ -26,8 +26,6 @@#define CLK_TOP_CLK32K 209#define CLK_TOP_IMGPLL 210#define CLK_TOP_MSDCPLL 211 -#define CLK_TOP_ULPOSC1_CK1 212 -#define CLK_TOP_ULPOSC_CK1 213/* apmixedsys */ #define PLL(_id, _reg, _pwr_reg, _en_mask, _flags, _pcwbits, _pd_reg, \
@@ -165,21 +163,21 @@ static const struct mtk_fixed_factor top_fixed_divs[] = {FACTOR1 (CLK_TOP_MMPLL_D6_D2 ,CLK_TOP_MMPLL_D6 ,1 ,2 ),FACTOR0 (CLK_TOP_MMPLL_D7 ,CLK_APMIXED_MMPLL ,1 ,7 ),FACTOR0 (CLK_TOP_MMPLL_D9 ,CLK_APMIXED_MMPLL ,1 ,9 ), -FACTOR1 (CLK_TOP_TVDPLL1_D2 ,CLK_TOP_TVDPLL1 ,1 ,2 ), -FACTOR1 (CLK_TOP_TVDPLL1_D4 ,CLK_TOP_TVDPLL1 ,1 ,4 ), -FACTOR1 (CLK_TOP_TVDPLL1_D8 ,CLK_TOP_TVDPLL1 ,1 ,8 ), -FACTOR1 (CLK_TOP_TVDPLL1_D16 ,CLK_TOP_TVDPLL1 ,1 ,16 ), -FACTOR1 (CLK_TOP_TVDPLL2_D2 ,CLK_TOP_TVDPLL2 ,1 ,2 ), -FACTOR1 (CLK_TOP_TVDPLL2_D4 ,CLK_TOP_TVDPLL2 ,1 ,4 ), -FACTOR1 (CLK_TOP_TVDPLL2_D8 ,CLK_TOP_TVDPLL2 ,1 ,8 ), -FACTOR1 (CLK_TOP_TVDPLL2_D16 ,CLK_TOP_TVDPLL2 ,1 ,16 ), +FACTOR0 (CLK_TOP_TVDPLL1_D2 ,CLK_APMIXED_TVDPLL1 ,1 ,2 ), +FACTOR0 (CLK_TOP_TVDPLL1_D4 ,CLK_APMIXED_TVDPLL1 ,1 ,4 ), +FACTOR0 (CLK_TOP_TVDPLL1_D8 ,CLK_APMIXED_TVDPLL1 ,1 ,8 ), +FACTOR0 (CLK_TOP_TVDPLL1_D16 ,CLK_APMIXED_TVDPLL1 ,1 ,16 ), +FACTOR0 (CLK_TOP_TVDPLL2_D2 ,CLK_APMIXED_TVDPLL2 ,1 ,2 ), +FACTOR0 (CLK_TOP_TVDPLL2_D4 ,CLK_APMIXED_TVDPLL2 ,1 ,4 ), +FACTOR0 (CLK_TOP_TVDPLL2_D8 ,CLK_APMIXED_TVDPLL2 ,1 ,8 ), +FACTOR0 (CLK_TOP_TVDPLL2_D16 ,CLK_APMIXED_TVDPLL2 ,1 ,16 ),FACTOR0 (CLK_TOP_MSDCPLL ,CLK_APMIXED_MSDCPLL ,1 ,1 ),FACTOR0 (CLK_TOP_MSDCPLL_D2 ,CLK_APMIXED_MSDCPLL ,1 ,2 ),FACTOR0 (CLK_TOP_MSDCPLL_D16 ,CLK_APMIXED_MSDCPLL ,1 ,16 ), -FACTOR1 (CLK_TOP_ETHPLL_D2 ,CLK_TOP_ETHPLL ,1 ,2 ), -FACTOR1 (CLK_TOP_ETHPLL_D4 ,CLK_TOP_ETHPLL ,1 ,4 ), -FACTOR1 (CLK_TOP_ETHPLL_D8 ,CLK_TOP_ETHPLL ,1 ,8 ), -FACTOR1 (CLK_TOP_ETHPLL_D10 ,CLK_TOP_ETHPLL ,1 ,10 ), +FACTOR0 (CLK_TOP_ETHPLL_D2 ,CLK_APMIXED_ETHPLL ,1 ,2 ), +FACTOR0 (CLK_TOP_ETHPLL_D4 ,CLK_APMIXED_ETHPLL ,1 ,4 ), +FACTOR0 (CLK_TOP_ETHPLL_D8 ,CLK_APMIXED_ETHPLL ,1 ,8 ), +FACTOR0 (CLK_TOP_ETHPLL_D10 ,CLK_APMIXED_ETHPLL ,1 ,10 ),FACTOR0 (CLK_TOP_ADSPPLL_D2 ,CLK_APMIXED_ADSPPLL ,1 ,2 ),FACTOR0 (CLK_TOP_ADSPPLL_D4 ,CLK_APMIXED_ADSPPLL ,1 ,4 ), FACTOR0(CLK_TOP_ADSPPLL_D8, CLK_APMIXED_ADSPPLL, 1, 8),
@@ -859,7 +857,7 @@ static const int adsp_parents[] = {CLK_TOP_UNIVPLL_D4_D4 ,CLK_TOP_UNIVPLL_D4 ,CLK_TOP_ULPOSC1_D2 , -CLK_TOP_ULPOSC1_CK1 , +CLK_TOP_ULPOSC1 ,CLK_TOP_ADSPPLL ,CLK_TOP_ADSPPLL_D2 , CLK_TOP_ADSPPLL_D4,
@@ -876,7 +874,7 @@ static const int audio_local_bus_parents[] = {CLK_TOP_MAINPLL_D7 ,CLK_TOP_MAINPLL_D4 ,CLK_TOP_UNIVPLL_D6 , -CLK_TOP_ULPOSC1_CK1 , +CLK_TOP_ULPOSC1 ,CLK_TOP_ULPOSC1_D4 , CLK_TOP_ULPOSC1_D2 };
@@ -1015,7 +1013,7 @@ static const int spinor_parents[] = { };static const int ulposc_parents[] = { -CLK_TOP_ULPOSC_CK1 , +CLK_TOP_ULPOSC1 ,CLK_TOP_ETHPLL_D2 ,CLK_TOP_MAINPLL_D4_D2 ,CLK_TOP_ETHPLL_D10
@@ -1356,8 +1354,6 @@ static const int mt8188_id_offs_map[] = {8 ,/* CLK_TOP_CLK32K */ -1 ,/* CLK_TOP_IMGPLL */ 72, /* CLK_TOP_MSDCPLL */ --1 ,/* CLK_TOP_ULPOSC1_CK1 */ - -1, /* CLK_TOP_ULPOSC_CK1 */ }; static const struct mtk_gate_regs top0_cg_regs = {
Signature · 1 line
2.52.0
PATCH v2 5/5 clk: mediatek: mt8188: refactor driver to improve readability
In reply to Julien StephanRefactor some part of the driver to improve readability and future additions:
- use CLK_TOP_NR_CLK for added clocks
- rename the id map to make it more clear that the map applies to top clocks only
- refactor the id map to improve readability
- xtal2_rate is only used for PLL clocks, so only the apmixedsys clock tree needs it. Remove it elsewhere.
--- drivers/clk/mediatek/clk-mt8188.c | 447 ++++++++++++++++++-------------------- 1 file changed, 217 insertions(+), 230 deletions(-)
drivers/clk/mediatek/clk-mt8188.c +217 -230
@@ -20,12 +20,13 @@#define MT8188_PLL_FMIN (1500UL * MHZ)/* Missing topckgen clocks definition in dt-bindings */ -#define CLK_TOP_ADSPPLL 206 -#define CLK_TOP_CLK13M 207 -#define CLK_TOP_CLK26M 208 -#define CLK_TOP_CLK32K 209 -#define CLK_TOP_IMGPLL 210 -#define CLK_TOP_MSDCPLL 211 +#define CLK_TOP_ADSPPLL CLK_TOP_NR_CLK +#define CLK_TOP_CLK13M CLK_TOP_NR_CLK + 1 +#define CLK_TOP_CLK26M CLK_TOP_NR_CLK + 2 +#define CLK_TOP_CLK32K CLK_TOP_NR_CLK + 3 +#define CLK_TOP_IMGPLL CLK_TOP_NR_CLK + 4 +#define CLK_TOP_MSDCPLL CLK_TOP_NR_CLK + 5 +#define CLK_TOP_FULL_NR_CLK CLK_TOP_NR_CLK + 6/* apmixedsys */ #define PLL(_id, _reg, _pwr_reg, _en_mask, _flags, _pcwbits, _pd_reg, \
@@ -1141,219 +1142,211 @@ static const struct mtk_composite top_muxes[] = { MUX_GATE(CLK_TOP_SRCK, srck_parents, 0x0128, 16, 4, 23), }; -static const int mt8188_id_offs_map[] = { -88 ,/* CLK_TOP_AXI */ -89 ,/* CLK_TOP_SPM */ -90 ,/* CLK_TOP_SCP */ -91 ,/* CLK_TOP_BUS_AXIMEM */ -92 ,/* CLK_TOP_VPP */ -93 ,/* CLK_TOP_ETHDR */ -94 ,/* CLK_TOP_IPE */ -95 ,/* CLK_TOP_CAM */ -96 ,/* CLK_TOP_CCU */ -97 ,/* CLK_TOP_CCU_AHB */ -98 ,/* CLK_TOP_IMG */ -99 ,/* CLK_TOP_CAMTM */ -100 ,/* CLK_TOP_DSP */ -101 ,/* CLK_TOP_DSP1 */ -102 ,/* CLK_TOP_DSP2 */ -103 ,/* CLK_TOP_DSP3 */ -104 ,/* CLK_TOP_DSP4 */ -105 ,/* CLK_TOP_DSP5 */ -106 ,/* CLK_TOP_DSP6 */ -107 ,/* CLK_TOP_DSP7 */ -108 ,/* CLK_TOP_MFG_CORE_TMP */ -109 ,/* CLK_TOP_CAMTG */ -110 ,/* CLK_TOP_CAMTG2 */ -111 ,/* CLK_TOP_CAMTG3 */ -112 ,/* CLK_TOP_UART */ -113 ,/* CLK_TOP_SPI */ -114 ,/* CLK_TOP_MSDC50_0_HCLK */ -115 ,/* CLK_TOP_MSDC50_0 */ -116 ,/* CLK_TOP_MSDC30_1 */ -117 ,/* CLK_TOP_MSDC30_2 */ -118 ,/* CLK_TOP_INTDIR */ -119 ,/* CLK_TOP_AUD_INTBUS */ -120 ,/* CLK_TOP_AUDIO_H */ -121 ,/* CLK_TOP_PWRAP_ULPOSC */ -122 ,/* CLK_TOP_ATB */ -123 ,/* CLK_TOP_SSPM */ -124 ,/* CLK_TOP_DP */ -125 ,/* CLK_TOP_EDP */ -126 ,/* CLK_TOP_DPI */ -127 ,/* CLK_TOP_DISP_PWM0 */ -128 ,/* CLK_TOP_DISP_PWM1 */ -129 ,/* CLK_TOP_USB_TOP */ -130 ,/* CLK_TOP_SSUSB_XHCI */ -131 ,/* CLK_TOP_USB_TOP_2P */ -132 ,/* CLK_TOP_SSUSB_XHCI_2P */ -133 ,/* CLK_TOP_USB_TOP_3P */ -134 ,/* CLK_TOP_SSUSB_XHCI_3P */ -135 ,/* CLK_TOP_I2C */ -136 ,/* CLK_TOP_SENINF */ -137 ,/* CLK_TOP_SENINF1 */ -138 ,/* CLK_TOP_GCPU */ -139 ,/* CLK_TOP_VENC */ -140 ,/* CLK_TOP_VDEC */ -141 ,/* CLK_TOP_PWM */ -142 ,/* CLK_TOP_MCUPM */ -143 ,/* CLK_TOP_SPMI_P_MST */ -144 ,/* CLK_TOP_SPMI_M_MST */ -145 ,/* CLK_TOP_DVFSRC */ -146 ,/* CLK_TOP_TL */ -147 ,/* CLK_TOP_AES_MSDCFDE */ -148 ,/* CLK_TOP_DSI_OCC */ -149 ,/* CLK_TOP_WPE_VPP */ -150 ,/* CLK_TOP_HDCP */ -151 ,/* CLK_TOP_HDCP_24M */ -152 ,/* CLK_TOP_HDMI_APB */ -153 ,/* CLK_TOP_SNPS_ETH_250M */ -154 ,/* CLK_TOP_SNPS_ETH_62P4M_PTP */ -155 ,/* CLK_TOP_SNPS_ETH_50M_RMII */ -156 ,/* CLK_TOP_ADSP */ -157 ,/* CLK_TOP_AUDIO_LOCAL_BUS */ -158 ,/* CLK_TOP_ASM_H */ -159 ,/* CLK_TOP_ASM_L */ -160 ,/* CLK_TOP_APLL1 */ -161 ,/* CLK_TOP_APLL2 */ -162 ,/* CLK_TOP_APLL3 */ -163 ,/* CLK_TOP_APLL4 */ -164 ,/* CLK_TOP_APLL5 */ -165 ,/* CLK_TOP_I2SO1 */ -166 ,/* CLK_TOP_I2SO2 */ -167 ,/* CLK_TOP_I2SI1 */ -168 ,/* CLK_TOP_I2SI2 */ -169 ,/* CLK_TOP_DPTX */ -170 ,/* CLK_TOP_AUD_IEC */ -171 ,/* CLK_TOP_A1SYS_HP */ -172 ,/* CLK_TOP_A2SYS */ -173 ,/* CLK_TOP_A3SYS */ -174 ,/* CLK_TOP_A4SYS */ -175 ,/* CLK_TOP_ECC */ -176 ,/* CLK_TOP_SPINOR */ -177 ,/* CLK_TOP_ULPOSC */ -178 ,/* CLK_TOP_SRCK */ --1 ,/* CLK_TOP_MFG_CK_FAST_REF */ -9 ,/* CLK_TOP_MAINPLL_D3 */ -10 ,/* CLK_TOP_MAINPLL_D4 */ -11 ,/* CLK_TOP_MAINPLL_D4_D2 */ -12 ,/* CLK_TOP_MAINPLL_D4_D4 */ -13 ,/* CLK_TOP_MAINPLL_D4_D8 */ -14 ,/* CLK_TOP_MAINPLL_D5 */ -15 ,/* CLK_TOP_MAINPLL_D5_D2 */ -16 ,/* CLK_TOP_MAINPLL_D5_D4 */ -17 ,/* CLK_TOP_MAINPLL_D5_D8 */ -18 ,/* CLK_TOP_MAINPLL_D6 */ -19 ,/* CLK_TOP_MAINPLL_D6_D2 */ -20 ,/* CLK_TOP_MAINPLL_D6_D4 */ -21 ,/* CLK_TOP_MAINPLL_D6_D8 */ -22 ,/* CLK_TOP_MAINPLL_D7 */ -23 ,/* CLK_TOP_MAINPLL_D7_D2 */ -24 ,/* CLK_TOP_MAINPLL_D7_D4 */ -25 ,/* CLK_TOP_MAINPLL_D7_D8 */ -26 ,/* CLK_TOP_MAINPLL_D9 */ -27 ,/* CLK_TOP_UNIVPLL_D2 */ -28 ,/* CLK_TOP_UNIVPLL_D3 */ -29 ,/* CLK_TOP_UNIVPLL_D4 */ -30 ,/* CLK_TOP_UNIVPLL_D4_D2 */ -31 ,/* CLK_TOP_UNIVPLL_D4_D4 */ -32 ,/* CLK_TOP_UNIVPLL_D4_D8 */ -33 ,/* CLK_TOP_UNIVPLL_D5 */ -34 ,/* CLK_TOP_UNIVPLL_D5_D2 */ -35 ,/* CLK_TOP_UNIVPLL_D5_D4 */ -36 ,/* CLK_TOP_UNIVPLL_D5_D8 */ -37 ,/* CLK_TOP_UNIVPLL_D6 */ -38 ,/* CLK_TOP_UNIVPLL_D6_D2 */ -39 ,/* CLK_TOP_UNIVPLL_D6_D4 */ -40 ,/* CLK_TOP_UNIVPLL_D6_D8 */ -41 ,/* CLK_TOP_UNIVPLL_D7 */ -42 ,/* CLK_TOP_UNIVPLL_192M */ -43 ,/* CLK_TOP_UNIVPLL_192M_D4 */ -44 ,/* CLK_TOP_UNIVPLL_192M_D8 */ -45 ,/* CLK_TOP_UNIVPLL_192M_D10 */ -46 ,/* CLK_TOP_UNIVPLL_192M_D16 */ -47 ,/* CLK_TOP_UNIVPLL_192M_D32 */ -48 ,/* CLK_TOP_APLL1_D3 */ -49 ,/* CLK_TOP_APLL1_D4 */ -50 ,/* CLK_TOP_APLL2_D3 */ -51 ,/* CLK_TOP_APLL2_D4 */ -52 ,/* CLK_TOP_APLL3_D4 */ -53 ,/* CLK_TOP_APLL4_D4 */ -54 ,/* CLK_TOP_APLL5_D4 */ -55 ,/* CLK_TOP_MMPLL_D4 */ -56 ,/* CLK_TOP_MMPLL_D4_D2 */ -57 ,/* CLK_TOP_MMPLL_D5 */ -58 ,/* CLK_TOP_MMPLL_D5_D2 */ -59 ,/* CLK_TOP_MMPLL_D5_D4 */ -60 ,/* CLK_TOP_MMPLL_D6 */ -61 ,/* CLK_TOP_MMPLL_D6_D2 */ -62 ,/* CLK_TOP_MMPLL_D7 */ -62 ,/* CLK_TOP_MMPLL_D9 */ --1 ,/* CLK_TOP_TVDPLL1 */ -64 ,/* CLK_TOP_TVDPLL1_D2 */ -65 ,/* CLK_TOP_TVDPLL1_D4 */ -66 ,/* CLK_TOP_TVDPLL1_D8 */ -67 ,/* CLK_TOP_TVDPLL1_D16 */ --1 ,/* CLK_TOP_TVDPLL2 */ -68 ,/* CLK_TOP_TVDPLL2_D2 */ -69 ,/* CLK_TOP_TVDPLL2_D4 */ -70 ,/* CLK_TOP_TVDPLL2_D8 */ -71 ,/* CLK_TOP_TVDPLL2_D16 */ -73 ,/* CLK_TOP_MSDCPLL_D2 */ -74 ,/* CLK_TOP_MSDCPLL_D16 */ --1 ,/* CLK_TOP_ETHPLL */ -75 ,/* CLK_TOP_ETHPLL_D2 */ -76 ,/* CLK_TOP_ETHPLL_D4 */ -77 ,/* CLK_TOP_ETHPLL_D8 */ -78 ,/* CLK_TOP_ETHPLL_D10 */ -79 ,/* CLK_TOP_ADSPPLL_D2 */ -80 ,/* CLK_TOP_ADSPPLL_D4 */ -81 ,/* CLK_TOP_ADSPPLL_D8 */ -0 ,/* CLK_TOP_ULPOSC1 */ -82 ,/* CLK_TOP_ULPOSC1_D2 */ -83 ,/* CLK_TOP_ULPOSC1_D4 */ -84 ,/* CLK_TOP_ULPOSC1_D8 */ -85 ,/* CLK_TOP_ULPOSC1_D7 */ -86 ,/* CLK_TOP_ULPOSC1_D10 */ -87 ,/* CLK_TOP_ULPOSC1_D16 */ -1 ,/* CLK_TOP_MPHONE_SLAVE_BCK */ -2 ,/* CLK_TOP_PAD_FPC */ -3 ,/* CLK_TOP_466M_FMEM */ -4 ,/* CLK_TOP_PEXTP_PIPE */ -5 ,/* CLK_TOP_DSI_PHY */ --1 ,/* CLK_TOP_APLL12_CK_DIV0 */ --1 ,/* CLK_TOP_APLL12_CK_DIV1 */ --1 ,/* CLK_TOP_APLL12_CK_DIV2 */ --1 ,/* CLK_TOP_APLL12_CK_DIV3 */ --1 ,/* CLK_TOP_APLL12_CK_DIV4 */ --1 ,/* CLK_TOP_APLL12_CK_DIV9 */ -188 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP0 */ -189 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP1 */ -190 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO0 */ -191 ,/* CLK_TOP_CFGREG_CLOCK_EN_VDO1 */ -192 ,/* CLK_TOP_CFGREG_CLOCK_ISP_AXI_GALS */ -193 ,/* CLK_TOP_CFGREG_F26M_VPP0 */ -194 ,/* CLK_TOP_CFGREG_F26M_VPP1 */ -195 ,/* CLK_TOP_CFGREG_F26M_VDO0 */ -196 ,/* CLK_TOP_CFGREG_F26M_VDO1 */ -197 ,/* CLK_TOP_CFGREG_AUD_F26M_AUD */ -198 ,/* CLK_TOP_CFGREG_UNIPLL_SES */ -199 ,/* CLK_TOP_CFGREG_F_PCIE_PHY_REF */ -200 ,/* CLK_TOP_SSUSB_TOP_REF */ -201 ,/* CLK_TOP_SSUSB_PHY_REF */ -202 ,/* CLK_TOP_SSUSB_TOP_P1_REF */ -203 ,/* CLK_TOP_SSUSB_PHY_P1_REF */ -204 ,/* CLK_TOP_SSUSB_TOP_P2_REF */ -205 ,/* CLK_TOP_SSUSB_PHY_P2_REF */ -206 ,/* CLK_TOP_SSUSB_TOP_P3_REF */ -207 ,/* CLK_TOP_SSUSB_PHY_P3_REF */ --1 ,/* CLK_TOP_NR_CLK */ --1 ,/* CLK_TOP_ADSPPLL */ -6 ,/* CLK_TOP_CLK13M */ -7 ,/* CLK_TOP_CLK26M */ -8 ,/* CLK_TOP_CLK32K */ --1 ,/* CLK_TOP_IMGPLL */ -72 ,/* CLK_TOP_MSDCPLL */ +static const int mt8188_id_top_offs_map[] = { + [0 ...CLK_TOP_FULL_NR_CLK -1 ] =-1 , +/* FIXED */ + [CLK_TOP_ULPOSC1 ] =0 , + [CLK_TOP_MPHONE_SLAVE_BCK ] =1 , + [CLK_TOP_PAD_FPC ] =2 , + [CLK_TOP_466M_FMEM ] =3 , + [CLK_TOP_PEXTP_PIPE ] =4 , + [CLK_TOP_DSI_PHY ] =5 , + [CLK_TOP_CLK13M ] =6 , + [CLK_TOP_CLK26M ] =7 , + [CLK_TOP_CLK32K ] =8 , +/* FACTOR */ + [CLK_TOP_MAINPLL_D3 ] =9 , + [CLK_TOP_MAINPLL_D4 ] =10 , + [CLK_TOP_MAINPLL_D4_D2 ] =11 , + [CLK_TOP_MAINPLL_D4_D4 ] =12 , + [CLK_TOP_MAINPLL_D4_D8 ] =13 , + [CLK_TOP_MAINPLL_D5 ] =14 , + [CLK_TOP_MAINPLL_D5_D2 ] =15 , + [CLK_TOP_MAINPLL_D5_D4 ] =16 , + [CLK_TOP_MAINPLL_D5_D8 ] =17 , + [CLK_TOP_MAINPLL_D6 ] =18 , + [CLK_TOP_MAINPLL_D6_D2 ] =19 , + [CLK_TOP_MAINPLL_D6_D4 ] =20 , + [CLK_TOP_MAINPLL_D6_D8 ] =21 , + [CLK_TOP_MAINPLL_D7 ] =22 , + [CLK_TOP_MAINPLL_D7_D2 ] =23 , + [CLK_TOP_MAINPLL_D7_D4 ] =24 , + [CLK_TOP_MAINPLL_D7_D8 ] =25 , + [CLK_TOP_MAINPLL_D9 ] =26 , + [CLK_TOP_UNIVPLL_D2 ] =27 , + [CLK_TOP_UNIVPLL_D3 ] =28 , + [CLK_TOP_UNIVPLL_D4 ] =29 , + [CLK_TOP_UNIVPLL_D4_D2 ] =30 , + [CLK_TOP_UNIVPLL_D4_D4 ] =31 , + [CLK_TOP_UNIVPLL_D4_D8 ] =32 , + [CLK_TOP_UNIVPLL_D5 ] =33 , + [CLK_TOP_UNIVPLL_D5_D2 ] =34 , + [CLK_TOP_UNIVPLL_D5_D4 ] =35 , + [CLK_TOP_UNIVPLL_D5_D8 ] =36 , + [CLK_TOP_UNIVPLL_D6 ] =37 , + [CLK_TOP_UNIVPLL_D6_D2 ] =38 , + [CLK_TOP_UNIVPLL_D6_D4 ] =39 , + [CLK_TOP_UNIVPLL_D6_D8 ] =40 , + [CLK_TOP_UNIVPLL_D7 ] =41 , + [CLK_TOP_UNIVPLL_192M ] =42 , + [CLK_TOP_UNIVPLL_192M_D4 ] =43 , + [CLK_TOP_UNIVPLL_192M_D8 ] =44 , + [CLK_TOP_UNIVPLL_192M_D10 ] =45 , + [CLK_TOP_UNIVPLL_192M_D16 ] =46 , + [CLK_TOP_UNIVPLL_192M_D32 ] =47 , + [CLK_TOP_APLL1_D3 ] =48 , + [CLK_TOP_APLL1_D4 ] =49 , + [CLK_TOP_APLL2_D3 ] =50 , + [CLK_TOP_APLL2_D4 ] =51 , + [CLK_TOP_APLL3_D4 ] =52 , + [CLK_TOP_APLL4_D4 ] =53 , + [CLK_TOP_APLL5_D4 ] =54 , + [CLK_TOP_MMPLL_D4 ] =55 , + [CLK_TOP_MMPLL_D4_D2 ] =56 , + [CLK_TOP_MMPLL_D5 ] =57 , + [CLK_TOP_MMPLL_D5_D2 ] =58 , + [CLK_TOP_MMPLL_D5_D4 ] =59 , + [CLK_TOP_MMPLL_D6 ] =60 , + [CLK_TOP_MMPLL_D6_D2 ] =61 , + [CLK_TOP_MMPLL_D7 ] =62 , + [CLK_TOP_MMPLL_D9 ] =62 , + [CLK_TOP_TVDPLL1_D2 ] =64 , + [CLK_TOP_TVDPLL1_D4 ] =65 , + [CLK_TOP_TVDPLL1_D8 ] =66 , + [CLK_TOP_TVDPLL1_D16 ] =67 , + [CLK_TOP_TVDPLL2_D2 ] =68 , + [CLK_TOP_TVDPLL2_D4 ] =69 , + [CLK_TOP_TVDPLL2_D8 ] =70 , + [CLK_TOP_TVDPLL2_D16 ] =71 , + [CLK_TOP_MSDCPLL ] =72 , + [CLK_TOP_MSDCPLL_D2 ] =73 , + [CLK_TOP_MSDCPLL_D16 ] =74 , + [CLK_TOP_ETHPLL_D2 ] =75 , + [CLK_TOP_ETHPLL_D4 ] =76 , + [CLK_TOP_ETHPLL_D8 ] =77 , + [CLK_TOP_ETHPLL_D10 ] =78 , + [CLK_TOP_ADSPPLL_D2 ] =79 , + [CLK_TOP_ADSPPLL_D4 ] =80 , + [CLK_TOP_ADSPPLL_D8 ] =81 , + [CLK_TOP_ULPOSC1_D2 ] =82 , + [CLK_TOP_ULPOSC1_D4 ] =83 , + [CLK_TOP_ULPOSC1_D8 ] =84 , + [CLK_TOP_ULPOSC1_D7 ] =85 , + [CLK_TOP_ULPOSC1_D10 ] =86 , + [CLK_TOP_ULPOSC1_D16 ] =87 , +/* MUX */ + [CLK_TOP_AXI ] =88 , + [CLK_TOP_SPM ] =89 , + [CLK_TOP_SCP ] =90 , + [CLK_TOP_BUS_AXIMEM ] =91 , + [CLK_TOP_VPP ] =92 , + [CLK_TOP_ETHDR ] =93 , + [CLK_TOP_IPE ] =94 , + [CLK_TOP_CAM ] =95 , + [CLK_TOP_CCU ] =96 , + [CLK_TOP_CCU_AHB ] =97 , + [CLK_TOP_IMG ] =98 , + [CLK_TOP_CAMTM ] =99 , + [CLK_TOP_DSP ] =100 , + [CLK_TOP_DSP1 ] =101 , + [CLK_TOP_DSP2 ] =102 , + [CLK_TOP_DSP3 ] =103 , + [CLK_TOP_DSP4 ] =104 , + [CLK_TOP_DSP5 ] =105 , + [CLK_TOP_DSP6 ] =106 , + [CLK_TOP_DSP7 ] =107 , + [CLK_TOP_MFG_CORE_TMP ] =108 , + [CLK_TOP_CAMTG ] =109 , + [CLK_TOP_CAMTG2 ] =110 , + [CLK_TOP_CAMTG3 ] =111 , + [CLK_TOP_UART ] =112 , + [CLK_TOP_SPI ] =113 , + [CLK_TOP_MSDC50_0_HCLK ] =114 , + [CLK_TOP_MSDC50_0 ] =115 , + [CLK_TOP_MSDC30_1 ] =116 , + [CLK_TOP_MSDC30_2 ] =117 , + [CLK_TOP_INTDIR ] =118 , + [CLK_TOP_AUD_INTBUS ] =119 , + [CLK_TOP_AUDIO_H ] =120 , + [CLK_TOP_PWRAP_ULPOSC ] =121 , + [CLK_TOP_ATB ] =122 , + [CLK_TOP_SSPM ] =123 , + [CLK_TOP_DP ] =124 , + [CLK_TOP_EDP ] =125 , + [CLK_TOP_DPI ] =126 , + [CLK_TOP_DISP_PWM0 ] =127 , + [CLK_TOP_DISP_PWM1 ] =128 , + [CLK_TOP_USB_TOP ] =129 , + [CLK_TOP_SSUSB_XHCI ] =130 , + [CLK_TOP_USB_TOP_2P ] =131 , + [CLK_TOP_SSUSB_XHCI_2P ] =132 , + [CLK_TOP_USB_TOP_3P ] =133 , + [CLK_TOP_SSUSB_XHCI_3P ] =134 , + [CLK_TOP_I2C ] =135 , + [CLK_TOP_SENINF ] =136 , + [CLK_TOP_SENINF1 ] =137 , + [CLK_TOP_GCPU ] =138 , + [CLK_TOP_VENC ] =139 , + [CLK_TOP_VDEC ] =140 , + [CLK_TOP_PWM ] =141 , + [CLK_TOP_MCUPM ] =142 , + [CLK_TOP_SPMI_P_MST ] =143 , + [CLK_TOP_SPMI_M_MST ] =144 , + [CLK_TOP_DVFSRC ] =145 , + [CLK_TOP_TL ] =146 , + [CLK_TOP_AES_MSDCFDE ] =147 , + [CLK_TOP_DSI_OCC ] =148 , + [CLK_TOP_WPE_VPP ] =149 , + [CLK_TOP_HDCP ] =150 , + [CLK_TOP_HDCP_24M ] =151 , + [CLK_TOP_HDMI_APB ] =152 , + [CLK_TOP_SNPS_ETH_250M ] =153 , + [CLK_TOP_SNPS_ETH_62P4M_PTP ] =154 , + [CLK_TOP_SNPS_ETH_50M_RMII ] =155 , + [CLK_TOP_ADSP ] =156 , + [CLK_TOP_AUDIO_LOCAL_BUS ] =157 , + [CLK_TOP_ASM_H ] =158 , + [CLK_TOP_ASM_L ] =159 , + [CLK_TOP_APLL1 ] =160 , + [CLK_TOP_APLL2 ] =161 , + [CLK_TOP_APLL3 ] =162 , + [CLK_TOP_APLL4 ] =163 , + [CLK_TOP_APLL5 ] =164 , + [CLK_TOP_I2SO1 ] =165 , + [CLK_TOP_I2SO2 ] =166 , + [CLK_TOP_I2SI1 ] =167 , + [CLK_TOP_I2SI2 ] =168 , + [CLK_TOP_DPTX ] =169 , + [CLK_TOP_AUD_IEC ] =170 , + [CLK_TOP_A1SYS_HP ] =171 , + [CLK_TOP_A2SYS ] =172 , + [CLK_TOP_A3SYS ] =173 , + [CLK_TOP_A4SYS ] =174 , + [CLK_TOP_ECC ] =175 , + [CLK_TOP_SPINOR ] =176 , + [CLK_TOP_ULPOSC ] =177 , + [CLK_TOP_SRCK ] =178 , +/* GATE */ + [CLK_TOP_CFGREG_CLOCK_EN_VPP0 ] =179 , + [CLK_TOP_CFGREG_CLOCK_EN_VPP1 ] =180 , + [CLK_TOP_CFGREG_CLOCK_EN_VDO0 ] =181 , + [CLK_TOP_CFGREG_CLOCK_EN_VDO1 ] =182 , + [CLK_TOP_CFGREG_CLOCK_ISP_AXI_GALS ] =183 , + [CLK_TOP_CFGREG_F26M_VPP0 ] =184 , + [CLK_TOP_CFGREG_F26M_VPP1 ] =185 , + [CLK_TOP_CFGREG_F26M_VDO0 ] =186 , + [CLK_TOP_CFGREG_F26M_VDO1 ] =187 , + [CLK_TOP_CFGREG_AUD_F26M_AUD ] =188 , + [CLK_TOP_CFGREG_UNIPLL_SES ] =189 , + [CLK_TOP_CFGREG_F_PCIE_PHY_REF ] =190 , + [CLK_TOP_SSUSB_TOP_REF ] =191 , + [CLK_TOP_SSUSB_PHY_REF ] =192 , + [CLK_TOP_SSUSB_TOP_P1_REF ] =193 , + [CLK_TOP_SSUSB_PHY_P1_REF ] =194 , + [CLK_TOP_SSUSB_TOP_P2_REF ] =195 , + [CLK_TOP_SSUSB_PHY_P2_REF ] =196 , + [CLK_TOP_SSUSB_TOP_P3_REF ] =197 , + [CLK_TOP_SSUSB_PHY_P3_REF ] =198 , };static const struct mtk_gate_regs top0_cg_regs = {
@@ -1411,12 +1404,11 @@ static const struct mtk_gate topckgen_cg_clks[] = {static const struct mtk_clk_tree mt8188_topckgen_clk_tree = { .xtal_rate =26 *MHZ , - .xtal2_rate =26 *MHZ , - .id_offs_map = mt8188_id_offs_map, - .id_offs_map_size =ARRAY_SIZE (mt8188_id_offs_map), - .fdivs_offs =9 ,/* CLK_TOP_MAINPLL_D3 */ - .muxes_offs =88 ,/* CLK_TOP_AXI */ - .gates_offs =188 ,/* CLK_TOP_CFGREG_CLOCK_EN_VPP0 */ + .id_offs_map = mt8188_id_top_offs_map, + .id_offs_map_size =ARRAY_SIZE (mt8188_id_top_offs_map), + .fdivs_offs = mt8188_id_top_offs_map[CLK_TOP_MAINPLL_D3 ], + .muxes_offs = mt8188_id_top_offs_map[CLK_TOP_AXI ], + .gates_offs = mt8188_id_top_offs_map[CLK_TOP_CFGREG_CLOCK_EN_VPP0 ], .fclks = top_fixed_clks, .fdivs = top_fixed_divs, .muxes = top_muxes,
@@ -1590,7 +1582,6 @@ static const struct mtk_gate infracfg_ao_clks[] = {static const struct mtk_clk_tree mt8188_infracfg_ao_clk_tree = { .xtal_rate =26 *MHZ , - .xtal2_rate =26 *MHZ , };static const struct mtk_gate_regs peri_ao_cg_regs = {
@@ -1624,7 +1615,6 @@ static const struct mtk_gate pericfg_ao_clks[] = {static const struct mtk_clk_tree mt8188_pericfg_ao_clk_tree = { .xtal_rate =26 *MHZ , - .xtal2_rate =26 *MHZ , };static const struct mtk_gate_regs imp_iic_wrap_cg_regs = {
@@ -1659,17 +1649,14 @@ static const struct mtk_gate imp_iic_wrap_en_clks[] = {const struct mtk_clk_tree mt8188_imp_iic_wrap_c_clk_tree = { .xtal_rate =26 *MHZ , - .xtal2_rate =26 *MHZ , };const struct mtk_clk_tree mt8188_imp_iic_wrap_w_clk_tree = { .xtal_rate =26 *MHZ , - .xtal2_rate =26 *MHZ , };const struct mtk_clk_tree mt8188_imp_iic_wrap_en_clk_tree = { .xtal_rate =26 *MHZ , - .xtal2_rate =26 *MHZ , };static int mt8188_apmixedsys_probe (struct udevice *dev)
Signature · 1 line
2.52.0
Quoted 8 lines · Julien Stephan
I recently submitted the clock driver for MT8188. I naively submitted a driver that was ported from the kernel driver, and mostly work to boot a kernel.
Recently David Lechner, added support for the clk dump command for Mediatek clock drivers, so I used it to check the MT8188 and found several issues fixed on this series:
[...]
Applied to u-boot/next, thanks!
[1/5] clk: mediatek: mt8188: remove separate topckgen-cg driver
commit: a04835c0e929c04403b01b50e1dd966eb42e5004
[2/5] clk: mediatek: mt8188: fix circular clock dependency
commit: 6354f83f43f7d2c1b76a17f9b5629a1af7b7916a
[3/5] clk: mediatek: mt8188: add missing fixed clock
commit: 5e9bbbdab003e147f54d15e0a1c081c13bb0855f
[4/5] clk: mediatek: mt8188: fix some clock parents
commit: 2797fa3efd88fb8e4661093aab1958799a4696f0
[5/5] clk: mediatek: mt8188: refactor driver to improve readability
commit: 0cdd01dbde2a686ae3891c8bd79dd75d686fcbabSignature · 1 line
Tom