diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2013-10-08 20:56:17 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-10-09 13:20:23 +0000 |
| commit | 34ea5342bd6da63f666215c4ef4b7b3948511c14 (patch) | |
| tree | 47a215cc1837cef4c7976043f7d632ebc664bac5 /arch | |
| parent | 080972aaff6f6634fe1a6195ecc25e4e0904348e (diff) | |
| download | linux-34ea5342bd6da63f666215c4ef4b7b3948511c14.tar.gz linux-34ea5342bd6da63f666215c4ef4b7b3948511c14.tar.bz2 linux-34ea5342bd6da63f666215c4ef4b7b3948511c14.zip | |
ARM: Dove: Add the audio device to the Cubox DT
This patch activates the audio device of the Cubox.
The audio flow (pin mpp_audio1) is output on both I2S and S/PDIF.
The third si5351 clock (#2, pin mpp13) is used as the external clock.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/dove-cubox.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index 4af59b6dce0f..173d46304cd2 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -132,3 +132,11 @@ reg = <0>; }; }; + +&audio1 { + status = "okay"; + clocks = <&gate_clk 13>, <&si5351 2>; + clock-names = "internal", "extclk"; + pinctrl-0 = <&pmx_audio1_i2s1_spdifo &pmx_audio1_extclk>; + pinctrl-names = "default"; +}; diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 1e60db1ae353..113a8bc7bee7 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -297,6 +297,11 @@ marvell,function = "gpio"; }; + pmx_audio1_extclk: pmx-audio1-extclk { + marvell,pins = "mpp13"; + marvell,function = "audio1"; + }; + pmx_gpio_14: pmx-gpio-14 { marvell,pins = "mpp14"; marvell,function = "gpio"; @@ -372,6 +377,11 @@ marvell,function = "gpio"; }; + pmx_audio1_i2s1_spdifo: pmx-audio1-i2s1-spdifo { + marvell,pins = "mpp_audio1"; + marvell,function = "i2s1/spdifo"; + }; + pmx_spi0: pmx-spi0 { marvell,pins = "mpp_spi0"; marvell,function = "spi0"; |