]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'davinci-for-v4.10/dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 7 Dec 2016 20:34:30 +0000 (12:34 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 7 Dec 2016 20:34:30 +0000 (12:34 -0800)
- Add device tree nodes for pin pull-up/pull-down
bias control on DA850.

- Enable high speed support on DA850 MMC/SD

* tag 'davinci-for-v4.10/dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850: enable high speed for mmc
  ARM: dts: da850: Add node for pullup/pulldown pinconf

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/boot/dts/da850.dtsi

Simple merge