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

Merge tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu into next/dt

From Jason Cooper:
mvebu DT changes for v3.14 (incr. #3)

 - kirkwood
    - use symbolic names for gpios and key inputs

 - mvebu
    - add the pxa nand controller to the ReadyNAS and A370-RD boards

* tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: Enable NAND controller in A370 Reference Design board
  ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file
  ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file
  ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file
  ARM: DT: Kirkwood: Use symbolic names from gpio.h
  ARM: DT: Kirkwood: Use symbolic names from input.h

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 1cfe0874 69e18e26
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment