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

Skip to content
Commit af43ef67 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre:
First DT series for 3.13
- addition of sound for at91sam9n12
- a little fix for MMC vs. SPI on at91sam9g20ek

* tag 'at91-dt' of git://github.com/at91linux/linux-at91

:
  ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek
  ARM: at91: add sound support on at91sam9n12ek board
  ARM: at91: enable ssc on at91sam9n12ek board
  ARM: at91: enable wm8904 on at91sam9n12ek board
  ARM: at91: add ssc dma parameter for at91sam9n12
  ARM: at91: add at91sam9n12 ssc clock in look up table

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents ec902c62 e483341c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment