From: Olof Johansson Date: Tue, 27 Jan 2015 04:26:34 +0000 (-0800) Subject: Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux... X-Git-Tag: firefly_0821_release~176^2~2307^2~13 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9a5074ff5908da051731ad4e9f1beae4117a321d;p=firefly-linux-kernel-4.4.55.git Merge tag 'at91-dt2' of git://git./linux/kernel/git/nferre/linux-at91 into next/dt Merge "at91: dt for 3.20 #2" from Nicolas Ferre: Second DT batch for 3.20: - correct some pin configuration for at91sam9x5ek - add pioD on sama5d4 following a modification of pinctrl driver - add more precise nand compatibility string for sama5d4 - audio modifications for wm8904 or ac97 * tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/dt: sam9263: Add ac97 device node dt: atmel_ac97c: Add device tree documentation ARM: at91: at91sam9n12ek/dt: use dt ids for wm8904 ARM: at91: sama5d3xek/dt: use dt ids for wm8904 ARM: at91: sama5d4: dts: change the nand compatible string ARM: at91/dt: sama5d4: add pioD controller ARM: at91/dt: disable pull-up on vbus-gpio (PB16) to reduce power consumption Signed-off-by: Olof Johansson --- 9a5074ff5908da051731ad4e9f1beae4117a321d