summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-03-0110-22/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits) ARM: Eliminate decompressor -Dstatic= PIC hack ARM: 5958/1: ARM: U300: fix inverted clk round rate ARM: 5956/1: misplaced parentheses ARM: 5955/1: ep93xx: move timer defines into core.c and document ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c ARM: 5953/1: ep93xx: fix broken build of clock.c ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig ARM: 5949/1: NUC900 add gpio virtual memory map ARM: 5948/1: Enable timer0 to time4 clock support for nuc910 ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk ARM: make_coherent(): fix problems with highpte, part 2 MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself ARM: 5945/1: ep93xx: include correct irq.h in core.c ARM: 5933/1: amba-pl011: support hardware flow control ARM: 5930/1: Add PKMAP area description to memory.txt. ARM: 5929/1: Add checks to detect overlap of memory regions. ARM: 5928/1: Change type of VMALLOC_END to unsigned long. ARM: 5927/1: Make delimiters of DMA area globally visibly. ARM: 5926/1: Add "Virtual kernel memory..." printout. ARM: 5920/1: OMAP4: Enable L2 Cache ... Fix up trivial conflict in arch/arm/mach-mx25/clock.c
| * Merge branches 'clks' and 'pnx' into develRussell King2010-02-258-20/+8
| |\
| | * ARM: Consolidate clks_register() and similarRussell King2010-02-128-20/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most machine classes want some way to register a block of clk_lookup structures, and most do it by implementing a clks_register() type function which walks an array, or by open-coding a loop. Consolidate all this into clkdev_add_table(). Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | Merge branch 'misc2' into develRussell King2010-02-251-1/+1
| |\ \
| | * | ARM: 5928/1: Change type of VMALLOC_END to unsigned long.Fenkart/Bostandzhyan2010-02-151-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | Makes it consistent with VMALLOC_START Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | ARM: 5910/1: ARM: Add tmp register for addruart and loadspTony Lindgren2010-02-121-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise more complicated uart configuration won't be possible. We can use r1 for tmp register for both head.S and debug.S. NOTE: This patch depends on another patch to add the the tmp register into all debug-macro.S files. That can be done with: $ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/" arch/arm/*/include/*/debug-macro.S Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | pxa_camera: remove init() callbackAntonio Ospite2010-02-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or even to request GPIOs to be used by the camera *sensor*. These initializations can be performed statically in machine init functions. The current semantics for this init() callback is ambiguous anyways, it is invoked in pxa_camera_activate(), hence at device node open, but its users use it like a generic initialization to be done at module init time (configure MFP, request GPIOs for *sensor* control). Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
* | [ARM] pxa: fix irq suspend/resume for pxa25xEric Miao2010-01-131-4/+10
| | | | | | | | | | | | | | PXA25x does not have IPR registers, saving and restoring should happen only for pxa27x and pxa3xx. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | [ARM] pxa: fix the incorrect naming of AC97 reset pin config for pxa26xEric Miao2010-01-131-2/+4
| | | | | | | | | | | | | | GPIO89_AC97_nRESET is really a PXA26x specific option and was incorrectly named. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | [ARM] pxa/corgi: fix incorrect default GPIO for UDC VbusEric Miao2010-01-131-0/+1
|/ | | | | | | There is no such GPIO for udc vbus sensing, put '-1' instead of default '0' as '0' does mean a valid GPIO. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa: fix strange characters in zaurus gpio .descCyril Hrubis2010-01-081-2/+2
| | | | | | | | | Somehow, strange characters made their way zaurus gpio .desc fields. Fix it. Signed-off-by: Pavel Machek <pavel@ucw.cz> Acked-by: Stanislav Brabec <utx@penguin.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa: fix compiler warnings of unused variable 'id' in cpu_is_pxa9*()Eric Miao2010-01-041-6/+3
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *'Eric Miao2010-01-049-9/+9
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/poodle: fix incorrect 'gpio_card_detect' of MMCEric Miao2009-12-291-1/+1
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slotHaojian Zhuang2009-12-294-94/+16
| | | | | | | | PXA mmc host driver supports card detect, read only and power gpio pin setting already. Zylonite platform driver needn't implement this any more. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/zeus: provide power-source information when APM is enabledMarc Zyngier2009-12-291-0/+21
| | | | | Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/zeus: relax memory timings on Zeus ethernet portsMarc Zyngier2009-12-291-1/+10
| | | | | | | | DM9000s on Zeus sometime fail under heavy load. Relaxing the timings a bit seems to be of a great help. Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/zeus: make internal zeus_get_pcb_info staticMarc Zyngier2009-12-291-2/+2
| | | | | Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/littleton: select CPU_PXA300 and CPU_PXA310Marek Vasut2009-12-291-0/+2
| | | | | | | This has to be selected, otherwise some peripherals don't get initialized. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/littleton: add UART3 GPIO configMarek Vasut2009-12-291-0/+6
| | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa: fix no reference of cpu_is_pxa25x() in devices.cEric Miao2009-12-161-0/+1
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/cm-x300: add PWM backlight supportIgor Grinberg2009-12-162-0/+32
| | | | | | 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>
* revert "[ARM] pxa/cm-x300: add PWM backlight support"Eric Miao2009-12-163-32/+0
| | | | | | | Commit db205463fd24c0972ad2c4e4fafb1c76e51b4380 was incorrectly applied, and reverted here to re-apply. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/zeus: make Viper pcmcia support more generic to support ZeusMarc Zyngier2009-12-135-4/+65
| | | | | | | | | | | The Arcom Zeus CF slot requires the same kind of support as the Viper. To avoid code duplication, introduce a platform device that abstracts the differences. This also allows for the removal of the ugly export of viper_cf_rst(). Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/zeus: basic support for Arcom Zeus SBCMarc Zyngier2009-12-134-0/+881
| | | | | Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/em-x270: fix usb hub power up/reset sequenceIgor Grinberg2009-12-131-6/+5
| | | | | | 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>
* Merge branch 'for-linus' of ↵Linus Torvalds2009-12-096-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits) tree-wide: fix misspelling of "definition" in comments reiserfs: fix misspelling of "journaled" doc: Fix a typo in slub.txt. inotify: remove superfluous return code check hdlc: spelling fix in find_pvc() comment doc: fix regulator docs cut-and-pasteism mtd: Fix comment in Kconfig doc: Fix IRQ chip docs tree-wide: fix assorted typos all over the place drivers/ata/libata-sff.c: comment spelling fixes fix typos/grammos in Documentation/edac.txt sysctl: add missing comments fs/debugfs/inode.c: fix comment typos sgivwfb: Make use of ARRAY_SIZE. sky2: fix sky2_link_down copy/paste comment error tree-wide: fix typos "couter" -> "counter" tree-wide: fix typos "offest" -> "offset" fix kerneldoc for set_irq_msi() spidev: fix double "of of" in comment comment typo fix: sybsystem -> subsystem ...
| * Merge branch 'for-next' into for-linusJiri Kosina2009-12-076-6/+6
| |\ | | | | | | | | | | | | | | | Conflicts: kernel/irq/chip.c
| | * tree-wide: fix assorted typos all over the placeAndré Goddard Rosa2009-12-046-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That is "success", "unknown", "through", "performance", "[re|un]mapping" , "access", "default", "reasonable", "[con]currently", "temperature" , "channel", "[un]used", "application", "example","hierarchy", "therefore" , "[over|under]flow", "contiguous", "threshold", "enough" and others. Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | Merge branch 'devel-stable' into develRussell King2009-12-0567-725/+1873
|\ \ \ | |/ / |/| |
| * | [ARM] pxa/hx4700: actually use platform_lcd driverDmitry Artamonow2009-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit e2c509c7e6 ([ARM] pxa/hx4700: use platform_lcd driver) missed to actually register platform device for LCD. It causes following GCC warning: arch/arm/mach-pxa/hx4700.c:553: warning: 'hx4700_lcd' defined but not used Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Acked-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa/pcm990: don't use pxa_camera init() callbackAntonio Ospite2009-12-011-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | pxa_camera init() is ambiguous, it's better to configure PXA CIF pins statically in machine init function. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa/em-x270: don't use pxa_camera init() callbackAntonio Ospite2009-12-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | pxa_camera init() is ambiguous, it's better to statically configure the sensor. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Acked-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa/cm-x300: add PWM backlight supportIgor Grinberg2009-12-013-0/+32
| | | | | | | | | | | | | | | | | | 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>
| * | [ARM] pxa/cm-x300: update authors and copyrightIgor Grinberg2009-12-011-1/+2
| | | | | | | | | | | | | | | | | | 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>
| * | [ARM] pxa/cm-x300: add da9030 supportIgor Grinberg2009-12-011-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | Register DA9030 PMIC. Use only backlight sub-device for now. 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>
| * | [ARM] pxa/cm-x300: enable USB port 2 for PXA300Igor Grinberg2009-12-011-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Port 2 requires setting of UP2OCR register to function as USB host. 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>
| * | [ARM] pxa/cm-x300: add support for PXA310 cpuIgor Grinberg2009-12-011-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | CM-X300 can be assembled with PXA300 and PXA310 CPU. Provide support for both CPU variants. 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>
| * | [ARM] pxa/cm-x300: add Wi2Wi chip (Bluetooth and WiFi) initializationIgor Grinberg2009-12-011-0/+38
| | | | | | | | | | | | | | | | | | 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>
| * | [ARM] pxa/cm-x300: add ac97 controller registrationIgor Grinberg2009-12-011-0/+11
| | | | | | | | | | | | | | | | | | 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>
| * | [ARM] pxa/cm-x300: add TDO35S lcd supportIgor Grinberg2009-12-011-3/+57
| | | | | | | | | | | | | | | | | | 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>
| * | [ARM] pxa/cm-x300: add revision difference handlingIgor Grinberg2009-12-011-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Different revisions of CM-X300 use different pins for several functions. Make the kernel aware of it. 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>
| * | [ARM] pxa/viper: convert to use plat_serial8250_port irqflags fieldMarc Zyngier2009-12-011-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use .irqflags in the plat_serial8250_port structure to set IRQ polarity, and get rid of the corresponding set_irq_type(). Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa/ezx: add leds-lp3944 support for A910 EZX phoneAntonio Ospite2009-12-011-0/+53
| | | | | | | | | | | | | | | Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa/ezx: add camera support for A780 and A910 EZX phonesAntonio Ospite2009-12-011-4/+170
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bart Visscher <bartv@thisnet.nl> Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa/zaurus: rename spitz_battery_levels_* to sharpsl_*Pavel Machek2009-12-014-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Battery power levels are shared between spitz and corgi, rename variable to reflect it. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa/zaurus: cleanup sharpsl_pm.cPavel Machek2009-12-012-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | This fixes checkpatch/style problems in sharpsl_pm.c, allowing me to submit real fixes next. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa: rename macro from pxa9xx to pxa93xHaojian Zhuang2009-12-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Because original macro can only judge whether current CPU is pxa93x, rename the macro to correct name. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa: add EXT_WAKEUP interrupts handling for pxa3xxMike Rapoport2009-12-011-0/+42
| | | | | | | | | | | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | [ARM] pxa: make CPU_PXA* to be selectable hidden optionsEric Miao2009-12-011-29/+36
| | | | | | | | | | | | | | | | | | | | | CONFIG_CPU_PXA{300,310,320,930,935,950} are really platform dependent and should be made into selectable hidden options. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
OpenPOWER on IntegriCloud