diff mbox

[3/3] ARM: dts: vf610: add remaining SAI instaces

Message ID 1445141122-14183-3-git-send-email-stefan@agner.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Stefan Agner Oct. 18, 2015, 4:05 a.m. UTC
This adds the remaining SAI instances SAI0, SAI1 and SAI3. All
instances are very similar, except that the DMA channel of SAI3
is available on MUX1 (compared to MUX0 for SAI0-SAI2). Also,
SAI3 has a slightly different memory map due to a deeper FIFO,
however in practice the current driver works for SAI3 fine.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 arch/arm/boot/dts/vfxxx.dtsi | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

Comments

Stefan Agner Jan. 28, 2016, 12:31 a.m. UTC | #1
Hi Shawn,

The rest of the patchset has been applied during rc phase of v4.4, I
guess this one was scheduled for the next release (v4.5). However, I
just realized that this seemed to have slipped through...

--
Stefan

On 2015-10-17 21:05, Stefan Agner wrote:
> This adds the remaining SAI instances SAI0, SAI1 and SAI3. All
> instances are very similar, except that the DMA channel of SAI3
> is available on MUX1 (compared to MUX0 for SAI0-SAI2). Also,
> SAI3 has a slightly different memory map due to a deeper FIFO,
> however in practice the current driver works for SAI3 fine.
> 
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> ---
>  arch/arm/boot/dts/vfxxx.dtsi | 42 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 42 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
> index c2a4d1c..b45bc81 100644
> --- a/arch/arm/boot/dts/vfxxx.dtsi
> +++ b/arch/arm/boot/dts/vfxxx.dtsi
> @@ -174,6 +174,34 @@
>  				status = "disabled";
>  			};
>  
> +			sai0: sai@4002f000 {
> +				compatible = "fsl,vf610-sai";
> +				reg = <0x4002f000 0x1000>;
> +				interrupts = <84 IRQ_TYPE_LEVEL_HIGH>;
> +				clocks = <&clks VF610_CLK_SAI0>,
> +					<&clks VF610_CLK_SAI0_DIV>,
> +					<&clks 0>, <&clks 0>;
> +				clock-names = "bus", "mclk1", "mclk2", "mclk3";
> +				dma-names = "tx", "rx";
> +				dmas = <&edma0 0 17>,
> +					<&edma0 0 16>;
> +				status = "disabled";
> +			};
> +
> +			sai1: sai@40030000 {
> +				compatible = "fsl,vf610-sai";
> +				reg = <0x40030000 0x1000>;
> +				interrupts = <85 IRQ_TYPE_LEVEL_HIGH>;
> +				clocks = <&clks VF610_CLK_SAI1>,
> +					<&clks VF610_CLK_SAI1_DIV>,
> +					<&clks 0>, <&clks 0>;
> +				clock-names = "bus", "mclk1", "mclk2", "mclk3";
> +				dma-names = "tx", "rx";
> +				dmas = <&edma0 0 19>,
> +					<&edma0 0 18>;
> +				status = "disabled";
> +			};
> +
>  			sai2: sai@40031000 {
>  				compatible = "fsl,vf610-sai";
>  				reg = <0x40031000 0x1000>;
> @@ -188,6 +216,20 @@
>  				status = "disabled";
>  			};
>  
> +			sai3: sai@40032000 {
> +				compatible = "fsl,vf610-sai";
> +				reg = <0x40032000 0x1000>;
> +				interrupts = <87 IRQ_TYPE_LEVEL_HIGH>;
> +				clocks = <&clks VF610_CLK_SAI3>,
> +					<&clks VF610_CLK_SAI3_DIV>,
> +					<&clks 0>, <&clks 0>;
> +				clock-names = "bus", "mclk1", "mclk2", "mclk3";
> +				dma-names = "tx", "rx";
> +				dmas = <&edma0 1 9>,
> +					<&edma0 1 8>;
> +				status = "disabled";
> +			};
> +
>  			pit: pit@40037000 {
>  				compatible = "fsl,vf610-pit";
>  				reg = <0x40037000 0x1000>;
Stefan Agner Jan. 28, 2016, 1:52 a.m. UTC | #2
On 2016-01-27 17:53, Shawn Guo wrote:
> On Wed, Jan 27, 2016 at 04:31:48PM -0800, Stefan Agner wrote:
>> Hi Shawn,
>>
>> The rest of the patchset has been applied during rc phase of v4.4, I
>> guess this one was scheduled for the next release (v4.5). However, I
>> just realized that this seemed to have slipped through...
> 
> Sorry, Stefan.  If I can get a ping from you before v4.5 merge window
> closes, we might be able to catch up with v4.5.

Sure, no problem. Not really a mission critical patch :-)

> 
> Queued it up for v4.6.

Thanks

--
Stefan
Shawn Guo Jan. 28, 2016, 1:53 a.m. UTC | #3
On Wed, Jan 27, 2016 at 04:31:48PM -0800, Stefan Agner wrote:
> Hi Shawn,
> 
> The rest of the patchset has been applied during rc phase of v4.4, I
> guess this one was scheduled for the next release (v4.5). However, I
> just realized that this seemed to have slipped through...

Sorry, Stefan.  If I can get a ping from you before v4.5 merge window
closes, we might be able to catch up with v4.5.

Queued it up for v4.6.

Shawn
diff mbox

Patch

diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index c2a4d1c..b45bc81 100644
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -174,6 +174,34 @@ 
 				status = "disabled";
 			};
 
+			sai0: sai@4002f000 {
+				compatible = "fsl,vf610-sai";
+				reg = <0x4002f000 0x1000>;
+				interrupts = <84 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clks VF610_CLK_SAI0>,
+					<&clks VF610_CLK_SAI0_DIV>,
+					<&clks 0>, <&clks 0>;
+				clock-names = "bus", "mclk1", "mclk2", "mclk3";
+				dma-names = "tx", "rx";
+				dmas = <&edma0 0 17>,
+					<&edma0 0 16>;
+				status = "disabled";
+			};
+
+			sai1: sai@40030000 {
+				compatible = "fsl,vf610-sai";
+				reg = <0x40030000 0x1000>;
+				interrupts = <85 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clks VF610_CLK_SAI1>,
+					<&clks VF610_CLK_SAI1_DIV>,
+					<&clks 0>, <&clks 0>;
+				clock-names = "bus", "mclk1", "mclk2", "mclk3";
+				dma-names = "tx", "rx";
+				dmas = <&edma0 0 19>,
+					<&edma0 0 18>;
+				status = "disabled";
+			};
+
 			sai2: sai@40031000 {
 				compatible = "fsl,vf610-sai";
 				reg = <0x40031000 0x1000>;
@@ -188,6 +216,20 @@ 
 				status = "disabled";
 			};
 
+			sai3: sai@40032000 {
+				compatible = "fsl,vf610-sai";
+				reg = <0x40032000 0x1000>;
+				interrupts = <87 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clks VF610_CLK_SAI3>,
+					<&clks VF610_CLK_SAI3_DIV>,
+					<&clks 0>, <&clks 0>;
+				clock-names = "bus", "mclk1", "mclk2", "mclk3";
+				dma-names = "tx", "rx";
+				dmas = <&edma0 1 9>,
+					<&edma0 1 8>;
+				status = "disabled";
+			};
+
 			pit: pit@40037000 {
 				compatible = "fsl,vf610-pit";
 				reg = <0x40037000 0x1000>;