summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im into develRussell King2008-12-159-9/+380
|\
| * [ARM] pxa: Add multi-io support for e-seriesIan Molton2008-12-159-8/+320
| | | | | | | | | | | | | | | | | | This patchset provides support for the TMIO based IO controller used in the Toshiba e-series PDAs. Signed-off-by: Ian Molton <spyro@f2s.com> Acked-by: Samuel Ortiz <sameo@openedhand.com> Acked-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: e740 MFP fixIan Molton2008-11-291-0/+4
| | | | | | | | | | | | Add the USB pins to the e740 MFP table. Signed-off-by: Ian Molton <spyro@f2s.com>
| * [ARM] IrDA support for e7xxIan Molton2008-11-295-1/+56
| | | | | | | | | | | | | | This patchset provides a fully functional SIR IrDA driver for the Toshiba e7xx PDAs. Signed-off-by: Ian Molton <spyro@f2s.com>
* | [ARM] move asm/xip.h's mach/hardware.h include to mach/xip.hRussell King2008-12-143-1/+3
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] eliminate NULL test and memset after alloc_bootmemJulia Lawall2008-12-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\|alloc_bootmem_node\|alloc_bootmem_low_pages_node\|alloc_bootmem_pages_node\)(...) ... when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\|alloc_bootmem_node\|alloc_bootmem_low_pages_node\|alloc_bootmem_pages_node\)(...) ... when != E - memset(E,0,E1); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] pcm037: add 1wire supportSascha Hauer2008-12-141-0/+3
| | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] MX2 pcm038: add 1-wire master supportSascha Hauer2008-12-141-0/+2
| | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] MX31: add w1 platform_device and resourcesSascha Hauer2008-12-142-0/+16
| | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] MX2: Add W1 device/resourcesSascha Hauer2008-12-142-1/+16
| | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] DSM320: Update KS8695 defconfig to include DSM320Daniel Silverstone2008-12-141-282/+425
| | | | | | | | | | | | | | | | | | Update the KS8695 defconfig to bring it up to modern config standards and include the DSM320 and appropriate drivers for the DSM320 (E.g. prism54). Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] DSM320: Add support for the DSM320Daniel Silverstone2008-12-143-0/+138
| | | | | | | | | | | | | | | | Add support for the D-Link DSM-320 Wireless Media Player which is based on the Micrel KS8695 SoC. Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] KS8695: Add GPIO to IRQ mapping functionBen Dooks2008-12-142-8/+3
| | | | | | | | | | | | | | Use the GPIOlib .to_irq call to map KS8695 GPIOs to the relevant IRQ line. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] KS8695: Fixup the KS8695 GPIO to be GPIOLIBDaniel Silverstone2008-12-144-43/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is as small a change as possible to the KS8695 GPIO layer to use GPIOLIB to allow the generic GPIO expanders and the like to be compiled. As a side-effect, we also remove __init_or_module from several functions which could be called by drivers such as i2c-gpio which could plausibly be compiled into a non-modular kernel. Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk> Signed-off-by: Vincent Sanders <vince@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] KS8695: Fix up device registration.Daniel Silverstone2008-12-141-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The KS8695 device.c provides registration functionality for the KS8695's various devices such as watchdog timers and ethernet devices. Rather than predicating those on the config options for the drivers, always register the platform devices so that a later built module can hook on. Also, the ethernet used to register virtual addresses in the platform data. This is wrong and so this patch changes them to physical addresses and also passes in the appropriate physical region for the PHY or Switch as appropriate. Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | Merge git://git.marvell.com/orion into develRussell King2008-12-1314-143/+602
|\ \
| * | [ARM] Kirkwood: update defconfigNicolas Pitre2008-12-111-90/+239
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | [ARM] Feroceon: pass proper -mtune argument to gccNicolas Pitre2008-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Compilation for the Feroceon core should use -mtune=marvell-f. This is available in Code Sourcery's 2008Q3 release at the moment. Otherwise fall back to -mtune-=xscale. Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | [ARM] Kirkwood: properly handle the WAN port on newer RD88F6281 boardsRonen Shitrit2008-12-111-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On newer versions of the RD88F6281 board, the WAN port is connected to its own ethernet port on the CPU, via a separate PHY, whereas on older versions of the board, it is connected to one of the PHYs in the ethernet switch. In the RD8F6281 setup code, detect which version of the board we are running on, and instantiate the ethernet ports and switch driver accordingly. Signed-off-by: Ronen Shitrit <rshitrit@marvell.com> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | [ARM] Kirkwood: allow instantiating the second ethernet portRonen Shitrit2008-12-113-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 88f6192 and 88f6281 Kirkwood SoCs support two ethernet ports. Add the platform glue that will allow board support files to instantiate the second ethernet port. Signed-off-by: Ronen Shitrit <rshitrit@marvell.com> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | [ARM] DNS323: Initialise 88F5182 correctlyMatt Palmer2008-12-111-4/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 88F5182 found in the DNS-323 rev B1 (and some other devices, such as the CH3SNAS) require different initialisation of the SATA controller and MPP registers. Tested on a DNS-323 rev B1. Signed-off-by: Matt Palmer <mpalmer@hezmatt.org>
| * | [ARM] DNS323: Read MAC address from flashMatt Palmer2008-12-111-16/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | Based on similar code from the tsx09 series of machines, just rips the MAC address out of flash and stuffs it into the NIC. Tested on a DNS323 rev B1. It's possible (though unlikely) that an A1 will have the MAC in a different location in flash. Signed-off-by: Matt Palmer <mpalmer@hezmatt.org>
| * | [ARM] Orion: add the option to support different ehci phy initializationRonen Shitrit2008-12-044-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Orion ehci driver serves the Orion, kirkwood and DD Soc families. Since each of those integrate a different USB phy we should have the ability to use few initialization sequences or to leave the boot loader phy settings as is. Signed-off-by: Ronen Shitrit <rshitrit@marvell.com>
| * | spi: fix spi_s3c24xx_gpio num_chipselectBen Dooks2008-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spi master driver must have num_chipselect set to allow the bus to initialise. Pass this through the platform data. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | Merge branch 'for-rmk' of ↵Russell King2008-11-273-33/+120
| |\ \ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
| | * | [ARM] pxa/palmtx: misc fixes to use generic GPIO APIMarek Vasut2008-11-271-32/+118
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| | * | [ARM] pxa/corgi: update default config to exclude tosa from being builtEric Miao2008-11-261-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com>
| | * | [ARM] pxa/pcm990: use negative number for an invalid GPIO in camera dataGuennadi Liakhovetski2008-11-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0 is a valid GPIO number, use a negative number to specify, that this camera doesn't have a GPIO for bus-width switching. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | | | [ARM] fix xm_x2xx_defconfig build errorsRussell King2008-12-132-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/built-in.o: In function `pci_set_consistent_dma_mask': hid-quirks.c:(.text+0x2664): multiple definition of `pci_set_consistent_dma_mask' drivers/built-in.o: In function `pci_set_dma_mask': hid-quirks.c:(.text+0x42c4): multiple definition of `pci_set_dma_mask' because drivers/pci/pci.c was not seeing the definition disabling these functions. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [ARM] 5343/1: ep93xx: include linux/i2c.hHartley Sweeten2008-12-1311-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include <linux/i2c.h> in all ep93xx platforms. Patch "5311/1: add core support for built in i2c bus" will cause build errors due to the following in arch/arm/mach-ep93xx/include/mach/platform.h: +void ep93xx_register_i2c(struct i2c_board_info *devices, int num); The i2c.h header needs to be included in order to define struct i2c_board_info. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [ARM] 5342/1: ep93xx: platform init cleanupHartley Sweeten2008-12-1310-83/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use EP93XX_*_PHYS_BASE and SZ_* defines in ep93xx platform inits. The following patch changes the flash memory hard-coded resource addresses and MACHINE_START boot_params to EP93XX_*_PHYS_BASE and SZ_* defines to improve readability. Also some minor whitespace cleanup resulting from previous patches. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [ARM] 5337/1: gumstix: move am200 specific gpio pins into am200epd.Jaya Kumar2008-12-132-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gpio setup for AM200 specific GPIO pins should be done in the AM200 code rather than in generic gumstix code. Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [ARM] dma: correct dma_supported() implementationRussell King2008-12-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dma_supported() is supposed to indicate whether the system can support the DMA mask it was passed, which depends on the maximal address which can be returned for DMA allocations. If the mask is smaller than that, we are unable to guarantee that the driver can reliably obtain suitable memory. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [ARM] netwinder: clean up GPIO namingRussell King2008-12-1311-35/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Netwinder was using gpio_xxx names which could clash with the GPIO layer. Add a 'nw_' prefix to ensure that these remain separate. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [ARM] 5338/1: Add Nuvoton W90P910 Platform supportwanzongshun2008-12-0323-0/+986
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Nuvoton W90X900 ARM9 plat support to linux arm tree, Now, this patch include only W90P910 EVB of W90P910 CPU, Its driver is nothing. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | Merge branch 'for-rmk' of ↵Russell King2008-12-0240-766/+2199
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel Conflicts: arch/arm/mach-pxa/pxa25x.c
| * | | | [ARM] pxa: add basic support for HP iPAQ h5000Anton Vorontsov2008-12-025-0/+1314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds HP iPAQ h5000's (h5400, h5500) basic definitions. Kernel will able to boot, work via serial console, mount filesystems placed on flashes and run USB gadgets (g_ether by default). Other device drivers (frame buffer, LCD, touchscreen, backlight, bluetooth, w1/battery, ...) are depend on SAMCOP and MediaQ SoCs/MFDs, drivers to which will be submitted too, after massive cleanups. This machine will be used as "real user" for these new drivers. This is an updated version of the patch, which contains fixes proposed on linux-arm-kernel mailing list. Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> Signed-off-by: Milan Plzik <milan.plzik@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | | [ARM] pxa/poodle: add physmap mapping for ROMDmitry Baryshkov2008-12-021-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/corgi: add physmap mapping for ROMDmitry Baryshkov2008-12-021-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/spitz: add physmap mapping for ROMDmitry Baryshkov2008-12-021-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/tosa: add physmap mapping for ROMDmitry Baryshkov2008-12-021-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/tosa: fix building w/o TC6393XB driverDmitry Baryshkov2008-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | | [ARM] pxa/tosa: support tc6393xb/tmiofb.Dmitry Baryshkov2008-12-021-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add platform data necessary to support tmiofb on tosa. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | | [ARM] pxa/MioA701: improve power supply sourcesRobert Jarzmik2008-12-021-116/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take advantage of the newly created wm97xx battery driver and remove useless code in mioa701 board code. Add also the ac connection detect capability after the matching gpio was discovered. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | | [ARM] pxa/MioA701: discovered new gpio definitions.Robert Jarzmik2008-12-022-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The charger enable gpio is straight (1 means draw from USB Vbus, 0 mean do not draw). The USB Vbus sensing is inverted (1 means no Vbus voltage sensed, 0 means Vbus voltage present). Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | | [ARM] pxa/MioA701: change reset function to preserve RTC.Robert Jarzmik2008-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the halt and reboot method from gpio based to "jump to ROM IPL beginning". This gives control back to IPL, which without PowerOn key pressed, will put the device into deep sleep until PowerOn is pressed for 1 second. But this has the benefit of keeping the RTC registers across reboots, which is good for OS change. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | | [ARM] pxa/MioA701: add camera support for Mio A701 board.Robert Jarzmik2008-12-021-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GPIO configuration and platform specific declarations to make Mitac Mio A701 camera chip work. The chip is a Micron MT9M111 CMOS sensor, based on PXA QIF interface and I2C bus for sensor control. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | | [ARM] pxa/MioA701: remove KConfig leds driver requirementRobert Jarzmik2008-12-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since mioa701 board has migrated to the mfp architecture, low power gpio setup is now correctly handled even when gpio led driver is not loaded, and leds and vibrator don't stay activated in suspend mode (especially vibrator). Remove the not needed anymore dependency. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | | [ARM] pxa: add resources for incoming rtc-pxa driverRobert Jarzmik2008-12-025-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add IO memory and IRQ ressources for pxa based SoC to be able to use the new rtc-pxa driver. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | | [ARM] pxa: cpufreq-pxa2xx: sdram_rows detection supportPhilipp Zabel2008-12-022-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements Eric Miao's idea to detect the correct value of sdram_rows by inspecting the MDCNFG register settings. It is only tested on two pxa27x devices with 64MB RAM (magician and hx4700) so far. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
OpenPOWER on IntegriCloud