From: Linus Torvalds Date: Wed, 19 May 2010 19:08:50 +0000 (-0700) Subject: Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~9833^2~2113 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=024a6b95181f2df6090975c8a293499d24bf8b28;p=firefly-linux-kernel-4.4.55.git Merge branch 'davinci-for-linus' of git://git./linux/kernel/git/khilman/linux-davinci * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (48 commits) Revert "rtc: omap: let device wakeup capability be configured from chip init logic" DM365: Added more PINMUX configurations for AEMIF DM365: Make CLKOUTx available DM365: Added PINMUX definitions for GPIO30..32 Davinci: iotable based ioremap() interception Davinci: pinmux - use ioremap() Davinci: aintc/cpintc - use ioremap() Davinci: psc - use ioremap() Davinci: timer - use ioremap() Davinci: jtag_id - use ioremap() Davinci: da8xx: rtc - use ioremap Davinci: gpio - use ioremap() davinci: edma: fix coding style issue related to breaking lines davinci: edma: use BIT() wherever possible davinci: edma: fix coding style issue related to usage of braces davinci: edma: use a more intuitive name for edma_info Davinci: serial - conditional reset via pwremu Davinci: serial - use ioremap() Davinci: serial - remove unnecessary define Davinci: watchdog reset separation across socs ... Fix up trivial conflict in arch/arm/Kconfig due to removal of "select GENERIC_TIME" --- 024a6b95181f2df6090975c8a293499d24bf8b28 diff --cc arch/arm/Kconfig index a07b6c47a6b8,1151d1afd756..2d70cece2ea2 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -760,9 -776,11 +760,8 @@@ config ARCH_NOMADI config ARCH_DAVINCI bool "TI DaVinci" - select CPU_ARM926T - select GENERIC_TIME select GENERIC_CLOCKEVENTS - select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB - select HAVE_CLK select ZONE_DMA select HAVE_IDE select COMMON_CLKDEV