diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-06 14:25:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-06 14:25:27 +0100 |
| commit | a52afea68f94d2501b7fe1fa18cc6acf84e35a76 (patch) | |
| tree | 977eb066b9de1bea4e7ce7ea9a5583d00279061f /arch/arm/boot/dts/omap3-n900.dts | |
| parent | ALSA: usb-audio: Check Marantz/Denon USB DACs in a single place (diff) | |
| parent | Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next (diff) | |
| download | linux-a52afea68f94d2501b7fe1fa18cc6acf84e35a76.tar.xz linux-a52afea68f94d2501b7fe1fa18cc6acf84e35a76.zip | |
Merge tag 'asoc-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Changes for v4.1
A selection of changes for v4.1 so far. The main things are:
- Move of jack registration to the card where it belongs.
- Support for DAPM routes specified by both the machine driver and DT.
Diffstat (limited to 'arch/arm/boot/dts/omap3-n900.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 60403273f83e..db80f9d376fa 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -16,6 +16,13 @@ model = "Nokia N900"; compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3"; + aliases { + i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + }; + cpus { cpu@0 { cpu0-supply = <&vcc>; @@ -704,7 +711,7 @@ compatible = "smsc,lan91c94"; interrupt-parent = <&gpio2>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ - reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */ + reg = <1 0 0xf>; /* 16 byte IO range */ bank-width = <2>; pinctrl-names = "default"; pinctrl-0 = <ðernet_pins>; |