diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-05-14 10:48:24 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-05-14 10:48:24 -0600 |
| commit | 4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5 (patch) | |
| tree | 1c7fe0106ace9c86cc5a671e1dd00d49d259a643 /arch/arm/boot/dts/tegra-trimslice.dts | |
| parent | d9e33b593bceb62075225a4a5122bbb4803a8705 (diff) | |
| parent | 22bfe102c0c39f0bac24950b875e7bfdeb329dd9 (diff) | |
| download | linux-4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5.tar.gz linux-4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5.tar.xz linux-4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5.zip | |
Merge branch 'for-3.5/dt' into for-3.5/dt2-new
Diffstat (limited to 'arch/arm/boot/dts/tegra-trimslice.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra-trimslice.dts | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts index e4fcf9a8178a..ead93657dd06 100644 --- a/arch/arm/boot/dts/tegra-trimslice.dts +++ b/arch/arm/boot/dts/tegra-trimslice.dts @@ -250,13 +250,19 @@ i2c@7000c500 { clock-frequency = <400000>; - }; - i2c@7000d000 { - status = "disable"; + codec: codec@1a { + compatible = "ti,tlv320aic23"; + reg = <0x1a>; + }; + + rtc@56 { + compatible = "emmicro,em3027"; + reg = <0x56>; + }; }; - i2s@70002800 { + i2c@7000d000 { status = "disable"; }; @@ -264,8 +270,10 @@ status = "disable"; }; - das@70000c00 { - status = "disable"; + sound { + compatible = "nvidia,tegra-audio-trimslice"; + nvidia,i2s-controller = <&tegra_i2s1>; + nvidia,audio-codec = <&codec>; }; serial@70006000 { @@ -288,10 +296,6 @@ status = "disable"; }; - sdhci@c8000000 { - status = "disable"; - }; - sdhci@c8000200 { status = "disable"; }; |