GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-07-03 19:49:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allwinner H3: Add I2S pins to DT (#987)

Browse source 
* removing unresolved/00-19-add-H3-i2s-DT-nodes.patch

removing unresolved/00-19-add-H3-i2s-DT-nodes.patch
	=> now already included into dts/sunxi-h3-h5.dtsi upstream

* removed 00-20-add-i2s-DT-pins.patch

removing 00-20-add-i2s-DT-pins.patch 
	=> updated and renamed to general-dd-i2s-DT-pins.patch

* updated 00-20-add-i2s-DT-pins.patch

updated 00-20-add-i2s-DT-pins.patch and renamed to general-dd-i2s-DT-pins.patch
	=> failed originally because mmc0_pins_a rename ...
This commit is contained in:
Karabek 2018-05-31 12:55:37 +02:00 • committed by Mikhail
parent 442ab52d3e
commit 3c1d263da6
2 changed files with 3 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patch/kernel/sunxi-dev/unresolved/00-20-add-i2s-DT-pins.patch → patch/kernel/sunxi-dev/general-add-i2s-DT-pins.patch
View file

@ -1,8 +1,8 @@
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index 11240a83..6049895c 100644
index 1be1a02..dc9775d 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -310,6 +310,16 @@
@@ -416,6 +416,16 @@
function = "i2c2";
};
@ -16,6 +16,6 @@ index 11240a83..6049895c 100644
+ function = "i2s1";
+ };
+
mmc0_pins_a: mmc0@0 {
mmc0_pins: mmc0 {
pins = "PF0", "PF1", "PF2", "PF3",
"PF4", "PF5";

50
patch/kernel/sunxi-dev/unresolved/00-19-add-H3-i2s-DT-nodes.patch
View file

@ -1,50 +0,0 @@
Add the new DAI blocks to the device tree. I2S0 and I2S1 are for
connecting to an external codec.
Signed-off-by: Marcus Cooper <codek...@gmail.com>
---
v2 changes compared to v1 are:
- removed i2s2 which is used for HDMI audio
---
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index 11240a8313c2..ef87d29036d9 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -450,6 +450,32 @@
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";
+ };
+
codec: codec@01c22c00 {
#sound-dai-cells = <0>;
compatible = "allwinner,sun8i-h3-codec";
--
2.14.1