From 080972aaff6f6634fe1a6195ecc25e4e0904348e Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Tue, 8 Oct 2013 19:41:19 +0200 Subject: ARM: Dove: Add the audio devices in DT This patch adds the nodes to instantiate the audio devices of the Dove boards. Signed-off-by: Jean-Francois Moine Acked-by: Sebastian Hesselbarth Signed-off-by: Jason Cooper --- arch/arm/boot/dts/dove.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 499abadf86f0..1e60db1ae353 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -573,6 +573,24 @@ phy-handle = <ðphy>; }; }; + + audio0: audio-controller@b0000 { + compatible = "marvell,dove-audio"; + reg = <0xb0000 0x2210>; + interrupts = <19>, <20>; + clocks = <&gate_clk 12>; + clock-names = "internal"; + status = "disabled"; + }; + + audio1: audio-controller@b4000 { + compatible = "marvell,dove-audio"; + reg = <0xb4000 0x2210>; + interrupts = <21>, <22>; + clocks = <&gate_clk 13>; + clock-names = "internal"; + status = "disabled"; + }; }; }; }; -- cgit From 34ea5342bd6da63f666215c4ef4b7b3948511c14 Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Tue, 8 Oct 2013 20:56:17 +0200 Subject: 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 Acked-by: Sebastian Hesselbarth Signed-off-by: Jason Cooper --- arch/arm/boot/dts/dove-cubox.dts | 8 ++++++++ arch/arm/boot/dts/dove.dtsi | 10 ++++++++++ 2 files changed, 18 insertions(+) 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"; -- cgit From 1deb122c724edfd799a4d7d0b88ff14c365c9e69 Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Tue, 8 Oct 2013 20:20:27 +0200 Subject: ARM: Dove: fix bad properties of the si5351 clkout2 used by Cubox audio As defined in the DT, clkout2 is not allowed to change the pll inside si5351. This patch extends the properties of clkout2 so that it works as the external clock of the audio device in the Cubox. Also, as the second si5351 clock is not used in the Cubox, its definition is removed. Signed-off-by: Jean-Francois Moine Acked-by: Sebastian Hesselbarth Signed-off-by: Jason Cooper --- arch/arm/boot/dts/dove-cubox.dts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index 173d46304cd2..8349a248ecea 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -99,18 +99,12 @@ silabs,pll-master; }; - clkout1 { - reg = <1>; - silabs,drive-strength = <8>; - silabs,multisynth-source = <1>; - silabs,clock-source = <0>; - silabs,pll-master; - }; - clkout2 { reg = <2>; + silabs,drive-strength = <8>; silabs,multisynth-source = <1>; silabs,clock-source = <0>; + silabs,pll-master; }; }; }; -- cgit