From: Rafael J. Wysocki Date: Wed, 11 Jul 2012 21:06:35 +0000 (+0200) Subject: Merge branch 'renesas-armadillo' into renesas-board X-Git-Tag: next-20120724~11^2~2^2^2~9 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8600fb68cfa8f89e23cf872efb87fec641cc747d;p=karo-tx-linux.git Merge branch 'renesas-armadillo' into renesas-board * renesas-armadillo: ARM: mach-shmobile: armadillo800eva: defconfig Allow use of armhf userspace ARM: shmobile: armadillo800eva: A3SP domain includes USB ARM: shmobile: armadillo800eva: A4LC domain includes LCDC ARM: shmobile: armadillo800eva: USB Func enables external IRQ mode ARM: mach-shmobile: add fixed voltage regulators to armadillo800eva ARM: shmobile: use common extra gpio functions on armadillo800eva ARM: shmobile: armadillo800eva: enable DMAEngine on USB ARM: shmobile: armadillo800eva: enable DMAEngine on SDHI ARM: shmobile: armadillo800eva: enable DMAEngine on FSI ARM: shmobile: armadillo800eva: enable FSI-HDMI sound ARM: shmobile: armadillo800eva: enable FSI-WM8978 sound Conflicts: arch/arm/mach-shmobile/Kconfig --- 8600fb68cfa8f89e23cf872efb87fec641cc747d diff --cc arch/arm/mach-shmobile/Kconfig index 0168382d3cba,1542e913f73e..4cacc2d22fbe --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@@ -113,7 -106,7 +113,8 @@@ config MACH_ARMADILLO800EV depends on ARCH_R8A7740 select ARCH_REQUIRE_GPIOLIB select USE_OF + select REGULATOR_FIXED_VOLTAGE if REGULATOR + select SND_SOC_WM8978 if SND_SIMPLE_CARD config MACH_MARZEN bool "MARZEN board"