Clean up the pll_en_bit from en_mask on all the MediaTek clock drivers
Subsystems (2)
v2 cover Clean up the pll_en_bit from en_mask on all the MediaTek clock drivers
This series is based on v5.10-rc1 and
[v5,07/24] clk: mediatek: Fix asymmetrical PLL enable and disable control[1] in Mediatek MT8192 clock support series
[1] https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
change since v1:
- add patch for MT8167
Weiyi Lu (13):
clk: mediatek: Clean up the pll_en_bit from en_mask on MT2701
clk: mediatek: Clean up the pll_en_bit from en_mask on MT2712
clk: mediatek: Clean up the pll_en_bit from en_mask on MT6765
clk: mediatek: Clean up the pll_en_bit from en_mask on MT6779
clk: mediatek: Clean up the pll_en_bit from en_mask on MT6797
clk: mediatek: Clean up the pll_en_bit from en_mask on MT7622
clk: mediatek: Clean up the pll_en_bit from en_mask on MT7629
clk: mediatek: Clean up the pll_en_bit from en_mask on MT8135
clk: mediatek: Clean up the pll_en_bit from en_mask on MT8167
clk: mediatek: Clean up the pll_en_bit from en_mask on MT8173
clk: mediatek: Clean up the pll_en_bit from en_mask on MT8183
clk: mediatek: Clean up the pll_en_bit from en_mask on MT8516
clk: mediatek: use en_mask as a pure div_en_mask
drivers/clk/mediatek/clk-mt2701.c | 26 +++++++++++++------------- drivers/clk/mediatek/clk-mt2712.c | 30 +++++++++++++++--------------- drivers/clk/mediatek/clk-mt6765.c | 20 ++++++++++---------- drivers/clk/mediatek/clk-mt6779.c | 24 ++++++++++++------------ drivers/clk/mediatek/clk-mt6797.c | 20 ++++++++++---------- drivers/clk/mediatek/clk-mt7622.c | 18 +++++++++--------- drivers/clk/mediatek/clk-mt7629.c | 12 ++++++------ drivers/clk/mediatek/clk-mt8135.c | 20 ++++++++++---------- drivers/clk/mediatek/clk-mt8167.c | 16 ++++++++-------- drivers/clk/mediatek/clk-mt8173.c | 28 ++++++++++++++-------------- drivers/clk/mediatek/clk-mt8183.c | 22 +++++++++++----------- drivers/clk/mediatek/clk-mt8516.c | 12 ++++++------ drivers/clk/mediatek/clk-pll.c | 12 ++++-------- 13 files changed, 128 insertions(+), 132 deletions(-)
PATCH v2 1/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT2701
remove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt2701.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/clk/mediatek/clk-mt2701.c +13 -13
@@ -934,31 +934,31 @@ static int mtk_pericfg_init(struct platform_device *pdev) }static const struct mtk_pll_data apmixed_plls[] = { -PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x200 ,0x20c ,0x80000001 , +PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x200 ,0x20c ,0x80000000 ,PLL_AO ,21 ,0x204 ,24 ,0x0 ,0x204 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x210 ,0x21c ,0xf0000001 , +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x210 ,0x21c ,0xf0000000 ,HAVE_RST_BAR ,21 ,0x210 ,4 ,0x0 ,0x214 ,0 ), -PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x220 ,0x22c ,0xf3000001 , +PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x220 ,0x22c ,0xf3000000 ,HAVE_RST_BAR ,7 ,0x220 ,4 ,0x0 ,0x224 ,14 ), -PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x230 ,0x23c ,0x00000001 ,0 , +PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x230 ,0x23c ,0 ,0 ,21 ,0x230 ,4 ,0x0 ,0x234 ,0 ), -PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x240 ,0x24c ,0x00000001 ,0 , +PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x240 ,0x24c ,0 ,0 ,21 ,0x240 ,4 ,0x0 ,0x244 ,0 ), -PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x250 ,0x25c ,0x00000001 ,0 , +PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x250 ,0x25c ,0 ,0 ,21 ,0x250 ,4 ,0x0 ,0x254 ,0 ), -PLL (CLK_APMIXED_AUD1PLL ,"aud1pll" ,0x270 ,0x27c ,0x00000001 ,0 , +PLL (CLK_APMIXED_AUD1PLL ,"aud1pll" ,0x270 ,0x27c ,0 ,0 ,31 ,0x270 ,4 ,0x0 ,0x274 ,0 ), -PLL (CLK_APMIXED_TRGPLL ,"trgpll" ,0x280 ,0x28c ,0x00000001 ,0 , +PLL (CLK_APMIXED_TRGPLL ,"trgpll" ,0x280 ,0x28c ,0 ,0 ,31 ,0x280 ,4 ,0x0 ,0x284 ,0 ), -PLL (CLK_APMIXED_ETHPLL ,"ethpll" ,0x290 ,0x29c ,0x00000001 ,0 , +PLL (CLK_APMIXED_ETHPLL ,"ethpll" ,0x290 ,0x29c ,0 ,0 ,31 ,0x290 ,4 ,0x0 ,0x294 ,0 ), -PLL (CLK_APMIXED_VDECPLL ,"vdecpll" ,0x2a0 ,0x2ac ,0x00000001 ,0 , +PLL (CLK_APMIXED_VDECPLL ,"vdecpll" ,0x2a0 ,0x2ac ,0 ,0 ,31 ,0x2a0 ,4 ,0x0 ,0x2a4 ,0 ), -PLL (CLK_APMIXED_HADDS2PLL ,"hadds2pll" ,0x2b0 ,0x2bc ,0x00000001 ,0 , +PLL (CLK_APMIXED_HADDS2PLL ,"hadds2pll" ,0x2b0 ,0x2bc ,0 ,0 ,31 ,0x2b0 ,4 ,0x0 ,0x2b4 ,0 ), -PLL (CLK_APMIXED_AUD2PLL ,"aud2pll" ,0x2c0 ,0x2cc ,0x00000001 ,0 , +PLL (CLK_APMIXED_AUD2PLL ,"aud2pll" ,0x2c0 ,0x2cc ,0 ,0 ,31 ,0x2c0 ,4 ,0x0 ,0x2c4 ,0 ), -PLL (CLK_APMIXED_TVD2PLL ,"tvd2pll" ,0x2d0 ,0x2dc ,0x00000001 ,0 , +PLL (CLK_APMIXED_TVD2PLL ,"tvd2pll" ,0x2d0 ,0x2dc ,0 ,0 ,21 ,0x2d0 ,4 ,0x0 ,0x2d4 ,0 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 2/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT2712
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt2712.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/clk/mediatek/clk-mt2712.c +15 -15
@@ -1222,38 +1222,38 @@ };static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0230 ,0x023C ,0xf0000101 , +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0230 ,0x023C ,0xf0000100 ,HAVE_RST_BAR ,31 ,0x0230 ,4 ,0 ,0 ,0 ,0x0234 ,0 ), -PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x0240 ,0x024C ,0xfe000101 , +PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x0240 ,0x024C ,0xfe000100 ,HAVE_RST_BAR ,31 ,0x0240 ,4 ,0 ,0 ,0 ,0x0244 ,0 ), -PLL (CLK_APMIXED_VCODECPLL ,"vcodecpll" ,0x0320 ,0x032C ,0xc0000101 , +PLL (CLK_APMIXED_VCODECPLL ,"vcodecpll" ,0x0320 ,0x032C ,0xc0000100 ,0 ,31 ,0x0320 ,4 ,0 ,0 ,0 ,0x0324 ,0 ), -PLL (CLK_APMIXED_VENCPLL ,"vencpll" ,0x0280 ,0x028C ,0x00000101 , +PLL (CLK_APMIXED_VENCPLL ,"vencpll" ,0x0280 ,0x028C ,0x00000100 ,0 ,31 ,0x0280 ,4 ,0 ,0 ,0 ,0x0284 ,0 ), -PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x0330 ,0x0340 ,0x00000101 , +PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x0330 ,0x0340 ,0x00000100 ,0 ,31 ,0x0330 ,4 ,0x0338 ,0x0014 ,0 ,0x0334 ,0 ), -PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x0350 ,0x0360 ,0x00000101 , +PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x0350 ,0x0360 ,0x00000100 ,0 ,31 ,0x0350 ,4 ,0x0358 ,0x0014 ,1 ,0x0354 ,0 ), -PLL (CLK_APMIXED_LVDSPLL ,"lvdspll" ,0x0370 ,0x037c ,0x00000101 , +PLL (CLK_APMIXED_LVDSPLL ,"lvdspll" ,0x0370 ,0x037c ,0x00000100 ,0 ,31 ,0x0370 ,4 ,0 ,0 ,0 ,0x0374 ,0 ), -PLL (CLK_APMIXED_LVDSPLL2 ,"lvdspll2" ,0x0390 ,0x039C ,0x00000101 , +PLL (CLK_APMIXED_LVDSPLL2 ,"lvdspll2" ,0x0390 ,0x039C ,0x00000100 ,0 ,31 ,0x0390 ,4 ,0 ,0 ,0 ,0x0394 ,0 ), -PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x0270 ,0x027C ,0x00000101 , +PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x0270 ,0x027C ,0x00000100 ,0 ,31 ,0x0270 ,4 ,0 ,0 ,0 ,0x0274 ,0 ), -PLL (CLK_APMIXED_MSDCPLL2 ,"msdcpll2" ,0x0410 ,0x041C ,0x00000101 , +PLL (CLK_APMIXED_MSDCPLL2 ,"msdcpll2" ,0x0410 ,0x041C ,0x00000100 ,0 ,31 ,0x0410 ,4 ,0 ,0 ,0 ,0x0414 ,0 ), -PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x0290 ,0x029C ,0xc0000101 , +PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x0290 ,0x029C ,0xc0000100 ,0 ,31 ,0x0290 ,4 ,0 ,0 ,0 ,0x0294 ,0 ), -PLL_B (CLK_APMIXED_MMPLL ,"mmpll" ,0x0250 ,0x0260 ,0x00000101 , +PLL_B (CLK_APMIXED_MMPLL ,"mmpll" ,0x0250 ,0x0260 ,0x00000100 ,0 ,31 ,0x0250 ,4 ,0 ,0 ,0 ,0x0254 ,0 , mmpll_div_table), -PLL_B (CLK_APMIXED_ARMCA35PLL ,"armca35pll" ,0x0100 ,0x0110 ,0xf0000101 , +PLL_B (CLK_APMIXED_ARMCA35PLL ,"armca35pll" ,0x0100 ,0x0110 ,0xf0000100 ,HAVE_RST_BAR ,31 ,0x0100 ,4 ,0 ,0 ,0 ,0x0104 ,0 , armca35pll_div_table), -PLL_B (CLK_APMIXED_ARMCA72PLL ,"armca72pll" ,0x0210 ,0x0220 ,0x00000101 , +PLL_B (CLK_APMIXED_ARMCA72PLL ,"armca72pll" ,0x0210 ,0x0220 ,0x00000100 ,0 ,31 ,0x0210 ,4 ,0 ,0 ,0 ,0x0214 ,0 , armca72pll_div_table), -PLL (CLK_APMIXED_ETHERPLL ,"etherpll" ,0x0300 ,0x030C ,0xc0000101 , +PLL (CLK_APMIXED_ETHERPLL ,"etherpll" ,0x0300 ,0x030C ,0xc0000100 ,0 ,31 ,0x0300 ,4 ,0 ,0 ,0 ,0x0304 ,0 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 3/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT6765
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt6765.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/clk/mediatek/clk-mt6765.c +10 -10
@@ -747,26 +747,26 @@ _pcw_reg, _pcw_shift, NULL) \static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_ARMPLL_L ,"armpll_l" ,0x021C ,0x0228 ,BIT (0 ), +PLL (CLK_APMIXED_ARMPLL_L ,"armpll_l" ,0x021C ,0x0228 ,0 ,PLL_AO ,22 ,8 ,0x0220 ,24 ,0 ,0 ,0 ,0x0220 ,0 ), -PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x020C ,0x0218 ,BIT (0 ), +PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x020C ,0x0218 ,0 ,PLL_AO ,22 ,8 ,0x0210 ,24 ,0 ,0 ,0 ,0x0210 ,0 ), -PLL (CLK_APMIXED_CCIPLL ,"ccipll" ,0x022C ,0x0238 ,BIT (0 ), +PLL (CLK_APMIXED_CCIPLL ,"ccipll" ,0x022C ,0x0238 ,0 ,PLL_AO ,22 ,8 ,0x0230 ,24 ,0 ,0 ,0 ,0x0230 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x023C ,0x0248 ,BIT (0 ), +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x023C ,0x0248 ,0 , (HAVE_RST_BAR |PLL_AO ),22 ,8 ,0x0240 ,24 ,0 ,0 ,0 ,0x0240 ,0 ), -PLL (CLK_APMIXED_MFGPLL ,"mfgpll" ,0x024C ,0x0258 ,BIT (0 ), +PLL (CLK_APMIXED_MFGPLL ,"mfgpll" ,0x024C ,0x0258 ,0 ,0 ,22 ,8 ,0x0250 ,24 ,0 ,0 ,0 ,0x0250 ,0 ), -PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x025C ,0x0268 ,BIT (0 ), +PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x025C ,0x0268 ,0 ,0 ,22 ,8 ,0x0260 ,24 ,0 ,0 ,0 ,0x0260 ,0 ), -PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x026C ,0x0278 ,BIT (0 ), +PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x026C ,0x0278 ,0 ,HAVE_RST_BAR ,22 ,8 ,0x0270 ,24 ,0 ,0 ,0 ,0x0270 ,0 ), -PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x027C ,0x0288 ,BIT (0 ), +PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x027C ,0x0288 ,0 ,0 ,22 ,8 ,0x0280 ,24 ,0 ,0 ,0 ,0x0280 ,0 ), -PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x028C ,0x029C ,BIT (0 ), +PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x028C ,0x029C ,0 ,0 ,32 ,8 ,0x0290 ,24 ,0x0040 ,0x000C ,0 ,0x0294 ,0 ), -PLL (CLK_APMIXED_MPLL ,"mpll" ,0x02A0 ,0x02AC ,BIT (0 ), +PLL (CLK_APMIXED_MPLL ,"mpll" ,0x02A0 ,0x02AC ,0 ,PLL_AO ,22 ,8 ,0x02A4 ,24 ,0 ,0 ,0 ,0x02A4 ,0 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 4/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT6779
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt6779.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/clk/mediatek/clk-mt6779.c +12 -12
@@ -1180,33 +1180,33 @@ _pcw_chg_reg, NULL)static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_ARMPLL_LL ,"armpll_ll" ,0x0200 ,0x020C ,BIT (0 ), +PLL (CLK_APMIXED_ARMPLL_LL ,"armpll_ll" ,0x0200 ,0x020C ,0 ,PLL_AO ,0 ,22 ,8 ,0x0204 ,24 ,0 ,0 ,0 ,0x0204 ,0 ,0 ), -PLL (CLK_APMIXED_ARMPLL_BL ,"armpll_bl" ,0x0210 ,0x021C ,BIT (0 ), +PLL (CLK_APMIXED_ARMPLL_BL ,"armpll_bl" ,0x0210 ,0x021C ,0 ,PLL_AO ,0 ,22 ,8 ,0x0214 ,24 ,0 ,0 ,0 ,0x0214 ,0 ,0 ), -PLL (CLK_APMIXED_CCIPLL ,"ccipll" ,0x02A0 ,0x02AC ,BIT (0 ), +PLL (CLK_APMIXED_CCIPLL ,"ccipll" ,0x02A0 ,0x02AC ,0 ,PLL_AO ,0 ,22 ,8 ,0x02A4 ,24 ,0 ,0 ,0 ,0x02A4 ,0 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0230 ,0x023C ,BIT (0 ), +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0230 ,0x023C ,0 , (HAVE_RST_BAR ),BIT (24 ),22 ,8 ,0x0234 ,24 ,0 ,0 ,0 ,0x0234 ,0 ,0 ), -PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x0240 ,0x024C ,BIT (0 ), +PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x0240 ,0x024C ,0 , (HAVE_RST_BAR ),BIT (24 ),22 ,8 ,0x0244 ,24 ,0 ,0 ,0 ,0x0244 ,0 ,0 ), -PLL (CLK_APMIXED_MFGPLL ,"mfgpll" ,0x0250 ,0x025C ,BIT (0 ), +PLL (CLK_APMIXED_MFGPLL ,"mfgpll" ,0x0250 ,0x025C ,0 ,0 ,0 ,22 ,8 ,0x0254 ,24 ,0 ,0 ,0 ,0x0254 ,0 ,0 ), -PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x0260 ,0x026C ,BIT (0 ), +PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x0260 ,0x026C ,0 ,0 ,0 ,22 ,8 ,0x0264 ,24 ,0 ,0 ,0 ,0x0264 ,0 ,0 ), -PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x0270 ,0x027C ,BIT (0 ), +PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x0270 ,0x027C ,0 ,0 ,0 ,22 ,8 ,0x0274 ,24 ,0 ,0 ,0 ,0x0274 ,0 ,0 ), -PLL (CLK_APMIXED_ADSPPLL ,"adsppll" ,0x02b0 ,0x02bC ,BIT (0 ), +PLL (CLK_APMIXED_ADSPPLL ,"adsppll" ,0x02b0 ,0x02bC ,0 , (HAVE_RST_BAR ),BIT (23 ),22 ,8 ,0x02b4 ,24 ,0 ,0 ,0 ,0x02b4 ,0 ,0 ), -PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x0280 ,0x028C ,BIT (0 ), +PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x0280 ,0x028C ,0 , (HAVE_RST_BAR ),BIT (23 ),22 ,8 ,0x0284 ,24 ,0 ,0 ,0 ,0x0284 ,0 ,0 ), -PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x02C0 ,0x02D0 ,BIT (0 ), +PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x02C0 ,0x02D0 ,0 ,0 ,0 ,32 ,8 ,0x02C0 ,1 ,0 ,0x14 ,0 ,0x02C4 ,0 ,0x2C0 ), -PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x02D4 ,0x02E4 ,BIT (0 ), +PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x02D4 ,0x02E4 ,0 ,0 ,0 ,32 ,8 ,0x02D4 ,1 ,0 ,0x14 ,1 ,0x02D8 ,0 ,0x02D4 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 5/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT6797
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt6797.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/clk/mediatek/clk-mt6797.c +10 -10
@@ -634,25 +634,25 @@ static int mtk_infrasys_init(struct platform_device *pdev) NULL)static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0220 ,0x022C ,0xF0000101 ,PLL_AO , +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0220 ,0x022C ,0xF0000100 ,PLL_AO ,21 ,0x220 ,4 ,0x0 ,0x224 ,0 ), -PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x0230 ,0x023C ,0xFE000011 ,0 ,7 , +PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x0230 ,0x023C ,0xFE000010 ,0 ,7 ,0x230 ,4 ,0x0 ,0x234 ,14 ), -PLL (CLK_APMIXED_MFGPLL ,"mfgpll" ,0x0240 ,0x024C ,0x00000101 ,0 ,21 , +PLL (CLK_APMIXED_MFGPLL ,"mfgpll" ,0x0240 ,0x024C ,0x00000100 ,0 ,21 ,0x244 ,24 ,0x0 ,0x244 ,0 ), -PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x0250 ,0x025C ,0x00000121 ,0 ,21 , +PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x0250 ,0x025C ,0x00000120 ,0 ,21 ,0x250 ,4 ,0x0 ,0x254 ,0 ), -PLL (CLK_APMIXED_IMGPLL ,"imgpll" ,0x0260 ,0x026C ,0x00000121 ,0 ,21 , +PLL (CLK_APMIXED_IMGPLL ,"imgpll" ,0x0260 ,0x026C ,0x00000120 ,0 ,21 ,0x260 ,4 ,0x0 ,0x264 ,0 ), -PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x0270 ,0x027C ,0xC0000121 ,0 ,21 , +PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x0270 ,0x027C ,0xC0000120 ,0 ,21 ,0x270 ,4 ,0x0 ,0x274 ,0 ), -PLL (CLK_APMIXED_CODECPLL ,"codecpll" ,0x0290 ,0x029C ,0x00000121 ,0 ,21 , +PLL (CLK_APMIXED_CODECPLL ,"codecpll" ,0x0290 ,0x029C ,0x00000120 ,0 ,21 ,0x290 ,4 ,0x0 ,0x294 ,0 ), -PLL (CLK_APMIXED_VDECPLL ,"vdecpll" ,0x02E4 ,0x02F0 ,0x00000121 ,0 ,21 , +PLL (CLK_APMIXED_VDECPLL ,"vdecpll" ,0x02E4 ,0x02F0 ,0x00000120 ,0 ,21 ,0x2E4 ,4 ,0x0 ,0x2E8 ,0 ), -PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x02A0 ,0x02B0 ,0x00000131 ,0 ,31 , +PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x02A0 ,0x02B0 ,0x00000130 ,0 ,31 ,0x2A0 ,4 ,0x2A8 ,0x2A4 ,0 ), -PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x02B4 ,0x02C4 ,0x00000131 ,0 ,31 , +PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x02B4 ,0x02C4 ,0x00000130 ,0 ,31 ,0x2B4 ,4 ,0x2BC ,0x2B8 ,0 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 6/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT7622
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt7622.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/clk/mediatek/clk-mt7622.c +9 -9
@@ -328,23 +328,23 @@ };static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x0200 ,0x020C ,0x00000001 , +PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x0200 ,0x020C ,0 ,PLL_AO ,21 ,0x0204 ,24 ,0 ,0x0204 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0210 ,0x021C ,0x00000001 , +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0210 ,0x021C ,0 ,HAVE_RST_BAR ,21 ,0x0214 ,24 ,0 ,0x0214 ,0 ), -PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x0220 ,0x022C ,0x00000001 , +PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x0220 ,0x022C ,0 ,HAVE_RST_BAR ,7 ,0x0224 ,24 ,0 ,0x0224 ,14 ), -PLL (CLK_APMIXED_ETH1PLL ,"eth1pll" ,0x0300 ,0x0310 ,0x00000001 , +PLL (CLK_APMIXED_ETH1PLL ,"eth1pll" ,0x0300 ,0x0310 ,0 ,0 ,21 ,0x0300 ,1 ,0 ,0x0304 ,0 ), -PLL (CLK_APMIXED_ETH2PLL ,"eth2pll" ,0x0314 ,0x0320 ,0x00000001 , +PLL (CLK_APMIXED_ETH2PLL ,"eth2pll" ,0x0314 ,0x0320 ,0 ,0 ,21 ,0x0314 ,1 ,0 ,0x0318 ,0 ), -PLL (CLK_APMIXED_AUD1PLL ,"aud1pll" ,0x0324 ,0x0330 ,0x00000001 , +PLL (CLK_APMIXED_AUD1PLL ,"aud1pll" ,0x0324 ,0x0330 ,0 ,0 ,31 ,0x0324 ,1 ,0 ,0x0328 ,0 ), -PLL (CLK_APMIXED_AUD2PLL ,"aud2pll" ,0x0334 ,0x0340 ,0x00000001 , +PLL (CLK_APMIXED_AUD2PLL ,"aud2pll" ,0x0334 ,0x0340 ,0 ,0 ,31 ,0x0334 ,1 ,0 ,0x0338 ,0 ), -PLL (CLK_APMIXED_TRGPLL ,"trgpll" ,0x0344 ,0x0354 ,0x00000001 , +PLL (CLK_APMIXED_TRGPLL ,"trgpll" ,0x0344 ,0x0354 ,0 ,0 ,21 ,0x0344 ,1 ,0 ,0x0348 ,0 ), -PLL (CLK_APMIXED_SGMIPLL ,"sgmipll" ,0x0358 ,0x0368 ,0x00000001 , +PLL (CLK_APMIXED_SGMIPLL ,"sgmipll" ,0x0358 ,0x0368 ,0 ,0 ,21 ,0x0358 ,1 ,0 ,0x035C ,0 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 7/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT7629
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt7629.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clk/mediatek/clk-mt7629.c +6 -6
@@ -335,17 +335,17 @@ };static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x0200 ,0x020C ,0x00000001 , +PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x0200 ,0x020C ,0 ,0 ,21 ,0x0204 ,24 ,0 ,0x0204 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0210 ,0x021C ,0x00000001 , +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0210 ,0x021C ,0 ,HAVE_RST_BAR ,21 ,0x0214 ,24 ,0 ,0x0214 ,0 ), -PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x0220 ,0x022C ,0x00000001 , +PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x0220 ,0x022C ,0 ,HAVE_RST_BAR ,7 ,0x0224 ,24 ,0 ,0x0224 ,14 ), -PLL (CLK_APMIXED_ETH1PLL ,"eth1pll" ,0x0300 ,0x0310 ,0x00000001 , +PLL (CLK_APMIXED_ETH1PLL ,"eth1pll" ,0x0300 ,0x0310 ,0 ,0 ,21 ,0x0300 ,1 ,0 ,0x0304 ,0 ), -PLL (CLK_APMIXED_ETH2PLL ,"eth2pll" ,0x0314 ,0x0320 ,0x00000001 , +PLL (CLK_APMIXED_ETH2PLL ,"eth2pll" ,0x0314 ,0x0320 ,0 ,0 ,21 ,0x0314 ,1 ,0 ,0x0318 ,0 ), -PLL (CLK_APMIXED_SGMIPLL ,"sgmipll" ,0x0358 ,0x0368 ,0x00000001 , +PLL (CLK_APMIXED_SGMIPLL ,"sgmipll" ,0x0358 ,0x0368 ,0 ,0 ,21 ,0x0358 ,1 ,0 ,0x035C ,0 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 8/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT8135
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt8135.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/clk/mediatek/clk-mt8135.c +10 -10
@@ -611,16 +611,16 @@ static void __init mtk_pericfg_init(struct device_node *node) }static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_ARMPLL1 ,"armpll1" ,0x200 ,0x218 ,0x80000001 ,0 ,21 ,0x204 ,24 ,0x0 ,0x204 ,0 ), -PLL (CLK_APMIXED_ARMPLL2 ,"armpll2" ,0x2cc ,0x2e4 ,0x80000001 ,0 ,21 ,0x2d0 ,24 ,0x0 ,0x2d0 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x21c ,0x234 ,0xf0000001 ,HAVE_RST_BAR ,21 ,0x21c ,6 ,0x0 ,0x220 ,0 ), -PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x238 ,0x250 ,0xf3000001 ,HAVE_RST_BAR ,7 ,0x238 ,6 ,0x0 ,0x238 ,9 ), -PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x254 ,0x26c ,0xf0000001 ,HAVE_RST_BAR ,21 ,0x254 ,6 ,0x0 ,0x258 ,0 ), -PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x278 ,0x290 ,0x80000001 ,0 ,21 ,0x278 ,6 ,0x0 ,0x27c ,0 ), -PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x294 ,0x2ac ,0x80000001 ,0 ,31 ,0x294 ,6 ,0x0 ,0x298 ,0 ), -PLL (CLK_APMIXED_LVDSPLL ,"lvdspll" ,0x2b0 ,0x2c8 ,0x80000001 ,0 ,21 ,0x2b0 ,6 ,0x0 ,0x2b4 ,0 ), -PLL (CLK_APMIXED_AUDPLL ,"audpll" ,0x2e8 ,0x300 ,0x80000001 ,0 ,31 ,0x2e8 ,6 ,0x2f8 ,0x2ec ,0 ), -PLL (CLK_APMIXED_VDECPLL ,"vdecpll" ,0x304 ,0x31c ,0x80000001 ,0 ,21 ,0x2b0 ,6 ,0x0 ,0x308 ,0 ), +PLL (CLK_APMIXED_ARMPLL1 ,"armpll1" ,0x200 ,0x218 ,0x80000000 ,0 ,21 ,0x204 ,24 ,0x0 ,0x204 ,0 ), +PLL (CLK_APMIXED_ARMPLL2 ,"armpll2" ,0x2cc ,0x2e4 ,0x80000000 ,0 ,21 ,0x2d0 ,24 ,0x0 ,0x2d0 ,0 ), +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x21c ,0x234 ,0xf0000000 ,HAVE_RST_BAR ,21 ,0x21c ,6 ,0x0 ,0x220 ,0 ), +PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x238 ,0x250 ,0xf3000000 ,HAVE_RST_BAR ,7 ,0x238 ,6 ,0x0 ,0x238 ,9 ), +PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x254 ,0x26c ,0xf0000000 ,HAVE_RST_BAR ,21 ,0x254 ,6 ,0x0 ,0x258 ,0 ), +PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x278 ,0x290 ,0x80000000 ,0 ,21 ,0x278 ,6 ,0x0 ,0x27c ,0 ), +PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x294 ,0x2ac ,0x80000000 ,0 ,31 ,0x294 ,6 ,0x0 ,0x298 ,0 ), +PLL (CLK_APMIXED_LVDSPLL ,"lvdspll" ,0x2b0 ,0x2c8 ,0x80000000 ,0 ,21 ,0x2b0 ,6 ,0x0 ,0x2b4 ,0 ), +PLL (CLK_APMIXED_AUDPLL ,"audpll" ,0x2e8 ,0x300 ,0x80000000 ,0 ,31 ,0x2e8 ,6 ,0x2f8 ,0x2ec ,0 ), +PLL (CLK_APMIXED_VDECPLL ,"vdecpll" ,0x304 ,0x31c ,0x80000000 ,0 ,21 ,0x2b0 ,6 ,0x0 ,0x308 ,0 ), };static void __init mtk_apmixedsys_init (struct device_node *node)
Signature · 1 line
1.8.1.1.dirty
PATCH v2 9/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT8167
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt8167.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/clk/mediatek/clk-mt8167.c +8 -8
@@ -1016,21 +1016,21 @@ static void __init mtk_infracfg_init(struct device_node *node) };static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x0100 ,0x0110 ,0x00000001 ,0 , +PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x0100 ,0x0110 ,0 ,0 ,21 ,0x0104 ,24 ,0 ,0x0104 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0120 ,0x0130 ,0x00000001 , +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0120 ,0x0130 ,0 ,HAVE_RST_BAR ,21 ,0x0124 ,24 ,0 ,0x0124 ,0 ), -PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x0140 ,0x0150 ,0x30000001 , +PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x0140 ,0x0150 ,0x30000000 ,HAVE_RST_BAR ,7 ,0x0144 ,24 ,0 ,0x0144 ,0 ), -PLL_B (CLK_APMIXED_MMPLL ,"mmpll" ,0x0160 ,0x0170 ,0x00000001 ,0 , +PLL_B (CLK_APMIXED_MMPLL ,"mmpll" ,0x0160 ,0x0170 ,0 ,0 ,21 ,0x0164 ,24 ,0 ,0x0164 ,0 , mmpll_div_table), -PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x0180 ,0x0190 ,0x00000001 ,0 , +PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x0180 ,0x0190 ,0 ,0 ,31 ,0x0180 ,1 ,0x0194 ,0x0184 ,0 ), -PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x01A0 ,0x01B0 ,0x00000001 ,0 , +PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x01A0 ,0x01B0 ,0 ,0 ,31 ,0x01A0 ,1 ,0x01B4 ,0x01A4 ,0 ), -PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x01C0 ,0x01D0 ,0x00000001 ,0 , +PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x01C0 ,0x01D0 ,0 ,0 ,21 ,0x01C4 ,24 ,0 ,0x01C4 ,0 ), -PLL (CLK_APMIXED_LVDSPLL ,"lvdspll" ,0x01E0 ,0x01F0 ,0x00000001 ,0 , +PLL (CLK_APMIXED_LVDSPLL ,"lvdspll" ,0x01E0 ,0x01F0 ,0 ,0 ,21 ,0x01E4 ,24 ,0 ,0x01E4 ,0 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 10/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT8173
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt8173.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/clk/mediatek/clk-mt8173.c +14 -14
@@ -972,20 +972,20 @@ struct mtk_clk_usb { };static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_ARMCA15PLL ,"armca15pll" ,0x200 ,0x20c ,0x00000001 ,0 ,21 ,0x204 ,24 ,0x0 ,0x204 ,0 ), -PLL (CLK_APMIXED_ARMCA7PLL ,"armca7pll" ,0x210 ,0x21c ,0x00000001 ,0 ,21 ,0x214 ,24 ,0x0 ,0x214 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x220 ,0x22c ,0xf0000101 ,HAVE_RST_BAR ,21 ,0x220 ,4 ,0x0 ,0x224 ,0 ), -PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x230 ,0x23c ,0xfe000001 ,HAVE_RST_BAR ,7 ,0x230 ,4 ,0x0 ,0x234 ,14 ), -PLL_B (CLK_APMIXED_MMPLL ,"mmpll" ,0x240 ,0x24c ,0x00000001 ,0 ,21 ,0x244 ,24 ,0x0 ,0x244 ,0 , mmpll_div_table), -PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x250 ,0x25c ,0x00000001 ,0 ,21 ,0x250 ,4 ,0x0 ,0x254 ,0 ), -PLL (CLK_APMIXED_VENCPLL ,"vencpll" ,0x260 ,0x26c ,0x00000001 ,0 ,21 ,0x260 ,4 ,0x0 ,0x264 ,0 ), -PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x270 ,0x27c ,0x00000001 ,0 ,21 ,0x270 ,4 ,0x0 ,0x274 ,0 ), -PLL (CLK_APMIXED_MPLL ,"mpll" ,0x280 ,0x28c ,0x00000001 ,0 ,21 ,0x280 ,4 ,0x0 ,0x284 ,0 ), -PLL (CLK_APMIXED_VCODECPLL ,"vcodecpll" ,0x290 ,0x29c ,0x00000001 ,0 ,21 ,0x290 ,4 ,0x0 ,0x294 ,0 ), -PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x2a0 ,0x2b0 ,0x00000001 ,0 ,31 ,0x2a0 ,4 ,0x2a4 ,0x2a4 ,0 ), -PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x2b4 ,0x2c4 ,0x00000001 ,0 ,31 ,0x2b4 ,4 ,0x2b8 ,0x2b8 ,0 ), -PLL (CLK_APMIXED_LVDSPLL ,"lvdspll" ,0x2d0 ,0x2dc ,0x00000001 ,0 ,21 ,0x2d0 ,4 ,0x0 ,0x2d4 ,0 ), -PLL (CLK_APMIXED_MSDCPLL2 ,"msdcpll2" ,0x2f0 ,0x2fc ,0x00000001 ,0 ,21 ,0x2f0 ,4 ,0x0 ,0x2f4 ,0 ), +PLL (CLK_APMIXED_ARMCA15PLL ,"armca15pll" ,0x200 ,0x20c ,0 ,0 ,21 ,0x204 ,24 ,0x0 ,0x204 ,0 ), +PLL (CLK_APMIXED_ARMCA7PLL ,"armca7pll" ,0x210 ,0x21c ,0 ,0 ,21 ,0x214 ,24 ,0x0 ,0x214 ,0 ), +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x220 ,0x22c ,0xf0000100 ,HAVE_RST_BAR ,21 ,0x220 ,4 ,0x0 ,0x224 ,0 ), +PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x230 ,0x23c ,0xfe000000 ,HAVE_RST_BAR ,7 ,0x230 ,4 ,0x0 ,0x234 ,14 ), +PLL_B (CLK_APMIXED_MMPLL ,"mmpll" ,0x240 ,0x24c ,0 ,0 ,21 ,0x244 ,24 ,0x0 ,0x244 ,0 , mmpll_div_table), +PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x250 ,0x25c ,0 ,0 ,21 ,0x250 ,4 ,0x0 ,0x254 ,0 ), +PLL (CLK_APMIXED_VENCPLL ,"vencpll" ,0x260 ,0x26c ,0 ,0 ,21 ,0x260 ,4 ,0x0 ,0x264 ,0 ), +PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x270 ,0x27c ,0 ,0 ,21 ,0x270 ,4 ,0x0 ,0x274 ,0 ), +PLL (CLK_APMIXED_MPLL ,"mpll" ,0x280 ,0x28c ,0 ,0 ,21 ,0x280 ,4 ,0x0 ,0x284 ,0 ), +PLL (CLK_APMIXED_VCODECPLL ,"vcodecpll" ,0x290 ,0x29c ,0 ,0 ,21 ,0x290 ,4 ,0x0 ,0x294 ,0 ), +PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x2a0 ,0x2b0 ,0 ,0 ,31 ,0x2a0 ,4 ,0x2a4 ,0x2a4 ,0 ), +PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x2b4 ,0x2c4 ,0 ,0 ,31 ,0x2b4 ,4 ,0x2b8 ,0x2b8 ,0 ), +PLL (CLK_APMIXED_LVDSPLL ,"lvdspll" ,0x2d0 ,0x2dc ,0 ,0 ,21 ,0x2d0 ,4 ,0x0 ,0x2d4 ,0 ), +PLL (CLK_APMIXED_MSDCPLL2 ,"msdcpll2" ,0x2f0 ,0x2fc ,0 ,0 ,21 ,0x2f0 ,4 ,0x0 ,0x2f4 ,0 ), };static void __init mtk_apmixedsys_init (struct device_node *node)
Signature · 1 line
1.8.1.1.dirty
PATCH v2 11/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT8183
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt8183.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/clk/mediatek/clk-mt8183.c +11 -11
@@ -1121,34 +1121,34 @@ };static const struct mtk_pll_data plls[] = { -PLL_B (CLK_APMIXED_ARMPLL_LL ,"armpll_ll" ,0x0200 ,0x020C ,0x00000001 , +PLL_B (CLK_APMIXED_ARMPLL_LL ,"armpll_ll" ,0x0200 ,0x020C ,0 ,HAVE_RST_BAR |PLL_AO ,BIT (24 ),22 ,8 ,0x0204 ,24 ,0x0 ,0x0 ,0 ,0x0204 ,0 ,0 , armpll_div_table), -PLL_B (CLK_APMIXED_ARMPLL_L ,"armpll_l" ,0x0210 ,0x021C ,0x00000001 , +PLL_B (CLK_APMIXED_ARMPLL_L ,"armpll_l" ,0x0210 ,0x021C ,0 ,HAVE_RST_BAR |PLL_AO ,BIT (24 ),22 ,8 ,0x0214 ,24 ,0x0 ,0x0 ,0 ,0x0214 ,0 ,0 , armpll_div_table), -PLL (CLK_APMIXED_CCIPLL ,"ccipll" ,0x0290 ,0x029C ,0x00000001 , +PLL (CLK_APMIXED_CCIPLL ,"ccipll" ,0x0290 ,0x029C ,0 ,HAVE_RST_BAR |PLL_AO ,BIT (24 ),22 ,8 ,0x0294 ,24 ,0x0 ,0x0 ,0 ,0x0294 ,0 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0220 ,0x022C ,0x00000001 , +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0220 ,0x022C ,0 ,HAVE_RST_BAR ,BIT (24 ),22 ,8 ,0x0224 ,24 ,0x0 ,0x0 ,0 ,0x0224 ,0 ,0 ), -PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x0230 ,0x023C ,0x00000001 , +PLL (CLK_APMIXED_UNIV2PLL ,"univ2pll" ,0x0230 ,0x023C ,0 ,HAVE_RST_BAR ,BIT (24 ),22 ,8 ,0x0234 ,24 ,0x0 ,0x0 ,0 ,0x0234 ,0 ,0 ), -PLL_B (CLK_APMIXED_MFGPLL ,"mfgpll" ,0x0240 ,0x024C ,0x00000001 , +PLL_B (CLK_APMIXED_MFGPLL ,"mfgpll" ,0x0240 ,0x024C ,0 ,0 ,0 ,22 ,8 ,0x0244 ,24 ,0x0 ,0x0 ,0 ,0x0244 ,0 ,0 , mfgpll_div_table), -PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x0250 ,0x025C ,0x00000001 , +PLL (CLK_APMIXED_MSDCPLL ,"msdcpll" ,0x0250 ,0x025C ,0 ,0 ,0 ,22 ,8 ,0x0254 ,24 ,0x0 ,0x0 ,0 ,0x0254 ,0 ,0 ), -PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x0260 ,0x026C ,0x00000001 , +PLL (CLK_APMIXED_TVDPLL ,"tvdpll" ,0x0260 ,0x026C ,0 ,0 ,0 ,22 ,8 ,0x0264 ,24 ,0x0 ,0x0 ,0 ,0x0264 ,0 ,0 ), -PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x0270 ,0x027C ,0x00000001 , +PLL (CLK_APMIXED_MMPLL ,"mmpll" ,0x0270 ,0x027C ,0 ,HAVE_RST_BAR ,BIT (23 ),22 ,8 ,0x0274 ,24 ,0x0 ,0x0 ,0 ,0x0274 ,0 ,0 ), -PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x02A0 ,0x02B0 ,0x00000001 , +PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x02A0 ,0x02B0 ,0 ,0 ,0 ,32 ,8 ,0x02A0 ,1 ,0x02A8 ,0x0014 ,0 ,0x02A4 ,0 ,0x02A0 ), -PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x02b4 ,0x02c4 ,0x00000001 , +PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x02b4 ,0x02c4 ,0 ,0 ,0 ,32 ,8 ,0x02B4 ,1 ,0x02BC ,0x0014 ,1 ,0x02B8 ,0 ,0x02B4 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 12/13 clk: mediatek: Clean up the pll_en_bit from en_mask on MT8516
In reply to Weiyi Luremove pll_en_bit(bit0) from en_mask to make en_mask a pure en_mask that only used for pll dividers.
--- drivers/clk/mediatek/clk-mt8516.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clk/mediatek/clk-mt8516.c +6 -6
@@ -770,17 +770,17 @@ static void __init mtk_infracfg_init(struct device_node *node) };static const struct mtk_pll_data plls[] = { -PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x0100 ,0x0110 ,0x00000001 ,0 , +PLL (CLK_APMIXED_ARMPLL ,"armpll" ,0x0100 ,0x0110 ,0 ,0 ,21 ,0x0104 ,24 ,0 ,0x0104 ,0 ), -PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0120 ,0x0130 ,0x00000001 , +PLL (CLK_APMIXED_MAINPLL ,"mainpll" ,0x0120 ,0x0130 ,0 ,HAVE_RST_BAR ,21 ,0x0124 ,24 ,0 ,0x0124 ,0 ), -PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x0140 ,0x0150 ,0x30000001 , +PLL (CLK_APMIXED_UNIVPLL ,"univpll" ,0x0140 ,0x0150 ,0x30000000 ,HAVE_RST_BAR ,7 ,0x0144 ,24 ,0 ,0x0144 ,0 ), -PLL_B (CLK_APMIXED_MMPLL ,"mmpll" ,0x0160 ,0x0170 ,0x00000001 ,0 , +PLL_B (CLK_APMIXED_MMPLL ,"mmpll" ,0x0160 ,0x0170 ,0 ,0 ,21 ,0x0164 ,24 ,0 ,0x0164 ,0 , mmpll_div_table), -PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x0180 ,0x0190 ,0x00000001 ,0 , +PLL (CLK_APMIXED_APLL1 ,"apll1" ,0x0180 ,0x0190 ,0 ,0 ,31 ,0x0180 ,1 ,0x0194 ,0x0184 ,0 ), -PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x01A0 ,0x01B0 ,0x00000001 ,0 , +PLL (CLK_APMIXED_APLL2 ,"apll2" ,0x01A0 ,0x01B0 ,0 ,0 ,31 ,0x01A0 ,1 ,0x01B4 ,0x01A4 ,0 ), };
Signature · 1 line
1.8.1.1.dirty
PATCH v2 13/13 clk: mediatek: use en_mask as a pure div_en_mask
In reply to Weiyi LuBecause all pll data has been updated. We no longer allow en_mask to be a combination of pll_en_bit and div_en_mask.
--- drivers/clk/mediatek/clk-pll.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/clk/mediatek/clk-pll.c +4 -8
@@ -238,7 +238,6 @@ static int mtk_pll_prepare(struct clk_hw *hw) {struct mtk_clk_pll *pll =to_mtk_clk_pll (hw);u32 r; -u32 div_en_mask; r =readl (pll->pwr_addr) |CON0_PWR_ON ;writel (r, pll->pwr_addr);
@@ -251,9 +250,8 @@ static int mtk_pll_prepare(struct clk_hw *hw) r =readl (pll->base_addr +REG_CON0 ) |CON0_BASE_EN ;writel (r, pll->base_addr +REG_CON0 ); - div_en_mask = pll->data->en_mask & ~CON0_BASE_EN ; -if (div_en_mask) { - r =readl (pll->base_addr +REG_CON0 ) | div_en_mask; +if (pll->data->en_mask) { + r =readl (pll->base_addr +REG_CON0 ) | pll->data->en_mask;writel (r, pll->base_addr +REG_CON0 ); }
@@ -274,7 +272,6 @@ static void mtk_pll_unprepare(struct clk_hw *hw) {struct mtk_clk_pll *pll =to_mtk_clk_pll (hw);u32 r; -u32 div_en_mask;if (pll->data->flags &HAVE_RST_BAR ) { r =readl (pll->base_addr +REG_CON0 );
@@ -284,9 +281,8 @@ static void mtk_pll_unprepare(struct clk_hw *hw)__mtk_pll_tuner_disable (pll); - div_en_mask = pll->data->en_mask & ~CON0_BASE_EN ; -if (div_en_mask) { - r =readl (pll->base_addr +REG_CON0 ) & ~div_en_mask; +if (pll->data->en_mask) { + r =readl (pll->base_addr +REG_CON0 ) & ~pll->data->en_mask;writel (r, pll->base_addr +REG_CON0 ); }
Signature · 1 line
1.8.1.1.dirty
Stephen Boyd
maintainerQuoting Weiyi Lu (2020-11-08 18:13:15)
Quoted 7 lines
This series is based on v5.10-rc1 and
[v5,07/24] clk: mediatek: Fix asymmetrical PLL enable and disable control[1] in Mediatek MT8192 clock support series[1] https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
change since v1:
- add patch for MT8167
The last patch doesn't apply. Also the whole series is base64 encoded and confuses my MUA. Please resend.
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek