summaryrefslogtreecommitdiffstats
path: root/arch
AgeCommit message (Collapse)Author
2010-08-05ARM: S5P: Add System define for arch_reset()Jongpill Lee
This patch adds system define for arch_reset() using Watchdog reset. And adds IO mapping for using WDT. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5P: Changes the definition name of default UART registersKukjin Kim
This patch changes the definition name of default UCON, ULCON, and UFCON UART registers from ARCH(SoC) to Machine(Board). Because it depends on machine. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05ARM: S5P: Add PMU deviceJoonyoung Shim
This patch adds an initcall for the s5p platforms so that they register their PMU IRQs with the PMU framework in the Kernel. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-08-05Merge branch 'topic/misc' into for-linusTakashi Iwai
2010-08-05Merge branch 'topic/asoc' into for-linusTakashi Iwai
2010-08-05Merge branch 'perf/nmi' into perf/coreIngo Molnar
Conflicts: kernel/Makefile Merge reason: Add the now complete topic, fix the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-08-05[ARM] pxa/cm-x300: fix ffuart registrationIgor Grinberg
ffuart is available on cm-x300 only with pxa300. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: stable <stable@kernel.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] mmp: move declarations into SoC specific header file from common.hEric Miao
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] mmp: avoid devices.h being included multiple timesEric Miao
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] mmp: move mmp2 specific timer code to mmp2.cEric Miao
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] mmp: rename pxa_map_io() to mmp_map_io()Eric Miao
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] mmp: remove never supported .boot_params for MMPEric Miao
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa/balloon3: Add MAX1586 PMIC supportMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/balloon3: Add NAND driverMarek Vasut
The NAND support is implemented through the gen_nand driver. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/balloon3: PCF857x GPIO expander and LEDsMarek Vasut
Add supported for PCF8574A GPIO expander and LEDs attached to it. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/balloon3: PCMCIA SupportMarek Vasut
This driver adds support for the on-board CF socket. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/balloon3: Machine file cleanupMarek Vasut
Modularize components of the Balloon3 board. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/balloon3: Machine file cleanupMarek Vasut
Logically separate parts of the file that are handled by one particular driver. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/z2: Fix flash layout typoMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/spitz: Formating and naming fixesMarek Vasut
Improve formating so checkpatch passes. Also, change some function and variable names to make the naming consistent. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/spitz: Rework spitzMarek Vasut
This huge patch mostly shuffles code. The spitz.c file contained terrible mess and needed a cleanup, here it is: 1) Made every part modular, components are not built in if not selected. 2) Removed loads of preprocessor goo, mostly "#ifdef MACH_AKITA .... #endif" and similar code. The kernel size will grow by a few kb now, but the file is much more readable. 3) Reworked SD/CF power setting function and made it reentrant. 4) Add ISL6271A regulator support 5) Correctly register WM8750 Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/palm: Flip Palm LD,TX,T5,Z72 to Palm27xMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa/palm: Introduce Palm27xMarek Vasut
This contains common code for Palm LD, TX, T5, Z72, Treo680, Centro This code also adds PMIC support for all the devices, Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-05[ARM] pxa: removed mostly unused and confusing two sharpsl.hEric Miao
Only a small part of used code is moved into sharpsl_pm.h. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: use generic gpio_get_value() instead of READ_GPIO_BIT()Eric Miao
READ_GPIO_BIT() is no way generic by accessing GPIO registers directly, replace it with gpio_get_value(). Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa/corgi: remove unused declarations of corgiscoop_deviceEric Miao
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa/spitz: remove unused declarationsEric Miao
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: removing dead IDE_PXA_CFChristoph Egger
IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references for it from the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Acked-by: Juergen Schindele <schindele@nentec.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: removing dead XSCALE_CACHE_ERRATAChristoph Egger
XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all references for it from the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Cc: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: removing dead CORGI_SSP_DEPRECATEDChristoph Egger
CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all references for it from the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: removing dead ARCH_GUMSTIX_ORIGChristoph Egger
ARCH_GUMSTIX_ORIG doesn't exist in Kconfig, therefore removing all references for it from the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: removing dead BACKLIGHT_CORGIChristoph Egger
BACKLIGHT_CORGI was later renamed to BACKLIGHT_GENERIC and has not been used since then. As it's now safe to completely transition to LCD_CORGI driver, which incorprates both the LCD and backlight device. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: replacing dead SHARPSL_LOCOMO with SHARP_LOCOMOChristoph Egger
SHARP_LOCOMO doesn't exist in Kconfig, therefore replacing all references for it with SHARP_LOCOMO in the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: cpufreq-pxa2xx: fix DRI recomputation routineMarek Vasut
This patch: 1) Simpifies the DRI recomputation routine by pulling out the common code 2) Fixes a bug in PXA27x DRI recomputation caused by incorrect parenthesis Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: fix HSIO bus x24 multiplier for pxa3xxMarek Vasut
The latest PXA3xx DM has enabled 312MHz for the HSS bus, which allows x24 multiplier. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] scoop: Add CPR register bit definitionsMarek Vasut
Add bit definitions of the CPR register of the SCOOP chip into scoop.h. Also, cleanup the GPCR definitions to match coding style. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa/colibri320: Add UDC supportMarek Vasut
Add support for PXA UDC. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa/z2: Add regulator supportMarek Vasut
Register TPS65021 regulator in Zipit Z2. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: PXA_SHARPSL_DETECT_MACH_ID to include head-sharpsl.SEric Miao
With kexec-based kernel boot loader on Zaurus, the machine ID is actually correctly passed, and head-sharpsl.S is not necessary. Introduce PXA_SHARPSL_DETECT_MACH_ID, and include head-sharpsl.S only when that's explicitly enabled. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: move hidden Kconfig options to right place and vice versaEric Miao
1. TOSA related un-hidden options moved to right under MACH_TOSA 2. SHARPSL_PM related hidden options moved to the end of Kconfig Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: remove now unnecessary dma_needs_bounce()Eric Miao
With a correct dev->dma_mask before calling dmabounce_register_dev(), dma_needs_bounce() is not necessary. The sa1111, though, is a bit complicated. Until it's fully understood and fixed, dma_needs_bounce() for sa1111 is kept if CONFIG_SA1111 is enabled with no side effect (with the condition of machine_is_*) Thanks for Mike Rapoport to fix one error in the original version of the patch and get this tested. Acked-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: merge all eseries board code into eseries.cEric Miao
Cc: Ian Molton <spyro@f2s.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: move pmu device back into mach-pxa/Eric Miao
Not tested and enabled on MMP at this moment, and since the IRQ is different from mach-pxa, I'd prefer to move the PMU device back into mach-pxa/. Will introduce the PMU device to MMP once it's enabled and tested. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa/cm-x300: enable the IRQ_WAKEUP0 as wakeup source.Igor Grinberg
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: add set_type to the pxa3xx ext_wakeup irq chip.Igor Grinberg
pxa3xx cpu needs the irq type setup to be able to wakeup from low power mode on IRQ_WAKEUPx events. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: merge stargate2 and imote2 board filesJonathan Cameron
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05[ARM] pxa: fix all devices using wm97xx_batt.hMarek Vasut
This file is scheduled for removal, therefore fix all devices that use this file to use the suggested wm97xx.h and pass platform data properly. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Tomas Cech <sleep_walker@suse.cz> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-08-05Merge commit 'kumar/next' into nextBenjamin Herrenschmidt
2010-08-04Merge branch 'for-next' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits) Documentation: update broken web addresses. fix comment typo "choosed" -> "chosen" hostap:hostap_hw.c Fix typo in comment Fix spelling contorller -> controller in comments Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault fs/Kconfig: Fix typo Userpace -> Userspace Removing dead MACH_U300_BS26 drivers/infiniband: Remove unnecessary casts of private_data fs/ocfs2: Remove unnecessary casts of private_data libfc: use ARRAY_SIZE scsi: bfa: use ARRAY_SIZE drm: i915: use ARRAY_SIZE drm: drm_edid: use ARRAY_SIZE synclink: use ARRAY_SIZE block: cciss: use ARRAY_SIZE comment typo fixes: charater => character fix comment typos concerning "challenge" arm: plat-spear: fix typo in kerneldoc reiserfs: typo comment fix update email address ...
2010-08-04Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (39 commits) random: Reorder struct entropy_store to remove padding on 64bits padata: update API documentation padata: Remove padata_get_cpumask crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifier crypto: pcrypt - Rename pcrypt_instance padata: Pass the padata cpumasks to the cpumask_change_notifier chain padata: Rearrange set_cpumask functions padata: Rename padata_alloc functions crypto: pcrypt - Dont calulate a callback cpu on empty callback cpumask padata: Check for valid cpumasks padata: Allocate cpumask dependend recources in any case padata: Fix cpu index counting crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) pcrypt: Added sysfs interface to pcrypt padata: Added sysfs primitives to padata subsystem padata: Make two separate cpumasks padata: update documentation padata: simplify serialization mechanism padata: make padata_do_parallel to return zero on success padata: Handle empty padata cpumasks ...