Timur Tabi 4951896aad powerpc/85xx: p1022ds: disable the NOR flash node if video is enabled ... The Freescale P1022 has a unique pin muxing "feature" where the DIU video controller's video signals are muxed with 24 of the local bus address signals. When the DIU is enabled, the bulk of the local bus is disabled, preventing access to memory-mapped devices like NOR flash and the pixis FPGA. Therefore, if the DIU is going to be enabled, then memory-mapped devices on the localbus, like NOR flash, need to be disabled. This also means that the localbus is not a 'simple-bus' any more, so remove that string from the compatible node. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>		2012-03-16 10:46:33 -05:00
..
alpha	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
arm	arch/arm/mach-shmobile/board-ag5evm.c: included linux/dma-mapping.h twice	2012-02-24 13:32:17 +09:00
avr32	avr32: select generic atomic64_t support	2012-02-03 16:16:40 -08:00
blackfin	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
c6x	Kbuild: Use dtc's -d (dependency) option	2012-02-14 21:14:44 -05:00
cris	lib: use generic pci_iomap on all architectures	2012-01-10 18:04:27 -08:00
frv	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
h8300	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
hexagon	lib: move GENERIC_IOMAP to lib/Kconfig	2011-11-24 22:21:19 +02:00
ia64	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-01-18 15:51:48 -08:00
m32r	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
m68k	m68k: Do not set global share for non-kernel shared pages	2012-02-07 11:25:57 +10:00
microblaze	Revert "microblaze: Add topology init"	2012-01-31 09:06:52 +01:00
mips	mips: use the the PCI controller's io_map_base	2012-01-31 23:20:30 +02:00
mn10300	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
openrisc	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-01-16 14:34:54 -08:00
parisc	parisc, exec: remove redundant set_fs(USER_DS)	2012-01-12 20:13:04 -08:00
powerpc	powerpc/85xx: p1022ds: disable the NOR flash node if video is enabled	2012-03-16 10:46:33 -05:00
s390	sys_poll: fix incorrect type for 'timeout' parameter	2012-02-21 17:24:20 -08:00
score	score: fix off-by-one index into syscall table	2012-01-23 08:38:49 -08:00
sh	SuperH fixes for 3.3-rc5	2012-02-24 08:56:51 -08:00
sparc	lib: Fix multiple definitions of clz_tab	2012-02-02 10:34:23 +11:00
tile	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit	2012-01-17 16:41:31 -08:00
unicore32	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
x86	i387: export 'fpu_owner_task' per-cpu variable	2012-02-20 19:34:10 -08:00
xtensa	xtensa: fix memscan()	2012-02-03 16:16:40 -08:00
.gitignore
Kconfig	mm,x86,um: move CMPXCHG_DOUBLE config option	2012-01-12 20:13:03 -08:00