Skip to contentSkip to conversation

clk: mediatek: Remove unused MT8192 mcupm clock

PATCH In review Tinghan Shen 2 participants 2 messages Dec 22, 2020 – Jan 31, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: mediatek: Remove unused MT8192 mcupm clock

From: "TingHan Shen" <[email protected]>

Remove unused MT8192 mcupm clock

---
This patch depends on series "Mediatek MT8192 clock support"[1].

[1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=379955

---
 drivers/clk/mediatek/clk-mt8192.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/clk/mediatek/clk-mt8192.c +0 -9
index 673dc60182f5..80df1903bd58 100644
@@ -649,12 +649,6 @@ static const char * const aes_msdcfde_parents[] = {
 	"univpll_d6"
 };
 
-static const char * const mcupm_parents[] = {
-	"clk26m",
-	"mainpll_d6_d4",
-	"mainpll_d6_d2"
-};
-
 static const char * const sflash_parents[] = {
 	"clk26m",
 	"mainpll_d7_d8",
@@ -856,8 +850,6 @@ static const struct mtk_mux top_mtk_muxes[] = {
 	MUX_GATE_CLR_SET_UPD(CLK_TOP_AES_MSDCFDE_SEL, "aes_msdcfde_sel",
 		aes_msdcfde_parents, 0x100, 0x104, 0x108, 24, 3, 31, 0x00c, 1),
 	/* CLK_CFG_16 */
-	MUX_GATE_CLR_SET_UPD(CLK_TOP_MCUPM_SEL, "mcupm_sel",
-		mcupm_parents, 0x110, 0x114, 0x118, 0, 2, 7, 0x00c, 2),
 	MUX_GATE_CLR_SET_UPD(CLK_TOP_SFLASH_SEL, "sflash_sel",
 		sflash_parents, 0x110, 0x114, 0x118, 8, 2, 15, 0x00c, 3),
 };
@@ -983,7 +975,6 @@ static const struct mtk_gate infra_clks[] = {
 	GATE_INFRA0(CLK_INFRA_SCPSYS, "infra_scpsys", "scp_sel", 4),
 	GATE_INFRA0(CLK_INFRA_SEJ, "infra_sej", "axi_sel", 5),
 	GATE_INFRA0(CLK_INFRA_APXGPT, "infra_apxgpt", "axi_sel", 6),
-	GATE_INFRA0(CLK_INFRA_MCUPM, "infra_mcupm", "mcupm_sel", 7),
 	GATE_INFRA0(CLK_INFRA_GCE, "infra_gce", "axi_sel", 8),
 	GATE_INFRA0(CLK_INFRA_GCE2, "infra_gce2", "axi_sel", 9),
 	GATE_INFRA0(CLK_INFRA_THERM, "infra_therm", "axi_sel", 10),
Signature · 1 line
2.18.0
maintainer
#1 lore raw
Quoted 9 lines · Tinghan Shen

From: "TingHan Shen" <[email protected]>

Remove unused MT8192 mcupm clock

---
This patch depends on series "Mediatek MT8192 clock support"[1].

[1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=379955

This series is not upstream, so it should be fixed in the very same series and not as a follow up patch. From what I see, this is alread done in v6.

Thanks!
Matthias

Quoted 39 lines
---
 drivers/clk/mediatek/clk-mt8192.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/clk/mediatek/clk-mt8192.c +0 -9
index 673dc60182f5..80df1903bd58 100644
@@ -649,12 +649,6 @@ static const char * const aes_msdcfde_parents[] = {
 	"univpll_d6"
 };
 
-static const char * const mcupm_parents[] = {
-	"clk26m",
-	"mainpll_d6_d4",
-	"mainpll_d6_d2"
-};
-
 static const char * const sflash_parents[] = {
 	"clk26m",
 	"mainpll_d7_d8",
@@ -856,8 +850,6 @@ static const struct mtk_mux top_mtk_muxes[] = {
 	MUX_GATE_CLR_SET_UPD(CLK_TOP_AES_MSDCFDE_SEL, "aes_msdcfde_sel",
 		aes_msdcfde_parents, 0x100, 0x104, 0x108, 24, 3, 31, 0x00c, 1),
 	/* CLK_CFG_16 */
-	MUX_GATE_CLR_SET_UPD(CLK_TOP_MCUPM_SEL, "mcupm_sel",
-		mcupm_parents, 0x110, 0x114, 0x118, 0, 2, 7, 0x00c, 2),
 	MUX_GATE_CLR_SET_UPD(CLK_TOP_SFLASH_SEL, "sflash_sel",
 		sflash_parents, 0x110, 0x114, 0x118, 8, 2, 15, 0x00c, 3),
 };
@@ -983,7 +975,6 @@ static const struct mtk_gate infra_clks[] = {
 	GATE_INFRA0(CLK_INFRA_SCPSYS, "infra_scpsys", "scp_sel", 4),
 	GATE_INFRA0(CLK_INFRA_SEJ, "infra_sej", "axi_sel", 5),
 	GATE_INFRA0(CLK_INFRA_APXGPT, "infra_apxgpt", "axi_sel", 6),
-	GATE_INFRA0(CLK_INFRA_MCUPM, "infra_mcupm", "mcupm_sel", 7),
 	GATE_INFRA0(CLK_INFRA_GCE, "infra_gce", "axi_sel", 8),
 	GATE_INFRA0(CLK_INFRA_GCE2, "infra_gce2", "axi_sel", 9),
 	GATE_INFRA0(CLK_INFRA_THERM, "infra_therm", "axi_sel", 10),