diff mbox

[PATCHv2,9/9] DTS: OMAP3-N900: Add sound support

Message ID 1398694047-28596-10-git-send-email-sre@kernel.org (mailing list archive)
State New, archived
Headers show

Commit Message

Sebastian Reichel April 28, 2014, 2:07 p.m. UTC
This patch adds support for the Nokia N900's sound
system.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
 arch/arm/boot/dts/omap3-n900.dts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Comments

Mark Brown May 1, 2014, 5:58 p.m. UTC | #1
On Mon, Apr 28, 2014 at 04:07:27PM +0200, Sebastian Reichel wrote:
> This patch adds support for the Nokia N900's sound
> system.

Reviewed-by: Mark Brown <broonie@linaro.org>
Tony Lindgren May 5, 2014, 7:45 p.m. UTC | #2
* Mark Brown <broonie@kernel.org> [140501 11:41]:
> On Mon, Apr 28, 2014 at 04:07:27PM +0200, Sebastian Reichel wrote:
> > This patch adds support for the Nokia N900's sound
> > system.
> 
> Reviewed-by: Mark Brown <broonie@linaro.org>

Applying the last patch into omap-for-v3.16/dt branch thanks.

Tony
Pavel Machek June 30, 2014, 10:02 a.m. UTC | #3
On Mon 2014-04-28 16:07:27, Sebastian Reichel wrote:
> This patch adds support for the Nokia N900's sound
> system.
> 
> Signed-off-by: Sebastian Reichel <sre@kernel.org>

Acked-by: Pavel Machek <pavel@ucw.cz>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 6bc8100..5701f91 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -90,6 +90,19 @@ 
 			};
 		};
 	};
+
+	sound: n900-audio {
+		compatible = "nokia,n900-audio";
+
+		nokia,cpu-dai = <&mcbsp2>;
+		nokia,audio-codec = <&tlv320aic3x>, <&tlv320aic3x_aux>;
+		nokia,headphone-amplifier = <&tpa6130a2>;
+
+		tvout-selection-gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>; /* 40 */
+		jack-detection-gpios = <&gpio6 17 GPIO_ACTIVE_HIGH>; /* 177 */
+		eci-switch-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* 182 */
+		speaker-amplifier-gpios = <&twl_gpio 7 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &omap3_pmx_core {
@@ -662,3 +675,7 @@ 
 		};
 	};
 };
+
+&mcbsp2 {
+	status = "ok";
+};