Skip to content

Commit 71202c4

Browse files
xdarklightjbrun3t
authored andcommitted
clk: meson: meson8b: set audio output clock hierarchy
The aiu devices peripheral clocks needs the aiu and aiu_glue clocks to operate. Reflect this hierarchy in the clock tree. Fixes: e31a190 ("meson: clk: Add support for clock gates") Suggested-by: Jerome Brunet <[email protected]> Signed-off-by: Martin Blumenstingl <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Signed-off-by: Jerome Brunet <[email protected]>
1 parent a18c8e0 commit 71202c4

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

drivers/clk/meson/meson8b.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2605,14 +2605,6 @@ static MESON_GATE(meson8b_spi, HHI_GCLK_MPEG0, 30);
26052605
static MESON_GATE(meson8b_i2s_spdif, HHI_GCLK_MPEG1, 2);
26062606
static MESON_GATE(meson8b_eth, HHI_GCLK_MPEG1, 3);
26072607
static MESON_GATE(meson8b_demux, HHI_GCLK_MPEG1, 4);
2608-
static MESON_GATE(meson8b_aiu_glue, HHI_GCLK_MPEG1, 6);
2609-
static MESON_GATE(meson8b_iec958, HHI_GCLK_MPEG1, 7);
2610-
static MESON_GATE(meson8b_i2s_out, HHI_GCLK_MPEG1, 8);
2611-
static MESON_GATE(meson8b_amclk, HHI_GCLK_MPEG1, 9);
2612-
static MESON_GATE(meson8b_aififo2, HHI_GCLK_MPEG1, 10);
2613-
static MESON_GATE(meson8b_mixer, HHI_GCLK_MPEG1, 11);
2614-
static MESON_GATE(meson8b_mixer_iface, HHI_GCLK_MPEG1, 12);
2615-
static MESON_GATE(meson8b_adc, HHI_GCLK_MPEG1, 13);
26162608
static MESON_GATE(meson8b_blkmv, HHI_GCLK_MPEG1, 14);
26172609
static MESON_GATE(meson8b_aiu, HHI_GCLK_MPEG1, 15);
26182610
static MESON_GATE(meson8b_uart1, HHI_GCLK_MPEG1, 16);
@@ -2659,6 +2651,19 @@ static MESON_GATE(meson8b_vclk2_vencl, HHI_GCLK_OTHER, 25);
26592651
static MESON_GATE(meson8b_vclk2_other, HHI_GCLK_OTHER, 26);
26602652
static MESON_GATE(meson8b_edp, HHI_GCLK_OTHER, 31);
26612653

2654+
/* AIU gates */
2655+
#define MESON_AIU_GLUE_GATE(_name, _reg, _bit) \
2656+
MESON_PCLK(_name, _reg, _bit, &meson8b_aiu_glue.hw)
2657+
2658+
static MESON_PCLK(meson8b_aiu_glue, HHI_GCLK_MPEG1, 6, &meson8b_aiu.hw);
2659+
static MESON_AIU_GLUE_GATE(meson8b_iec958, HHI_GCLK_MPEG1, 7);
2660+
static MESON_AIU_GLUE_GATE(meson8b_i2s_out, HHI_GCLK_MPEG1, 8);
2661+
static MESON_AIU_GLUE_GATE(meson8b_amclk, HHI_GCLK_MPEG1, 9);
2662+
static MESON_AIU_GLUE_GATE(meson8b_aififo2, HHI_GCLK_MPEG1, 10);
2663+
static MESON_AIU_GLUE_GATE(meson8b_mixer, HHI_GCLK_MPEG1, 11);
2664+
static MESON_AIU_GLUE_GATE(meson8b_mixer_iface, HHI_GCLK_MPEG1, 12);
2665+
static MESON_AIU_GLUE_GATE(meson8b_adc, HHI_GCLK_MPEG1, 13);
2666+
26622667
/* Always On (AO) domain gates */
26632668

26642669
static MESON_GATE(meson8b_ao_media_cpu, HHI_GCLK_AO, 0);

0 commit comments

Comments
 (0)