* [PATCH 0/3] clk: meson: gxbb: audio clock updates
@ 2020-01-22 10:04 Jerome Brunet
2020-01-22 10:04 ` [PATCH 1/3] dt-bindings: clk: meson: add the gxl internal dac gate Jerome Brunet
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Jerome Brunet @ 2020-01-22 10:04 UTC (permalink / raw)
To: Neil Armstrong, linux-clk
Cc: Kevin Hilman, linux-amlogic, linux-kernel, devicetree, Jerome Brunet
This patcheset provides updates related to the audio peripheral clocks
It adds the peripheral clock required by the internal audio dac
and reorganize the AIU clocks into a hierarchy to better reflect the
behavior of the SoC.
Jerome Brunet (3):
dt-bindings: clk: meson: add the gxl internal dac gate
clk: meson: gxbb: add the gxl internal dac gate
clk: meson: gxbb: set audio output clock hierarchy
drivers/clk/meson/gxbb.c | 21 +++++++++++++--------
drivers/clk/meson/gxbb.h | 2 +-
include/dt-bindings/clock/gxbb-clkc.h | 1 +
3 files changed, 15 insertions(+), 9 deletions(-)
--
2.24.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/3] dt-bindings: clk: meson: add the gxl internal dac gate 2020-01-22 10:04 [PATCH 0/3] clk: meson: gxbb: audio clock updates Jerome Brunet @ 2020-01-22 10:04 ` Jerome Brunet 2020-01-23 9:51 ` Neil Armstrong 2020-01-22 10:04 ` [PATCH 2/3] clk: meson: gxbb: " Jerome Brunet ` (2 subsequent siblings) 3 siblings, 1 reply; 8+ messages in thread From: Jerome Brunet @ 2020-01-22 10:04 UTC (permalink / raw) To: Neil Armstrong, linux-clk Cc: Kevin Hilman, linux-amlogic, linux-kernel, devicetree, Jerome Brunet Add the gxl ACODEC clock id to the gxbb clock controller bindings Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- include/dt-bindings/clock/gxbb-clkc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h index db0763e96173..4073eb7a9da1 100644 --- a/include/dt-bindings/clock/gxbb-clkc.h +++ b/include/dt-bindings/clock/gxbb-clkc.h @@ -146,5 +146,6 @@ #define CLKID_CTS_VDAC 201 #define CLKID_HDMI_TX 202 #define CLKID_HDMI 205 +#define CLKID_ACODEC 206 #endif /* __GXBB_CLKC_H */ -- 2.24.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] dt-bindings: clk: meson: add the gxl internal dac gate 2020-01-22 10:04 ` [PATCH 1/3] dt-bindings: clk: meson: add the gxl internal dac gate Jerome Brunet @ 2020-01-23 9:51 ` Neil Armstrong 0 siblings, 0 replies; 8+ messages in thread From: Neil Armstrong @ 2020-01-23 9:51 UTC (permalink / raw) To: Jerome Brunet, linux-clk Cc: Kevin Hilman, devicetree, linux-kernel, linux-amlogic On 22/01/2020 11:04, Jerome Brunet wrote: > Add the gxl ACODEC clock id to the gxbb clock controller bindings > > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > --- > include/dt-bindings/clock/gxbb-clkc.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h > index db0763e96173..4073eb7a9da1 100644 > --- a/include/dt-bindings/clock/gxbb-clkc.h > +++ b/include/dt-bindings/clock/gxbb-clkc.h > @@ -146,5 +146,6 @@ > #define CLKID_CTS_VDAC 201 > #define CLKID_HDMI_TX 202 > #define CLKID_HDMI 205 > +#define CLKID_ACODEC 206 > > #endif /* __GXBB_CLKC_H */ > Acked-by: Neil Armstrong <narmstrong@baylibre.com> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] clk: meson: gxbb: add the gxl internal dac gate 2020-01-22 10:04 [PATCH 0/3] clk: meson: gxbb: audio clock updates Jerome Brunet 2020-01-22 10:04 ` [PATCH 1/3] dt-bindings: clk: meson: add the gxl internal dac gate Jerome Brunet @ 2020-01-22 10:04 ` Jerome Brunet 2020-01-23 9:51 ` Neil Armstrong 2020-01-22 10:04 ` [PATCH 3/3] clk: meson: gxbb: set audio output clock hierarchy Jerome Brunet 2020-02-13 16:35 ` [PATCH 0/3] clk: meson: gxbb: audio clock updates Jerome Brunet 3 siblings, 1 reply; 8+ messages in thread From: Jerome Brunet @ 2020-01-22 10:04 UTC (permalink / raw) To: Neil Armstrong, linux-clk Cc: Kevin Hilman, linux-amlogic, linux-kernel, devicetree, Jerome Brunet Add the ACODEC clock gate to the gxl clk controller driver Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- drivers/clk/meson/gxbb.c | 3 +++ drivers/clk/meson/gxbb.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 1f9c056e684c..47916c4f1700 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -2613,6 +2613,7 @@ static MESON_GATE(gxbb_assist_misc, HHI_GCLK_MPEG0, 23); static MESON_GATE(gxbb_emmc_a, HHI_GCLK_MPEG0, 24); static MESON_GATE(gxbb_emmc_b, HHI_GCLK_MPEG0, 25); static MESON_GATE(gxbb_emmc_c, HHI_GCLK_MPEG0, 26); +static MESON_GATE(gxl_acodec, HHI_GCLK_MPEG0, 28); static MESON_GATE(gxbb_spi, HHI_GCLK_MPEG0, 30); static MESON_GATE(gxbb_i2s_spdif, HHI_GCLK_MPEG1, 2); @@ -3100,6 +3101,7 @@ static struct clk_hw_onecell_data gxl_hw_onecell_data = { [CLKID_HDMI_SEL] = &gxbb_hdmi_sel.hw, [CLKID_HDMI_DIV] = &gxbb_hdmi_div.hw, [CLKID_HDMI] = &gxbb_hdmi.hw, + [CLKID_ACODEC] = &gxl_acodec.hw, [NR_CLKS] = NULL, }, .num = NR_CLKS, @@ -3491,6 +3493,7 @@ static struct clk_regmap *const gxl_clk_regmaps[] = { &gxl_hdmi_pll_od, &gxl_hdmi_pll_od2, &gxl_hdmi_pll_dco, + &gxl_acodec, }; static const struct meson_eeclkc_data gxbb_clkc_data = { diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index b53584fe66cf..1ee8cb7e2f5a 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -188,7 +188,7 @@ #define CLKID_HDMI_SEL 203 #define CLKID_HDMI_DIV 204 -#define NR_CLKS 206 +#define NR_CLKS 207 /* include the CLKIDs that have been made part of the DT binding */ #include <dt-bindings/clock/gxbb-clkc.h> -- 2.24.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] clk: meson: gxbb: add the gxl internal dac gate 2020-01-22 10:04 ` [PATCH 2/3] clk: meson: gxbb: " Jerome Brunet @ 2020-01-23 9:51 ` Neil Armstrong 0 siblings, 0 replies; 8+ messages in thread From: Neil Armstrong @ 2020-01-23 9:51 UTC (permalink / raw) To: Jerome Brunet, linux-clk Cc: Kevin Hilman, devicetree, linux-kernel, linux-amlogic On 22/01/2020 11:04, Jerome Brunet wrote: > Add the ACODEC clock gate to the gxl clk controller driver > > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > --- > drivers/clk/meson/gxbb.c | 3 +++ > drivers/clk/meson/gxbb.h | 2 +- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c > index 1f9c056e684c..47916c4f1700 100644 > --- a/drivers/clk/meson/gxbb.c > +++ b/drivers/clk/meson/gxbb.c > @@ -2613,6 +2613,7 @@ static MESON_GATE(gxbb_assist_misc, HHI_GCLK_MPEG0, 23); > static MESON_GATE(gxbb_emmc_a, HHI_GCLK_MPEG0, 24); > static MESON_GATE(gxbb_emmc_b, HHI_GCLK_MPEG0, 25); > static MESON_GATE(gxbb_emmc_c, HHI_GCLK_MPEG0, 26); > +static MESON_GATE(gxl_acodec, HHI_GCLK_MPEG0, 28); > static MESON_GATE(gxbb_spi, HHI_GCLK_MPEG0, 30); > > static MESON_GATE(gxbb_i2s_spdif, HHI_GCLK_MPEG1, 2); > @@ -3100,6 +3101,7 @@ static struct clk_hw_onecell_data gxl_hw_onecell_data = { > [CLKID_HDMI_SEL] = &gxbb_hdmi_sel.hw, > [CLKID_HDMI_DIV] = &gxbb_hdmi_div.hw, > [CLKID_HDMI] = &gxbb_hdmi.hw, > + [CLKID_ACODEC] = &gxl_acodec.hw, > [NR_CLKS] = NULL, > }, > .num = NR_CLKS, > @@ -3491,6 +3493,7 @@ static struct clk_regmap *const gxl_clk_regmaps[] = { > &gxl_hdmi_pll_od, > &gxl_hdmi_pll_od2, > &gxl_hdmi_pll_dco, > + &gxl_acodec, > }; > > static const struct meson_eeclkc_data gxbb_clkc_data = { > diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h > index b53584fe66cf..1ee8cb7e2f5a 100644 > --- a/drivers/clk/meson/gxbb.h > +++ b/drivers/clk/meson/gxbb.h > @@ -188,7 +188,7 @@ > #define CLKID_HDMI_SEL 203 > #define CLKID_HDMI_DIV 204 > > -#define NR_CLKS 206 > +#define NR_CLKS 207 > > /* include the CLKIDs that have been made part of the DT binding */ > #include <dt-bindings/clock/gxbb-clkc.h> > Acked-by: Neil Armstrong <narmstrong@baylibre.com> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] clk: meson: gxbb: set audio output clock hierarchy 2020-01-22 10:04 [PATCH 0/3] clk: meson: gxbb: audio clock updates Jerome Brunet 2020-01-22 10:04 ` [PATCH 1/3] dt-bindings: clk: meson: add the gxl internal dac gate Jerome Brunet 2020-01-22 10:04 ` [PATCH 2/3] clk: meson: gxbb: " Jerome Brunet @ 2020-01-22 10:04 ` Jerome Brunet 2020-01-23 9:51 ` Neil Armstrong 2020-02-13 16:35 ` [PATCH 0/3] clk: meson: gxbb: audio clock updates Jerome Brunet 3 siblings, 1 reply; 8+ messages in thread From: Jerome Brunet @ 2020-01-22 10:04 UTC (permalink / raw) To: Neil Armstrong, linux-clk Cc: Kevin Hilman, linux-amlogic, linux-kernel, devicetree, Jerome Brunet The aiu devices peripheral clocks needs the aiu and aiu_glue clocks to operate. Reflect this hierarchy in the gxbb clock tree. Fixes: 738f66d3211d ("clk: gxbb: add AmLogic GXBB clk controller driver") Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- drivers/clk/meson/gxbb.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 47916c4f1700..5fd6a574f8c3 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -2619,14 +2619,6 @@ static MESON_GATE(gxbb_spi, HHI_GCLK_MPEG0, 30); static MESON_GATE(gxbb_i2s_spdif, HHI_GCLK_MPEG1, 2); static MESON_GATE(gxbb_eth, HHI_GCLK_MPEG1, 3); static MESON_GATE(gxbb_demux, HHI_GCLK_MPEG1, 4); -static MESON_GATE(gxbb_aiu_glue, HHI_GCLK_MPEG1, 6); -static MESON_GATE(gxbb_iec958, HHI_GCLK_MPEG1, 7); -static MESON_GATE(gxbb_i2s_out, HHI_GCLK_MPEG1, 8); -static MESON_GATE(gxbb_amclk, HHI_GCLK_MPEG1, 9); -static MESON_GATE(gxbb_aififo2, HHI_GCLK_MPEG1, 10); -static MESON_GATE(gxbb_mixer, HHI_GCLK_MPEG1, 11); -static MESON_GATE(gxbb_mixer_iface, HHI_GCLK_MPEG1, 12); -static MESON_GATE(gxbb_adc, HHI_GCLK_MPEG1, 13); static MESON_GATE(gxbb_blkmv, HHI_GCLK_MPEG1, 14); static MESON_GATE(gxbb_aiu, HHI_GCLK_MPEG1, 15); static MESON_GATE(gxbb_uart1, HHI_GCLK_MPEG1, 16); @@ -2681,6 +2673,16 @@ static MESON_GATE(gxbb_ao_ahb_bus, HHI_GCLK_AO, 2); static MESON_GATE(gxbb_ao_iface, HHI_GCLK_AO, 3); static MESON_GATE(gxbb_ao_i2c, HHI_GCLK_AO, 4); +/* AIU gates */ +static MESON_PCLK(gxbb_aiu_glue, HHI_GCLK_MPEG1, 6, &gxbb_aiu.hw); +static MESON_PCLK(gxbb_iec958, HHI_GCLK_MPEG1, 7, &gxbb_aiu_glue.hw); +static MESON_PCLK(gxbb_i2s_out, HHI_GCLK_MPEG1, 8, &gxbb_aiu_glue.hw); +static MESON_PCLK(gxbb_amclk, HHI_GCLK_MPEG1, 9, &gxbb_aiu_glue.hw); +static MESON_PCLK(gxbb_aififo2, HHI_GCLK_MPEG1, 10, &gxbb_aiu_glue.hw); +static MESON_PCLK(gxbb_mixer, HHI_GCLK_MPEG1, 11, &gxbb_aiu_glue.hw); +static MESON_PCLK(gxbb_mixer_iface, HHI_GCLK_MPEG1, 12, &gxbb_aiu_glue.hw); +static MESON_PCLK(gxbb_adc, HHI_GCLK_MPEG1, 13, &gxbb_aiu_glue.hw); + /* Array of all clocks provided by this provider */ static struct clk_hw_onecell_data gxbb_hw_onecell_data = { -- 2.24.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] clk: meson: gxbb: set audio output clock hierarchy 2020-01-22 10:04 ` [PATCH 3/3] clk: meson: gxbb: set audio output clock hierarchy Jerome Brunet @ 2020-01-23 9:51 ` Neil Armstrong 0 siblings, 0 replies; 8+ messages in thread From: Neil Armstrong @ 2020-01-23 9:51 UTC (permalink / raw) To: Jerome Brunet, linux-clk Cc: Kevin Hilman, devicetree, linux-kernel, linux-amlogic On 22/01/2020 11:04, Jerome Brunet wrote: > The aiu devices peripheral clocks needs the aiu and aiu_glue clocks to > operate. Reflect this hierarchy in the gxbb clock tree. > > Fixes: 738f66d3211d ("clk: gxbb: add AmLogic GXBB clk controller driver") > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > --- > drivers/clk/meson/gxbb.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c > index 47916c4f1700..5fd6a574f8c3 100644 > --- a/drivers/clk/meson/gxbb.c > +++ b/drivers/clk/meson/gxbb.c > @@ -2619,14 +2619,6 @@ static MESON_GATE(gxbb_spi, HHI_GCLK_MPEG0, 30); > static MESON_GATE(gxbb_i2s_spdif, HHI_GCLK_MPEG1, 2); > static MESON_GATE(gxbb_eth, HHI_GCLK_MPEG1, 3); > static MESON_GATE(gxbb_demux, HHI_GCLK_MPEG1, 4); > -static MESON_GATE(gxbb_aiu_glue, HHI_GCLK_MPEG1, 6); > -static MESON_GATE(gxbb_iec958, HHI_GCLK_MPEG1, 7); > -static MESON_GATE(gxbb_i2s_out, HHI_GCLK_MPEG1, 8); > -static MESON_GATE(gxbb_amclk, HHI_GCLK_MPEG1, 9); > -static MESON_GATE(gxbb_aififo2, HHI_GCLK_MPEG1, 10); > -static MESON_GATE(gxbb_mixer, HHI_GCLK_MPEG1, 11); > -static MESON_GATE(gxbb_mixer_iface, HHI_GCLK_MPEG1, 12); > -static MESON_GATE(gxbb_adc, HHI_GCLK_MPEG1, 13); > static MESON_GATE(gxbb_blkmv, HHI_GCLK_MPEG1, 14); > static MESON_GATE(gxbb_aiu, HHI_GCLK_MPEG1, 15); > static MESON_GATE(gxbb_uart1, HHI_GCLK_MPEG1, 16); > @@ -2681,6 +2673,16 @@ static MESON_GATE(gxbb_ao_ahb_bus, HHI_GCLK_AO, 2); > static MESON_GATE(gxbb_ao_iface, HHI_GCLK_AO, 3); > static MESON_GATE(gxbb_ao_i2c, HHI_GCLK_AO, 4); > > +/* AIU gates */ > +static MESON_PCLK(gxbb_aiu_glue, HHI_GCLK_MPEG1, 6, &gxbb_aiu.hw); > +static MESON_PCLK(gxbb_iec958, HHI_GCLK_MPEG1, 7, &gxbb_aiu_glue.hw); > +static MESON_PCLK(gxbb_i2s_out, HHI_GCLK_MPEG1, 8, &gxbb_aiu_glue.hw); > +static MESON_PCLK(gxbb_amclk, HHI_GCLK_MPEG1, 9, &gxbb_aiu_glue.hw); > +static MESON_PCLK(gxbb_aififo2, HHI_GCLK_MPEG1, 10, &gxbb_aiu_glue.hw); > +static MESON_PCLK(gxbb_mixer, HHI_GCLK_MPEG1, 11, &gxbb_aiu_glue.hw); > +static MESON_PCLK(gxbb_mixer_iface, HHI_GCLK_MPEG1, 12, &gxbb_aiu_glue.hw); > +static MESON_PCLK(gxbb_adc, HHI_GCLK_MPEG1, 13, &gxbb_aiu_glue.hw); > + > /* Array of all clocks provided by this provider */ > > static struct clk_hw_onecell_data gxbb_hw_onecell_data = { > Acked-by: Neil Armstrong <narmstrong@baylibre.com> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] clk: meson: gxbb: audio clock updates 2020-01-22 10:04 [PATCH 0/3] clk: meson: gxbb: audio clock updates Jerome Brunet ` (2 preceding siblings ...) 2020-01-22 10:04 ` [PATCH 3/3] clk: meson: gxbb: set audio output clock hierarchy Jerome Brunet @ 2020-02-13 16:35 ` Jerome Brunet 3 siblings, 0 replies; 8+ messages in thread From: Jerome Brunet @ 2020-02-13 16:35 UTC (permalink / raw) To: Neil Armstrong, linux-clk Cc: Kevin Hilman, devicetree, linux-kernel, linux-amlogic On Wed 22 Jan 2020 at 11:04, Jerome Brunet <jbrunet@baylibre.com> wrote: > This patcheset provides updates related to the audio peripheral clocks > It adds the peripheral clock required by the internal audio dac > and reorganize the AIU clocks into a hierarchy to better reflect the > behavior of the SoC. > > Jerome Brunet (3): > dt-bindings: clk: meson: add the gxl internal dac gate > clk: meson: gxbb: add the gxl internal dac gate > clk: meson: gxbb: set audio output clock hierarchy > > drivers/clk/meson/gxbb.c | 21 +++++++++++++-------- > drivers/clk/meson/gxbb.h | 2 +- > include/dt-bindings/clock/gxbb-clkc.h | 1 + > 3 files changed, 15 insertions(+), 9 deletions(-) Applied _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-02-13 16:35 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-01-22 10:04 [PATCH 0/3] clk: meson: gxbb: audio clock updates Jerome Brunet 2020-01-22 10:04 ` [PATCH 1/3] dt-bindings: clk: meson: add the gxl internal dac gate Jerome Brunet 2020-01-23 9:51 ` Neil Armstrong 2020-01-22 10:04 ` [PATCH 2/3] clk: meson: gxbb: " Jerome Brunet 2020-01-23 9:51 ` Neil Armstrong 2020-01-22 10:04 ` [PATCH 3/3] clk: meson: gxbb: set audio output clock hierarchy Jerome Brunet 2020-01-23 9:51 ` Neil Armstrong 2020-02-13 16:35 ` [PATCH 0/3] clk: meson: gxbb: audio clock updates Jerome Brunet
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).