Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-30 16:35:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clk: mediatek: mt7622: add missing clock MUX1_SEL

Browse source 
Add missing infra clock MUX1_SEL needed for CPU clock. This is needed to
match the upstream clk ID order in preparation for OF_UPSTREAM.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-08-03 10:43:23 +02:00 • committed by Tom Rini
parent 6dfa991204
commit a942c0c3f5
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/clk/mediatek/clk-mt7622.c
View file

@ -384,6 +384,20 @@ static const struct mtk_composite top_muxes[] = {
}; };
/* infracfg */ /* 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),
APMIXED_PARENT(CLK_APMIXED_MAIN_CORE_EN),
APMIXED_PARENT(CLK_APMIXED_MAINPLL),
};
static const struct mtk_composite infra_muxes[] = {
MUX_MIXED(CLK_INFRA_MUX1_SEL, infra_mux1_parents, 0x000, 2, 2),
};
static const struct mtk_gate_regs infra_cg_regs = { static const struct mtk_gate_regs infra_cg_regs = {
.set_ofs = 0x40, .set_ofs = 0x40,
.clr_ofs = 0x44, .clr_ofs = 0x44,
@ -579,6 +593,14 @@ static const struct mtk_clk_tree mt7622_apmixed_clk_tree = {
.gates = apmixed_cgs, .gates = apmixed_cgs,
}; };
static const struct mtk_clk_tree mt7622_infra_clk_tree = {
.xtal_rate = 25 * MHZ,
.muxes_offs = CLK_INFRA_MUX1_SEL,
.gates_offs = CLK_INFRA_DBGCLK_PD,
.muxes = infra_muxes,
.gates = infra_cgs,
};
static const struct mtk_clk_tree mt7622_clk_tree = { static const struct mtk_clk_tree mt7622_clk_tree = {
.xtal_rate = 25 * MHZ, .xtal_rate = 25 * MHZ,
.fdivs_offs = CLK_TOP_TO_USB3_SYS, .fdivs_offs = CLK_TOP_TO_USB3_SYS,
@ -630,7 +652,7 @@ static int mt7622_topckgen_probe(struct udevice *dev)
static int mt7622_infracfg_probe(struct udevice *dev) static int mt7622_infracfg_probe(struct udevice *dev)
{ {
return mtk_common_clk_gate_init(dev, &mt7622_clk_tree, infra_cgs); return mtk_common_clk_infrasys_init(dev, &mt7622_infra_clk_tree);
} }
static int mt7622_pericfg_probe(struct udevice *dev) static int mt7622_pericfg_probe(struct udevice *dev)

13
include/dt-bindings/clock/mt7622-clk.h
View file

@ -120,12 +120,13 @@
/* INFRACFG */ /* INFRACFG */
#define CLK_INFRA_DBGCLK_PD 0 #define CLK_INFRA_MUX1_SEL 0
#define CLK_INFRA_AUDIO_PD 1 #define CLK_INFRA_DBGCLK_PD 1
#define CLK_INFRA_IRRX_PD 2 #define CLK_INFRA_AUDIO_PD 2
#define CLK_INFRA_APXGPT_PD 3 #define CLK_INFRA_IRRX_PD 3
#define CLK_INFRA_PMIC_PD 4 #define CLK_INFRA_APXGPT_PD 4
#define CLK_INFRA_TRNG 5 #define CLK_INFRA_PMIC_PD 5
#define CLK_INFRA_TRNG 6
/* PERICFG */ /* PERICFG */