* [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets
@ 2019-08-20 12:15 Jerome Brunet
2019-08-20 12:15 ` [PATCH 1/2] arm64: dts: meson: g12a: audio clock controller provides resets Jerome Brunet
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Jerome Brunet @ 2019-08-20 12:15 UTC (permalink / raw)
To: Kevin Hilman; +Cc: Jerome Brunet, linux-amlogic, devicetree, linux-kernel
This patchset adds the dedicated reset of the tdm formatters which
have been added on the g12a SoC family. Using these help with the channel
mapping when the formatter uses more than 1 i2s lane.
Kevin, please note that to build, this patchset depends on the new reset
bindings of the audio clock controller. I've prepared a tag for you [0]
[0]: git://github.com/BayLibre/clk-meson.git - clk-meson-dt-v5.4-2
Jerome Brunet (2):
arm64: dts: meson: g12a: audio clock controller provides resets
arm64: dts: meson: g12a: add reset to tdm formatters
arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
--
2.21.0
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] arm64: dts: meson: g12a: audio clock controller provides resets 2019-08-20 12:15 [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets Jerome Brunet @ 2019-08-20 12:15 ` Jerome Brunet 2019-08-20 12:15 ` [PATCH 2/2] arm64: dts: meson: g12a: add reset to tdm formatters Jerome Brunet ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Jerome Brunet @ 2019-08-20 12:15 UTC (permalink / raw) To: Kevin Hilman; +Cc: Jerome Brunet, linux-amlogic, devicetree, linux-kernel The clock controller dedicated to audio clocks also provides reset lines on the g12 SoC family Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 809f741a82ec..8eb92edb7a66 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -1477,6 +1477,7 @@ compatible = "amlogic,g12a-audio-clkc"; reg = <0x0 0x0 0x0 0xb4>; #clock-cells = <1>; + #reset-cells = <1>; clocks = <&clkc CLKID_AUDIO>, <&clkc CLKID_MPLL0>, -- 2.21.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] arm64: dts: meson: g12a: add reset to tdm formatters 2019-08-20 12:15 [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets Jerome Brunet 2019-08-20 12:15 ` [PATCH 1/2] arm64: dts: meson: g12a: audio clock controller provides resets Jerome Brunet @ 2019-08-20 12:15 ` Jerome Brunet 2019-08-21 14:23 ` [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets Neil Armstrong 2019-08-27 23:42 ` Kevin Hilman 3 siblings, 0 replies; 8+ messages in thread From: Jerome Brunet @ 2019-08-20 12:15 UTC (permalink / raw) To: Kevin Hilman; +Cc: Jerome Brunet, linux-amlogic, devicetree, linux-kernel Add the reset to the TDM formatters of the g12a. This helps with channel mapping when a playback/capture uses more than 1 lane. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 8eb92edb7a66..c8b9b9754598 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -11,6 +11,7 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h> +#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h> #include <dt-bindings/reset/amlogic,meson-g12a-reset.h> / { @@ -1586,6 +1587,7 @@ "amlogic,axg-tdmin"; reg = <0x0 0x300 0x0 0x40>; sound-name-prefix = "TDMIN_A"; + resets = <&clkc_audio AUD_RESET_TDMIN_A>; clocks = <&clkc_audio AUD_CLKID_TDMIN_A>, <&clkc_audio AUD_CLKID_TDMIN_A_SCLK>, <&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>, @@ -1601,6 +1603,7 @@ "amlogic,axg-tdmin"; reg = <0x0 0x340 0x0 0x40>; sound-name-prefix = "TDMIN_B"; + resets = <&clkc_audio AUD_RESET_TDMIN_B>; clocks = <&clkc_audio AUD_CLKID_TDMIN_B>, <&clkc_audio AUD_CLKID_TDMIN_B_SCLK>, <&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>, @@ -1616,6 +1619,7 @@ "amlogic,axg-tdmin"; reg = <0x0 0x380 0x0 0x40>; sound-name-prefix = "TDMIN_C"; + resets = <&clkc_audio AUD_RESET_TDMIN_C>; clocks = <&clkc_audio AUD_CLKID_TDMIN_C>, <&clkc_audio AUD_CLKID_TDMIN_C_SCLK>, <&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>, @@ -1631,6 +1635,7 @@ "amlogic,axg-tdmin"; reg = <0x0 0x3c0 0x0 0x40>; sound-name-prefix = "TDMIN_LB"; + resets = <&clkc_audio AUD_RESET_TDMIN_LB>; clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>, <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>, <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>, @@ -1670,6 +1675,7 @@ compatible = "amlogic,g12a-tdmout"; reg = <0x0 0x500 0x0 0x40>; sound-name-prefix = "TDMOUT_A"; + resets = <&clkc_audio AUD_RESET_TDMOUT_A>; clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>, <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>, <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>, @@ -1684,6 +1690,7 @@ compatible = "amlogic,g12a-tdmout"; reg = <0x0 0x540 0x0 0x40>; sound-name-prefix = "TDMOUT_B"; + resets = <&clkc_audio AUD_RESET_TDMOUT_B>; clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>, <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>, <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>, @@ -1698,6 +1705,7 @@ compatible = "amlogic,g12a-tdmout"; reg = <0x0 0x580 0x0 0x40>; sound-name-prefix = "TDMOUT_C"; + resets = <&clkc_audio AUD_RESET_TDMOUT_C>; clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>, <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>, <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>, -- 2.21.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets 2019-08-20 12:15 [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets Jerome Brunet 2019-08-20 12:15 ` [PATCH 1/2] arm64: dts: meson: g12a: audio clock controller provides resets Jerome Brunet 2019-08-20 12:15 ` [PATCH 2/2] arm64: dts: meson: g12a: add reset to tdm formatters Jerome Brunet @ 2019-08-21 14:23 ` Neil Armstrong 2019-08-27 23:42 ` Kevin Hilman 3 siblings, 0 replies; 8+ messages in thread From: Neil Armstrong @ 2019-08-21 14:23 UTC (permalink / raw) To: Jerome Brunet, Kevin Hilman; +Cc: linux-amlogic, devicetree, linux-kernel On 20/08/2019 14:15, Jerome Brunet wrote: > This patchset adds the dedicated reset of the tdm formatters which > have been added on the g12a SoC family. Using these help with the channel > mapping when the formatter uses more than 1 i2s lane. > > Kevin, please note that to build, this patchset depends on the new reset > bindings of the audio clock controller. I've prepared a tag for you [0] > > [0]: git://github.com/BayLibre/clk-meson.git - clk-meson-dt-v5.4-2 > > Jerome Brunet (2): > arm64: dts: meson: g12a: audio clock controller provides resets > arm64: dts: meson: g12a: add reset to tdm formatters > > arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 9 +++++++++ > 1 file changed, 9 insertions(+) > For the serie, Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Neil ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets 2019-08-20 12:15 [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets Jerome Brunet ` (2 preceding siblings ...) 2019-08-21 14:23 ` [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets Neil Armstrong @ 2019-08-27 23:42 ` Kevin Hilman 2019-08-28 8:03 ` Jerome Brunet 3 siblings, 1 reply; 8+ messages in thread From: Kevin Hilman @ 2019-08-27 23:42 UTC (permalink / raw) To: Jerome Brunet; +Cc: Jerome Brunet, linux-amlogic, devicetree, linux-kernel Jerome Brunet <jbrunet@baylibre.com> writes: > This patchset adds the dedicated reset of the tdm formatters which > have been added on the g12a SoC family. Using these help with the channel > mapping when the formatter uses more than 1 i2s lane. Because I forgot^W waited on this, we did the meson-g12a-common split, so this no longer applies cleanly. Could you rebase this on current v5.4/dt64 and I'll queue it for v5.4/dt64. > Kevin, please note that to build, this patchset depends on the new reset > bindings of the audio clock controller. I've prepared a tag for you [0] > > [0]: git://github.com/BayLibre/clk-meson.git - clk-meson-dt-v5.4-2 Thanks for the tag. This is now included in v5.4/dt64. Kevin ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets 2019-08-27 23:42 ` Kevin Hilman @ 2019-08-28 8:03 ` Jerome Brunet 2019-08-28 15:05 ` Kevin Hilman 0 siblings, 1 reply; 8+ messages in thread From: Jerome Brunet @ 2019-08-28 8:03 UTC (permalink / raw) To: Kevin Hilman; +Cc: linux-amlogic, devicetree, linux-kernel On Tue 27 Aug 2019 at 16:42, Kevin Hilman <khilman@baylibre.com> wrote: > Jerome Brunet <jbrunet@baylibre.com> writes: > >> This patchset adds the dedicated reset of the tdm formatters which >> have been added on the g12a SoC family. Using these help with the channel >> mapping when the formatter uses more than 1 i2s lane. > > Because I forgot^W waited on this, we did the meson-g12a-common split, > so this no longer applies cleanly. Could you rebase this on current v5.4/dt64 > and I'll queue it for v5.4/dt64. Acutally it was already not applying when I sent this v1 ... .. which is why I sent a v2 [0] ;) [0]: https://lkml.kernel.org/r/20190823154432.16268-1-jbrunet@baylibre.com > >> Kevin, please note that to build, this patchset depends on the new reset >> bindings of the audio clock controller. I've prepared a tag for you [0] >> >> [0]: git://github.com/BayLibre/clk-meson.git - clk-meson-dt-v5.4-2 > > Thanks for the tag. This is now included in v5.4/dt64. > > Kevin ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets 2019-08-28 8:03 ` Jerome Brunet @ 2019-08-28 15:05 ` Kevin Hilman 2019-08-28 15:12 ` Jerome Brunet 0 siblings, 1 reply; 8+ messages in thread From: Kevin Hilman @ 2019-08-28 15:05 UTC (permalink / raw) To: Jerome Brunet; +Cc: linux-amlogic, devicetree, linux-kernel Jerome Brunet <jbrunet@baylibre.com> writes: > On Tue 27 Aug 2019 at 16:42, Kevin Hilman <khilman@baylibre.com> wrote: > >> Jerome Brunet <jbrunet@baylibre.com> writes: >> >>> This patchset adds the dedicated reset of the tdm formatters which >>> have been added on the g12a SoC family. Using these help with the channel >>> mapping when the formatter uses more than 1 i2s lane. >> >> Because I forgot^W waited on this, we did the meson-g12a-common split, >> so this no longer applies cleanly. Could you rebase this on current v5.4/dt64 >> and I'll queue it for v5.4/dt64. > > Acutally it was already not applying when I sent this v1 ... > .. which is why I sent a v2 [0] ;) > > [0]: https://lkml.kernel.org/r/20190823154432.16268-1-jbrunet@baylibre.com Oops, I saw there was a v2, but I missed that in my `git pw` because v2 of the series had an "ASoC:" prefix in the cover letter, not an "arm64: dts" one, so I skimmed past it. Kevin ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets 2019-08-28 15:05 ` Kevin Hilman @ 2019-08-28 15:12 ` Jerome Brunet 0 siblings, 0 replies; 8+ messages in thread From: Jerome Brunet @ 2019-08-28 15:12 UTC (permalink / raw) To: Kevin Hilman; +Cc: linux-amlogic, devicetree, linux-kernel On Wed 28 Aug 2019 at 08:05, Kevin Hilman <khilman@baylibre.com> wrote: > Jerome Brunet <jbrunet@baylibre.com> writes: > >> On Tue 27 Aug 2019 at 16:42, Kevin Hilman <khilman@baylibre.com> wrote: >> >>> Jerome Brunet <jbrunet@baylibre.com> writes: >>> >>>> This patchset adds the dedicated reset of the tdm formatters which >>>> have been added on the g12a SoC family. Using these help with the channel >>>> mapping when the formatter uses more than 1 i2s lane. >>> >>> Because I forgot^W waited on this, we did the meson-g12a-common split, >>> so this no longer applies cleanly. Could you rebase this on current v5.4/dt64 >>> and I'll queue it for v5.4/dt64. >> >> Acutally it was already not applying when I sent this v1 ... >> .. which is why I sent a v2 [0] ;) >> >> [0]: https://lkml.kernel.org/r/20190823154432.16268-1-jbrunet@baylibre.com > > Oops, I saw there was a v2, but I missed that in my `git pw` because v2 > of the series had an "ASoC:" prefix in the cover letter, not an "arm64: > dts" one, so I skimmed past it. Oh ! indeed and this prefix makes no sense. Sorry about that > > Kevin ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-08-28 15:12 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-20 12:15 [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets Jerome Brunet 2019-08-20 12:15 ` [PATCH 1/2] arm64: dts: meson: g12a: audio clock controller provides resets Jerome Brunet 2019-08-20 12:15 ` [PATCH 2/2] arm64: dts: meson: g12a: add reset to tdm formatters Jerome Brunet 2019-08-21 14:23 ` [PATCH 0/2] arm64: dts: meson: g12a: add tdm resets Neil Armstrong 2019-08-27 23:42 ` Kevin Hilman 2019-08-28 8:03 ` Jerome Brunet 2019-08-28 15:05 ` Kevin Hilman 2019-08-28 15:12 ` 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).