Age | Commit message (Collapse) | Author | Files | Lines |
|
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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
[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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
into for-armsoc
|
|
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]>
|
|
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]>
|
|
Conflicts:
arch/arm/mach-exynos/cpu.c
The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
|
|
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]>
|
|
devel-stable
|
|
Signed-off-by: Nicolas Pitre <[email protected]>
|
|
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]>
|
|
Signed-off-by: Nicolas Pitre <[email protected]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
- 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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
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]>
|
|
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]>
|