| Message ID | 20170903150806.3451-1-codekipper@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Marcus! Dne nedelja, 03. september 2017 ob 17:08:06 CEST je codekipper@gmail.com napisal(a): > From: Marcus Cooper <codekipper@gmail.com> > > Add the new DAI blocks to the device tree. I2S0 and I2S1 are for > connecting to an external codec whereas I2S2 is used for HDMI > audio. > > Signed-off-by: Marcus Cooper <codekipper@gmail.com> > --- > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 39 > ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) > > diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 11240a8313c2..cf6fcc857324 > 100644 > --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > @@ -450,6 +450,45 @@ > status = "disabled"; > }; > > + i2s0: i2s@01c22000 { > + #sound-dai-cells = <0>; > + compatible = "allwinner,sun8i-h3-i2s"; > + reg = <0x01c22000 0x400>; > + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&ccu CLK_BUS_I2S0>, <&ccu CLK_I2S0>; > + clock-names = "apb", "mod"; > + dmas = <&dma 3>, <&dma 3>; > + resets = <&ccu RST_BUS_I2S0>; > + dma-names = "rx", "tx"; > + status = "disabled"; > + }; > + > + i2s1: i2s@01c22400 { > + #sound-dai-cells = <0>; > + compatible = "allwinner,sun8i-h3-i2s"; > + reg = <0x01c22400 0x400>; > + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>; > + clock-names = "apb", "mod"; > + dmas = <&dma 4>, <&dma 4>; > + resets = <&ccu RST_BUS_I2S1>; > + dma-names = "rx", "tx"; > + status = "disabled"; > + }; > + > + i2s2: i2s@01c22800 { > + #sound-dai-cells = <0>; > + compatible = "allwinner,sun8i-h3-i2s"; > + reg = <0x01c22800 0x400>; > + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>; > + clock-names = "apb", "mod"; > + dmas = <&dma 5>, <&dma 5>; > + resets = <&ccu RST_BUS_I2S2>; > + dma-names = "rx", "tx"; > + status = "disabled"; > + }; > + I don't want to be a pain, but shouldn't we skip this one for now? It is only for HDMI and has different capabilities (8 channels supported and slighlty different formula to calculate oversample rate. Best regards, Jernej
On 3 September 2017 at 18:35, Jernej Škrabec <jernej.skrabec@siol.net> wrote: > Hi Marcus! > > Dne nedelja, 03. september 2017 ob 17:08:06 CEST je codekipper@gmail.com > napisal(a): >> From: Marcus Cooper <codekipper@gmail.com> >> >> Add the new DAI blocks to the device tree. I2S0 and I2S1 are for >> connecting to an external codec whereas I2S2 is used for HDMI >> audio. >> >> Signed-off-by: Marcus Cooper <codekipper@gmail.com> >> --- >> arch/arm/boot/dts/sunxi-h3-h5.dtsi | 39 >> ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) >> >> diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi >> b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 11240a8313c2..cf6fcc857324 >> 100644 >> --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi >> +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi >> @@ -450,6 +450,45 @@ >> status = "disabled"; >> }; >> >> + i2s0: i2s@01c22000 { >> + #sound-dai-cells = <0>; >> + compatible = "allwinner,sun8i-h3-i2s"; >> + reg = <0x01c22000 0x400>; >> + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&ccu CLK_BUS_I2S0>, <&ccu CLK_I2S0>; >> + clock-names = "apb", "mod"; >> + dmas = <&dma 3>, <&dma 3>; >> + resets = <&ccu RST_BUS_I2S0>; >> + dma-names = "rx", "tx"; >> + status = "disabled"; >> + }; >> + >> + i2s1: i2s@01c22400 { >> + #sound-dai-cells = <0>; >> + compatible = "allwinner,sun8i-h3-i2s"; >> + reg = <0x01c22400 0x400>; >> + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>; >> + clock-names = "apb", "mod"; >> + dmas = <&dma 4>, <&dma 4>; >> + resets = <&ccu RST_BUS_I2S1>; >> + dma-names = "rx", "tx"; >> + status = "disabled"; >> + }; >> + >> + i2s2: i2s@01c22800 { >> + #sound-dai-cells = <0>; >> + compatible = "allwinner,sun8i-h3-i2s"; >> + reg = <0x01c22800 0x400>; >> + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>; >> + clock-names = "apb", "mod"; >> + dmas = <&dma 5>, <&dma 5>; >> + resets = <&ccu RST_BUS_I2S2>; >> + dma-names = "rx", "tx"; >> + status = "disabled"; >> + }; >> + > > I don't want to be a pain, but shouldn't we skip this one for now? It is only > for HDMI and has different capabilities (8 channels supported and slighlty > different formula to calculate oversample rate. I'll have a look into this..maybe this can be handled by the simple-audio-card binding that we use. The other thing with the padding which you mentioned I can add a field for. Maxime, what's your thoughts on this?..I can re-submit without i2s2. BR, CK > > Best regards, > Jernej
On Mon, Sep 04, 2017 at 12:51:38PM +0200, Code Kipper wrote: > On 3 September 2017 at 18:35, Jernej Škrabec <jernej.skrabec@siol.net> wrote: > > Hi Marcus! > > > > Dne nedelja, 03. september 2017 ob 17:08:06 CEST je codekipper@gmail.com > > napisal(a): > >> From: Marcus Cooper <codekipper@gmail.com> > >> > >> Add the new DAI blocks to the device tree. I2S0 and I2S1 are for > >> connecting to an external codec whereas I2S2 is used for HDMI > >> audio. > >> > >> Signed-off-by: Marcus Cooper <codekipper@gmail.com> > >> --- > >> arch/arm/boot/dts/sunxi-h3-h5.dtsi | 39 > >> ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) > >> > >> diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > >> b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 11240a8313c2..cf6fcc857324 > >> 100644 > >> --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > >> +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > >> @@ -450,6 +450,45 @@ > >> status = "disabled"; > >> }; > >> > >> + i2s0: i2s@01c22000 { > >> + #sound-dai-cells = <0>; > >> + compatible = "allwinner,sun8i-h3-i2s"; > >> + reg = <0x01c22000 0x400>; > >> + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; > >> + clocks = <&ccu CLK_BUS_I2S0>, <&ccu CLK_I2S0>; > >> + clock-names = "apb", "mod"; > >> + dmas = <&dma 3>, <&dma 3>; > >> + resets = <&ccu RST_BUS_I2S0>; > >> + dma-names = "rx", "tx"; > >> + status = "disabled"; > >> + }; > >> + > >> + i2s1: i2s@01c22400 { > >> + #sound-dai-cells = <0>; > >> + compatible = "allwinner,sun8i-h3-i2s"; > >> + reg = <0x01c22400 0x400>; > >> + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; > >> + clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>; > >> + clock-names = "apb", "mod"; > >> + dmas = <&dma 4>, <&dma 4>; > >> + resets = <&ccu RST_BUS_I2S1>; > >> + dma-names = "rx", "tx"; > >> + status = "disabled"; > >> + }; > >> + > >> + i2s2: i2s@01c22800 { > >> + #sound-dai-cells = <0>; > >> + compatible = "allwinner,sun8i-h3-i2s"; > >> + reg = <0x01c22800 0x400>; > >> + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; > >> + clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>; > >> + clock-names = "apb", "mod"; > >> + dmas = <&dma 5>, <&dma 5>; > >> + resets = <&ccu RST_BUS_I2S2>; > >> + dma-names = "rx", "tx"; > >> + status = "disabled"; > >> + }; > >> + > > > > I don't want to be a pain, but shouldn't we skip this one for now? It is only > > for HDMI and has different capabilities (8 channels supported and slighlty > > different formula to calculate oversample rate. > I'll have a look into this..maybe this can be handled by the > simple-audio-card binding that we use. The other thing with the > padding which you mentioned I can add a field for. Maxime, what's your > thoughts on this?..I can re-submit without i2s2. Yes, please do so. Thanks! Maxime
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 11240a8313c2..cf6fcc857324 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi @@ -450,6 +450,45 @@ status = "disabled"; }; + i2s0: i2s@01c22000 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun8i-h3-i2s"; + reg = <0x01c22000 0x400>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2S0>, <&ccu CLK_I2S0>; + clock-names = "apb", "mod"; + dmas = <&dma 3>, <&dma 3>; + resets = <&ccu RST_BUS_I2S0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + i2s1: i2s@01c22400 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun8i-h3-i2s"; + reg = <0x01c22400 0x400>; + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>; + clock-names = "apb", "mod"; + dmas = <&dma 4>, <&dma 4>; + resets = <&ccu RST_BUS_I2S1>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + i2s2: i2s@01c22800 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun8i-h3-i2s"; + reg = <0x01c22800 0x400>; + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>; + clock-names = "apb", "mod"; + dmas = <&dma 5>, <&dma 5>; + resets = <&ccu RST_BUS_I2S2>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + codec: codec@01c22c00 { #sound-dai-cells = <0>; compatible = "allwinner,sun8i-h3-codec";