Skip to content

Commit 83b89a7

Browse files
committed
clk: meson: gxbb: set audio output clock hierarchy
The aiu devices peripheral clocks needs the aiu and aiu_glue clocks to operate. Reflect this hierarchy in the gxbb clock tree. Fixes: 738f66d ("clk: gxbb: add AmLogic GXBB clk controller driver") Acked-by: Neil Armstrong <[email protected]> Signed-off-by: Jerome Brunet <[email protected]>
1 parent 73c7ddd commit 83b89a7

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

drivers/clk/meson/gxbb.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,14 +2619,6 @@ static MESON_GATE(gxbb_spi, HHI_GCLK_MPEG0, 30);
26192619
static MESON_GATE(gxbb_i2s_spdif, HHI_GCLK_MPEG1, 2);
26202620
static MESON_GATE(gxbb_eth, HHI_GCLK_MPEG1, 3);
26212621
static MESON_GATE(gxbb_demux, HHI_GCLK_MPEG1, 4);
2622-
static MESON_GATE(gxbb_aiu_glue, HHI_GCLK_MPEG1, 6);
2623-
static MESON_GATE(gxbb_iec958, HHI_GCLK_MPEG1, 7);
2624-
static MESON_GATE(gxbb_i2s_out, HHI_GCLK_MPEG1, 8);
2625-
static MESON_GATE(gxbb_amclk, HHI_GCLK_MPEG1, 9);
2626-
static MESON_GATE(gxbb_aififo2, HHI_GCLK_MPEG1, 10);
2627-
static MESON_GATE(gxbb_mixer, HHI_GCLK_MPEG1, 11);
2628-
static MESON_GATE(gxbb_mixer_iface, HHI_GCLK_MPEG1, 12);
2629-
static MESON_GATE(gxbb_adc, HHI_GCLK_MPEG1, 13);
26302622
static MESON_GATE(gxbb_blkmv, HHI_GCLK_MPEG1, 14);
26312623
static MESON_GATE(gxbb_aiu, HHI_GCLK_MPEG1, 15);
26322624
static MESON_GATE(gxbb_uart1, HHI_GCLK_MPEG1, 16);
@@ -2681,6 +2673,16 @@ static MESON_GATE(gxbb_ao_ahb_bus, HHI_GCLK_AO, 2);
26812673
static MESON_GATE(gxbb_ao_iface, HHI_GCLK_AO, 3);
26822674
static MESON_GATE(gxbb_ao_i2c, HHI_GCLK_AO, 4);
26832675

2676+
/* AIU gates */
2677+
static MESON_PCLK(gxbb_aiu_glue, HHI_GCLK_MPEG1, 6, &gxbb_aiu.hw);
2678+
static MESON_PCLK(gxbb_iec958, HHI_GCLK_MPEG1, 7, &gxbb_aiu_glue.hw);
2679+
static MESON_PCLK(gxbb_i2s_out, HHI_GCLK_MPEG1, 8, &gxbb_aiu_glue.hw);
2680+
static MESON_PCLK(gxbb_amclk, HHI_GCLK_MPEG1, 9, &gxbb_aiu_glue.hw);
2681+
static MESON_PCLK(gxbb_aififo2, HHI_GCLK_MPEG1, 10, &gxbb_aiu_glue.hw);
2682+
static MESON_PCLK(gxbb_mixer, HHI_GCLK_MPEG1, 11, &gxbb_aiu_glue.hw);
2683+
static MESON_PCLK(gxbb_mixer_iface, HHI_GCLK_MPEG1, 12, &gxbb_aiu_glue.hw);
2684+
static MESON_PCLK(gxbb_adc, HHI_GCLK_MPEG1, 13, &gxbb_aiu_glue.hw);
2685+
26842686
/* Array of all clocks provided by this provider */
26852687

26862688
static struct clk_hw_onecell_data gxbb_hw_onecell_data = {

0 commit comments

Comments
 (0)