Move repeated *_PARENT() macros from chip-specific .c files to the common mtk-clk.h file.
Signed-off-by: David Lechner <[email protected]> --- drivers/clk/mediatek/clk-mt7622.c | 8 -------- drivers/clk/mediatek/clk-mt7623.c | 6 ------ drivers/clk/mediatek/clk-mt7629.c | 4 ---- drivers/clk/mediatek/clk-mt7981.c | 5 ----- drivers/clk/mediatek/clk-mt7986.c | 5 ----- drivers/clk/mediatek/clk-mt7987.c | 4 ---- drivers/clk/mediatek/clk-mt7988.c | 4 ---- drivers/clk/mediatek/clk-mt8189.c | 4 ---- drivers/clk/mediatek/clk-mtk.h | 7 +++++++ 9 files changed, 7 insertions(+), 40 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index e420be5a137..88ccb4cb8ea 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c @@ -159,10 +159,6 @@ static const struct mtk_fixed_factor top_fixed_divs[] = { FACTOR0(CLK_TOP_ETH_500M, CLK_APMIXED_ETH1PLL, 1, 1), }; -#define XTAL_PARENT(id) PARENT(id, CLK_PARENT_XTAL) -#define TOP_PARENT(id) PARENT(id, CLK_PARENT_TOPCKGEN) -#define VOID_PARENT PARENT(-1, 0) - static const struct mtk_parent axi_parents[] = { XTAL_PARENT(CLK_XTAL), TOP_PARENT(CLK_TOP_SYSPLL1_D2), @@ -390,10 +386,6 @@ static const struct mtk_composite top_muxes[] = { MUX_MIXED(CLK_TOP_I2S3_MCK_SEL, apll1_ck_parents, 0x120, 161, 1), }; -/* infracfg */ -#define APMIXED_PARENT(_id) PARENT(_id, CLK_PARENT_APMIXED) -#define XTAL_PARENT(_id) PARENT(_id, CLK_PARENT_XTAL) - static const struct mtk_parent infra_mux1_parents[] = { XTAL_PARENT(CLK_XTAL), APMIXED_PARENT(CLK_APMIXED_MAINPLL), diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c index dfe6f5e113e..16424ba2de6 100644 --- a/drivers/clk/mediatek/clk-mt7623.c +++ b/drivers/clk/mediatek/clk-mt7623.c @@ -375,9 +375,6 @@ static const struct mtk_fixed_factor top_fixed_divs[] = { FACTOR1(CLK_TOP_8BDAC, CLK_TOP_UNIVPLL_D2, 1, 1), }; -#define XTAL_PARENT(id) PARENT(id, CLK_PARENT_XTAL) -#define TOP_PARENT(id) PARENT(id, CLK_PARENT_TOPCKGEN) - static const struct mtk_parent axi_parents[] = { XTAL_PARENT(CLK_XTAL), TOP_PARENT(CLK_TOP_SYSPLL1_D2), @@ -869,9 +866,6 @@ static const int peri_id_offs_map[] = { [CLK_PERI_FCI] = 48, }; -#define TOP_PARENT(_id) PARENT(_id, CLK_PARENT_TOPCKGEN) -#define XTAL_PARENT(_id) PARENT(_id, CLK_PARENT_XTAL) - static const struct mtk_parent uart_ck_sel_parents[] = { XTAL_PARENT(CLK_XTAL), TOP_PARENT(CLK_TOP_UART_SEL), diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c index 56f4c99d84b..b82212ec664 100644 --- a/drivers/clk/mediatek/clk-mt7629.c +++ b/drivers/clk/mediatek/clk-mt7629.c @@ -152,10 +152,6 @@ static const struct mtk_fixed_factor top_fixed_divs[] = { FACTOR1(CLK_TOP_PCIE0_MAC_EN, CLK_TOP_UNIVPLL1_D4, 1, 1), }; -#define XTAL_PARENT(id) PARENT(id, CLK_PARENT_XTAL) -#define TOP_PARENT(id) PARENT(id, CLK_PARENT_TOPCKGEN) -#define VOID_PARENT PARENT(-1, 0) - static const struct mtk_parent axi_parents[] = { XTAL_PARENT(CLK_XTAL), TOP_PARENT(CLK_TOP_SYSPLL1_D2), diff --git a/drivers/clk/mediatek/clk-mt7981.c b/drivers/clk/mediatek/clk-mt7981.c index 87b68559e65..3fb6a3e33df 100644 --- a/drivers/clk/mediatek/clk-mt7981.c +++ b/drivers/clk/mediatek/clk-mt7981.c @@ -318,11 +318,6 @@ static const struct mtk_fixed_factor infra_fixed_divs[] = { TOP_FACTOR(CLK_INFRA_66M_MCK, "infra_66m_mck", CLK_TOP_SYSAXI_SEL, 1, 2), }; -/* INFRASYS MUX PARENTS */ -#define INFRA_PARENT(_id) PARENT(_id, CLK_PARENT_INFRASYS) -#define TOP_PARENT(_id) PARENT(_id, CLK_PARENT_TOPCKGEN) -#define VOID_PARENT PARENT(-1, 0) - static const struct mtk_parent infra_uart0_parents[] = { TOP_PARENT(CLK_TOP_F26M_SEL), TOP_PARENT(CLK_TOP_UART_SEL) diff --git a/drivers/clk/mediatek/clk-mt7986.c b/drivers/clk/mediatek/clk-mt7986.c index 3309850aa60..65d4142fa63 100644 --- a/drivers/clk/mediatek/clk-mt7986.c +++ b/drivers/clk/mediatek/clk-mt7986.c @@ -18,11 +18,6 @@ #define MT7986_CLK_PDN 0x250 #define MT7986_CLK_PDN_EN_WRITE BIT(31) -#define APMIXED_PARENT(_id) PARENT(_id, CLK_PARENT_APMIXED) -#define INFRA_PARENT(_id) PARENT(_id, CLK_PARENT_INFRASYS) -#define TOP_PARENT(_id) PARENT(_id, CLK_PARENT_TOPCKGEN) -#define VOID_PARENT PARENT(-1, 0) - #define FIXED_CLK0(_id, _rate) \ FIXED_CLK(_id, CLK_XTAL, CLK_PARENT_XTAL, _rate) diff --git a/drivers/clk/mediatek/clk-mt7987.c b/drivers/clk/mediatek/clk-mt7987.c index b4bb02ca736..8c6edab6885 100644 --- a/drivers/clk/mediatek/clk-mt7987.c +++ b/drivers/clk/mediatek/clk-mt7987.c @@ -110,10 +110,6 @@ static const struct mtk_fixed_factor topckgen_mtk_fixed_factors[] = { TOP_FACTOR(CLK_TOP_CB_RTC_32P7K, "cb_rtc_32p7k", CLK_TOP_CB_CKSQ_40M, 1, 1221), }; -/* TOPCKGEN MUX PARENTS */ -#define APMIXED_PARENT(_id) PARENT(_id, CLK_PARENT_APMIXED) -#define TOP_PARENT(_id) PARENT(_id, CLK_PARENT_TOPCKGEN) - /* CLK_TOP_NETSYS_SEL (netsys_sel) in topckgen */ static const struct mtk_parent netsys_parents[] = { TOP_PARENT(CLK_TOP_CB_CKSQ_40M), diff --git a/drivers/clk/mediatek/clk-mt7988.c b/drivers/clk/mediatek/clk-mt7988.c index 2f0fa9f1ce9..55a4ec858df 100644 --- a/drivers/clk/mediatek/clk-mt7988.c +++ b/drivers/clk/mediatek/clk-mt7988.c @@ -93,10 +93,6 @@ static const struct mtk_fixed_factor topckgen_mtk_fixed_factors[] = { PLL_FACTOR(CLK_TOP_NET2PLL_D8, "net2pll_d8", CLK_APMIXED_NET2PLL, 1, 8), }; -/* TOPCKGEN MUX PARENTS */ -#define APMIXED_PARENT(_id) PARENT(_id, CLK_PARENT_APMIXED) -#define TOP_PARENT(_id) PARENT(_id, CLK_PARENT_TOPCKGEN) - static const struct mtk_parent netsys_parents[] = { TOP_PARENT(CLK_TOP_XTAL), TOP_PARENT(CLK_TOP_NET2PLL_D2), TOP_PARENT(CLK_TOP_MMPLL_D2), diff --git a/drivers/clk/mediatek/clk-mt8189.c b/drivers/clk/mediatek/clk-mt8189.c index 4ade03f2f6c..744e644f138 100644 --- a/drivers/clk/mediatek/clk-mt8189.c +++ b/drivers/clk/mediatek/clk-mt8189.c @@ -429,10 +429,6 @@ static const struct mtk_fixed_factor top_fixed_divs[] = { FACTOR1(CLK_TOP_OSC_D20, CLK_PAD_ULPOSC, 1, 20), }; -#define EXT_PARENT(id) PARENT(id, CLK_PARENT_EXT) -#define APMIXED_PARENT(id) PARENT(id, CLK_PARENT_APMIXED) -#define TOP_PARENT(id) PARENT(id, CLK_PARENT_TOPCKGEN) - static const struct mtk_parent axi_parents[] = { EXT_PARENT(CLK_PAD_CLK26M), TOP_PARENT(CLK_TOP_MAINPLL_D4_D4), diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h index 8374ed5ce78..588c940b715 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h @@ -122,6 +122,13 @@ struct mtk_parent { .flags = _flags, \ } +#define APMIXED_PARENT(id) PARENT(id, CLK_PARENT_APMIXED) +#define TOP_PARENT(id) PARENT(id, CLK_PARENT_TOPCKGEN) +#define INFRA_PARENT(id) PARENT(id, CLK_PARENT_INFRASYS) +#define XTAL_PARENT(id) PARENT(id, CLK_PARENT_XTAL) +#define EXT_PARENT(id) PARENT(id, CLK_PARENT_EXT) +#define VOID_PARENT PARENT(-1, 0) + /** * struct mtk_composite - aggregate clock of mux, divider and gate clocks * -- 2.43.0
