summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2011-09-15Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux ↵Russell King14-54/+434
into devel-stable
2011-09-14ARM: zImage: prevent constant copy+rebuild of lib1funcs.SNicolas Pitre1-2/+2
The rule to copy this file doesn't have to be forced. However lib1funcs.[So] have to be listed amongst the targets. This prevents zImage from being recreated needlessly. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dave Martin <dave.martin@linaro.org> Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
2011-09-14ARM: zImage: allow supplementing appended DTB with traditional ATAG dataNicolas Pitre6-2/+184
Some old bootloaders can't be updated to a device tree capable one, yet they provide ATAGs with memory configuration, the ramdisk address, the kernel cmdline string, etc. To allow a device tree enabled kernel to be used with such bootloaders, it is necessary to convert those ATAGs into FDT properties and fold them into the DTB appended to zImage. Currently the following ATAGs are converted: ATAG_CMDLINE ATAG_MEM ATAG_INITRD2 If the corresponding information already exists in the appended DTB, it is replaced, otherwise the required node is created to hold it. The code looks for ATAGs at the location pointed by the value of r2 upon entry into the zImage code. If no ATAGs are found there, an attempt at finding ATAGs at the typical 0x100 offset from start of RAM is made. Otherwise the DTB is left unchanged. Thisstarted from an older patch from John Bonesio <bones@secretlab.ca>, with contributions from David Brown <davidb@codeaurora.org>. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dave Martin <dave.martin@linaro.org> Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
2011-09-14ARM: zImage: gather some string functions into string.cNicolas Pitre3-41/+132
This is a small subset of string functions needed by commits to come. Except for memcpy() which is unchanged from its original location, their implementation is meant to be small, and -Os is enforced to prevent gcc from doing pointless loop unrolling. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dave Martin <dave.martin@linaro.org> Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
2011-09-14ARM: zImage: make sure appended DTB doesn't get overwritten by kernel .bssNicolas Pitre2-4/+18
The appended DTB gets relocated with the decompressor code to get out of the way of the decompressed kernel. However the kernel's .bss section may be larger than the relocated code and data, and then the DTB gets overwritten. Let's make sure the relocation takes care of moving zImage far enough so no such conflict with .bss occurs. Thanks to Tony Lindgren <tony@atomide.com> for figuring out this issue. While at it, let's clean up the code a bit so that the wont_overwrite symbol is used while determining if a conflict exists, making the above change more precise as well as eliminating some ARM/THUMB alternates. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dave Martin <dave.martin@linaro.org> Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
2011-09-14ARM: zImage: Allow the appending of a device tree binaryJohn Bonesio2-3/+87
This patch provides the ability to boot using a device tree that is appended to the raw binary zImage (e.g. cat zImage <filename>.dtb > zImage_w_dtb). Signed-off-by: John Bonesio <bones@secretlab.ca> [nico: ported to latest zImage changes plus additional cleanups/improvements] Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Tony Lindgren <tony@atomide.com> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dave Martin <dave.martin@linaro.org> Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
2011-09-14ARM: zImage: ensure it is always a multiple of 64 bits in sizeNicolas Pitre1-0/+4
This is needed for proper alignment when the DTB appending feature is used. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dave Martin <dave.martin@linaro.org> Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
2011-08-28Merge branch 'pm-fixes' of ↵Linus Torvalds4-1/+6
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ARM: mach-shmobile: sh7372 LCDC1 suspend fix V2 (incremental) OMAP: omap_device: only override _noirq methods, not normal suspend/resume PM / Runtime: Correct documentation of pm_runtime_irq_safe() ARM: mach-shmobile: sh7372 LCDC1 suspend fix sh-sci / PM: Use power.irq_safe PM: Use spinlock instead of mutex in clock management functions
2011-08-27ARM: mach-shmobile: sh7372 LCDC1 suspend fix V2 (incremental)Magnus Damm1-1/+1
This patch updates the recently submitted "Associate the HDMI clock together with LCDC1 on sh7372" to V2 with the following change: - Use lcdc1_device on AP4EVB to build properly. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2011-08-27All Arch: remove linkage for sys_nfsservctl system callNeilBrown1-1/+1
The nfsservctl system call is now gone, so we should remove all linkage for it. Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-25OMAP: omap_device: only override _noirq methods, not normal suspend/resumeKevin Hilman1-1/+2
Commit c03f007a8bf0e092caeb6856a5c8a850df10b974 (OMAP: PM: omap_device: add system PM methods for PM domain handling) mistakenly used SET_SYSTEM_SLEEP_PM_OPS() when trying to configure custom methods for the PM domains noirq methods. Fix that by setting only the suspend_noirq and resume_noirq methods with custom versions. Note that all other PM domain methods (including the "normal" suspend/resume methods) are populated using USE_PLATFORM_PM_SLEEP_OPS, which configures them all to the default subsystem (platform_bus) methods. Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2011-08-25ARM: mach-shmobile: sh7372 LCDC1 suspend fixMagnus Damm3-0/+4
Associate the HDMI clock together with LCDC1 on sh7372. Without this patch Suspend-to-RAM hangs on the boards AP4EVB and Mackerel. The code hangs in the LCDC driver where the software is waiting forever for the hardware to power down. By explicitly associating the HDMI clock with LCDC1 we can make sure the HDMI clock is enabled using Runtime PM whenever the driver is accessing the hardware. This HDMI and LCDC1 dependency is documented in the sh7372 data sheet. Older kernels did work as expected but the recently merged (3.1-rc) 794d78f drivers: sh: late disabling of clocks V2 introduced code to turn off clocks lacking software reference which happens to include the HDMI clock that is needed by LCDC1 to operate as expected. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2011-08-23Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into ↵Russell King329-415/+393
devel-stable
2011-08-22ARM: Remove support for macro CONSISTENT_DMA_SIZEJon Medhurst1-4/+0
There are now no platforms which set this macro. Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
2011-08-22ARM: mach-shmobile: Setup consistent dma size at boot timeJon Medhurst6-3/+15
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> CC: Paul Mundt <lethal@linux-sh.org> CC: Magnus Damm <magnus.damm@gmail.com>
2011-08-22ARM: mach-bcmring: Setup consistent dma size at boot timeJon Medhurst2-5/+3
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> CC: Jiandong Zheng <jdzheng@broadcom.com> CC: Scott Branden <sbranden@broadcom.com>
2011-08-22ARM: mach-at91: Setup consistent dma size at boot timeJon Medhurst2-2/+2
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> Acked-by: Nicolas Ferre<nicolas.ferre@atmel.com>
2011-08-22ARM: mach-u300: Setup consistent dma size at boot timeJon Medhurst2-5/+3
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
2011-08-22ARM: mach-davinci: Setup consistent dma size at boot timeJon Medhurst2-5/+3
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> CC: Sekhar Nori <nsekhar@ti.com> CC: Kevin Hilman <khilman@ti.com>
2011-08-22ARM: mxc: Remove setting of consistent dma sizeJon Medhurst1-15/+0
All in-tree MX boards using video use memblock_* functions to get their coherent dma space for the camera. So there is no need to increase CONSISTENT_DMA_SIZE beyond the default 2MB and we can simply remove the defines which do this. Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-08-22ARM: mach-s5pv210: Setup consistent dma size at boot timeJon Medhurst2-1/+2
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> CC: Kukjin Kim <kgene.kim@samsung.com>
2011-08-22ARM: mach-s5p64x0: Setup consistent dma size at boot timeJon Medhurst2-1/+3
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> CC: Kukjin Kim <kgene.kim@samsung.com>
2011-08-22ARM: mach-s3c64xx: Setup consistent dma size at boot timeJon Medhurst2-2/+2
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> CC: Ben Dooks <ben-linux@fluff.org>
2011-08-22ARM: omap: Setup consistent dma size at boot timeJon Medhurst5-14/+12
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> CC: Tony Lindgren <tony@atomide.com>
2011-08-22ARM: Add init_consistent_dma_size()Jon Medhurst4-29/+45
This function can be called during boot to increase the size of the consistent DMA region above it's default value of 2MB. It must be called before the memory allocator is initialised, i.e. before any core_initcall. Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
2011-08-22ARM: remove boot_params from struct machine_descNicolas Pitre2-20/+0
Now that there is no more users, we can remove it from the kernel. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-prima2: convert boot_params to atag_offsetNicolas Pitre1-1/+1
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-w90x900: remove useless boot_params entriesNicolas Pitre3-3/+0
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-vt8500: convert boot_params to atag_offsetNicolas Pitre2-2/+2
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: vexpress: convert boot_params to atag_offsetNicolas Pitre1-1/+1
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-versatile: convert boot-params to atag_offsetNicolas Pitre2-2/+2
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-ux500: convert boot-params to atag_offsetNicolas Pitre2-4/+4
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-u300: convert boot_params to atag_offsetNicolas Pitre2-5/+5
Someone was smoking good stuff with CONFIG_MACH_U300_2MB_ALIGNMENT_FIX here... Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-tegra: convert boot_params to atag_offsetNicolas Pitre4-6/+6
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-tcc8k: convert boot_params to atag_offsetNicolas Pitre1-1/+1
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-spear*: convert boot_params to atag_offsetNicolas Pitre4-4/+4
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-shark: convert boot_params to atag_offsetNicolas Pitre1-1/+1
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-sa1100: convert boot_params to atag_offsetNicolas Pitre10-10/+10
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offsetNicolas Pitre6-6/+6
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-s3c64xx: convert boot_params to atag_offsetNicolas Pitre10-10/+10
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-s5p64x0: convert boot_params to atag_offsetNicolas Pitre2-2/+2
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-s3c24*: convert boot_params to atag_offsetNicolas Pitre23-26/+26
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-rpc: convert boot_params to atag_offsetNicolas Pitre1-1/+1
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-realview: convert boot_params to atag_offsetNicolas Pitre5-5/+5
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-pxa: convert boot_params to atag_offsetNicolas Pitre43-60/+60
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-pnx4008: convert boot_params to atag_offsetNicolas Pitre1-1/+1
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-orion5x: convert boot_params to atag_offsetNicolas Pitre21-23/+23
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-omap2: convert boot_params to atag_offsetNicolas Pitre27-33/+33
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-omap1: convert boot_params to atag_offsetNicolas Pitre15-15/+15
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2011-08-22ARM: mach-nuc93x: convert boot_params to atag_offsetNicolas Pitre1-1/+0
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
generated by cgit v1.2.3 (git 2.39.0) at 2025-01-28 06:04:26 +0300