diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 20:53:03 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 20:54:04 +0000 |
| commit | 4c6c826b22da9f6408b6bc6939a92aa0be838488 (patch) | |
| tree | 4fcb8be74ea59140cda6b9bfc076603a3060f0fe /arch/arm/boot/dts/tegra-paz00.dts | |
| parent | fcd2a8e945949868eaf6705db318c31524102286 (diff) | |
| parent | 96d6714ca27acab087dcc8d75a7ec815abe3dde7 (diff) | |
Merge tag 'tegra-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/dt
Device tree updates for tegra. Various development, including a handful
of additions to the tegra30 device trees.
* tag 'tegra-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
ASoC: DT: Add digital microphone binding to PAZ00 board.
ARM: dt: Add ARM PMU to tegra*.dtsi
ARM: dt: Add SD controller configuration to Tegra Cardhu
ARM: dt: tegra: Enable headset autodetection on PAZ00 board.
ARM: dt: tegra: Enable device tree audio codec on PAZ00 board.
ARM: dt: Add binding for Tegra PMC
ARM: dt: tegra: Enable audio on WM8903 boards, disable others
ARM: dt: tegra: Add labels for I2S controllers
ARM: dt: tegra: Modify I2S nodes to match binding
ARM: dt: tegra: Add Tegra APB DMA device tree binding
ARM: dt: tegra30.dtsi: Add extra GPIO interrupt
ARM: dt: tegra30.dtsi: Reformat gpio's interrupts property
dt: tegra gpio: Flesh out binding documentation
ARM: tegra: seaboard: add EMC table to device tree
ARM: tegra: emc: device tree bindings
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/tegra-paz00.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra-paz00.dts | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 825d2957da0..3c1ff5a43fb 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts @@ -12,6 +12,13 @@ i2c@7000c000 { clock-frequency = <400000>; + + alc5632: alc5632@1e { + compatible = "realtek,alc5632"; + reg = <0x1e>; + gpio-controller; + #gpio-cells = <2>; + }; }; i2c@7000c400 { @@ -37,6 +44,30 @@ clock-frequency = <400000>; }; + i2s@70002a00 { + status = "disable"; + }; + + sound { + compatible = "nvidia,tegra-audio-alc5632-paz00", + "nvidia,tegra-audio-alc5632"; + + nvidia,model = "Compal PAZ00"; + + nvidia,audio-routing = + "Int Spk", "SPKOUT", + "Int Spk", "SPKOUTN", + "Headset Mic", "MICBIAS1", + "MIC1", "Headset Mic", + "Headset Stereophone", "HPR", + "Headset Stereophone", "HPL", + "DMICDAT", "Digital Mic"; + + nvidia,audio-codec = <&alc5632>; + nvidia,i2s-controller = <&tegra_i2s1>; + nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ + }; + serial@70006000 { clock-frequency = <216000000>; }; |