summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-11-30Merge branch 'clks' into develRussell King13-271/+65
2008-11-30[ARM] amba drivers: don't pass a consumer clock name for devices with unique ↵Russell King4-4/+4
clocks Where devices only have one consumer, passing a consumer clock ID has no real benefit, and it only encourages wrong implementations of the clk API. Remove it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] lh7a40x: convert to simple clk APIRussell King1-61/+4
lh7a40x only uses the clk API for the framebuffer, so there's no point having a complicated implementation. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] lh7a40x: clocks - cleanupRussell King1-27/+0
Remove commented out code, and unnecessary declarations. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] aaec2000: convert to simple clk APIRussell King4-129/+24
aaec2000 only uses the clk API for the framebuffer, so there's no point having a complicated implementation. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] netx: fix simple clk APIRussell King1-5/+2
... to only return the framebuffer clock for the framebuffer device. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] ep93xx: convert to clkdev and match clocks by struct device where possibleRussell King3-45/+31
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] Update mach-typesRussell King1-3/+98
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] davinci: asm/memory.h is not required for mach/vmalloc.hRussell King1-1/+0
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] amba-clcd: don't use SZ_ constants in driversRussell King1-1/+1
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] Ensure that both MAX_DMA_ADDRESS and ISA_DMA_THRESHOLD are definedRussell King4-3/+4
Both of these symbols should be defined by a platform, or neither should be defined. Ensure that all platforms conform. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] Add a common typesafe __io implementationRussell King23-65/+44
As Al did for Versatile in 2ad4f86b60b649fd7428265c08d73a3bd360c81b, add a typesafe __io implementation for platforms to use. Convert platforms to use this new simple typesafe implementation. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] integrator: parenthesize __virt_to_bus/__bus_to_virt argumentRussell King1-2/+2
Macro arguments should be parenthesized to avoid unexpected side effects. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-30[ARM] pnx4008: fix definition of PHYS_OFFSETRussell King1-1/+1
PHYS_OFFSET constants should be defined using UL(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into develRussell King39-41/+41
2008-11-29[ARM] give RiscPC a NR_IRQS definition and remove defaultRussell King2-4/+1
RiscPC is the only platform using the default setting for NR_IRQS, so the default NR_IRQS doesn't really make sense; remove it and make RiscPC provide such a definition. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] Remove linux/sched.h from asm/cacheflush.h and asm/uaccess.hRussell King6-2/+6
... and fix those drivers that were incorrectly relying upon that include. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] Rename ISA mach/dma.h header to mach/isa-dma.hRussell King5-5/+5
This avoids confusion with platform specific DMA implementations in mach/dma.h Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] Hide ISA DMA API when ISA_DMA_API is unsetRussell King49-311/+61
When ISA_DMA_API is unset, we're not implementing the ISA DMA API, so there's no point in publishing the prototypes via asm/dma.h, nor including the machine dependent parts of that API. This allows us to remove a lot of mach/dma.h files which don't contain any useful code. Unfortunately though, some platforms put their own private non-ISA definitions into mach/dma.h, so we leave these behind and fix the appropriate #include statments. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] fix constant values of MAX_DMA_ADDRESSRussell King3-10/+2
Since 8d5796d2ec6b5a4e7a52861144e63af438d6f8f7, we have allowed PAGE_OFFSET to be configurable, so a constant virtual address for MAX_DMA_ADDRESS is buggy. It should be defined in terms of PAGE_OFFSET rather than a constant virtual address. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] move MAX_DMA_ADDRESS to mach/memory.hRussell King14-44/+20
Move the definition of MAX_DMA_ADDRESS from mach/dma.h to mach/memory.h, thereby placing it along side its relative, ISA_DMA_THRESHOLD. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] Remove unnecessary mach/hardware.h includes in arch/arm/mmRussell King3-3/+0
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] asm/system.h does not require asm/memory.hRussell King1-2/+0
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] ns9xxx: mach/hardware.h doesn't need asm/memory.hRussell King1-2/+0
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] ixp4xx: clean up includesRussell King2-5/+1
mach/io.h doesn't need linux/mm.h. mach/dma.h doesn't need linux/device.h, asm/page.h or mach/hardware.h Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] ixp23xx: mach/io.h doesn't need BUG() anymoreRussell King1-2/+0
ixp23xx's mach/io.h claims to need linux/kernel.h for BUG(). However, this header doesn't make use of BUG(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] iop13xx: avoid polluting the kernel's namespaceRussell King1-2/+0
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/timex.h. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] iop3xx: avoid polluting the kernel's namespaceRussell King7-13/+4
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h, mach/memory.h and mach/timex.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] shark: avoid polluting the kernel's namespaceRussell King3-25/+6
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] shark: remove old unused "translated" IO macrosRussell King1-17/+0
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] clps711x: avoid polluting the kernel's namespaceRussell King1-2/+0
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-29[ARM] footbridge: mach/hardware.h doesn't require mach/memory.hRussell King1-2/+0
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] footbridge: avoid polluting the kernel's namespaceRussell King2-4/+2
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] aaec2000: avoid polluting the kernel's namespaceRussell King1-2/+0
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] lh7a40x: avoid polluting the kernel's namespaceRussell King2-3/+2
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] l7200: avoid polluting the kernel's namespaceRussell King1-2/+0
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] h720x: avoid polluting the kernel's namespaceRussell King1-2/+0
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] imx: avoid polluting the kernel's namespaceRussell King1-2/+0
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] pxa: avoid polluting the kernel's namespaceRussell King7-3/+8
Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] rpc: remove obsolete IO accessorsRussell King1-46/+1
Remove __arch_base_xxx() and __ioaddrc() macros; they're obsolete and unused. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] versatile: remove IRQ mask definitionsRussell King2-144/+0
These definitions are unused and serve no purpose with genirq. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28Merge branch 'highmem' into develRussell King68-1254/+771
Conflicts: arch/arm/mach-clps7500/include/mach/memory.h
2008-11-28[ARM] remove a common set of __virt_to_bus definitionsNicolas Pitre39-299/+21
Let's provide an overridable default instead of having every machine class define __virt_to_bus and __bus_to_virt to the same thing. What most platforms are using is bus_addr == phys_addr so such is the default. One exception is ebsa110 which has no DMA what so ever, so the actual definition is not important except only for proper compilation. Also added a comment about the special footbridge bus translation. Let's also remove comments alluding to set_dma_addr which is not (and should not) be commonly used. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] unconditionally define __virt_to_phys and __phys_to_virtNicolas Pitre1-2/+0
There is no machine class overriding this. If non linear translations are implemented again for some machines then this could be restored at that time. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] remove bogus #ifdef CONFIG_HIGHMEM in show_pte()Nicolas Pitre1-2/+4
The restriction on !CONFIG_HIGHMEM is unneeded since page tables are currently never allocated with highmem pages, and actually disable PTE dump whenever highmem is configured. Let's have a dynamic test to better describe the current limitation instead. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] prevent the vmalloc cmdline argument from eating all memoryNicolas Pitre1-0/+7
Commit 8d5796d2ec6b5a4e7a52861144e63af438d6f8f7 allows for the vmalloc area to be resized from the kernel cmdline. Make sure it cannot overlap with RAM entirely. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] mem_init() cleanupsNicolas Pitre1-21/+24
Make free_area() arguments pfn based, and return number of freed pages. This will simplify highmem initialization later. Also, codepages, datapages and initpages are actually codesize, datasize and initsize. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] split highmem into its own memory bankNicolas Pitre1-33/+51
Doing so will greatly simplify the bootmem initialization code as each bank is therefore entirely lowmem or highmem with no crossing between those zones. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] rationalize memory configuration code some moreNicolas Pitre6-59/+45
Currently there are two instances of struct meminfo: one in kernel/setup.c marked __initdata, and another in mm/init.c with permanent storage. Let's keep only the later to directly populate the permanent version from arm_add_memory(). Also move common validation tests between the MMU and non-MMU cases into arm_add_memory() to remove some duplication. Protection against overflowing the membank array is also moved in there in order to cover the kernel cmdline parsing path as well. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-11-28[ARM] fix a couple clear_user_highpage assembly constraintsNicolas Pitre7-34/+34
In all cases the kaddr is assigned an input register even though it is modified in the assembly code. Let's assign a new variable to the modified value and mark those inline asm with volatile otherwise they get optimized away because the output variable is otherwise not used. Also fix a few conversion errors in copypage-feroceon.c and copypage-v4mc.c. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>