[][kernel][mt7988][clk][remove clocks from clock driver]
[Description]
Remove clocks from clock driver, trng clock no need controlled by CCF,
66m uart clocks are duplicated.
[Release-log]
N/A
Change-Id: I2a4e28fa314c5371e4b2ef4bc64798c2b2ae6920
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6833501
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988-clkitg.dtsi b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988-clkitg.dtsi
index 1e020d8..1c9c479 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988-clkitg.dtsi
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988-clkitg.dtsi
@@ -231,12 +231,8 @@
<&infracfg_ao CK_INFRA_66M_AP_DMA_BCK>,
<&infracfg_ao CK_INFRA_66M_SEJ_BCK>,
<&infracfg_ao CK_INFRA_PRE_CK_SEJ_F13M>,
- <&infracfg_ao CK_INFRA_66M_TRNG>,
<&system_clk>,
<&infracfg_ao CK_INFRA_I2C_BCK>,
- <&infracfg_ao CK_INFRA_66M_UART0_PCK>,
- <&infracfg_ao CK_INFRA_66M_UART1_PCK>,
- <&infracfg_ao CK_INFRA_66M_UART2_PCK>,
<&infracfg_ao CK_INFRA_52M_UART0_CK>,
<&infracfg_ao CK_INFRA_52M_UART1_CK>,
<&infracfg_ao CK_INFRA_52M_UART2_CK>,
diff --git a/target/linux/mediatek/files-5.4/drivers/clk/mediatek/clk-mt7988.c b/target/linux/mediatek/files-5.4/drivers/clk/mediatek/clk-mt7988.c
index 6ccd92f..04a680b 100644
--- a/target/linux/mediatek/files-5.4/drivers/clk/mediatek/clk-mt7988.c
+++ b/target/linux/mediatek/files-5.4/drivers/clk/mediatek/clk-mt7988.c
@@ -728,18 +728,10 @@
"infra_66m_mck", 29),
GATE_INFRA1(CK_INFRA_PRE_CK_SEJ_F13M, "infra_pre_ck_sej_f13m",
"infra_ck_f26m", 30),
- GATE_INFRA1(CK_INFRA_66M_TRNG, "infra_hf_66m_trng", "infra_peri_66m_o",
- 31),
/* INFRA2 */
GATE_INFRA2(CK_INFRA_26M_THERM_SYSTEM, "infra_hf_26m_therm_system",
"infra_ck_f26m", 0),
GATE_INFRA2(CK_INFRA_I2C_BCK, "infra_i2c_bck", "infra_i2c_o", 1),
- GATE_INFRA2(CK_INFRA_66M_UART0_PCK, "infra_hf_66m_uart0_pck",
- "infra_66m_mck", 3),
- GATE_INFRA2(CK_INFRA_66M_UART1_PCK, "infra_hf_66m_uart1_pck",
- "infra_66m_mck", 4),
- GATE_INFRA2(CK_INFRA_66M_UART2_PCK, "infra_hf_66m_uart2_pck",
- "infra_66m_mck", 5),
GATE_INFRA2(CK_INFRA_52M_UART0_CK, "infra_f_52m_uart0",
"infra_mux_uart0_sel", 3),
GATE_INFRA2(CK_INFRA_52M_UART1_CK, "infra_f_52m_uart1",
diff --git a/target/linux/mediatek/files-5.4/include/dt-bindings/clock/mt7988-clk.h b/target/linux/mediatek/files-5.4/include/dt-bindings/clock/mt7988-clk.h
index fb97122..3ba1f16 100644
--- a/target/linux/mediatek/files-5.4/include/dt-bindings/clock/mt7988-clk.h
+++ b/target/linux/mediatek/files-5.4/include/dt-bindings/clock/mt7988-clk.h
@@ -109,69 +109,65 @@
#define CK_INFRA_66M_AP_DMA_BCK 38
#define CK_INFRA_66M_SEJ_BCK 39
#define CK_INFRA_PRE_CK_SEJ_F13M 40
-#define CK_INFRA_66M_TRNG 41
-#define CK_INFRA_26M_THERM_SYSTEM 42
-#define CK_INFRA_I2C_BCK 43
-#define CK_INFRA_66M_UART0_PCK 44
-#define CK_INFRA_66M_UART1_PCK 45
-#define CK_INFRA_66M_UART2_PCK 46
-#define CK_INFRA_52M_UART0_CK 47
-#define CK_INFRA_52M_UART1_CK 48
-#define CK_INFRA_52M_UART2_CK 49
-#define CK_INFRA_NFI 50
-#define CK_INFRA_SPINFI 51
-#define CK_INFRA_66M_NFI_HCK 52
-#define CK_INFRA_104M_SPI0 53
-#define CK_INFRA_104M_SPI1 54
-#define CK_INFRA_104M_SPI2_BCK 55
-#define CK_INFRA_66M_SPI0_HCK 56
-#define CK_INFRA_66M_SPI1_HCK 57
-#define CK_INFRA_66M_SPI2_HCK 58
-#define CK_INFRA_66M_FLASHIF_AXI 59
-#define CK_INFRA_RTC 60
-#define CK_INFRA_26M_ADC_BCK 61
-#define CK_INFRA_RC_ADC 62
-#define CK_INFRA_MSDC400 63
-#define CK_INFRA_MSDC2_HCK 64
-#define CK_INFRA_133M_MSDC_0_HCK 65
-#define CK_INFRA_66M_MSDC_0_HCK 66
-#define CK_INFRA_133M_CPUM_BCK 67
-#define CK_INFRA_BIST2FPC 68
-#define CK_INFRA_I2C_X16W_MCK_CK_P1 69
-#define CK_INFRA_I2C_X16W_PCK_CK_P1 70
-#define CK_INFRA_133M_USB_HCK 71
-#define CK_INFRA_133M_USB_HCK_CK_P1 72
-#define CK_INFRA_66M_USB_HCK 73
-#define CK_INFRA_66M_USB_HCK_CK_P1 74
-#define CK_INFRA_USB_SYS 75
-#define CK_INFRA_USB_SYS_CK_P1 76
-#define CK_INFRA_USB_REF 77
-#define CK_INFRA_USB_CK_P1 78
-#define CK_INFRA_USB_FRMCNT 79
-#define CK_INFRA_USB_FRMCNT_CK_P1 80
-#define CK_INFRA_USB_PIPE 81
-#define CK_INFRA_USB_PIPE_CK_P1 82
-#define CK_INFRA_USB_UTMI 83
-#define CK_INFRA_USB_UTMI_CK_P1 84
-#define CK_INFRA_USB_XHCI 85
-#define CK_INFRA_USB_XHCI_CK_P1 86
-#define CK_INFRA_PCIE_GFMUX_TL_P0 87
-#define CK_INFRA_PCIE_GFMUX_TL_P1 88
-#define CK_INFRA_PCIE_GFMUX_TL_P2 89
-#define CK_INFRA_PCIE_GFMUX_TL_P3 90
-#define CK_INFRA_PCIE_PIPE_P0 91
-#define CK_INFRA_PCIE_PIPE_P1 92
-#define CK_INFRA_PCIE_PIPE_P2 93
-#define CK_INFRA_PCIE_PIPE_P3 94
-#define CK_INFRA_133M_PCIE_CK_P0 95
-#define CK_INFRA_133M_PCIE_CK_P1 96
-#define CK_INFRA_133M_PCIE_CK_P2 97
-#define CK_INFRA_133M_PCIE_CK_P3 98
-#define CK_INFRA_PCIE_PERI_26M_CK_P0 99
-#define CK_INFRA_PCIE_PERI_26M_CK_P1 100
-#define CK_INFRA_PCIE_PERI_26M_CK_P2 101
-#define CK_INFRA_PCIE_PERI_26M_CK_P3 102
-#define CLK_INFRA_AO_NR_CLK 103
+#define CK_INFRA_26M_THERM_SYSTEM 41
+#define CK_INFRA_I2C_BCK 42
+#define CK_INFRA_52M_UART0_CK 43
+#define CK_INFRA_52M_UART1_CK 44
+#define CK_INFRA_52M_UART2_CK 45
+#define CK_INFRA_NFI 46
+#define CK_INFRA_SPINFI 47
+#define CK_INFRA_66M_NFI_HCK 48
+#define CK_INFRA_104M_SPI0 49
+#define CK_INFRA_104M_SPI1 50
+#define CK_INFRA_104M_SPI2_BCK 51
+#define CK_INFRA_66M_SPI0_HCK 52
+#define CK_INFRA_66M_SPI1_HCK 53
+#define CK_INFRA_66M_SPI2_HCK 54
+#define CK_INFRA_66M_FLASHIF_AXI 55
+#define CK_INFRA_RTC 56
+#define CK_INFRA_26M_ADC_BCK 57
+#define CK_INFRA_RC_ADC 58
+#define CK_INFRA_MSDC400 59
+#define CK_INFRA_MSDC2_HCK 60
+#define CK_INFRA_133M_MSDC_0_HCK 61
+#define CK_INFRA_66M_MSDC_0_HCK 62
+#define CK_INFRA_133M_CPUM_BCK 63
+#define CK_INFRA_BIST2FPC 64
+#define CK_INFRA_I2C_X16W_MCK_CK_P1 65
+#define CK_INFRA_I2C_X16W_PCK_CK_P1 66
+#define CK_INFRA_133M_USB_HCK 67
+#define CK_INFRA_133M_USB_HCK_CK_P1 68
+#define CK_INFRA_66M_USB_HCK 69
+#define CK_INFRA_66M_USB_HCK_CK_P1 70
+#define CK_INFRA_USB_SYS 71
+#define CK_INFRA_USB_SYS_CK_P1 72
+#define CK_INFRA_USB_REF 73
+#define CK_INFRA_USB_CK_P1 74
+#define CK_INFRA_USB_FRMCNT 75
+#define CK_INFRA_USB_FRMCNT_CK_P1 76
+#define CK_INFRA_USB_PIPE 77
+#define CK_INFRA_USB_PIPE_CK_P1 78
+#define CK_INFRA_USB_UTMI 79
+#define CK_INFRA_USB_UTMI_CK_P1 80
+#define CK_INFRA_USB_XHCI 81
+#define CK_INFRA_USB_XHCI_CK_P1 82
+#define CK_INFRA_PCIE_GFMUX_TL_P0 83
+#define CK_INFRA_PCIE_GFMUX_TL_P1 84
+#define CK_INFRA_PCIE_GFMUX_TL_P2 85
+#define CK_INFRA_PCIE_GFMUX_TL_P3 86
+#define CK_INFRA_PCIE_PIPE_P0 87
+#define CK_INFRA_PCIE_PIPE_P1 88
+#define CK_INFRA_PCIE_PIPE_P2 89
+#define CK_INFRA_PCIE_PIPE_P3 90
+#define CK_INFRA_133M_PCIE_CK_P0 91
+#define CK_INFRA_133M_PCIE_CK_P1 92
+#define CK_INFRA_133M_PCIE_CK_P2 93
+#define CK_INFRA_133M_PCIE_CK_P3 94
+#define CK_INFRA_PCIE_PERI_26M_CK_P0 95
+#define CK_INFRA_PCIE_PERI_26M_CK_P1 96
+#define CK_INFRA_PCIE_PERI_26M_CK_P2 97
+#define CK_INFRA_PCIE_PERI_26M_CK_P3 98
+#define CLK_INFRA_AO_NR_CLK 99
/* TOPCKGEN */