diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 23:36:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 23:36:38 +0100 |
| commit | bb2d850778477a5ac30bf2752658856f20c2b1ac (patch) | |
| tree | 60226df8199755bb2fddba38d024f83708d1a50d | |
| parent | f39266cb18da53fe2c0148847a27cd78a82bc5c8 (diff) | |
| parent | c458e1b504a6a8c817fc56b4d4704273f2c459bb (diff) | |
Merge tag 'v4.10-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Pull "Rockchip dts32 changes for 4.10" from Heiko Stübner:
A bit of attention for the rk3066, fixed tsadc reset node
as well as enabling the dma for uart and mmc controllers.
And one new soc, the rk1108 combining a single-core Cortex-A7
with a separate DSP core.
* tag 'v4.10-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: add the sdmmc pinctrl for rk1108
ARM: dts: rockchip: add rockchip RK1108 Evaluation board
ARM: dts: rockchip: add basic support for RK1108 SOC
clk: rockchip: add dt-binding header for rk1108
dt-bindings: rockchip-dw-mshc: add RK1108 dw-mshc description
ARM: dts: rockchip: enable dma for uart and mmc on rk3066a
ARM: dts: rockchip: fix TSADC reset node for rk3066a