aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-spear6xx/include
AgeCommit message (Collapse)AuthorFilesLines
2013-03-12ARM: spear: move spear.h and misc_regs.h into plat-spearArnd Bergmann2-81/+0
The spear13xx version of spear.h is completely different from the newly combined spear3xx/spear6xx version, but we can never build ARMv5 and ARMv7 platforms together, so there is no harm in putting all the contents into a single file and adding appropriate ifdefs. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Viresh Kumar <[email protected]>
2013-03-12ARM: spear: make spear3xx/6xx mach/spear.h files identicalArnd Bergmann2-25/+38
The two files are almost identical already basically just differ in the identifier names. By changing the identifiers to be the same, we are able to merge the two as a preparation to building a combined kernel. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Viresh Kumar <[email protected]>
2013-03-12ARM: spear: move identical headers to plat-spear/include/machArnd Bergmann6-146/+0
As an intermediate step towards unification of the three spear platforms, this gets rid of the mach/* header files that are obviously not platform specific. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Viresh Kumar <[email protected]>
2013-03-12ARM: spear: unify mach/generic.h and mach/irqs.hArnd Bergmann2-12/+57
These are indeed easy to combine, as there are no conflicting definitions in generic.h, and irqs.h will be obsolete once we enable SPARSE_IRQ. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Viresh Kumar <[email protected]>
2012-09-14ARM: make mach/gpio.h headers optionalRob Herring1-19/+0
Most platforms don't need mach/gpio.h and it prevents multi-platform kernel images. Add CONFIG_NEED_MACH_GPIO_H and make platforns select it if they need gpio.h. This is platforms that define __GPIOLIB_COMPLEX or have lots of implicit includes pulled in by mach/gpio.h. at91 and omap have gpio clean-up pending and can drop CONFIG_NEED_MACH_GPIO_H once that is in. Signed-off-by: Rob Herring <[email protected]> Cc: Russell King <[email protected]> Acked-by: Jason Cooper <[email protected]> Acked-by: Linus Walleij <[email protected]>
2012-06-20Viresh has movedViresh Kumar2-2/+2
[email protected] email-id doesn't exist anymore as I have left the company. Replace ST's id with [email protected]. It also updates .mailmap file to fix address for 'git shortlog' Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-05-14Merge branch 'spear/dt' into spear/clockArnd Bergmann6-196/+12
Conflicts: arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear3xx/include/mach/misc_regs.h arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear6xx/clock.c arch/arm/mach-spear6xx/include/mach/misc_regs.h Resolve even more merge conflicts. Signed-off-by: Arnd Bergmann <[email protected]>
2012-05-12SPEAr: Switch to common clock frameworkViresh Kumar1-153/+1
SPEAr SoCs used its own clock framework since now. From now on they will move to use common clock framework. This patch updates existing SPEAr machine support to adapt for common clock framework. Signed-off-by: Viresh Kumar <[email protected]> Reviewed-by: Mike Turquette <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2012-05-12SPEAr: Add DT bindings for SPEAr's timerViresh Kumar3-5/+1
All SPEAr SoC's use ST's Timer module. This patch adds device tree probing capability for that. Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2012-04-22ARM: spear: remove most mach/*.h header contentsArnd Bergmann6-346/+12
The register and irq definitions in mach/*.h for spear3xx and spear6xx are now mostly obsolete, after the platforms have been converted to device tree based probing and the data is now part of the device tree files. The misc_regs.h contents are moved into clock.c because that is the only user, aside from the DMA_CHN_CFG that should eventually get handled differently. Some of the contents of mach/spear.h still remain, because they are used to set up the static map table, timer, uart and auxdata tables, but almost everything got removed. We might remove everything but the map table as the DT conversion completes, but that is not a priority. I've also made sure to make both copies of spear.h more or less identical so we can eventually combine them. The spear3?0.h files were only used by the spear3?0.c files, so I merged the contents in there and removed the bits that were unused. This is something that should still be looked at. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Viresh Kumar <[email protected]>
2012-03-06ARM: remove bunch of now unused mach/io.h filesRob Herring1-20/+0
Now that many platforms don't need mach/io.h, remove the unused ones. Signed-off-by: Rob Herring <[email protected]> Acked-by: Shawn Guo <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: H Hartley Sweeten <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Acked-by: Jamie Iles <[email protected]> Acked-by: Pawel Moll <[email protected]> Acked-by: Nicolas Pitre <[email protected]>
2012-02-22Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ↵Russell King1-18/+0
into for-armsoc
2012-02-21ARM: remove disable_fiq and arch_ret_to_user macrosRob Herring1-18/+0
Now that most platforms don't need disable_fiq and arch_ret_to_user macros, we can remove the empty macros or empty entry-macro.S files. Signed-off-by: Rob Herring <[email protected]> Acked-by: Jamie Iles <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Tony Lindgren <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Ryan Mallon <[email protected]> Acked-by: Nicolas Ferre <[email protected]> Acked-by: H Hartley Sweeten <[email protected]> Acked-by: Shawn Guo <[email protected]>
2012-01-20ARM: big removal of now unused arch_idle()Nicolas Pitre1-19/+0
When this is the only content remaining in mach/system.h then the whole file is removed. Signed-off-by: Nicolas Pitre <[email protected]> Acked-by: H Hartley Sweeten <[email protected]> Acked-and-tested-by: Jamie Iles <[email protected]> Acked-by: Tony Lindgren <[email protected]> Acked-by: David Brown <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Linus Walleij <[email protected]>
2012-01-05Merge branch 'restart' into for-linusRussell King1-0/+2
Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c.
2012-01-05ARM: restart: spear: use new restart hookRussell King1-0/+2
Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-12-05Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into ↵Russell King1-19/+0
devel-stable
2011-11-26ARM: big removal of now unused vmalloc.h filesNicolas Pitre1-19/+0
Signed-off-by: Nicolas Pitre <[email protected]>
2011-11-15ARM: spear: convert to MULTI_IRQ_HANDLERJamie Iles1-36/+0
Now that there is a generic IRQ handler for multiple VIC devices use it for spear to help building multi platform kernels. Acked-by: Viresh Kumar <[email protected]> Cc: Rajeev Kumar <[email protected]> Signed-off-by: Jamie Iles <[email protected]>
2011-10-13ARM: spear: remove mach/memory.h and plat/memory.hNicolas Pitre1-19/+0
Signed-off-by: Nicolas Pitre <[email protected]>
2011-07-19ARM: Consolidate the clkdev header filesKyungmin Park1-19/+0
Now most of ARM machines has the alsmot same __clk_get/put() macro So place it at the arch/arm/include/asm/clkdev.h and remove the reduntant header files But some machines don't have the same form as above. It can use the machince specific clkdev file by HAVE_MACH_CLKDEV config Now there are only 3 caese. 1) define the clk structure with clkdev macro => Need to move clk structure to proper header file arch/arm/mach-versatile/include/mach/clkdev.h arch/arm/mach-realview/include/mach/clkdev.h arch/arm/mach-vexpress/include/mach/clkdev.h arch/arm/mach-integrator/include/mach/clkdev.h 2) export the __clk_get/put function at clock.c arch/arm/mach-shmobile/include/mach/clkdev.h 3) demuxing the clk source arch/arm/mach-u300/include/mach/clkdev.h Acked-by: Viresh Kumar <[email protected]> Acked-by: H Hartley Sweeten <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-05-20ARM: 6926/1: SPEAr clock: Define common clk_init routine in plat/clock.cviresh kumar1-1/+1
Define common clk_init routine in plat/clock.c for calling recalc_root_clocks. This routine will be used for any common code across all machine families. Whereas family specific spear*xx_clk_init routines will be used for family specific code. Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-03-09ARM: 6794/1: SPEAr: Append UL to device address macros.Shiraz Hashim1-45/+46
Reviewed-by: Stanley Miao <[email protected]> Signed-off-by: Shiraz Hashim <[email protected]> Signed-off-by: Rajeev Kumar <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-03-09ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h filesviresh kumar1-83/+0
Now we used standard SZ_* macros instead of self defined *_SIZE macros. This patch removes all such unused *_SIZE macros for spear3xx & 6xx. Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-03-09ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.hviresh kumar4-3/+2
This patch makes inclusion of hardware.h and spear.h consistent over all spear variants. Now we will include hardware.h, wherever we need to use hardware macros. spear.h will be automatically included by hardware.h Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-03-09ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.viresh kumar2-3/+3
Order of inclusion of .h files must be: <linux/...>, <asm/...>, <plat/...>, <mach/...>. This patch corrects this ordering whereever it is not followed. Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-03-09ARM: 6703/1: SPEAr: update clk API supportviresh kumar1-2/+3
- Add support for divisor per parent clock - Add ENABLED_ON_INIT feature in clk - Add clk_set_rate(), round_rate_index & clk_round_rate() - Simplify clk_recalc functions - Add/update clock definitions Reviewed-by: Stanley Miao <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: shiraz hashim <[email protected]> Signed-off-by: Rajeev Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-03-09ARM: 6737/1: SPEAr: formalized timer supportShiraz Hashim1-1/+2
Move platform specific timer initialization code is moved into platform specific files. Reviewed-by: Jamie Iles <[email protected]> Reviewed-by: Stanley Miao <[email protected]> Signed-off-by: Shiraz Hashim <[email protected]> Signed-off-by: Rajeev Kumar <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-03-09ARM: 6677/1: SPEAr: add IOMEM(x) definition and update declaration of MISC_BASEviresh kumar2-69/+70
Add IOMEM(x) definition, and use it with MISC_BASE for SPEAr platform. With this there is no need to typecast misc macros to (unsigned int *). Reviewed-by: Stanley Miao <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-04ARM: 6091/1: ST SPEAr: Adding support for shared irq layerviresh kumar1-0/+1
Multiple peripherals in SPEAr share common hardware interrupt lines. This patch adds support for a shared irq layer, which registers hardware irqs by itself and exposes virtual irq numbers to peripherals. Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-04-14ARM: 6014/1: ST SPEAr: Added clock framework for SPEAr platform and machinesviresh kumar1-0/+19
Clock framework for SPEAr is based upon clkdev framework for ARM Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-04-14ARM: 6011/1: ST SPEAr: Added basic header files for SPEAr6xx machine familyviresh kumar15-0/+732
Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Rajeev Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>