linux-toradex.git/arch/arm/mach-shark/include, branch v3.2.2

ARM: add an extra temp register to the low level debugging addruart macro

2011-09-26T14:11:25+00:00

Some platforms (like OMAP not to name it) are doing rather complicated
hacks just to determine the base UART address to use.  Let's give their
addruart macro some slack by providing an extra work register which will
allow for much needed cleanups.

This is basically a no-op as this commit is only adding the extra argument
to the macro but no one is using it yet.

Signed-off-by: nicolas Pitre 
Reviewed-by: Kevin Hilman

Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-27T00:12:10+00:00

* 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: Consolidate the clkdev header files
  ARM: set vga memory base at run-time
  ARM: convert PCI defines to variables
  ARM: pci: make pcibios_assign_all_busses use pci_has_flag
  ARM: remove unnecessary mach/hardware.h includes
  pci: move microblaze and powerpc pci flag functions into asm-generic
  powerpc: rename ppc_pci_*_flags to pci_*_flags

Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h

Merge branch 'devel-stable' into for-next

2011-07-22T22:09:07+00:00

Conflicts:
	arch/arm/kernel/entry-armv.S

ARM: mach-shark: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size

2011-07-18T19:30:04+00:00

Signed-off-by: Nicolas Pitre

ARM: set vga memory base at run-time

2011-07-12T16:19:29+00:00

Convert the incorrectly named PCIMEM_BASE to a variable called vga_base.
This removes the dependency on mach/hardware.h.

Signed-off-by: Rob Herring 
Acked-by: Nicolas Pitre 
Reviewed-by: Arnd Bergmann

ARM: convert PCI defines to variables

2011-07-12T16:19:29+00:00

Convert PCIBIOS_MIN_IO and PCIBIOS_MIN_MEM to variables to allow
multi-platform builds. This also removes the requirement for a platform to
have a mach/hardware.h.

The default values for i/o and mem are 0x1000 and 0x01000000, respectively.
Per Arnd Bergmann, other values are likely to be incorrect, but this commit
does not try to address that issue.

Signed-off-by: Rob Herring 
Acked-by: Nicolas Pitre 
Reviewed-by: Arnd Bergmann

ARM: pci: make pcibios_assign_all_busses use pci_has_flag

2011-07-12T16:19:28+00:00

Convert pcibios_assign_all_busses from a define to inline so platforms can
control this setting.

Signed-off-by: Rob Herring 
Acked-by: Nicolas Pitre 
Reviewed-by: Arnd Bergmann

ARM: entry: shark: don't directly reference registers in macros

2011-06-28T09:34:58+00:00

Directly referencing registers in macros makes assembly code harder
to change, because the macros have side effects which are non-obvious.
Use the provided 'base' register rather than directly referencing r4.

Signed-off-by: Russell King

ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes

2011-05-12T07:36:53+00:00

Rather than each platform providing its own function to adjust the
zone sizes, use the new ARM_DMA_ZONE_SIZE definition to perform this
adjustment.  This ensures that the actual DMA zone size and the
ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS definitions are consistent with
each other, and moves this complexity out of the platform code.

Acked-by: Nicolas Pitre 
Acked-by: Catalin Marinas 
Signed-off-by: Russell King

ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS

2011-05-12T07:36:49+00:00

The values of ISA_DMA_THRESHOLD and MAX_DMA_ADDRESS are related; one is
the physical/bus address, the other is the virtual address.  Both need
to be kept in step, so rather than having platforms define both, allow
them to define a single macro which sets both of these macros
appropraitely.

Acked-by: Nicolas Pitre 
Acked-by: Catalin Marinas 
Signed-off-by: Russell King