diff options
| author | Christian Marangi <[email protected]> | 2024-08-03 10:32:52 +0200 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-08-19 16:14:09 -0600 |
| commit | 603585892f18412f13eb2b8a35707c2b143c4265 (patch) | |
| tree | 077d611f706e62f2dbdf7e27dd940599d30528c5 | |
| parent | e7ecdd5a4610b3f07ca1f844bb2d8c32ffc8ef41 (diff) | |
clk: mediatek: mt7988: rename TOP_CK_NPU_SEL_CM_TOPS_SEL to TOP_NPU_SEL
Upstream kernel linux clock include use TOP_NPU_SEL instead of
TOP_CK_NPU_SEL_CM_TOPS_SEL.
Rename this clock to the upstream kernel in preparation for support of
OF_UPSTREAM.
Signed-off-by: Christian Marangi <[email protected]>
| -rw-r--r-- | drivers/clk/mediatek/clk-mt7988.c | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/mt7988-clk.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/mediatek/clk-mt7988.c b/drivers/clk/mediatek/clk-mt7988.c index e2324f40084..1ce8c4d8fef 100644 --- a/drivers/clk/mediatek/clk-mt7988.c +++ b/drivers/clk/mediatek/clk-mt7988.c @@ -420,7 +420,7 @@ static const struct mtk_composite topckgen_mtk_muxes[] = { 0x110, 0x114, 0x118, 24, 2, 31, 0x1c8, 9), TOP_MUX(CK_TOP_ETH_MII_SEL, "eth_mii_sel", eth_mii_parents, 0x120, 0x124, 0x128, 0, 1, 7, 0x1c8, 10), - TOP_MUX(CK_TOP_CK_NPU_SEL_CM_TOPS_SEL, "ck_npu_sel_cm_tops_sel", + TOP_MUX(CK_TOP_NPU_SEL, "ck_npu_sel", netsys_2x_parents, 0x120, 0x124, 0x128, 8, 2, 15, 0x1c8, 11), }; diff --git a/include/dt-bindings/clock/mt7988-clk.h b/include/dt-bindings/clock/mt7988-clk.h index 841dd419e75..4fd968a12ca 100644 --- a/include/dt-bindings/clock/mt7988-clk.h +++ b/include/dt-bindings/clock/mt7988-clk.h @@ -309,7 +309,7 @@ #define CK_TOP_NETSYS_PPEFB_250M_SEL 135 /* Linux CLK ID (70) */ #define CK_TOP_NETSYS_WARP_SEL 136 /* Linux CLK ID (71) */ #define CK_TOP_ETH_MII_SEL 137 /* Linux CLK ID (72) */ -#define CK_TOP_CK_NPU_SEL_CM_TOPS_SEL 138 /* Linux CLK ID (73) */ +#define CK_TOP_NPU_SEL 138 /* Linux CLK ID (73) */ /* APMIXEDSYS */ /* mtk_pll_data */ |