Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: Split audio configuration to separate exynos5422-odroidxu3-audio

The Odroid XU4 board does not have audio codec so before adding DTS
for new board split the audio codec to separate DTSI file. Include
the audio codec DTSI in Odroid XU3 and XU3-Lite boards.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Kukjin Kim
8cec7349 0fb033bb

+63 -47
+61
arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
··· 1 + /* 2 + * Hardkernel Odroid XU3 Audio Codec device tree source 3 + * 4 + * Copyright (c) 2015 Krzysztof Kozlowski 5 + * Copyright (c) 2014 Collabora Ltd. 6 + * Copyright (c) 2013 Samsung Electronics Co., Ltd. 7 + * http://www.samsung.com 8 + * 9 + * This program is free software; you can redistribute it and/or modify 10 + * it under the terms of the GNU General Public License version 2 as 11 + * published by the Free Software Foundation. 12 + */ 13 + 14 + / { 15 + sound: sound { 16 + compatible = "simple-audio-card"; 17 + 18 + simple-audio-card,name = "Odroid-XU3"; 19 + simple-audio-card,widgets = 20 + "Headphone", "Headphone Jack", 21 + "Speakers", "Speakers"; 22 + simple-audio-card,routing = 23 + "Headphone Jack", "HPL", 24 + "Headphone Jack", "HPR", 25 + "Headphone Jack", "MICBIAS", 26 + "IN1", "Headphone Jack", 27 + "Speakers", "SPKL", 28 + "Speakers", "SPKR"; 29 + 30 + simple-audio-card,format = "i2s"; 31 + simple-audio-card,bitclock-master = <&link0_codec>; 32 + simple-audio-card,frame-master = <&link0_codec>; 33 + 34 + simple-audio-card,cpu { 35 + sound-dai = <&i2s0 0>; 36 + system-clock-frequency = <19200000>; 37 + }; 38 + 39 + link0_codec: simple-audio-card,codec { 40 + sound-dai = <&max98090>; 41 + clocks = <&i2s0 CLK_I2S_CDCLK>; 42 + }; 43 + }; 44 + }; 45 + 46 + &hsi2c_5 { 47 + status = "okay"; 48 + max98090: max98090@10 { 49 + compatible = "maxim,max98090"; 50 + reg = <0x10>; 51 + interrupt-parent = <&gpx3>; 52 + interrupts = <2 0>; 53 + clocks = <&i2s0 CLK_I2S_CDCLK>; 54 + clock-names = "mclk"; 55 + #sound-dai-cells = <0>; 56 + }; 57 + }; 58 + 59 + &i2s0 { 60 + status = "okay"; 61 + };
-47
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
··· 80 80 }; 81 81 }; 82 82 83 - sound: sound { 84 - compatible = "simple-audio-card"; 85 - 86 - simple-audio-card,name = "Odroid-XU3"; 87 - simple-audio-card,widgets = 88 - "Headphone", "Headphone Jack", 89 - "Speakers", "Speakers"; 90 - simple-audio-card,routing = 91 - "Headphone Jack", "HPL", 92 - "Headphone Jack", "HPR", 93 - "Headphone Jack", "MICBIAS", 94 - "IN1", "Headphone Jack", 95 - "Speakers", "SPKL", 96 - "Speakers", "SPKR"; 97 - 98 - simple-audio-card,format = "i2s"; 99 - simple-audio-card,bitclock-master = <&link0_codec>; 100 - simple-audio-card,frame-master = <&link0_codec>; 101 - 102 - simple-audio-card,cpu { 103 - sound-dai = <&i2s0 0>; 104 - system-clock-frequency = <19200000>; 105 - }; 106 - 107 - link0_codec: simple-audio-card,codec { 108 - sound-dai = <&max98090>; 109 - clocks = <&i2s0 CLK_I2S_CDCLK>; 110 - }; 111 - }; 112 - 113 83 fan0: pwm-fan { 114 84 compatible = "pwm-fan"; 115 85 pwms = <&pwm 0 20972 0>; ··· 346 376 }; 347 377 }; 348 378 349 - &hsi2c_5 { 350 - status = "okay"; 351 - max98090: max98090@10 { 352 - compatible = "maxim,max98090"; 353 - reg = <0x10>; 354 - interrupt-parent = <&gpx3>; 355 - interrupts = <2 0>; 356 - clocks = <&i2s0 CLK_I2S_CDCLK>; 357 - clock-names = "mclk"; 358 - #sound-dai-cells = <0>; 359 - }; 360 - }; 361 - 362 379 &i2c_2 { 363 380 samsung,i2c-sda-delay = <100>; 364 381 samsung,i2c-max-bus-freq = <66000>; ··· 355 398 compatible = "samsung,exynos4210-hdmiddc"; 356 399 reg = <0x50>; 357 400 }; 358 - }; 359 - 360 - &i2s0 { 361 - status = "okay"; 362 401 }; 363 402 364 403 &mfc {
+1
arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts
··· 13 13 14 14 /dts-v1/; 15 15 #include "exynos5422-odroidxu3-common.dtsi" 16 + #include "exynos5422-odroidxu3-audio.dtsi" 16 17 17 18 / { 18 19 model = "Hardkernel Odroid XU3 Lite";
+1
arch/arm/boot/dts/exynos5422-odroidxu3.dts
··· 12 12 13 13 /dts-v1/; 14 14 #include "exynos5422-odroidxu3-common.dtsi" 15 + #include "exynos5422-odroidxu3-audio.dtsi" 15 16 16 17 / { 17 18 model = "Hardkernel Odroid XU3";