summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
Commit message (Collapse)AuthorAgeFilesLines
* arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-2048-137/+0
| | | | | | | | | | | | | | | 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>
* arm: return both physical and virtual addresses from addruartJeremy Kerr2010-10-201-6/+4
| | | | | | | | | | | | | | | | | | | | 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 <jason77.wang@gmail.com> and Tony Lindgren <tony@atomide.com>, and fix for versatile express from Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>. Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Jason Wang <jason77.wang@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
* ARM: pxa/balloon3: Disperse MFP configMarek Vasut2010-10-091-36/+68
| | | | | | | | Move pin config to appropriate places and use it only if needed. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-By: Jonathan McDowell <noodles@earth.li> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa: reduce the scope of get_memclk_frequency_10khz()Haojian Zhuang2010-10-093-21/+1
| | | | | | | | | | | | Up to now, only pxa2xx pcmcia driver is using the API. No other device driver is using this API in PXA3xx or any other PXA silicons. Restrict the scope only on pxa2xx and remove the implementation of pxa3xx. So we can avoid oo much checking on cpuid after more pxa chips supported. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa: reduce the scope of get_clk_frequency_khz()Haojian Zhuang2010-10-092-4/+4
| | | | | | | | | | | | | | | get_clk_frequency_khz() is used in private cpufreq driver. In order to meet the change of different pxa silicons, checking cpuid is introduced in get_clk_frequency_khz(). While more pxa silicons are supported, the workload of checking cpuid is higher. So restrict the scope of get_clk_frequency_khz() on pxa2xx. Different pxa silcions use different private cpufreq driver to avoid too much checking on cpuid. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa: append tavorevb3 supportHaojian Zhuang2010-10-095-1/+149
| | | | | | | Bringup tavorevb3 development platform. UART and PMIC are enabled. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa: moved pxa27x_keypad.h to platform pxa directoryMark F. Brown2010-10-0915-73/+14
| | | | | | | | mach-mmp utilizes pxa27x_keypad code so we need to move header to platform pxa directory. Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa: fix pxa3xx-u2d crash when ULPI not usedMarek Vasut2010-10-081-0/+8
| | | | | | | | | | In case the pxa3xx-u2d driver isn't used, probing of ohci-pxa27x will cause an ugly kernel crash (NULL pointer dereference in pxa3xx_u2d_start_hc(), because struct u2d is NULL and clk_enable() call will crash the kernel, trying to access it). Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa: encode IRQ number into .nr_irqsHaojian Zhuang2010-10-0831-61/+61
| | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa/cm-x300: enable USB host port2Igor Grinberg2010-10-081-0/+77
| | | | | | 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: add U2D controller and ULPI driver for pxa3xxIgor Grinberg2010-10-087-2/+462
| | | | | | | | | | | | | | USB2.0 Device Controller (U2DC) which is found in Marvell PXA3xx. U2DC supports both High and Full speed modes. PXA320 and PXA300 U2DC supports only UTMI interface. PXA310 U2DC supports only ULPI interface and has the OTG capability. U2D Controller ULPI driver introduced in this patch supports only the PXA310 USB Host via the ULPI. 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 master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-09-274-3/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits) ARM: 6411/1: vexpress: set RAM latencies to 1 cycle for PL310 on ct-ca9x4 tile ARM: 6409/1: davinci: map sram using MT_MEMORY_NONCACHED instead of MT_DEVICE ARM: 6408/1: omap: Map only available sram memory ARM: 6407/1: mmu: Setup MT_MEMORY and MT_MEMORY_NONCACHED L1 entries ARM: pxa: remove pr_<level> uses of KERN_<level> ARM: pxa168fb: clear enable bit when not active ARM: pxa: fix cpu_is_pxa*() not expanding to zero when not configured ARM: pxa168: fix corrected reset vector ARM: pxa: Use PIO for PI2C communication on Palm27x ARM: pxa: Fix Vpac270 gpio_power for MMC ARM: 6401/1: plug a race in the alignment trap handler ARM: 6406/1: at91sam9g45: fix i2c bus speed leds: leds-ns2: fix locking ARM: dove: fix __io() definition to use bus based offset dmaengine: fix interrupt clearing for mv_xor ARM: kirkwood: Unbreak PCIe I/O port ARM: Fix build error when using KCONFIG_CONFIG ARM: 6383/1: Implement phys_mem_access_prot() to avoid attributes aliasing ARM: 6400/1: at91: fix arch_gettimeoffset fallout ARM: 6398/1: add proc info for ARM11MPCore/Cortex-A9 from ARM ...
| * ARM: pxa: remove pr_<level> uses of KERN_<level>Joe Perches2010-09-251-2/+1
| | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * ARM: pxa: fix cpu_is_pxa*() not expanding to zero when not configuredEric Miao2010-09-251-0/+12
| | | | | | | | | | | | | | | | When CONFIG_PXA3xx is not selected, cpu_is_pxa3xx() doesn't expand to zero, which in some places doesn't result in correct optimization. Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Reported-and-tested-by: Marek Vasut <marek.vasut@gmail.com>
| * ARM: pxa: Use PIO for PI2C communication on Palm27xMarek Vasut2010-09-251-1/+5
| | | | | | | | | | Original idea by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * ARM: pxa: Fix Vpac270 gpio_power for MMCMarek Vasut2010-09-251-0/+1
| | | | | | | | | | | | GPIO 0 is valid, yet this platform doesn't have any power GPIO for MMC. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
* | arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices"FUJITA Tomonori2010-09-222-1/+3
|/ | | | | | | | | | | | | | | | | | | This fixes the regression caused by the commit 6fee48cd330c68 ("dma-mapping: arm: use generic pci_set_dma_mask and pci_set_consistent_dma_mask"). ARM needs to clip the dma coherent mask for dmabounce devices. This restores the old trick. Note that strictly speaking, the DMA API doesn't allow architectures to do such but I'm not sure it's worth adding the new API to set the dma mask that allows architectures to clip it. Reported-by: Krzysztof Halasa <khc@pm.waw.pl> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* ARM: pxa: fix CI_HSYNC and CI_VSYNC MFP defines for pxa300Axel Lin2010-08-301-2/+2
| | | | | | | | | | | According to PXA3xx Processor Family Developer Manuall Vol1. section "Pin Descriptions and Control", PXA30x and PXA31x Processor Alternate Function Table shows the Alt FN 0 for GPIO51 is CI_HSYNC and for GPIO52 is CI_VSYNC. This patch fixes the MFP defines and also corrects the order of MFD defines. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa: remove __init from cpufreq_driver->init()Eric Miao2010-08-302-2/+2
| | | | | | | | This is causing section mismatches when linking, as cpufreq_driver->init() is not supposed to be in init section. Reported-by: Tomáš 'Sleep_Walker' Čech <sleep_walker@suse.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* Merge branch 'devel-stable' into develRussell King2010-08-0951-3814/+4090
|\
| * Merge branch 'devel' of ↵Russell King2010-08-0651-3814/+4090
| |\ | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable Conflicts: arch/arm/mach-pxa/palmt5.c arch/arm/mach-pxa/palmtreo.c
| | * [ARM] pxa/cm-x300: fix ffuart registrationIgor Grinberg2010-08-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa/balloon3: Add MAX1586 PMIC supportMarek Vasut2010-08-051-0/+55
| | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| | * [ARM] pxa/balloon3: Add NAND driverMarek Vasut2010-08-052-3/+176
| | | | | | | | | | | | | | | | | | The NAND support is implemented through the gen_nand driver. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| | * [ARM] pxa/balloon3: PCF857x GPIO expander and LEDsMarek Vasut2010-08-052-3/+92
| | | | | | | | | | | | | | | | | | Add supported for PCF8574A GPIO expander and LEDs attached to it. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| | * [ARM] pxa/balloon3: PCMCIA SupportMarek Vasut2010-08-052-18/+31
| | | | | | | | | | | | | | | | | | This driver adds support for the on-board CF socket. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| | * [ARM] pxa/balloon3: Machine file cleanupMarek Vasut2010-08-051-123/+231
| | | | | | | | | | | | | | | | | | Modularize components of the Balloon3 board. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| | * [ARM] pxa/balloon3: Machine file cleanupMarek Vasut2010-08-051-99/+126
| | | | | | | | | | | | | | | | | | Logically separate parts of the file that are handled by one particular driver. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| | * [ARM] pxa/z2: Fix flash layout typoMarek Vasut2010-08-051-1/+1
| | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| | * [ARM] pxa/spitz: Formating and naming fixesMarek Vasut2010-08-051-144/+138
| | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa/spitz: Rework spitzMarek Vasut2010-08-052-169/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa/palm: Flip Palm LD,TX,T5,Z72 to Palm27xMarek Vasut2010-08-056-1280/+214
| | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| | * [ARM] pxa/palm: Introduce Palm27xMarek Vasut2010-08-054-0/+562
| | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: removed mostly unused and confusing two sharpsl.hEric Miao2010-08-059-73/+13
| | | | | | | | | | | | | | | | | | Only a small part of used code is moved into sharpsl_pm.h. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * [ARM] pxa: use generic gpio_get_value() instead of READ_GPIO_BIT()Eric Miao2010-08-052-6/+6
| | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa/corgi: remove unused declarations of corgiscoop_deviceEric Miao2010-08-052-7/+0
| | | | | | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * [ARM] pxa/spitz: remove unused declarationsEric Miao2010-08-052-11/+0
| | | | | | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * [ARM] pxa: removing dead IDE_PXA_CFChristoph Egger2010-08-051-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: removing dead XSCALE_CACHE_ERRATAChristoph Egger2010-08-051-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: removing dead CORGI_SSP_DEPRECATEDChristoph Egger2010-08-052-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: removing dead ARCH_GUMSTIX_ORIGChristoph Egger2010-08-051-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: removing dead BACKLIGHT_CORGIChristoph Egger2010-08-053-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: cpufreq-pxa2xx: fix DRI recomputation routineMarek Vasut2010-08-051-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: fix HSIO bus x24 multiplier for pxa3xxMarek Vasut2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa/colibri320: Add UDC supportMarek Vasut2010-08-051-0/+40
| | | | | | | | | | | | | | | | | | | | | Add support for PXA UDC. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * [ARM] pxa/z2: Add regulator supportMarek Vasut2010-08-051-0/+71
| | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: PXA_SHARPSL_DETECT_MACH_ID to include head-sharpsl.SEric Miao2010-08-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: move hidden Kconfig options to right place and vice versaEric Miao2010-08-051-29/+28
| | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: merge all eseries board code into eseries.cEric Miao2010-08-058-998/+809
| | | | | | | | | | | | | | | Cc: Ian Molton <spyro@f2s.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * [ARM] pxa: move pmu device back into mach-pxa/Eric Miao2010-08-055-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
OpenPOWER on IntegriCloud