aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsuhiro Suzuki <suzuki.katsuhiro@socionext.com>2018-03-14 01:26:58 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-03-15 10:19:05 -0400
commit7f9f76b10dbe3f2585a21699312f74ed2b544b84 (patch)
treeb9a4f7f963261ae79529d58fc46d0a71fec3a1a2
parent05f7e3d18673a35d1f6f2a7b61c5b0b895324b76 (diff)
ARM: dts: uniphier: add sound node for PXs2
This patch adds audio controller, external codec and simple card node of UniPhier AIO sound system for PXs2 SoCs. Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--arch/arm/boot/dts/uniphier-pxs2-gentil.dts24
-rw-r--r--arch/arm/boot/dts/uniphier-pxs2-vodka.dts37
-rw-r--r--arch/arm/boot/dts/uniphier-pxs2.dtsi54
3 files changed, 115 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
index 59608de7c9fc..bed26b8ed9a3 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
@@ -32,6 +32,12 @@
32 device_type = "memory"; 32 device_type = "memory";
33 reg = <0x80000000 0x80000000>; 33 reg = <0x80000000 0x80000000>;
34 }; 34 };
35
36 sound {
37 compatible = "audio-graph-card";
38 label = "UniPhier PXs2";
39 dais = <&i2s_port2>;
40 };
35}; 41};
36 42
37&serial2 { 43&serial2 {
@@ -48,8 +54,26 @@
48 }; 54 };
49}; 55};
50 56
57&i2s_aux {
58 dai-format = "i2s";
59 remote-endpoint = <&wm_speaker>;
60};
61
51&i2c2 { 62&i2c2 {
52 status = "okay"; 63 status = "okay";
64
65 wm8960@1a {
66 compatible = "wlf,wm8960";
67 reg = <0x1a>;
68 #sound-dai-cells = <0>;
69
70 port@0 {
71 wm_speaker: endpoint {
72 dai-format = "i2s";
73 remote-endpoint = <&i2s_aux>;
74 };
75 };
76 };
53}; 77};
54 78
55&eth { 79&eth {
diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
index 41706763c8bf..b13d2d16ddad 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
@@ -30,12 +30,49 @@
30 device_type = "memory"; 30 device_type = "memory";
31 reg = <0x80000000 0x80000000>; 31 reg = <0x80000000 0x80000000>;
32 }; 32 };
33
34 sound {
35 compatible = "audio-graph-card";
36 label = "UniPhier PXs2";
37 dais = <&spdif_port0
38 &comp_spdif_port0>;
39 };
40
41 spdif-out {
42 compatible = "linux,spdif-dit";
43 #sound-dai-cells = <0>;
44
45 port@0 {
46 spdif_tx: endpoint {
47 remote-endpoint = <&spdif_hiecout1>;
48 };
49 };
50 };
51
52 comp-spdif-out {
53 compatible = "linux,spdif-dit";
54 #sound-dai-cells = <0>;
55
56 port@0 {
57 comp_spdif_tx: endpoint {
58 remote-endpoint = <&comp_spdif_hiecout1>;
59 };
60 };
61 };
33}; 62};
34 63
35&serial2 { 64&serial2 {
36 status = "okay"; 65 status = "okay";
37}; 66};
38 67
68&spdif_hiecout1 {
69 remote-endpoint = <&spdif_tx>;
70};
71
72&comp_spdif_hiecout1 {
73 remote-endpoint = <&comp_spdif_tx>;
74};
75
39&i2c0 { 76&i2c0 {
40 status = "okay"; 77 status = "okay";
41}; 78};
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index c0a8207c948d..595045441c9c 100644
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -225,6 +225,60 @@
225 <21 217 3>; 225 <21 217 3>;
226 }; 226 };
227 227
228 audio@56000000 {
229 compatible = "socionext,uniphier-pxs2-aio";
230 reg = <0x56000000 0x80000>;
231 interrupts = <0 144 4>;
232 pinctrl-names = "default";
233 pinctrl-0 = <&pinctrl_ain1>,
234 <&pinctrl_ain2>,
235 <&pinctrl_ainiec1>,
236 <&pinctrl_aout2>,
237 <&pinctrl_aout3>,
238 <&pinctrl_aoutiec1>,
239 <&pinctrl_aoutiec2>;
240 clock-names = "aio";
241 clocks = <&sys_clk 40>;
242 reset-names = "aio";
243 resets = <&sys_rst 40>;
244 #sound-dai-cells = <1>;
245
246 i2s_port0: port@0 {
247 i2s_hdmi: endpoint {
248 };
249 };
250
251 i2s_port1: port@1 {
252 i2s_line: endpoint {
253 };
254 };
255
256 i2s_port2: port@2 {
257 i2s_aux: endpoint {
258 };
259 };
260
261 spdif_port0: port@3 {
262 spdif_hiecout1: endpoint {
263 };
264 };
265
266 spdif_port1: port@4 {
267 spdif_iecout1: endpoint {
268 };
269 };
270
271 comp_spdif_port0: port@5 {
272 comp_spdif_hiecout1: endpoint {
273 };
274 };
275
276 comp_spdif_port1: port@6 {
277 comp_spdif_iecout1: endpoint {
278 };
279 };
280 };
281
228 i2c0: i2c@58780000 { 282 i2c0: i2c@58780000 {
229 compatible = "socionext,uniphier-fi2c"; 283 compatible = "socionext,uniphier-fi2c";
230 status = "disabled"; 284 status = "disabled";