Commit 5143e8ed8860c3d4b9caebe13a30536cba521965
1 parent
c33aa694d8
Exists in
fhd
JIG 용 DT 에 HDMI Sound 추가
Showing
2 changed files
with
28 additions
and
0 deletions
Show diff stats
kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven_jig.dtsi
| @@ -12,6 +12,12 @@ | @@ -12,6 +12,12 @@ | ||
| 12 | */ | 12 | */ |
| 13 | #include <dt-bindings/input/input.h> | 13 | #include <dt-bindings/input/input.h> |
| 14 | 14 | ||
| 15 | +#if 1 | ||
| 16 | +#define ENABLE_HDMI_SOUND 1 | ||
| 17 | +#else | ||
| 18 | +#define ENABLE_I2S_SOUND 1 | ||
| 19 | +#endif | ||
| 20 | + | ||
| 15 | &iomuxc { | 21 | &iomuxc { |
| 16 | pinctrl-names = "default"; | 22 | pinctrl-names = "default"; |
| 17 | pinctrl-0 = <&pinctrl_hog>; | 23 | pinctrl-0 = <&pinctrl_hog>; |
| @@ -284,6 +290,7 @@ | @@ -284,6 +290,7 @@ | ||
| 284 | }; | 290 | }; |
| 285 | }; | 291 | }; |
| 286 | 292 | ||
| 293 | +#ifdef ENABLE_I2S_SOUND | ||
| 287 | sound { | 294 | sound { |
| 288 | compatible = "fsl,imx6q-cmf-sgtl5000", | 295 | compatible = "fsl,imx6q-cmf-sgtl5000", |
| 289 | "fsl,imx-audio-sgtl5000"; | 296 | "fsl,imx-audio-sgtl5000"; |
| @@ -297,6 +304,15 @@ | @@ -297,6 +304,15 @@ | ||
| 297 | mux-int-port = <1>; | 304 | mux-int-port = <1>; |
| 298 | mux-ext-port = <3>; | 305 | mux-ext-port = <3>; |
| 299 | }; | 306 | }; |
| 307 | +#endif | ||
| 308 | + | ||
| 309 | +#ifdef ENABLE_HDMI_SOUND | ||
| 310 | + sound { | ||
| 311 | + compatible = "fsl,imx6q-audio-hdmi", "fsl,imx-audio-hdmi"; | ||
| 312 | + model = "imx-audio-hdmi"; | ||
| 313 | + hdmi-controller = <&hdmi_audio>; | ||
| 314 | + }; | ||
| 315 | +#endif | ||
| 300 | 316 | ||
| 301 | mxcfb1: fb@0 { | 317 | mxcfb1: fb@0 { |
| 302 | compatible = "fsl,mxc_sdc_fb"; | 318 | compatible = "fsl,mxc_sdc_fb"; |
| @@ -328,11 +344,13 @@ | @@ -328,11 +344,13 @@ | ||
| 328 | }; | 344 | }; |
| 329 | 345 | ||
| 330 | 346 | ||
| 347 | +#ifdef ENABLE_I2S_SOUND | ||
| 331 | &audmux { | 348 | &audmux { |
| 332 | status = "okay"; | 349 | status = "okay"; |
| 333 | pinctrl-names = "default"; | 350 | pinctrl-names = "default"; |
| 334 | pinctrl-0 = <&pinctrl_audmux>; | 351 | pinctrl-0 = <&pinctrl_audmux>; |
| 335 | }; | 352 | }; |
| 353 | +#endif | ||
| 336 | 354 | ||
| 337 | &ecspi1 { | 355 | &ecspi1 { |
| 338 | fsl,spi-num-chipselects = <1>; | 356 | fsl,spi-num-chipselects = <1>; |
| @@ -392,12 +410,19 @@ | @@ -392,12 +410,19 @@ | ||
| 392 | status = "okay"; | 410 | status = "okay"; |
| 393 | }; | 411 | }; |
| 394 | 412 | ||
| 413 | +#ifdef ENABLE_HDMI_SOUND | ||
| 414 | +&hdmi_audio { | ||
| 415 | + status = "okay"; | ||
| 416 | +}; | ||
| 417 | +#endif | ||
| 418 | + | ||
| 395 | &i2c1 { | 419 | &i2c1 { |
| 396 | clock-frequency = <100000>; | 420 | clock-frequency = <100000>; |
| 397 | pinctrl-names = "default"; | 421 | pinctrl-names = "default"; |
| 398 | pinctrl-0 = <&pinctrl_i2c1>; | 422 | pinctrl-0 = <&pinctrl_i2c1>; |
| 399 | status = "okay"; | 423 | status = "okay"; |
| 400 | 424 | ||
| 425 | +#ifdef ENABLE_I2S_SOUND | ||
| 401 | sgtl5000: sgtl5000@0a { | 426 | sgtl5000: sgtl5000@0a { |
| 402 | compatible = "fsl,sgtl5000"; | 427 | compatible = "fsl,sgtl5000"; |
| 403 | pinctrl-names = "default"; | 428 | pinctrl-names = "default"; |
| @@ -408,6 +433,7 @@ | @@ -408,6 +433,7 @@ | ||
| 408 | VDDD-supply = <®_1p2v>; | 433 | VDDD-supply = <®_1p2v>; |
| 409 | VDDIO-supply = <®_3p3v>; | 434 | VDDIO-supply = <®_3p3v>; |
| 410 | }; | 435 | }; |
| 436 | +#endif | ||
| 411 | }; | 437 | }; |
| 412 | 438 | ||
| 413 | &i2c2 { | 439 | &i2c2 { |
| @@ -480,10 +506,12 @@ | @@ -480,10 +506,12 @@ | ||
| 480 | status = "okay"; | 506 | status = "okay"; |
| 481 | }; | 507 | }; |
| 482 | 508 | ||
| 509 | +#ifdef ENABLE_I2S_SOUND | ||
| 483 | &ssi1 { | 510 | &ssi1 { |
| 484 | fsl,mode = "i2s-slave"; | 511 | fsl,mode = "i2s-slave"; |
| 485 | status = "okay"; | 512 | status = "okay"; |
| 486 | }; | 513 | }; |
| 514 | +#endif | ||
| 487 | 515 | ||
| 488 | &uart1 { | 516 | &uart1 { |
| 489 | pinctrl-names = "default"; | 517 | pinctrl-names = "default"; |
release/imx6s-prime-oven_jig.dtb
No preview for this file type