Skip to content

Commit 871afb4

Browse files
sjoerdsimonsbebarino
authored andcommitted
clk: mediatek: Drop __initconst from gates
Since commit 8ceff24 ("clk: mediatek: clk-gate: Refactor mtk_clk_register_gate to use mtk_gate struct") the mtk_gate structs are no longer just used for initialization/registration, but also at runtime. So drop __initconst annotations. Fixes: 8ceff24 ("clk: mediatek: clk-gate: Refactor mtk_clk_register_gate to use mtk_gate struct") Signed-off-by: Sjoerd Simons <sjoerd@collabora.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Laura Nao <laura.nao@collabora.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 8f0b4cc commit 871afb4

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/clk/mediatek/clk-mt7981-eth.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static const struct mtk_gate_regs sgmii0_cg_regs = {
3131
.ops = &mtk_clk_gate_ops_no_setclr_inv, \
3232
}
3333

34-
static const struct mtk_gate sgmii0_clks[] __initconst = {
34+
static const struct mtk_gate sgmii0_clks[] = {
3535
GATE_SGMII0(CLK_SGM0_TX_EN, "sgm0_tx_en", "usb_tx250m", 2),
3636
GATE_SGMII0(CLK_SGM0_RX_EN, "sgm0_rx_en", "usb_eq_rx250m", 3),
3737
GATE_SGMII0(CLK_SGM0_CK0_EN, "sgm0_ck0_en", "usb_ln0", 4),
@@ -53,7 +53,7 @@ static const struct mtk_gate_regs sgmii1_cg_regs = {
5353
.ops = &mtk_clk_gate_ops_no_setclr_inv, \
5454
}
5555

56-
static const struct mtk_gate sgmii1_clks[] __initconst = {
56+
static const struct mtk_gate sgmii1_clks[] = {
5757
GATE_SGMII1(CLK_SGM1_TX_EN, "sgm1_tx_en", "usb_tx250m", 2),
5858
GATE_SGMII1(CLK_SGM1_RX_EN, "sgm1_rx_en", "usb_eq_rx250m", 3),
5959
GATE_SGMII1(CLK_SGM1_CK1_EN, "sgm1_ck1_en", "usb_ln0", 4),
@@ -75,7 +75,7 @@ static const struct mtk_gate_regs eth_cg_regs = {
7575
.ops = &mtk_clk_gate_ops_no_setclr_inv, \
7676
}
7777

78-
static const struct mtk_gate eth_clks[] __initconst = {
78+
static const struct mtk_gate eth_clks[] = {
7979
GATE_ETH(CLK_ETH_FE_EN, "eth_fe_en", "netsys_2x", 6),
8080
GATE_ETH(CLK_ETH_GP2_EN, "eth_gp2_en", "sgm_325m", 7),
8181
GATE_ETH(CLK_ETH_GP1_EN, "eth_gp1_en", "sgm_325m", 8),

drivers/clk/mediatek/clk-mt8516.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ static const struct mtk_gate_regs top5_cg_regs = {
544544
#define GATE_TOP5(_id, _name, _parent, _shift) \
545545
GATE_MTK(_id, _name, _parent, &top5_cg_regs, _shift, &mtk_clk_gate_ops_setclr)
546546

547-
static const struct mtk_gate top_clks[] __initconst = {
547+
static const struct mtk_gate top_clks[] = {
548548
/* TOP1 */
549549
GATE_TOP1(CLK_TOP_THEM, "them", "ahb_infra_sel", 1),
550550
GATE_TOP1(CLK_TOP_APDMA, "apdma", "ahb_infra_sel", 2),

0 commit comments

Comments
 (0)