diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2014-05-27 17:38:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2014-05-27 17:38:08 +0200 |
| commit | a58bdba749b36069ec372da9c9fd16017b6c0b47 (patch) | |
| tree | 95c79448427425d1c05712a7c7fb98ed42e41539 /arch/arm/boot/dts/armada-375-db.dts | |
| parent | ALSA: sound/aoa/codecs/onyx.c: use static const for texts (diff) | |
| parent | ALSA: bebob: Improve comments about stream format (diff) | |
| download | linux-a58bdba749b36069ec372da9c9fd16017b6c0b47.tar.gz linux-a58bdba749b36069ec372da9c9fd16017b6c0b47.tar.bz2 linux-a58bdba749b36069ec372da9c9fd16017b6c0b47.zip | |
Merge branch 'topic/firewire' into for-next
This is a merge of big firewire audio stack updates by Takashi Sakamoto.
Diffstat (limited to 'arch/arm/boot/dts/armada-375-db.dts')
| -rw-r--r-- | arch/arm/boot/dts/armada-375-db.dts | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts index 9378d3136b41..0451124e8ebf 100644 --- a/arch/arm/boot/dts/armada-375-db.dts +++ b/arch/arm/boot/dts/armada-375-db.dts @@ -79,6 +79,11 @@ }; }; + sata@a0000 { + status = "okay"; + nr-ports = <2>; + }; + nand: nand@d0000 { pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; |