Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a90bb51 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.10-rc3' of... 

Merge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v3.10

A series of driver specific updates, none particularly critical, plus
one fix to the compressed API code to handle capture streams properly
which is very safe for mainline as there's no current users.
parents d47333dd 1ab9ecc2

Documentation/devicetree/bindings/net/macb.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties: 
- compatible: Should be "cdns,[<chip>-]{macb|gem}"

  Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs.

  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".

  Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

- reg: Address and length of the register set for the device

- interrupts: Should contain macb interrupt