Shawn Guo
c633c531f8
ARM: msm: use machine specific hook for late init
...
Cc: Daniel Walker <dwalker@fifo99.com >
Cc: Bryan Huntsman <bryanh@codeaurora.org >
Signed-off-by: Shawn Guo <shawn.guo@linaro.org >
Acked-by: David Brown <davidb@codeaurora.org >
2012-05-08 20:36:17 +08:00
David Howells
9f97da78bf
Disintegrate asm/system.h for ARM
...
Disintegrate asm/system.h for ARM.
Signed-off-by: David Howells <dhowells@redhat.com >
cc: Russell King <linux@arm.linux.org.uk >
cc: linux-arm-kernel@lists.infradead.org
2012-03-28 18:30:01 +01:00
Kay Sievers
edbaa603eb
driver-core: remove sysdev.h usage.
...
The sysdev.h file should not be needed by any in-kernel code, so remove
the .h file from these random files that seem to still want to include
it.
The sysdev code will be going away soon, so this include needs to be
removed no matter what.
Cc: Jiandong Zheng <jdzheng@broadcom.com >
Cc: Scott Branden <sbranden@broadcom.com >
Cc: Russell King <linux@arm.linux.org.uk >
Cc: Kukjin Kim <kgene.kim@samsung.com >
Cc: David Brown <davidb@codeaurora.org >
Cc: Daniel Walker <dwalker@fifo99.com >
Cc: Bryan Huntsman <bryanh@codeaurora.org >
Cc: Ben Dooks <ben-linux@fluff.org >
Cc: Wan ZongShun <mcuos.com@gmail.com >
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com >
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no >
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn >
Cc: "Venkatesh Pallipadi
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@redhat.com >
Cc: "H. Peter Anvin" <hpa@zytor.com >
Cc: Grant Likely <grant.likely@secretlab.ca >
Cc: Richard Purdie <rpurdie@rpsys.net >
Cc: Matthew Garrett <mjg@redhat.com >
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org >
2011-12-21 16:26:03 -08:00
Linus Torvalds
1fdb24e969
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/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.
2011-10-28 12:02:27 -07:00
Linus Torvalds
ca90666287
Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
...
* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm : (43 commits)
ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
ARM: 7104/1: plat-pxa: break out GPIO driver specifics
ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
ARM: 7083/1: rewrite U300 GPIO to use gpiolib
ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
ARM: 7057/1: mach-pnx4008: rename GPIO header
ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
ARM: 7043/1: mach-ixp2000: rename GPIO header
...
Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
2011-10-27 08:39:10 +02:00
Russell King
0744a3ee37
ARM: platform fixups: remove mdesc argument to fixup function
...
Get rid of the mdesc pointer in the fixup function call. No one uses
the mdesc pointer, it shouldn't be modified anyway, and we can't wrap
it, so let's remove it.
Platform files found by:
$ regexp=$(git grep -h '\.fixup.*=' arch/arm |
sed 's!.*= *\([^,]*\),* *!\1!' | sort -u |
tr '\n' '|' | sed 's,|$,,;s,|,\\|,g')
$ git grep $regexp arch/arm
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2011-10-17 09:13:41 +01:00
Nicolas Pitre
f631dd411e
ARM: mach-msm: convert boot_params to atag_offset
...
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org >
Acked-by: Arnd Bergmann <arnd@arndb.de >
2011-08-21 17:14:59 -04:00
Russell King
2f8163baad
ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h
...
Convert arch/arm includes of mach/gpio.h and asm/gpio.h to linux/gpio.h
before we start consolidating the individual platform implementations
of the gpio header files.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2011-08-08 14:27:41 +01:00
David Brown
92c260f755
Merge remote branch 'rmk/for-linus' into for-linus
...
* rmk/for-linus: (1557 commits)
ARM: 6806/1: irq: introduce entry and exit functions for chained handlers
ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas
ARM: 6747/1: P2V: Thumb2 support
ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump
ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode
ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9
ARM: 6772/1: errata: possible fault MMU translations following an ASID switch
ARM: 6776/1: mach-ux500: activate fix for errata 753970
ARM: 6794/1: SPEAr: Append UL to device address macros.
ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files
ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros
ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code
ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry
ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci
ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h
ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.
ARM: 6681/1: SPEAr: add debugfs support to clk API
ARM: 6703/1: SPEAr: update clk API support
ARM: 6679/1: SPEAr: make clk API functions more generic
ARM: 6737/1: SPEAr: formalized timer support
...
Conflicts:
arch/arm/mach-msm/board-msm7x27.c
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/board-qsd8x50.c
arch/arm/mach-msm/board-sapphire.c
arch/arm/mach-msm/include/mach/memory.h
2011-03-16 22:13:16 -07:00
Russell King
b75c178afa
ARM: P2V: avoid initializers and assembly using PHYS_OFFSET
...
As PHYS_OFFSET will be becoming a variable, we can't have it used in
initializers nor assembly code. Replace those in generic code with
a run-time initialization. Replace those in platform code using the
individual platform specific PLAT_PHYS_OFFSET.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org >
Acked-by: Tony Lindgren <tony@atomide.com >
Acked-by: Kukjin Kim <kgene.kim@samsung.com >
Acked-by: David Brown <davidb@codeaurora.org >
Acked-by: Eric Miao <eric.y.miao@gmail.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2011-02-17 23:27:30 +00:00
Stepan Moskovchenko
07a3cc4814
msm: Clean up useless ifdefs
...
Remove ifdefs that do nothing, either from having the code
between them previously removed, or from having been
accidentally added to the wrong file.
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org >
Signed-off-by: David Brown <davidb@codeaurora.org >
2011-01-28 11:28:23 -08:00
Nicolas Pitre
6451d7783b
arm: remove machine_desc.io_pg_offst and .phys_io
...
Since we're now using addruart to establish the debug mapping, we can
remove the io_pg_offst and phys_io members of struct machine_desc.
The various declarations were removed using the following script:
grep -rl MACHINE_START arch/arm | xargs \
sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'
[ Initial patch was from Jeremy Kerr, example script from Russell King ]
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org >
Acked-by: Eric Miao <eric.miao at canonical.com>
2010-10-20 00:27:46 -04:00
Daniel Walker
614ad98148
arm: msm: add board file for the HTC Sapphire device
...
This adds a basic board file without Kconfig changes.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org >
2010-05-12 09:13:32 -07:00