diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 16:10:28 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 16:10:28 +0200 |
commit | 0f02588434a448dc593d4fae35eda10fad1897c5 (patch) | |
tree | 9d10467b3ae907105e56227dfb14492a75448138 /arch/arm/configs/am200epdkit_defconfig | |
parent | 18aab73fba7abee4df472424d115d76b199877cb (diff) | |
parent | 068655dc9b7c71c4bea25c41eeaa5125c6724a91 (diff) | |
download | linux-0f02588434a448dc593d4fae35eda10fad1897c5.tar.bz2 |
Merge tag 'sunxi-dt-for-4.7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
Merge "Allwinner DT changes for 4.7, round 2" from Maxime Ripard:
Mostly DT patches to enable the new DRM driver on the CHIP, preliminary
support for the A10 and A20, and a support for a new variant of the Olimex
A20-Olinuxino-Lime2 featuring an eMMC
* tag 'sunxi-dt-for-4.7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sun7i: dt: Add pll3 and pll7 clocks
ARM: dts: sunxi: Add a olinuxino-lime2-emmc
ARM: sun4i: dt: Add pll3 and pll7 clocks
ARM: sun5i: chip: Enable the TV Encoder
ARM: sun5i: r8: Add display blocks to the DTSI
ARM: sun5i: a13: Add display and TCON clocks
Diffstat (limited to 'arch/arm/configs/am200epdkit_defconfig')
0 files changed, 0 insertions, 0 deletions