summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-04-27 21:24:03 +0200
committerStephen Warren <swarren@nvidia.com>2012-05-03 22:49:14 +0200
commit22bfe102c0c39f0bac24950b875e7bfdeb329dd9 (patch)
tree634ce07f7b7aae0ebdf6e817e4467d9f7fc519d7 /arch/arm/boot
parentARM: dt: tegra trimslice: enable SDHCI1 controller (diff)
downloadlinux-22bfe102c0c39f0bac24950b875e7bfdeb329dd9.tar.xz
linux-22bfe102c0c39f0bac24950b875e7bfdeb329dd9.zip
ARM: dt: tegra trimslice: add support for audio
* Add node for the audio codec * Enable Tegra's I2S1 controller and DAS * Add node for top-level sound complex Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/tegra-trimslice.dts15
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 23e6472c5700..6f8e26dab919 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -251,6 +251,11 @@
i2c@7000c500 {
clock-frequency = <400000>;
+ codec: codec@1a {
+ compatible = "ti,tlv320aic23";
+ reg = <0x1a>;
+ };
+
rtc@56 {
compatible = "emmicro,em3027";
reg = <0x56>;
@@ -261,16 +266,14 @@
status = "disable";
};
- i2s@70002800 {
- status = "disable";
- };
-
i2s@70002a00 {
status = "disable";
};
- das@70000c00 {
- status = "disable";
+ sound {
+ compatible = "nvidia,tegra-audio-trimslice";
+ nvidia,i2s-controller = <&tegra_i2s1>;
+ nvidia,audio-codec = <&codec>;
};
serial@70006000 {