All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>,
	Jason Cooper <jason@lakedaemon.net>,
	Gregory Clement <gregory.clement@free-electrons.com>,
	Andrew Lunn <andrew@lunn.ch>,
	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Lior Amsalem <alior@marvell.com>,
	alsa-devel@alsa-project.org, Tawfik Bayouk <tawfik@marvell.com>,
	Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/7] ARM: mvebu: add audio I2S controller to Armada 370 Device Tree
Date: Wed, 12 Feb 2014 18:20:58 +0100	[thread overview]
Message-ID: <1392225662-20431-4-git-send-email-thomas.petazzoni@free-electrons.com> (raw)
In-Reply-To: <1392225662-20431-1-git-send-email-thomas.petazzoni@free-electrons.com>

The Armada 370 SoC has an I2S audio controller. This commit adds the
description of this controller to the Device Tree describing this SoC,
as well as two possible muxing configurations for the I2S bus pins.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-370.dtsi | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 0d8530c..e3f4c18 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -132,6 +132,20 @@
 							"mpp51", "mpp52", "mpp53";
 					marvell,function = "sd0";
 				};
+
+				i2s_pins1: i2s-pins1 {
+					marvell,pins = "mpp5", "mpp6", "mpp7",
+						       "mpp8", "mpp9", "mpp10",
+						       "mpp12", "mpp13";
+					marvell,function = "audio";
+				};
+
+				i2s_pins2: i2s-pins2 {
+					marvell,pins = "mpp49", "mpp47", "mpp50",
+						       "mpp59", "mpp57", "mpp61",
+						       "mpp62", "mpp60", "mpp58";
+					marvell,function = "audio";
+				};
 			};
 
 			gpio0: gpio@18100 {
@@ -196,6 +210,15 @@
 				clocks = <&coreclk 2>;
 			};
 
+			audio_controller: audio-controller@30000 {
+				compatible = "marvell,armada370-audio";
+				reg = <0x30000 0x4000>;
+				interrupts = <93>;
+				clocks = <&gateclk 0>;
+				clock-names = "internal";
+				status = "disabled";
+			};
+
 			usb@50000 {
 				clocks = <&coreclk 0>;
 			};
-- 
1.8.3.2

WARNING: multiple messages have this Message-ID (diff)
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/7] ARM: mvebu: add audio I2S controller to Armada 370 Device Tree
Date: Wed, 12 Feb 2014 18:20:58 +0100	[thread overview]
Message-ID: <1392225662-20431-4-git-send-email-thomas.petazzoni@free-electrons.com> (raw)
In-Reply-To: <1392225662-20431-1-git-send-email-thomas.petazzoni@free-electrons.com>

The Armada 370 SoC has an I2S audio controller. This commit adds the
description of this controller to the Device Tree describing this SoC,
as well as two possible muxing configurations for the I2S bus pins.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-370.dtsi | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 0d8530c..e3f4c18 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -132,6 +132,20 @@
 							"mpp51", "mpp52", "mpp53";
 					marvell,function = "sd0";
 				};
+
+				i2s_pins1: i2s-pins1 {
+					marvell,pins = "mpp5", "mpp6", "mpp7",
+						       "mpp8", "mpp9", "mpp10",
+						       "mpp12", "mpp13";
+					marvell,function = "audio";
+				};
+
+				i2s_pins2: i2s-pins2 {
+					marvell,pins = "mpp49", "mpp47", "mpp50",
+						       "mpp59", "mpp57", "mpp61",
+						       "mpp62", "mpp60", "mpp58";
+					marvell,function = "audio";
+				};
 			};
 
 			gpio0: gpio at 18100 {
@@ -196,6 +210,15 @@
 				clocks = <&coreclk 2>;
 			};
 
+			audio_controller: audio-controller at 30000 {
+				compatible = "marvell,armada370-audio";
+				reg = <0x30000 0x4000>;
+				interrupts = <93>;
+				clocks = <&gateclk 0>;
+				clock-names = "internal";
+				status = "disabled";
+			};
+
 			usb at 50000 {
 				clocks = <&coreclk 0>;
 			};
-- 
1.8.3.2

  parent reply	other threads:[~2014-02-12 17:20 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-12 17:20 [PATCH v2 0/7] Audio support for Armada 370 DB Thomas Petazzoni
2014-02-12 17:20 ` Thomas Petazzoni
2014-02-12 17:20 ` [PATCH v2 1/7] sound: ASoC: add ASoC board driver " Thomas Petazzoni
2014-02-12 17:20   ` Thomas Petazzoni
2014-02-14 20:36   ` Mark Brown
2014-02-14 20:36     ` Mark Brown
2014-02-12 17:20 ` [PATCH v2 2/7] sound: ASoC: add S/PDIF support to Armada 370 DB ASoC driver Thomas Petazzoni
2014-02-12 17:20   ` Thomas Petazzoni
2014-03-18 18:38   ` Mark Brown
2014-03-18 18:38     ` Mark Brown
2014-02-12 17:20 ` Thomas Petazzoni [this message]
2014-02-12 17:20   ` [PATCH v2 3/7] ARM: mvebu: add audio I2S controller to Armada 370 Device Tree Thomas Petazzoni
2014-02-12 17:20 ` [PATCH v2 4/7] ARM: mvebu: add I2C0 muxing option for Armada 370 SoC Thomas Petazzoni
2014-02-12 17:20   ` Thomas Petazzoni
2014-02-12 17:21 ` [PATCH v2 5/7] ARM: mvebu: add audio support to Armada 370 DB Thomas Petazzoni
2014-02-12 17:21   ` Thomas Petazzoni
2014-02-12 17:21 ` [PATCH v2 6/7] ARM: mvebu: enable S/PDIF audio in Armada 370 DB Device Tree Thomas Petazzoni
2014-02-12 17:21   ` Thomas Petazzoni
2014-02-12 17:21 ` [PATCH v2 7/7] ARM: mvebu: enable audio options in mvebu_defconfig Thomas Petazzoni
2014-02-12 17:21   ` Thomas Petazzoni
2014-02-17  2:46 ` [PATCH v2 0/7] Audio support for Armada 370 DB Jason Cooper
2014-02-17  2:46   ` Jason Cooper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392225662-20431-4-git-send-email-thomas.petazzoni@free-electrons.com \
    --to=thomas.petazzoni@free-electrons.com \
    --cc=alior@marvell.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=andrew@lunn.ch \
    --cc=broonie@kernel.org \
    --cc=ezequiel.garcia@free-electrons.com \
    --cc=gregory.clement@free-electrons.com \
    --cc=jason@lakedaemon.net \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=sebastian.hesselbarth@gmail.com \
    --cc=tawfik@marvell.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.