projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e75cd94
)
ARM: dts: rockchip: merge the hdmi-audio card with rt5640-codec card
author
Jacob Chen
<jacob2.chen@rock-chips.com>
Tue, 19 Jul 2016 09:10:02 +0000
(17:10 +0800)
committer
Huang, Tao
<huangtao@rock-chips.com>
Thu, 21 Jul 2016 06:16:27 +0000
(14:16 +0800)
Change-Id: Ibe3f218f9b3283c82329500486fd73298fc3b0d6
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
arch/arm/boot/dts/rk3288-evb.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/rk3288-evb.dtsi
b/arch/arm/boot/dts/rk3288-evb.dtsi
index 645b23492d7bf724085f4d12bd4efb2ba25c0f23..f7db66c7f40be701862c40a43037bda6593689fb 100644
(file)
--- a/
arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/
arch/arm/boot/dts/rk3288-evb.dtsi
@@
-103,18
+103,41
@@
};
};
};
};
-
hdmi-
sound {
+ sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
- simple-audio-card,name = "
DW-HDMI
";
+ simple-audio-card,name = "
rockchip,rt5640-codec
";
simple-audio-card,mclk-fs = <512>;
simple-audio-card,mclk-fs = <512>;
+ simple-audio-card,widgets =
+ "Microphone", "Microphone Jack",
+ "Headphone", "Headphone Jack";
+ simple-audio-card,routing =
+ "MIC1", "Microphone Jack",
+ "MIC2", "Microphone Jack",
+ "Microphone Jack", "micbias1",
+ "Headphone Jack", "HPOL",
+ "Headphone Jack", "HPOR";
+
+ simple-audio-card,dai-link@0 {
+ format = "i2s";
+ cpu {
+ sound-dai = <&i2s>;
+ };
- simple-audio-card,cpu {
- sound-dai = <&i2s>;
+ codec {
+ sound-dai = <&rt5640>;
+ };
};
};
- simple-audio-card,codec {
- sound-dai = <&hdmi>;
+ simple-audio-card,dai-link@1 {
+ format = "i2s";
+ cpu {
+ sound-dai = <&i2s>;
+ };
+
+ codec {
+ sound-dai = <&hdmi>;
+ };
};
};
};
};
@@
-299,6
+322,20
@@
status = "okay";
};
status = "okay";
};
+&i2c2 {
+ status = "okay";
+
+ rt5640: rt5640@1c {
+ #sound-dai-cells = <0>;
+ compatible = "realtek,rt5640";
+ reg = <0x1c>;
+ clocks = <&cru SCLK_I2S0_OUT>;
+ clock-names = "mclk";
+ interrupt-parent = <&gpio6>;
+ interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+ };
+};
+
&i2c5 {
status = "okay";
};
&i2c5 {
status = "okay";
};