Commit 8cec7349 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Kukjin Kim
Browse files

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: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene@kernel.org>
parent 0fb033bb

arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * Hardkernel Odroid XU3 Audio Codec device tree source

 *

 * Copyright (c) 2015 Krzysztof Kozlowski

 * Copyright (c) 2014 Collabora Ltd.

 * Copyright (c) 2013 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



/ {

	sound: sound {

		compatible = "simple-audio-card";



		simple-audio-card,name = "Odroid-XU3";

		simple-audio-card,widgets =

			"Headphone", "Headphone Jack",

			"Speakers", "Speakers";

		simple-audio-card,routing =

			"Headphone Jack", "HPL",

			"Headphone Jack", "HPR",

			"Headphone Jack", "MICBIAS",

			"IN1", "Headphone Jack",

			"Speakers", "SPKL",

			"Speakers", "SPKR";



		simple-audio-card,format = "i2s";

		simple-audio-card,bitclock-master = <&link0_codec>;

		simple-audio-card,frame-master = <&link0_codec>;



		simple-audio-card,cpu {

			sound-dai = <&i2s0 0>;

			system-clock-frequency = <19200000>;

		};



		link0_codec: simple-audio-card,codec {

			sound-dai = <&max98090>;

			clocks = <&i2s0 CLK_I2S_CDCLK>;

		};

	};

};



&hsi2c_5 {

	status = "okay";

	max98090: max98090@10 {

		compatible = "maxim,max98090";

		reg = <0x10>;

		interrupt-parent = <&gpx3>;

		interrupts = <2 0>;

		clocks = <&i2s0 CLK_I2S_CDCLK>;

		clock-names = "mclk";

		#sound-dai-cells = <0>;

	};

};



&i2s0 {

	status = "okay";

};

arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi

+0 −47
Original line number Diff line number Diff line
@@ -80,36 +80,6 @@ 
		};

	};



	sound: sound {

		compatible = "simple-audio-card";



		simple-audio-card,name = "Odroid-XU3";

		simple-audio-card,widgets =

			"Headphone", "Headphone Jack",

			"Speakers", "Speakers";

		simple-audio-card,routing =

			"Headphone Jack", "HPL",

			"Headphone Jack", "HPR",

			"Headphone Jack", "MICBIAS",

			"IN1", "Headphone Jack",

			"Speakers", "SPKL",

			"Speakers", "SPKR";



		simple-audio-card,format = "i2s";

		simple-audio-card,bitclock-master = <&link0_codec>;

		simple-audio-card,frame-master = <&link0_codec>;



		simple-audio-card,cpu {

			sound-dai = <&i2s0 0>;

			system-clock-frequency = <19200000>;

		};



		link0_codec: simple-audio-card,codec {

			sound-dai = <&max98090>;

			clocks = <&i2s0 CLK_I2S_CDCLK>;

		};

	};



	fan0: pwm-fan {

		compatible = "pwm-fan";

		pwms = <&pwm 0 20972 0>;
@@ -376,19 +346,6 @@ 
	};

};



&hsi2c_5 {

	status = "okay";

	max98090: max98090@10 {

		compatible = "maxim,max98090";

		reg = <0x10>;

		interrupt-parent = <&gpx3>;

		interrupts = <2 0>;

		clocks = <&i2s0 CLK_I2S_CDCLK>;

		clock-names = "mclk";

		#sound-dai-cells = <0>;

	};

};



&i2c_2 {

	samsung,i2c-sda-delay = <100>;

	samsung,i2c-max-bus-freq = <66000>;
@@ -400,10 +357,6 @@ 
	};

};



&i2s0 {

	status = "okay";

};



&mfc {

	samsung,mfc-r = <0x43000000 0x800000>;

	samsung,mfc-l = <0x51000000 0x800000>;

arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


/dts-v1/;

#include "exynos5422-odroidxu3-common.dtsi"

#include "exynos5422-odroidxu3-audio.dtsi"



/ {

	model = "Hardkernel Odroid XU3 Lite";

arch/arm/boot/dts/exynos5422-odroidxu3.dts

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


/dts-v1/;

#include "exynos5422-odroidxu3-common.dtsi"

#include "exynos5422-odroidxu3-audio.dtsi"



/ {

	model = "Hardkernel Odroid XU3";

CRA Git | Maintained and supported by SUSTech CRA and CCSE