05 Jan, 2012
3 commits
-
Conflicts:
arch/arm/mach-exynos/cpu.cThe changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c. -
Remove the now empty arch_reset() from all the mach/system.h includes,
and remove its callsite. Remove arm_machine_restart() as this function
no longer does anything useful.For samsung platforms, remove the include of mach/system-reset.h and
plat/system-reset.h from their respective mach/system.h headers as these
just define their arch_reset functions. As a result, the s3c2410 and
plat-samsung system-reset.h files are no longer referenced, so remove
these files entirely.Acked-by: Nicolas Pitre
Acked-by: H Hartley Sweeten
Acked-by: Jamie Iles
Acked-by: Tony Lindgren
Acked-by: Linus Walleij
Signed-off-by: Russell King -
Hook these platforms restart code into the new restart hook rather
than using arch_reset().Acked-by: Viresh Kumar
Signed-off-by: Russell King
06 Dec, 2011
1 commit
27 Nov, 2011
1 commit
-
Signed-off-by: Nicolas Pitre
21 Nov, 2011
1 commit
-
We only need to set the system up for a soft-restart if we're going to
be doing a soft-restart. Provide a new function (soft_restart()) which
does the setup and final call for this, and make platforms use it.
Eliminate the call to setup_restart() from the default handler.This means that platforms arch_reset() function is no longer called with
the page tables prepared for a soft-restart, and caches will still be
enabled.Acked-by: Nicolas Pitre
Acked-by: Will Deacon
Acked-by: H Hartley Sweeten
Acked-by: Kukjin Kim
Acked-by: Sascha Hauer
Acked-by: Viresh Kumar
Acked-by: Krzysztof Ha■asa
Acked-by: Paul Mundt
Acked-by: Richard Purdie
Acked-by: Wan ZongShun
Acked-by: Eric Miao
Signed-off-by: Russell King
29 Oct, 2011
1 commit
-
…git-cur/linux-2.6-arm
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
ARM: gic, local timers: use the request_percpu_irq() interface
ARM: gic: consolidate PPI handling
ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
ARM: mach-s5p64x0: remove mach/memory.h
ARM: mach-s3c64xx: remove mach/memory.h
ARM: plat-mxc: remove mach/memory.h
ARM: mach-prima2: remove mach/memory.h
ARM: mach-zynq: remove mach/memory.h
ARM: mach-bcmring: remove mach/memory.h
ARM: mach-davinci: remove mach/memory.h
ARM: mach-pxa: remove mach/memory.h
ARM: mach-ixp4xx: remove mach/memory.h
ARM: mach-h720x: remove mach/memory.h
ARM: mach-vt8500: remove mach/memory.h
ARM: mach-s5pc100: remove mach/memory.h
ARM: mach-tegra: remove mach/memory.h
ARM: plat-tcc: remove mach/memory.h
ARM: mach-mmp: remove mach/memory.h
ARM: mach-cns3xxx: remove mach/memory.h
...Fix up mostly pretty trivial conflicts in:
- arch/arm/Kconfig
- arch/arm/include/asm/localtimer.h
- arch/arm/kernel/Makefile
- arch/arm/mach-shmobile/board-ap4evb.c
- arch/arm/mach-u300/core.c
- arch/arm/mm/dma-mapping.c
- arch/arm/mm/proc-v7.S
- arch/arm/plat-omap/Kconfig
largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
14 Oct, 2011
1 commit
-
Signed-off-by: Nicolas Pitre
26 Sep, 2011
1 commit
-
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
12 Aug, 2011
3 commits
-
Rather than marking the mach/gpio.h header files which want to use the
trivial GPIOLIB implementation, mark those which do not want to use it
instead. This means that by default, you get the trivial implementation
and only have to do something extra if you need to. This should
encourage the use of the trivial default implementation.As an additional bonus, several gpio.h header files become empty.
Acked-by: H Hartley Sweeten
Tested-by: Jamie Iles
Acked-by: Kukjin Kim
Signed-off-by: Russell King -
Many of the gpio_to_irq implementations use the gpiolib version of this
function. Provide the standard gpiolib gpio_to_irq() for everyone, but
allow platforms to override it if they wish. Add the neccessary
overrides for those platforms which do not use the standard definition.Acked-by: Kukjin Kim
Signed-off-by: Russell King -
Consolidate 24 trivial gpiolib implementions out of mach/gpio.h
into asm/gpio.h. This is basically the include of asm-generic/gpio.h
and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep
as described in Documentation/gpio.txtAcked-by: H Hartley Sweeten
Tested-by: David Brown
Acked-by: David Brown
Tested-by: Linus Walleij
Acked-by: Kukjin Kim
Tested-by: Shawn Guo
Signed-off-by: Russell King
27 Jul, 2011
1 commit
-
…git/arm/linux-arm-soc
* '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_*_flagsFix up conflicts in arch/microblaze/include/asm/pci-bridge.h
21 Jul, 2011
1 commit
-
Signed-off-by: Al Viro
20 Jul, 2011
1 commit
-
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.h2) 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.hAcked-by: Viresh Kumar
Acked-by: H Hartley Sweeten
Acked-by: Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Kyungmin Park
24 May, 2011
2 commits
-
Convert SPEAr platforms 16-bit up counting clocksource, which requires
a 16-bit register access read rather than 32-bit.Acked-by: Viresh Kumar
Signed-off-by: Russell King
21 May, 2011
1 commit
-
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
Signed-off-by: Russell King
31 Mar, 2011
1 commit
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
29 Mar, 2011
2 commits
-
Use irq_set_chip_and_handler() instead. Converted with coccinelle.
Signed-off-by: Thomas Gleixner
-
Convert to the new function names. Automated with coccinelle.
Signed-off-by: Thomas Gleixner
17 Mar, 2011
1 commit
-
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
09 Mar, 2011
8 commits
-
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.hSigned-off-by: Viresh Kumar
Signed-off-by: Russell King -
Order of inclusion of .h files must be: , , ,
. This patch corrects this ordering whereever it is not followed.Signed-off-by: Viresh Kumar
Signed-off-by: Russell King -
Reviewed-by: Stanley Miao
Signed-off-by: Shiraz Hashim
Signed-off-by: Viresh Kumar
Signed-off-by: Russell King -
- 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 definitionsReviewed-by: Stanley Miao
Signed-off-by: Viresh Kumar
Signed-off-by: shiraz hashim
Signed-off-by: Rajeev Kumar
Signed-off-by: Russell King -
- Add a dummy clk_set_rate() function. This is required for compilation
of a few drivers.
- Make functions in plat-spear/clock.c more generic over all SPEAr
platforms.
- Add div_factor in struct clk for clks with .recalc = follow_parent
- Change type of register pointers to void __iomem *Reviewed-by: Stanley Miao
Signed-off-by: Viresh Kumar
Signed-off-by: Rajeev Kumar
Signed-off-by: Russell King -
Move platform specific timer initialization code is moved into platform
specific files.Reviewed-by: Jamie Iles
Reviewed-by: Stanley Miao
Signed-off-by: Shiraz Hashim
Signed-off-by: Rajeev Kumar
Signed-off-by: Viresh Kumar
Signed-off-by: Russell King -
- compile padmux only for spear3xx
- padmux initialization code rearranged in evaluation board and machine
files.Reviewed-by: Stanley Miao
Signed-off-by: Viresh Kumar
Signed-off-by: Russell King -
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
Signed-off-by: Viresh Kumar
Signed-off-by: Russell King
22 Feb, 2011
2 commits
-
readl() and writel() calls the outer cache maintainance operations
which are not available during Linux uncompression. This patch replaces
readl() and writel() with readl_relaxed() and writel_relaxed() to avoid
the link time errors.Reviewed-by: Stanley Miao
Signed-off-by: Viresh Kumar
Signed-off-by: Russell King -
This patch fixes following warning:
arch/arm/mm/init.c:606: warning: format '%08lx' expects type 'long unsigned int', but argument 12 has type 'unsigned int'by appending UL to VMALLOC_END's Number.
Reviewed-by: Stanley Miao
Signed-off-by: Viresh Kumar
Signed-off-by: Russell King
18 Feb, 2011
1 commit
-
This uncouple PHYS_OFFSET from the platform definitions, thereby
facilitating run-time computation of the physical memory offset.Acked-by: Nicolas Pitre
Acked-by: Viresh Kumar
Acked-by: H Hartley Sweeten
Acked-by: Magnus Damm
Acked-by: Tony Lindgren
Acked-by: Jean-Christophe PLAGNIOL-VILLARD
Acked-by: Wan ZongShun
Acked-by: Kukjin Kim
Acked-by: Eric Miao
Acked-by: Jiandong Zheng
Signed-off-by: Russell King
14 Jan, 2011
1 commit
-
Signed-off-by: Lennert Buytenhek
Acked-by: Viresh Kumar
08 Jan, 2011
1 commit
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits)
Input: wacom_w8001 - support pen or touch only devices
Input: wacom_w8001 - use __set_bit to set keybits
Input: bu21013_ts - fix misuse of logical operation in place of bitop
Input: i8042 - add Acer Aspire 5100 to the Dritek list
Input: wacom - add support for digitizer in Lenovo W700
Input: psmouse - disable the synaptics extension on OLPC machines
Input: psmouse - fix up Synaptics comment
Input: synaptics - ignore bogus mt packet
Input: synaptics - add multi-finger and semi-mt support
Input: synaptics - report clickpad property
input: mt: Document interface updates
Input: fix double equality sign in uevent
Input: introduce device properties
hid: egalax: Add support for Wetab (726b)
Input: include MT library as source for kerneldoc
MAINTAINERS: Update input-mt entry
hid: egalax: Add support for Samsung NB30 netbook
hid: egalax: Document the new devices in Kconfig
hid: egalax: Add support for Wetab
hid: egalax: Convert to MT slots
...Fixed up trivial conflict in drivers/input/keyboard/Kconfig
07 Jan, 2011
1 commit
-
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
23 Dec, 2010
1 commit
-
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.Acked-by: Viresh Kumar
Signed-off-by: Russell King
26 Nov, 2010
1 commit
-
factorise some generic infrastructure to assist looking up struct clks
for the ARM & SH architecture.as the code is identical at 99%
put the arch specific code for allocation as example in asm/clkdev.h
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
Acked-by: Paul Mundt
Signed-off-by: Russell King
20 Nov, 2010
1 commit
-
Signed-off-by: Rajeev Kumar
Signed-off-by: Dmitry Torokhov
20 Oct, 2010
1 commit
-
Rather than checking the MMU status in every instance of addruart, do it
once in kernel/debug.S, and change the existing addruart macros to
return both physical and virtual addresses. The main debug code can then
select the appropriate address to use.This will also allow us to retreive the address of a uart for the MMU
state that we're not current in.Updated with fixes for OMAP from Jason Wang
and Tony Lindgren , and fix for versatile express from
Lorenzo Pieralisi .Signed-off-by: Jeremy Kerr
Signed-off-by: Lorenzo Pieralisi
Signed-off-by: Jason Wang
Signed-off-by: Tony Lindgren
Tested-by: Kevin Hilman
