Merge pull request #6 from analogdevicesinc/develop/g-xp-sharc-alsa-demo

Develop/g xp sharc alsa demo
analogdevicesinc · Oct 29, 2021 · 3a3c20e · 3a3c20e
2 parents e58c93a + ed28e3d
commit 3a3c20e
Show file tree

Hide file tree

Showing 8 changed files with 691 additions and 561 deletions.
diff --git a/arch/arm/boot/dts/sc594-som-ezkit.dts b/arch/arm/boot/dts/sc594-som-ezkit.dts
@@ -76,6 +76,7 @@
 			core-id = <1>;
 			core-irq = <74>; /* was 77 */
 			firmware-name = "adi_adsp_core1_fw.ldr";
+			interrupts = <GIC_SPI 165 IRQ_TYPE_EDGE_RISING>;
 		};
 
 		core2-rproc@0x3108c000 {
@@ -84,11 +85,12 @@
 			core-id = <2>;
 			core-irq = <75>; /* was 78 */
 			firmware-name = "adi_adsp_core2_fw.ldr";
+			interrupts = <GIC_SPI 165 IRQ_TYPE_EDGE_RISING>;
 		};
 
 		sound {
 			compatible = "sc5xx,asoc-card";
-			adi,cpu-dai = <&i2s0>;
+			adi,cpu-dai = <&i2s4>;
 			adi,codec = <&adau1962>, <&adau1979>;
 		};
 
@@ -305,13 +307,7 @@
 	};
 };
 
-&i2s0 {
-	reg = <0x31002400 0x80>, <0x31002480 0x80>;
-	interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
-			<GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
-			<GIC_SPI 165 IRQ_TYPE_EDGE_RISING>
-			;
-	dma-channel = <10>, <11>;
+&i2s4 {
 	status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/sc59x.dtsi b/arch/arm/boot/dts/sc59x.dtsi
@@ -41,7 +41,7 @@
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;
 		rtc0 = &rtc0;
-		i2s0 = &i2s0;
+		i2s4 = &i2s4;
 		mmc0 = &mmc0;
 	};
 
@@ -265,9 +265,14 @@
 			status = "disabled";
 		};
 
-		i2s0: i2s@0 {
+		i2s4: i2s@4 {
 			compatible = "sc5xx,i2s-dai";
 			status = "disabled";
+			reg = <0x31002400 0x80>, <0x31002480 0x80>;
+			sport-channel = <4>;
+			interrupt-names = "tx_staus", "rx_staus";
+			interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+			dma-channel = <10>, <11>;
 		};
 
 		watchdog@0x31008000 {