| Message ID | 20230506090116.9206-4-walker.chen@starfivetech.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Conor Dooley |
| Headers | show |
| Series | Add TDM audio on StarFive JH7110 | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/tree_selection | fail | Failed to apply to next/pending-fixes or riscv/for-next |
Hi Conor/Emil, DT overlay is used to describe combinations of VF2 and hat. Do you have any comments on this patch ? Thanks! Best regards, Walker On 2023/5/6 17:01, Walker Chen wrote: > Add the tdm controller node and sound card for the StarFive JH7110 SoC. > > Signed-off-by: Walker Chen <walker.chen@starfivetech.com> > --- > arch/riscv/boot/dts/starfive/Makefile | 3 + > .../jh7110-starfive-visionfive-2-wm8960.dtso | 70 +++++++++++++++++++ > .../jh7110-starfive-visionfive-2.dtsi | 40 +++++++++++ > arch/riscv/boot/dts/starfive/jh7110.dtsi | 21 ++++++ > 4 files changed, 134 insertions(+) > create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dtso > > diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile > index 170956846d49..644cc29b5be3 100644 > --- a/arch/riscv/boot/dts/starfive/Makefile > +++ b/arch/riscv/boot/dts/starfive/Makefile > @@ -4,3 +4,6 @@ dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-starfive-visionfive-v1.dtb > > dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb > dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb > + > +jh7110-starfive-visionfive-2-wm8960-dtbs := jh7110-starfive-visionfive-2-v1.3b.dtb jh7110-starfive-visionfive-2-wm8960.dtbo > +dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-wm8960.dtb > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dtso b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dtso > new file mode 100644 > index 000000000000..67897f000883 > --- /dev/null > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dtso > @@ -0,0 +1,70 @@ > +// SPDX-License-Identifier: GPL-2.0 OR MIT > +/* > + * Copyright (C) 2023 StarFive Technology Co., Ltd. > + * Author: Walker Chen <walker.chen@starfivetech.com> > + * > + * Requires ReSpeaker 2-Mics Pi HAT plugged in 40-pin GPIO header. > + */ > + > +/dts-v1/; > +/plugin/; > + > +&{/} { > + compatible = "starfive,visionfive-2-v1.3b", "starfive,jh7110"; > + > + wm8960_mclk: wm8960-mclk { > + compatible = "fixed-clock"; > + clock-output-names = "wm8960_mclk"; > + #clock-cells = <0>; > + clock-frequency = <24576000>; > + }; > + > + sound { > + compatible = "simple-audio-card"; > + > + #address-cells = <1>; > + #size-cells = <0>; > + > + simple-audio-card,name = "Starfive-TDM-Sound-Card"; > + simple-audio-card,widgets = "Microphone", "Mic Jack", > + "Line", "Line In", > + "Line", "Line Out", > + "Speaker", "Speaker", > + "Headphone", "Headphone Jack"; > + simple-audio-card,routing = "Headphone Jack", "HP_L", > + "Headphone Jack", "HP_R", > + "Speaker", "SPK_LP", > + "Speaker", "SPK_LN", > + "LINPUT1", "Mic Jack", > + "LINPUT3", "Mic Jack", > + "RINPUT1", "Mic Jack", > + "RINPUT2", "Mic Jack"; > + > + simple-audio-card,dai-link@0 { > + reg = <0>; > + format = "dsp_a"; > + bitclock-master = <&dailink_master>; > + frame-master = <&dailink_master>; > + > + cpu { > + sound-dai = <&tdm>; > + }; > + dailink_master: codec { > + sound-dai = <&wm8960>; > + clocks = <&wm8960_mclk>; > + }; > + }; > + }; > +}; > + > +&i2c0 { > + #address-cells = <1>; > + #size-cells = <0>; > + > + wm8960: codec@1a { > + compatible = "wlf,wm8960"; > + reg = <0x1a>; > + wlf,shared-lrclk; > + #sound-dai-cells = <0>; > + }; > +}; > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > index 1155b97b593d..19b5954ee72d 100644 > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > @@ -214,6 +214,40 @@ > slew-rate = <0>; > }; > }; > + > + tdm0_pins: tdm0-pins { > + tdm0-pins-tx { > + pinmux = <GPIOMUX(44, GPOUT_SYS_TDM_TXD, > + GPOEN_ENABLE, > + GPI_NONE)>; > + bias-pull-up; > + drive-strength = <2>; > + input-disable; > + input-schmitt-disable; > + slew-rate = <0>; > + }; > + > + tdm0-pins-rx { > + pinmux = <GPIOMUX(61, GPOUT_HIGH, > + GPOEN_DISABLE, > + GPI_SYS_TDM_RXD)>; > + input-enable; > + }; > + > + tdm0-pins-sync { > + pinmux = <GPIOMUX(63, GPOUT_HIGH, > + GPOEN_DISABLE, > + GPI_SYS_TDM_SYNC)>; > + input-enable; > + }; > + > + tdm0-pins-pcmclk { > + pinmux = <GPIOMUX(38, GPOUT_HIGH, > + GPOEN_DISABLE, > + GPI_SYS_TDM_CLK)>; > + input-enable; > + }; > + }; > }; > > &uart0 { > @@ -221,3 +255,9 @@ > pinctrl-0 = <&uart0_pins>; > status = "okay"; > }; > + > +&tdm { > + pinctrl-names = "default"; > + pinctrl-0 = <&tdm0_pins>; > + status = "okay"; > +}; > diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi > index 866313570a7e..cfda6fb0d91b 100644 > --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi > +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi > @@ -366,6 +366,27 @@ > status = "disabled"; > }; > > + tdm: tdm@10090000 { > + compatible = "starfive,jh7110-tdm"; > + reg = <0x0 0x10090000 0x0 0x1000>; > + clocks = <&syscrg JH7110_SYSCLK_TDM_AHB>, > + <&syscrg JH7110_SYSCLK_TDM_APB>, > + <&syscrg JH7110_SYSCLK_TDM_INTERNAL>, > + <&syscrg JH7110_SYSCLK_TDM_TDM>, > + <&syscrg JH7110_SYSCLK_MCLK_INNER>, > + <&tdm_ext>; > + clock-names = "tdm_ahb", "tdm_apb", > + "tdm_internal", "tdm", > + "mclk_inner", "tdm_ext"; > + resets = <&syscrg JH7110_SYSRST_TDM_AHB>, > + <&syscrg JH7110_SYSRST_TDM_APB>, > + <&syscrg JH7110_SYSRST_TDM_CORE>; > + dmas = <&dma 20>, <&dma 21>; > + dma-names = "rx","tx"; > + #sound-dai-cells = <0>; > + status = "disabled"; > + }; > + > stgcrg: clock-controller@10230000 { > compatible = "starfive,jh7110-stgcrg"; > reg = <0x0 0x10230000 0x0 0x10000>;
On Tue, May 09, 2023 at 08:52:48PM +0800, Walker Chen wrote: > Hi Conor/Emil, > > DT overlay is used to describe combinations of VF2 and hat. > Do you have any comments on this patch ? Up to Emil :) I seem to recall that he said at the linux-riscv sync-up call that we have* that he was not in favour of overlays for hats like this. I'll let him confirm that though, I might very well be misinterpreting or misremembering what he said. Cheers, Conor. * https://lore.kernel.org/linux-riscv/mhng-775d4068-6c1e-48a4-a1dc-b4a76ff26bb3@palmer-ri-x1c9a/
On Tue, 9 May 2023 at 20:05, Conor Dooley <conor@kernel.org> wrote: > > On Tue, May 09, 2023 at 08:52:48PM +0800, Walker Chen wrote: > > Hi Conor/Emil, > > > > DT overlay is used to describe combinations of VF2 and hat. > > Do you have any comments on this patch ? > > Up to Emil :) > > I seem to recall that he said at the linux-riscv sync-up call that we > have* that he was not in favour of overlays for hats like this. > I'll let him confirm that though, I might very well be misinterpreting or > misremembering what he said. What probably meant was that I didn't want a bunch of different device trees for each combination board * hat. An overlay makes a lot more sense. However, looking through the kernel tree there is a surprising lack of overlays for hats committed already, so I suspect there is some sort of policy around overlays already in place. > Cheers, > Conor. > > * https://lore.kernel.org/linux-riscv/mhng-775d4068-6c1e-48a4-a1dc-b4a76ff26bb3@palmer-ri-x1c9a/
On 2023/5/10 16:33, Emil Renner Berthing wrote: > On Tue, 9 May 2023 at 20:05, Conor Dooley <conor@kernel.org> wrote: >> >> On Tue, May 09, 2023 at 08:52:48PM +0800, Walker Chen wrote: >> > Hi Conor/Emil, >> > >> > DT overlay is used to describe combinations of VF2 and hat. >> > Do you have any comments on this patch ? >> >> Up to Emil :) >> >> I seem to recall that he said at the linux-riscv sync-up call that we >> have* that he was not in favour of overlays for hats like this. >> I'll let him confirm that though, I might very well be misinterpreting or >> misremembering what he said. > > What probably meant was that I didn't want a bunch of different device > trees for each combination board * hat. An overlay makes a lot more > sense. However, looking through the kernel tree there is a surprising > lack of overlays for hats committed already, so I suspect there is > some sort of policy around overlays already in place. Hi Emil, About the specific usage of overlay for this board + hat, referenced to the following example in kernel: linux/arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-imx219.dtso That board is connected with imx219 sensor via mipi_csi interface. That patch was accepted in 2022. So do you think this way is feasible ? Thanks! Best regards, Walker > >> Cheers, >> Conor. >> >> * https://lore.kernel.org/linux-riscv/mhng-775d4068-6c1e-48a4-a1dc-b4a76ff26bb3@palmer-ri-x1c9a/
On Wed, May 10, 2023 at 05:21:21PM +0800, Walker Chen wrote: > On 2023/5/10 16:33, Emil Renner Berthing wrote: > > On Tue, 9 May 2023 at 20:05, Conor Dooley <conor@kernel.org> wrote: > >> > >> On Tue, May 09, 2023 at 08:52:48PM +0800, Walker Chen wrote: > >> > Hi Conor/Emil, > >> > > >> > DT overlay is used to describe combinations of VF2 and hat. > >> > Do you have any comments on this patch ? > >> > >> I seem to recall that he said at the linux-riscv sync-up call that we > >> have* that he was not in favour of overlays for hats like this. > >> I'll let him confirm that though, I might very well be misinterpreting or > >> misremembering what he said. > > > > What probably meant was that I didn't want a bunch of different device > > trees for each combination board * hat. An overlay makes a lot more > > sense. However, looking through the kernel tree there is a surprising > > lack of overlays for hats committed already, so I suspect there is > > some sort of policy around overlays already in place. > About the specific usage of overlay for this board + hat, referenced to the following example in kernel: > linux/arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-imx219.dtso > That board is connected with imx219 sensor via mipi_csi interface. That patch was accepted in 2022. Hmm, so spoke to Emil again today about it. In the interest of being fair, I did go looking at that particular board & looked through their documentation for more information on why there are overlays. They do actually sell the bits required to use the overlays, based on what I saw in their datasheet for the board & wiki. That said, what is done for one arm64 platform does not necessarily apply elsewhere ;) I'm not against allowing in-tree overlays for hats/capes/daughter-boards that come bundled with a board, but accepting ones for a hat that someone decided to use theoretically has no limit! The "someone" in this case might be a StarFive developer, but it could be any random one of your customers next! We've got to draw a line somewhere, so my answer to the overlay *in this case* is a no. Sorry. When you submit your next version, please drop the overlay from this patch. Thanks, Conor.
On 2023/5/11 4:22, Conor Dooley wrote: > On Wed, May 10, 2023 at 05:21:21PM +0800, Walker Chen wrote: >> On 2023/5/10 16:33, Emil Renner Berthing wrote: >> > On Tue, 9 May 2023 at 20:05, Conor Dooley <conor@kernel.org> wrote: >> >> >> >> On Tue, May 09, 2023 at 08:52:48PM +0800, Walker Chen wrote: >> >> > Hi Conor/Emil, >> >> > >> >> > DT overlay is used to describe combinations of VF2 and hat. >> >> > Do you have any comments on this patch ? >> >> >> >> I seem to recall that he said at the linux-riscv sync-up call that we >> >> have* that he was not in favour of overlays for hats like this. >> >> I'll let him confirm that though, I might very well be misinterpreting or >> >> misremembering what he said. >> > >> > What probably meant was that I didn't want a bunch of different device >> > trees for each combination board * hat. An overlay makes a lot more >> > sense. However, looking through the kernel tree there is a surprising >> > lack of overlays for hats committed already, so I suspect there is >> > some sort of policy around overlays already in place. > >> About the specific usage of overlay for this board + hat, referenced to the following example in kernel: >> linux/arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-imx219.dtso >> That board is connected with imx219 sensor via mipi_csi interface. That patch was accepted in 2022. > > Hmm, so spoke to Emil again today about it. In the interest of being > fair, I did go looking at that particular board & looked through their > documentation for more information on why there are overlays. > They do actually sell the bits required to use the overlays, based on > what I saw in their datasheet for the board & wiki. That said, what is > done for one arm64 platform does not necessarily apply elsewhere ;) > > I'm not against allowing in-tree overlays for hats/capes/daughter-boards > that come bundled with a board, but accepting ones for a hat that > someone decided to use theoretically has no limit! The "someone" in this > case might be a StarFive developer, but it could be any random one of > your customers next! > We've got to draw a line somewhere, so my answer to the overlay *in this > case* is a no. Sorry. > When you submit your next version, please drop the overlay from this > patch. I'm trying to understand what you mean. so the conclusion is that I need to drop the file 'jh7110-starfive-visionfive-2-wm8960.dtso' from this patch. When I submit the next version, just keep the TDM node and the pins configuration for TDM in patch [3/3], need to drop the wm8960 stuff. Right ? Best regards, Walker
>I'm trying to understand what you mean. so the conclusion is that I need to drop the file > 'jh7110-starfive-visionfive-2-wm8960.dtso' from this patch. >When I submit the next version, just keep the TDM node and the pins configuration for TDM in patch [3/3], >need to drop the wm8960 stuff. >Right ? Yes. > >Best regards, >Walker
diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile index 170956846d49..644cc29b5be3 100644 --- a/arch/riscv/boot/dts/starfive/Makefile +++ b/arch/riscv/boot/dts/starfive/Makefile @@ -4,3 +4,6 @@ dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-starfive-visionfive-v1.dtb dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.2a.dtb dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-v1.3b.dtb + +jh7110-starfive-visionfive-2-wm8960-dtbs := jh7110-starfive-visionfive-2-v1.3b.dtb jh7110-starfive-visionfive-2-wm8960.dtbo +dtb-$(CONFIG_ARCH_STARFIVE) += jh7110-starfive-visionfive-2-wm8960.dtb diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dtso b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dtso new file mode 100644 index 000000000000..67897f000883 --- /dev/null +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dtso @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2023 StarFive Technology Co., Ltd. + * Author: Walker Chen <walker.chen@starfivetech.com> + * + * Requires ReSpeaker 2-Mics Pi HAT plugged in 40-pin GPIO header. + */ + +/dts-v1/; +/plugin/; + +&{/} { + compatible = "starfive,visionfive-2-v1.3b", "starfive,jh7110"; + + wm8960_mclk: wm8960-mclk { + compatible = "fixed-clock"; + clock-output-names = "wm8960_mclk"; + #clock-cells = <0>; + clock-frequency = <24576000>; + }; + + sound { + compatible = "simple-audio-card"; + + #address-cells = <1>; + #size-cells = <0>; + + simple-audio-card,name = "Starfive-TDM-Sound-Card"; + simple-audio-card,widgets = "Microphone", "Mic Jack", + "Line", "Line In", + "Line", "Line Out", + "Speaker", "Speaker", + "Headphone", "Headphone Jack"; + simple-audio-card,routing = "Headphone Jack", "HP_L", + "Headphone Jack", "HP_R", + "Speaker", "SPK_LP", + "Speaker", "SPK_LN", + "LINPUT1", "Mic Jack", + "LINPUT3", "Mic Jack", + "RINPUT1", "Mic Jack", + "RINPUT2", "Mic Jack"; + + simple-audio-card,dai-link@0 { + reg = <0>; + format = "dsp_a"; + bitclock-master = <&dailink_master>; + frame-master = <&dailink_master>; + + cpu { + sound-dai = <&tdm>; + }; + dailink_master: codec { + sound-dai = <&wm8960>; + clocks = <&wm8960_mclk>; + }; + }; + }; +}; + +&i2c0 { + #address-cells = <1>; + #size-cells = <0>; + + wm8960: codec@1a { + compatible = "wlf,wm8960"; + reg = <0x1a>; + wlf,shared-lrclk; + #sound-dai-cells = <0>; + }; +}; diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi index 1155b97b593d..19b5954ee72d 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -214,6 +214,40 @@ slew-rate = <0>; }; }; + + tdm0_pins: tdm0-pins { + tdm0-pins-tx { + pinmux = <GPIOMUX(44, GPOUT_SYS_TDM_TXD, + GPOEN_ENABLE, + GPI_NONE)>; + bias-pull-up; + drive-strength = <2>; + input-disable; + input-schmitt-disable; + slew-rate = <0>; + }; + + tdm0-pins-rx { + pinmux = <GPIOMUX(61, GPOUT_HIGH, + GPOEN_DISABLE, + GPI_SYS_TDM_RXD)>; + input-enable; + }; + + tdm0-pins-sync { + pinmux = <GPIOMUX(63, GPOUT_HIGH, + GPOEN_DISABLE, + GPI_SYS_TDM_SYNC)>; + input-enable; + }; + + tdm0-pins-pcmclk { + pinmux = <GPIOMUX(38, GPOUT_HIGH, + GPOEN_DISABLE, + GPI_SYS_TDM_CLK)>; + input-enable; + }; + }; }; &uart0 { @@ -221,3 +255,9 @@ pinctrl-0 = <&uart0_pins>; status = "okay"; }; + +&tdm { + pinctrl-names = "default"; + pinctrl-0 = <&tdm0_pins>; + status = "okay"; +}; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 866313570a7e..cfda6fb0d91b 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -366,6 +366,27 @@ status = "disabled"; }; + tdm: tdm@10090000 { + compatible = "starfive,jh7110-tdm"; + reg = <0x0 0x10090000 0x0 0x1000>; + clocks = <&syscrg JH7110_SYSCLK_TDM_AHB>, + <&syscrg JH7110_SYSCLK_TDM_APB>, + <&syscrg JH7110_SYSCLK_TDM_INTERNAL>, + <&syscrg JH7110_SYSCLK_TDM_TDM>, + <&syscrg JH7110_SYSCLK_MCLK_INNER>, + <&tdm_ext>; + clock-names = "tdm_ahb", "tdm_apb", + "tdm_internal", "tdm", + "mclk_inner", "tdm_ext"; + resets = <&syscrg JH7110_SYSRST_TDM_AHB>, + <&syscrg JH7110_SYSRST_TDM_APB>, + <&syscrg JH7110_SYSRST_TDM_CORE>; + dmas = <&dma 20>, <&dma 21>; + dma-names = "rx","tx"; + #sound-dai-cells = <0>; + status = "disabled"; + }; + stgcrg: clock-controller@10230000 { compatible = "starfive,jh7110-stgcrg"; reg = <0x0 0x10230000 0x0 0x10000>;
Add the tdm controller node and sound card for the StarFive JH7110 SoC. Signed-off-by: Walker Chen <walker.chen@starfivetech.com> --- arch/riscv/boot/dts/starfive/Makefile | 3 + .../jh7110-starfive-visionfive-2-wm8960.dtso | 70 +++++++++++++++++++ .../jh7110-starfive-visionfive-2.dtsi | 40 +++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 21 ++++++ 4 files changed, 134 insertions(+) create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dtso