Re: [PATCH v9 13/19] ARM: STi: DT: STiH407: Add sti-sasg-codec dt node
Hi Peter On 09/05/2016 03:16 PM, Peter Griffin wrote: > This patch adds the dt node for the internal audio > codec IP. > > Signed-off-by: Arnaud Pouliquen> Signed-off-by: Peter Griffin > --- > arch/arm/boot/dts/stih407-family.dtsi | 7 +++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/arm/boot/dts/stih407-family.dtsi > b/arch/arm/boot/dts/stih407-family.dtsi > index 45cab30..d1258d5 100644 > --- a/arch/arm/boot/dts/stih407-family.dtsi > +++ b/arch/arm/boot/dts/stih407-family.dtsi > @@ -873,5 +873,12 @@ > <_s_c0_flexgen CLK_TX_ICN_DISP_0>, > <_s_c0_flexgen CLK_EXT2F_A9>; > }; > + > + sti_sasg_codec: sti-sasg-codec { > + compatible = "st,stih407-sas-codec"; > + #sound-dai-cells = <1>; > + status = "disabled"; > + st,syscfg = <_core>; > + }; > }; > }; > Applied for STi next Thanks ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v9 10/19] ARM: DT: STiH407: Add i2s_out pinctrl configuration
Hi Peter On 09/05/2016 03:16 PM, Peter Griffin wrote: > This patch adds the pinctrl config for the i2s_out pins > used by the uniperif player IP. > > Signed-off-by: Arnaud Pouliquen> Signed-off-by: Peter Griffin > Acked-by: Lee Jones > --- > arch/arm/boot/dts/stih407-pinctrl.dtsi | 23 +++ > 1 file changed, 23 insertions(+) > > diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi > b/arch/arm/boot/dts/stih407-pinctrl.dtsi > index a538ae5..0fb5c8a 100644 > --- a/arch/arm/boot/dts/stih407-pinctrl.dtsi > +++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi > @@ -1067,6 +1067,29 @@ > }; > }; > > + i2s_out { > + pinctrl_i2s_8ch_out: i2s_8ch_out{ > + st,pins { > + mclk = < 5 ALT1 OUT>; > + lrclk = < 7 ALT1 OUT>; > + sclk = < 6 ALT1 OUT>; > + data0 = < 4 ALT1 OUT>; > + data1 = < 0 ALT1 OUT>; > + data2 = < 1 ALT1 OUT>; > + data3 = < 2 ALT1 OUT>; > + }; > + }; > + > + pinctrl_i2s_2ch_out: i2s_2ch_out{ > + st,pins { > + mclk = < 5 ALT1 OUT>; > + lrclk = < 7 ALT1 OUT>; > + sclk = < 6 ALT1 OUT>; > + data0 = < 4 ALT1 OUT>; > + }; > + }; > + }; > + > serial3 { > pinctrl_serial3: serial3-0 { > st,pins { > Applied for STi next Thanks ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v9 12/19] ARM: DT: STiH407: Add spdif_out pinctrl config
Hi Peter On 09/05/2016 03:16 PM, Peter Griffin wrote: > This patch adds the pinctrl config for the spidf out > pins used by the sasg codec IP. > > Signed-off-by: Arnaud Pouliquen> Signed-off-by: Peter Griffin > Acked-by: Lee Jones > --- > arch/arm/boot/dts/stih407-pinctrl.dtsi | 8 > 1 file changed, 8 insertions(+) > > diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi > b/arch/arm/boot/dts/stih407-pinctrl.dtsi > index 537db7e..598dbab 100644 > --- a/arch/arm/boot/dts/stih407-pinctrl.dtsi > +++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi > @@ -1114,6 +1114,14 @@ > }; > }; > > + spdif_out { > + pinctrl_spdif_out: spdif_out{ > + st,pins { > + spdif_out = < 7 ALT1 OUT>; > + }; > + }; > + }; > + > serial3 { > pinctrl_serial3: serial3-0 { > st,pins { > Applied for STi next Thanks ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v9 11/19] ARM: DT: STiH407: Add i2s_in pinctrl configuration
Hi Peter On 09/05/2016 03:16 PM, Peter Griffin wrote: > This patch adds the pinctrl config for the i2s_in pins > used by the uniperif reader IP. > > Signed-off-by: Arnaud Pouliquen> Signed-off-by: Peter Griffin > Acked-by: Lee Jones > --- > arch/arm/boot/dts/stih407-pinctrl.dtsi | 24 > 1 file changed, 24 insertions(+) > > diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi > b/arch/arm/boot/dts/stih407-pinctrl.dtsi > index 0fb5c8a..537db7e 100644 > --- a/arch/arm/boot/dts/stih407-pinctrl.dtsi > +++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi > @@ -1090,6 +1090,30 @@ > }; > }; > > + i2s_in { > + pinctrl_i2s_8ch_in: i2s_8ch_in{ > + st,pins { > + mclk = < 5 ALT1 IN>; > + lrclk = < 7 ALT1 IN>; > + sclk = < 6 ALT1 IN>; > + data0 = < 4 ALT1 IN>; > + data1 = < 0 ALT1 IN>; > + data2 = < 1 ALT1 IN>; > + data3 = < 2 ALT1 IN>; > + data4 = < 3 ALT1 IN>; > + }; > + }; > + > + pinctrl_i2s_2ch_in: i2s_2ch_in{ > + st,pins { > + mclk = < 5 ALT1 IN>; > + lrclk = < 7 ALT1 IN>; > + sclk = < 6 ALT1 IN>; > + data0 = < 4 ALT1 IN>; > + }; > + }; > + }; > + > serial3 { > pinctrl_serial3: serial3-0 { > st,pins { > Applied for STi next Thanks ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v9 15/19] ARM: STi: DT: STiH407: Add uniperif reader dt nodes
Hi Peter On 09/05/2016 03:16 PM, Peter Griffin wrote: > This patch adds the DT node for the uniperif reader > IP block found on STiH407 family silicon. > > Signed-off-by: Arnaud Pouliquen> Signed-off-by: Peter Griffin > --- > arch/arm/boot/dts/stih407-family.dtsi | 28 > 1 file changed, 28 insertions(+) > > diff --git a/arch/arm/boot/dts/stih407-family.dtsi > b/arch/arm/boot/dts/stih407-family.dtsi > index 1edc36c..883019a 100644 > --- a/arch/arm/boot/dts/stih407-family.dtsi > +++ b/arch/arm/boot/dts/stih407-family.dtsi > @@ -960,5 +960,33 @@ > > status = "disabled"; > }; > + > + sti_uni_reader0: sti-uni-reader@8d83000 { > + compatible = "st,sti-uni-reader"; > + #sound-dai-cells = <0>; > + st,syscfg = <_core>; > + reg = <0x8d83000 0x158>; > + interrupts = ; > + dmas = < 5 0 1>; > + dma-names = "rx"; > + dai-name = "Uni Reader #0 (PCM IN)"; > + st,version = <3>; > + > + status = "disabled"; > + }; > + > + sti_uni_reader1: sti-uni-reader@8d84000 { > + compatible = "st,sti-uni-reader"; > + #sound-dai-cells = <0>; > + st,syscfg = <_core>; > + reg = <0x8d84000 0x158>; > + interrupts = ; > + dmas = < 6 0 1>; > + dma-names = "rx"; > + dai-name = "Uni Reader #1 (HDMI RX)"; > + st,version = <3>; > + > + status = "disabled"; > + }; > }; > }; > Applied for STi next Thanks ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v9 06/19] ARM: STi: DT: STiH407: Add FDMA driver dt nodes.
Hi Peter On 09/05/2016 03:16 PM, Peter Griffin wrote: > These nodes are required to get the fdma driver working > on STiH407 based silicon. > > Signed-off-by: Peter Griffin> Acked-by: Lee Jones > --- > arch/arm/boot/dts/stih407-family.dtsi | 52 > +++ > 1 file changed, 52 insertions(+) > > diff --git a/arch/arm/boot/dts/stih407-family.dtsi > b/arch/arm/boot/dts/stih407-family.dtsi > index d294e82..45cab30 100644 > --- a/arch/arm/boot/dts/stih407-family.dtsi > +++ b/arch/arm/boot/dts/stih407-family.dtsi > @@ -821,5 +821,57 @@ > clock-frequency = <6>; > st,syscfg = <_core 0x224>; > }; > + > + /* fdma audio */ > + fdma0: dma-controller@8e2 { > + compatible = "st,stih407-fdma-mpe31-11", > "st,slim-rproc"; > + reg = <0x8e2 0x8000>, > + <0x8e3 0x3000>, > + <0x8e37000 0x1000>, > + <0x8e38000 0x8000>; > + reg-names = "slimcore", "dmem", "peripherals", "imem"; > + clocks = <_s_c0_flexgen CLK_FDMA>, > + <_s_c0_flexgen CLK_EXT2F_A9>, > + <_s_c0_flexgen CLK_EXT2F_A9>, > + <_s_c0_flexgen CLK_EXT2F_A9>; > + interrupts = ; > + dma-channels = <16>; > + #dma-cells = <3>; > + }; > + > + /* fdma app */ > + fdma1: dma-controller@8e4 { > + compatible = "st,stih407-fdma-mpe31-12", > "st,slim-rproc"; > + reg = <0x8e4 0x8000>, > + <0x8e5 0x3000>, > + <0x8e57000 0x1000>, > + <0x8e58000 0x8000>; > + reg-names = "slimcore", "dmem", "peripherals", "imem"; > + clocks = <_s_c0_flexgen CLK_FDMA>, > + <_s_c0_flexgen CLK_TX_ICN_DMU>, > + <_s_c0_flexgen CLK_TX_ICN_DMU>, > + <_s_c0_flexgen CLK_EXT2F_A9>; > + > + interrupts = ; > + dma-channels = <16>; > + #dma-cells = <3>; > + }; > + > + /* fdma free running */ > + fdma2: dma-controller@8e6 { > + compatible = "st,stih407-fdma-mpe31-13", > "st,slim-rproc"; > + reg = <0x8e6 0x8000>, > + <0x8e7 0x3000>, > + <0x8e77000 0x1000>, > + <0x8e78000 0x8000>; > + reg-names = "slimcore", "dmem", "peripherals", "imem"; > + interrupts = ; > + dma-channels = <16>; > + #dma-cells = <3>; > + clocks = <_s_c0_flexgen CLK_FDMA>, > + <_s_c0_flexgen CLK_EXT2F_A9>, > + <_s_c0_flexgen CLK_TX_ICN_DISP_0>, > + <_s_c0_flexgen CLK_EXT2F_A9>; > + }; > }; > }; > Applied for STi next Thanks ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v9 14/19] ARM: STi: DT: STiH407: Add uniperif player dt nodes
Hi Peter On 09/05/2016 03:16 PM, Peter Griffin wrote: > This patch adds the DT nodes for the uniperif player > IP blocks found on STiH407 family silicon. > > Signed-off-by: Arnaud Pouliquen> Signed-off-by: Peter Griffin > --- > arch/arm/boot/dts/stih407-family.dtsi | 80 > +++ > 1 file changed, 80 insertions(+) > > diff --git a/arch/arm/boot/dts/stih407-family.dtsi > b/arch/arm/boot/dts/stih407-family.dtsi > index d1258d5..1edc36c 100644 > --- a/arch/arm/boot/dts/stih407-family.dtsi > +++ b/arch/arm/boot/dts/stih407-family.dtsi > @@ -880,5 +880,85 @@ > status = "disabled"; > st,syscfg = <_core>; > }; > + > + sti_uni_player0: sti-uni-player@8d8 { > + compatible = "st,sti-uni-player"; > + #sound-dai-cells = <0>; > + st,syscfg = <_core>; > + clocks = <_s_d0_flexgen CLK_PCM_0>; > + assigned-clocks = <_s_d0_quadfs 0>, > <_s_d0_flexgen CLK_PCM_0>; > + assigned-clock-parents = <0>, <_s_d0_quadfs 0>; > + assigned-clock-rates = <5000>; > + reg = <0x8d8 0x158>; > + interrupts = ; > + dmas = < 2 0 1>; > + dai-name = "Uni Player #0 (HDMI)"; > + dma-names = "tx"; > + st,uniperiph-id = <0>; > + st,version = <5>; > + st,mode = "HDMI"; > + > + status = "disabled"; > + }; > + > + sti_uni_player1: sti-uni-player@8d81000 { > + compatible = "st,sti-uni-player"; > + #sound-dai-cells = <0>; > + st,syscfg = <_core>; > + clocks = <_s_d0_flexgen CLK_PCM_1>; > + assigned-clocks = <_s_d0_quadfs 1>, > <_s_d0_flexgen CLK_PCM_1>; > + assigned-clock-parents = <0>, <_s_d0_quadfs 1>; > + assigned-clock-rates = <5000>; > + reg = <0x8d81000 0x158>; > + interrupts = ; > + dmas = < 3 0 1>; > + dai-name = "Uni Player #1 (PIO)"; > + dma-names = "tx"; > + st,uniperiph-id = <1>; > + st,version = <5>; > + st,mode = "PCM"; > + > + status = "disabled"; > + }; > + > + sti_uni_player2: sti-uni-player@8d82000 { > + compatible = "st,sti-uni-player"; > + #sound-dai-cells = <0>; > + st,syscfg = <_core>; > + clocks = <_s_d0_flexgen CLK_PCM_2>; > + assigned-clocks = <_s_d0_quadfs 2>, > <_s_d0_flexgen CLK_PCM_2>; > + assigned-clock-parents = <0>, <_s_d0_quadfs 2>; > + assigned-clock-rates = <5000>; > + reg = <0x8d82000 0x158>; > + interrupts = ; > + dmas = < 4 0 1>; > + dai-name = "Uni Player #1 (DAC)"; > + dma-names = "tx"; > + st,uniperiph-id = <2>; > + st,version = <5>; > + st,mode = "PCM"; > + > + status = "disabled"; > + }; > + > + sti_uni_player3: sti-uni-player@8d85000 { > + compatible = "st,sti-uni-player"; > + #sound-dai-cells = <0>; > + st,syscfg = <_core>; > + clocks = <_s_d0_flexgen CLK_SPDIFF>; > + assigned-clocks = <_s_d0_quadfs 3>, > <_s_d0_flexgen CLK_SPDIFF>; > + assigned-clock-parents = <0>, <_s_d0_quadfs 3>; > + assigned-clock-rates = <5000>; > + reg = <0x8d85000 0x158>; > + interrupts = ; > + dmas = < 7 0 1>; > + dma-names = "tx"; > + dai-name = "Uni Player #1 (PIO)"; > + st,uniperiph-id = <3>; > + st,version = <5>; > + st,mode = "SPDIF"; > + > + status = "disabled"; > + }; > }; > }; > Applied for STi next Thanks ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v9 16/19] ARM: DT: STi: stihxxx-b2120: Add DT nodes for STi audio card
Hi Peter On 09/05/2016 03:16 PM, Peter Griffin wrote: > This patch enables the uniperif players 2 & 3 for b2120 boards > and also adds the "simple-audio-card" device node to interconnect > the SoC sound device and the codec. > > Signed-off-by: Arnaud Pouliquen> Signed-off-by: Peter Griffin > --- > arch/arm/boot/dts/stihxxx-b2120.dtsi | 45 > > 1 file changed, 45 insertions(+) > > diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi > b/arch/arm/boot/dts/stihxxx-b2120.dtsi > index 722c63f..4939501 100644 > --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi > +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi > @@ -131,5 +131,50 @@ > dvb-card= ; > }; > }; > + > + sti_uni_player2: sti-uni-player@8d82000 { > + status = "okay"; > + }; > + > + sti_uni_player3: sti-uni-player@8d85000 { > + status = "okay"; > + }; > + > + sti_sasg_codec: sti-sasg-codec { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <_spdif_out>; > + }; > + > + sound { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "sti audio card"; > + status = "okay"; > + > + simple-audio-card,dai-link@0 { > + /* DAC */ > + format = "i2s"; > + mclk-fs = <256>; > + cpu { > + sound-dai = <_uni_player2>; > + }; > + > + codec { > + sound-dai = <_sasg_codec 1>; > + }; > + }; > + simple-audio-card,dai-link@1 { > + /* SPDIF */ > + format = "left_j"; > + mclk-fs = <128>; > + cpu { > + sound-dai = <_uni_player3>; > + }; > + > + codec { > + sound-dai = <_sasg_codec 0>; > + }; > + }; > + }; > }; > }; > Applied for STi next Thanks ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v9 00/19] Add support for FDMA DMA controller and slim core rproc found on STi chipsets
Hi Bjorn On 09/13/2016 08:06 PM, Bjorn Andersson wrote: > On Tue 13 Sep 02:31 PDT 2016, Peter Griffin wrote: > >> Hi Vinod & Bjorn, >> >> [..] >> >> On Mon, 05 Sep 2016, Peter Griffin wrote: >> >>> v8 actions some review feedback from Bjorn to the slim rproc driver, and >>> also includes >>> a patch which fixes a recursive Kconfig error which is triggered when >>> st_fdma selects >>> slim_rproc driver. The series has also been rebased on v4.8-rc3. >>> >>> v9 actions some review feedback from Bjorn, Lee and Vinod. See below. >>> Importantly a bug >>> was found during testing now that the platform boots without >>> clk_ignore_unused parameter >>> whereby the clocks would not be enabled properly before firmware loading >>> was attempted. >>> >>> regards, >>> >>> Peter. >>> >>> Changes since v8: >>> - Add MODULE_ALIAS (Vinod) >>> - devm_kzalloc to devm_kcalloc (Vinod) >>> - quisce tasklet initialised by vchan_init() (Vinod) >>> - Don't make SLIM rproc user selectable (Bjorn) >>> - slim_rproc: Ensure clocks enabled before firmware load (Peter) >>> - Various code style nits / commit message change (Lee) >>> - Separate patch for '\n' kconfig removal (Vinod) >> >> I hate to send a ping, > > Sorry about that. > >> but do you think we can merge this fdma series? It has gone >> through quite a few review rounds now. >> > > I think the remoteproc part looks good. > > Vinod, I don't have any changes queued in remoteproc that should cause > merge issues. If you want to you could take the remoteproc patch > through your tree. > > > I do however think that the dts patches should go through arm-soc. I will take care about dts patches by adding them in the next STi DT pull request Thanks Patrice > > Regards, > Bjorn > ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization