aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/spitz.c
Commit message (Collapse)AuthorAge
* Merge branch 'devel' of ↵Russell King2011-03-26
|\ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable Conflicts: arch/arm/mach-pxa/tosa.c
| * ARM: pxa: clean up set_pxa_fb_infoRussell King - ARM Linux2011-03-16
| | | | | | | | | | | | | | | | | | | | set_pxa_fb_info() has been a long-standing wart in the naming scheme of the pxa_set_xxx_info() functions. This renames the function, and combines set_pxa_fb_parent() with set_pxa_fb_info(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | ARM: pxa2xx: reorganize I2C filesSebastian Andrzej Siewior2011-03-21
|/ | | | | | | | | | | | | | | | | This patch moves the platform data definition from arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so it can be accessed from x86 the same way as on ARM. This change should make no functional change to the PXA code. The move is verified by building the following defconfigs: cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig pxa910_defconfig Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: pxa: fix building issue of missing physmap.hEric Miao2011-01-15
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-01-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits) spi/omap: Fix DMA API usage in OMAP MCSPI driver spi/imx: correct the test on platform_get_irq() return value spi/topcliff: Typo fix threhold to threshold spi/dw_spi Typo change diable to disable. spi/fsl_espi: change the read behaviour of the SPIRF spi/mpc52xx-psc-spi: move probe/remove to proper sections spi/dw_spi: add DMA support spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs spi/dw_spi: Fix too short timeout in spi polling loop spi/pl022: convert running variable spi/pl022: convert busy flag to a bool spi/pl022: pass the returned sglen to the DMA engine spi/pl022: map the buffers on the DMA engine spi/topcliff_pch: Fix data transfer issue spi/imx: remove autodetection spi/pxa2xx: pass of_node to spi device and set a parent device spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes. spi/pxa2xx: Add chipselect support for Sodaville spi/pxa2xx: Consider CE4100's FIFO depth spi/pxa2xx: Add CE4100 support ...
| * arm/pxa2xx: reorgazine SSP and SPI header filesSebastian Andrzej Siewior2010-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PXA-SPI driver relies on some files / defines which are arm specific and are within the ARM tree. The CE4100 SoC which is x86 has also the SPI core. This patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to include/linux where the CE4100 can access them. This move got verified by building the following defconfigs: cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig raumfeld_defconfig magician_defconfig Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
* | ARM: pxa: Access SMEMC via virtual addressesMarek Vasut2010-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | This is important because on PXA3xx, the physical mapping of SMEMC registers differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx and PXA320, the PCMCIA driver was adjusted accordingly as well. Also, various places in the kernel had to be patched to use __raw_read/__raw_write. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io()Marek Vasut2010-12-16
|/ | | | | | | | | | | This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish between PXA25x/PXA27x and PXA3xx memory mapping. Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io() and pxa3xx_map_io() is included. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-20
| | | | | | | | | | | | | | | 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>
* Merge branch 'devel' of ↵Russell King2010-08-06
|\ | | | | | | | | | | | | | | 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/spitz: Formating and naming fixesMarek Vasut2010-08-05
| | | | | | | | | | | | | | 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-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: removed mostly unused and confusing two sharpsl.hEric Miao2010-08-05
| | | | | | | | | | | | 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/spitz: remove unused declarationsEric Miao2010-08-05
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | ARM: Remove DISCONTIGMEM supportRussell King2010-07-16
|/ | | | | | | Everything should now be using sparsemem rather than discontigmem, so remove the code supporting discontigmem from ARM. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] pxa/spitz: Correctly register WM8750Marek Vasut2010-05-31
| | | | | | | | This patch registers the WM8750 codec on a proper place on the SPITZ machine after the WM8750 driver was converted to new API. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecondEric Miao2010-05-11
| | | | | | | | | | | | | | | | | delay_detect in HZ is confusing, convert it to be millisecond based. And thus remove those unnecessary call to msecs_to_jiffies() at runtime for this field. Other constants are converted assuming HZ == 100, which are basically true for those platforms. The assignment in csb726.c was incorrect, and is fixed in this patch as a result. Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Marc Zyngier <maz@misterjones.org> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Daniel Mack <daniel@caiaq.de>
* [ARM] pxa/spitz: use generic GPIO API and remove pxa_gpio_mode()Eric Miao2010-05-11
| | | | | | | | REVISIT: change to GPIO18 is ugly, need to make sure whether that's really necessary - GPIO18_RDY as an VLIO input signal - we don't normally need to do such kind of trick during low power mode. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/spitz: fix On/off key name to fix warning during bootPavel Machek2010-05-05
| | | | | | | On/Off contains slash in the name, which causes warning during boot. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa: simplify the LCD pin configuration for pxa27x platformsEric Miao2010-03-01
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa: fix strange characters in zaurus gpio .descCyril Hrubis2010-01-07
| | | | | | | | | 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>
* Merge branch 'devel-stable' into develRussell King2009-12-05
|\
| * [ARM] pxa: allow platforms to control which uarts are registeredRussell King2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some platforms, it is inappropriate to register all PXA UARTs. In some cases, the UARTs may not be used, and in others we may want to avoid registering the UARTs to allow other drivers (eg, FICP) to make use of the UART. In addition, a while back there was a request to be able to pass platform data to the UART driver. This patch enables all of this by providing functions platforms can call to register each individual UART. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | [ARM] pxa/spitz: fix compile regression on spitzPavel Machek2009-11-22
|/ | | | | | | | | If CONFIG_AKITA is not set, spitz fails to compile. It worked ok in rc5. Fix is one more ifdef... 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/zaurus: fix NAND flash OOB layout for BorzoiStanislav Brabec2009-11-02
| | | | | | | | | | | | | | | | | Borzoi, Terrier and Akita use the same NAND Flash OOB layout, which seems to be different from Spitz for some reason. Here is a fix. When the code was ported to the platform data, the map was applied just for Akita. After this patch, Flash works again on Borzoi. Terrier still has a problem with partition table different from Borzoi (unfixable without reading of the system configuration in flash) and JFFS2 partitions can be mounted (with some "Empty flash at ... ends at ..." in the syslog). Signed-off-by: Stanislav Brabec <utx@penguin.cz> Acked-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/spitz: add gpio button support (fixes regression)Stanislav Brabec2009-10-17
| | | | | | | | | | | | | | | | | | | | | | | | Updating desc for lid keys and resending patch with proper comments: Define Spitz buttons as GPIO keys in a way compatible with the old driver: On/Off: As Suspend EV_PWR key Raw values of lid sensors SWA and SWB: As EV_SW switches SWA: Display Down SWB: Lid Closed Recommended user space decoding: SWA==0 & SWB==0: lid opened (landscape mode) SWA==1 & SWB==0: invalid (or mechanic race condition) SWA==0 & SWB==1: lid closed with display up (portrait mode or mechanic race condition while closing to display-less mode) SWA==1 & SWB==1: lid closed with display down (display-less mode) AK_INT remote trigger is not mapped as input event. Without complete remote driver and remote pull-up control it has no useful interpretation. Signed-off-by: Stanislav Brabec <utx@penguin.cz> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* Merge branch 'master' into for-linusRussell King2009-09-22
|\
| * ARM: spitz: fix touchscreen max presurePavel Machek2009-09-19
| | | | | | | | | | | | | | | | | | | | | | This fixes max_pressure for spitz's touchscreen, and is requirement for getting reasonable pressure numbers from touchscreen driver. Signed-off-by: Pavel Machek <pavel@ucw.cz> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.cMarek Vasut2009-09-10
| | | | | | | | | | | | | | and convert PXA-based devices to gpio_pwdown where possible. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | [ARM] pxa/spitz: make use of GPIO based matrix keypad driverEric Miao2009-09-10
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | [ARM] pxa: factor pxamci gpio handlingRobert Jarzmik2009-09-10
|/ | | | | | | | | | | | | | | | | | | | | Several boards use always the same pattern with pxamci : request gpio, request irq for that gpio to detect MMC card insertion, request gpio for read-only mode detection, etc ... Now that pxamci provides platform_data to describe simple gpio management of the MMC external controls, use it. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Cc: rpurdie@rpsys.net Cc: drwyrm@gmail.com Cc: sakoman@gmail.com Cc: marek.vasut@gmail.com Cc: s.hauer@pengutronix.de Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] pxa/spitz: drop unused header files from spitz.cDmitry Eremin-Solenikov2009-06-04
| | | | | Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] pxa: update pxa2xx_spi_chip initialization to use .gpio_cs fieldMike Rapoport2009-06-04
| | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] pxa: move mach/i2c.h to plat/i2c.hEric Miao2009-06-04
| | | | | Signed-off-by: Paul Shen <paul.shen@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] pxa/spitz: provide spitz_ohci_exit() that unregisters USB_HOST GPIODmitry Eremin-Solenikov2009-05-18
| | | | | | | | | Currently spitz_ohci_init() that requests GPIO doesn't have corresponding spitz_ohci_exit() which will gpio_free(). This causes minor problems e.g. during resume when the OHCI device can't be resumed. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] pxa: allow gpio_reset drive high during normal workDaniel Ribeiro2009-05-18
| | | | | | | | | I want to reuse tosa/spitz gpio_reset code, but my board needs the reset gpio to be driven high during normal operation. Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] pxa: make ads7846 on corgi and spitz to sync on HSYNCEric Miao2009-04-26
| | | | Signed-off-by: Eric Miao <eric.miao@marvell.com>
* Merge branch 'origin' into develRussell King2009-03-28
|\ | | | | | | | | Conflicts: sound/soc/pxa/pxa2xx-i2s.c
| * pxa/spitz: Setup I2S pins for pxa2xx-i2sPhilipp Zabel2009-02-08
| | | | | | | | | | | | | | | | | | The spitz has a WM8750 codec connected as I2S slave but doesn't use the PXA I2S system clock. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | [ARM] pass reboot command line to arch_reset()Russell King2009-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP wishes to pass state to the boot loader upon reboot in order to instruct it whether to wait for USB-based reflashing or not. There is already a facility to do this via the reboot() syscall, except we ignore the string passed to machine_restart(). This patch fixes things to pass this string to arch_reset(). This means that we keep the reboot mode limited to telling the kernel _how_ to perform the reboot which should be independent of what we request the boot loader to do. Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usageEric Miao2009-03-09
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Considering the header mess ATM, it is not always possible to include the correct header files within board code. Let's keep this simple: <mach/pxa25x.h> - for pxa25x based platforms <mach/pxa27x.h> - for pxa27x based platforms <mach/pxa300.h> - for pxa300 based platforms <mach/pxa320.h> - for pxa320 based platforms <mach/pxa930.h> - for pxa930 based platforms NOTE: 1. one header one board file, they are not compatible (i.e. they have conflicting definitions which won't compile if included together). 2. Unless strictly necessary, the following header files are considered to be SoC files use _only_, and is not recommended to be included in board code: <mach/hardware.h> <mach/pxa-regs.h> <mach/pxa2xx-regs.h> <mach/pxa3xx-regs.h> <mach/mfp.h> <mach/mfp-pxa2xx.h> <mach/mfp-pxa25x.h> <mach/mfp-pxa27x.h> <mach/mfp-pxa3xx.h> <mach/mfp-pxa300.h> <mach/mfp-pxa320.h> <mach/mfp-pxa930.h> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* Merge branch 'master' of ↵David Woodhouse2009-01-05
|\ | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/poodle.c arch/arm/mach-pxa/spitz.c
| * [ARM] pxa/spitz: add physmap mapping for ROMDmitry Baryshkov2008-12-02
| | | | | | | | | | | | | | Add mapping for system ROM using physmap-flash mapping. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: move I2C pin configurations out into board specific filesEric Miao2008-12-02
| | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | Merge branch 'misc/mtd/sharpsl-nand' of ↵David Woodhouse2008-12-10
|\ \ | |/ |/| | | git://git.kernel.org/pub/scm/linux/kernel/git/lumag/tosa-2.6
| * [MTD] sharpsl-nand: move registration to board codeDmitry Baryshkov2008-10-29
| | | | | | | | | | | | | | Finally move registration of sharpsl-nand device to board-specific code. sharpsl nand driver is now clean and simple. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
* | [ARM] pxa: fix incorrect PCMCIA PSKTSEL pin configuration for spitzEric Miao2008-11-16
| | | | | | | | | | | | | | | | | | The original incorrect configuration caused GPIO79_nCS_3 being overriden, thus resulted in the NAND flash not being detected. The real PSKTSEL pin is on GPIO104 instead of GPIO79. Signed-off-by: Eric Miao <eric.miao@marvell.com> Cc: Richard Purdie <rpurdie@rpsys.net>
* | [ARM] pxa: fix I2C controller device being registered twice on AkitaEric Miao2008-11-16
| | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Cc: Richard Purdie <rpurdie@rpsys.net>
* | [ARM] pxa/spitz: fix spi cs on spitzDmitry Baryshkov2008-10-28
|/ | | | | | | On spitz configure SPI CS GPIOs as outputs to unbreak spi chip selection. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] 5300/1: fixup spitz reset during bootDmitry Baryshkov2008-10-11
| | | | | | | | | | Some machines don't have the pullup/down on their reset pin, so configuring the reset generating pin as input makes them reset immediately. Fix that by making reset pin direction configurable. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-19 11:23:45 -0500