summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-04-1736-2470/+2142
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: (48 commits) [ARM] S3C24XX: ADC: Check pending queue before freeing adc client [ARM] S3C: Fix ADC driver sparse warning [ARM] Osiris: Fix double initialisation in machine block [ARM] Anubis: Fix sparse warnings for items that should be static [ARM] JIVE: Fix sparse warnings about items which should be static [ARM] S3C: Fix sparse warning from missing 's3c_device_hwmon' [ARM] S3C24XX: Fix sparse error in gpiolib.c [ARM] 5455/1: Fix IRQ noise from VIC code [ARM] 5454/1: ep93xx_eth: fix sparse warnings [ARM] remove .gitignore from include/asm-arm Update MAINTAINERS mxc defconfig updates mx31ads: Mark as having full regulatoion constraints with 1133-EV1 board mx31ads: Depend on all the WM8350 core dependencies for WM1133-EV1 board Fix ifdef in plat-mxc/irc.c MX1ADS: remove I2C ifdefs qong: remove AIPS[12] mappings from machine-specific iotable mx31ads: imoux pins should be passed in as unsigned int MXC: remove orphan imx_init_uart() definition mx31: pin definition for csi ...
| * Merge branch 'defconfig-s3c2410' of git://aeryn.fluff.org.uk/bjdooks/linuxRussell King2009-04-171-182/+930
| |\
| | * [ARM] s3c2410_defconfig: Update miscellaneous driversBen Dooks2009-04-161-27/+97
| | | | | | | | | | | | | | | | | | | | | Update the driver build in the s3c2410_defconfig for the LED, IDE, Input and EEPROM options Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * [ARM] s3c2410_defconfig: Update USB device driversBen Dooks2009-04-161-31/+41
| | | | | | | | | | | | | | | | | | | | | Add more USB device driver options to the s3c2410_defconfig, mostly as modules. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * [ARM] s3c2410_defconfig: Update filesystem optionsBen Dooks2009-04-161-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | Update the filesystem options in the s3c2410_defconfig, such as building ext4, enable the automounter as modules and update the network filesysyem choices. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * [ARM] s3c2410_defconfig: Add video/radio driversBen Dooks2009-04-161-4/+179
| | | | | | | | | | | | | | | | | | | | | Add a set of various video and radio drivers to the s3c2410_defconfig as modules. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * [ARM] s3c2410_defconfig: Add sound driversBen Dooks2009-04-161-1/+49
| | | | | | | | | | | | | | | | | | Add sound drivers to the s3c2410_defconfig. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * [ARM] s3c2410_defconfig: Add MMC/SD core and driversBen Dooks2009-04-151-2/+20
| | | | | | | | | | | | | | | | | | | | | Add SD/MMC to the s3c2410_defconfig, building in the core and adding the rest of the drivers as modules. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * [ARM] s3c2410_defconfig: Update machine configurationBen Dooks2009-04-151-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | Update the machine configuration of s3c2410_defconfig to add support for newer machines, and update the s3c24xx specific options. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * [ARM] s3c2410_defconfig: Update network optionsBen Dooks2009-04-151-13/+206
| | | | | | | | | | | | | | | | | | | | | | | | Update the list of modules being built for the network core of the s3c2410_defconfig. This update adds such items as TCP congestion, netfilter for IPv4 and IPv6. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * [ARM] s3c2410_defconfig: update to 2.6.30-rc2Ben Dooks2009-04-151-107/+319
| | | | | | | | | | | | | | | | | | | | | Update arch/arm/configs/s3c2410_defconfig to the latest kernel release (2.6.30-rc2). Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | Merge branch 'v2630-rc2-fixes' of git://aeryn.fluff.org.uk/bjdooks/linuxRussell King2009-04-178-7/+30
| |\ \
| | * | [ARM] S3C24XX: ADC: Check pending queue before freeing adc clientRamax Lo2009-04-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check pending queue and remove the adc client being released. Signed-off-by: Ramax Lo <ramaxlo@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | [ARM] S3C: Fix ADC driver sparse warningBen Dooks2009-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbol 's3c_adc_try' in arch/arm/plat-s3c24xx/adc.c does not need to be exported and thus should be static. This fixes the following sparse warning: adc.c:103:6: warning: symbol 's3c_adc_try' was not declared. Should it be static? Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | [ARM] Osiris: Fix double initialisation in machine blockBen Dooks2009-04-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .init_machine entry in mach-osiris.c had the same entry twice, so remove one definition to fix the following warning from sparse: mach-osiris.c:416:3: warning: Initializer entry defined twice mach-osiris.c:418:3: also defined here Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | [ARM] Anubis: Fix sparse warnings for items that should be staticBen Dooks2009-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make 'anubis_ide_platdata' statis as it is not used outside the file it is in, fixing the following sparse warning: mach-anubis.c:246:27: warning: symbol 'anubis_ide_platdata' was not declared. Should it be static? Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | [ARM] JIVE: Fix sparse warnings about items which should be staticBen Dooks2009-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make 'jive_vgg2432a4_display' and 'jive_lcd_config' static as they are not exported, and are generating the following sparse warnings: mach-jive.c:280:26: warning: symbol 'jive_vgg2432a4_display' was not declared. Should it be static? mach-jive.c:313:28: warning: symbol 'jive_lcd_config' was not declared. Should it be static? Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | [ARM] S3C: Fix sparse warning from missing 's3c_device_hwmon'Ben Dooks2009-04-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following sparse warning due to s3c_device_hwmon being missing from <plat/devs.h> devs.c:380:24: warning: symbol 's3c_device_hwmon' was not declared. Should it be static? Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | [ARM] S3C24XX: Fix sparse error in gpiolib.cBen Dooks2009-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following sparse error generated by including <plat/gpio-core.h> instead of <mach/gpio-core.h> gpiolib.c:78:22: warning: symbol 's3c24xx_gpios' was not declared. Should it be static? Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | [ARM] S3C: Export s3c_gpio_cfgpin and s3c_gpio_setpull for modulesBen Dooks2009-04-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an export of the two GPIO configuration calls s3c_gpio_cfgpin and s3c_gpio_setpull to allow modules to use them (such as ASoC drivers) Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | [ARM] SMDK6410: Request GPIOs for LCD power controlMark Brown2009-04-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Going forward gpio_request() will be a requirement for GPIO API users so call it for the LCD power GPIOs. With present code the kernel functions but generaets loud WARN_ON()s when using the unrequested GPIOs. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | [ARM] S3C: remove duplicated #includeHuang Weiyi2009-04-151-1/+0
| | |/ | | | | | | | | | | | | | | | | | | Remove duplicated #include in arch/arm/mach-s3c2412/mach-jive.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] 5455/1: Fix IRQ noise from VIC codeLinus Walleij2009-04-161-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VIC code will attempt to perform som default set_irq_chip() and set_irq_chip_data() on all IRQs supported by the VIC, while the new IRQ handling code strictly checks for the global NR_IRQS to be respected also for these IRQs. This patch will respect the interrupt mask passed to the VIC driver and will prevent it from attempting to call these functions on any unused interrupts. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6Russell King2009-04-1633-2398/+1246
| |\ \
| | * | mxc defconfig updatesSascha Hauer2009-04-165-2203/+1065
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes several i.MX board specific defconfig files in favour for a mx1_defconfig, mx27_defconfig and mx3_defconfig. All config files have all currently available boards, i.MX specific drivers and the network device drivers for the boards enabled. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | mx31ads: Mark as having full regulatoion constraints with 1133-EV1 boardMark Brown2009-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the regulator API to power off unused regulators at the end of init. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * | mx31ads: Depend on all the WM8350 core dependencies for WM1133-EV1 boardMark Brown2009-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise we'd need massive ifdefs in the code. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * | Fix ifdef in plat-mxc/irc.cDarius Augulis2009-04-162-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move ifdef under function brackets. This fixes compile crach when IRQ priorities are disabled. Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
| | * | MX1ADS: remove I2C ifdefsDarius Augulis2009-04-161-6/+0
| | | | | | | | | | | | | | | | Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
| | * | qong: remove AIPS[12] mappings from machine-specific iotableIlya Yanok2009-04-161-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AIPS[12] are no mapped from generic MX3 code so we don't need to map them from machine-specific map_io function anymore. Signed-off-by: Ilya Yanok <yanok@emcraft.com>
| | * | mx31ads: imoux pins should be passed in as unsigned intMark Brown2009-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | To match the mxc_iomux_setup_multiple_pins() prototype. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * | MXC: remove orphan imx_init_uart() definitionPaulius Zaleckas2009-04-161-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> Cc: Sascha Hauer <s.hauer@pengutronix.de>
| | * | mx31: pin definition for csiValentin Longchamp2009-04-161-0/+21
| | | | | | | | | | | | | | | | Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
| | * | MX31: pin definition for sdhc2Valentin Longchamp2009-04-161-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | This also adds the pins used on mx31moboard for WP and CD Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
| | * | MX31: Add I2C pin definitionsVladimir Barinov2009-04-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add I2C pin definitions for MX31 SoC Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com>
| | * | MX31: Add more alternate pin definitionsSascha Hauer2009-04-161-0/+14
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | pcm037 board support: Fix eth interrupt gpio settingSascha Hauer2009-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | gpio_direction_input needs the gpio number, not the pin description. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | imx21: activate i2cHolger Schurig2009-04-162-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the correct clkdev-name for the i2c clock. It also get's rid of the ARCH_NR_GPIOS define on the rationale that isn't an ARCH-wide setting anyway. If a device has two pca953x devices, the reserved number will be wrong. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
| | * | imx21: fixes some clocknamesHolger Schurig2009-04-161-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: <hs4233@mail.mn-solutions.de>
| * | | [ARM] 5453/1: fix building breakage of sys_oabi-compat.c due to missing ↵eric miao2009-04-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kmalloc/kfree It seems that declarations of kmalloc/kfree are missed, explicitly include it. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 5451/1: ep93xx:core.c: build warning fixHartley Sweeten2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix trivial build warning due to incompatible pointer type. ep93xx_timer_interrupt() has the wrong return type causing a warning during the build. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 5450/1: Flush only the needed range when unmapping a VMAAaro Koskinen2009-04-151-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When unmapping N pages (e.g. shared memory) the amount of TLB flushes done can be (N*PAGE_SIZE/ZAP_BLOCK_SIZE)*N although it should be N at maximum. With PREEMPT kernel ZAP_BLOCK_SIZE is 8 pages, so there is a noticeable performance penalty when unmapping a large VMA and the system is spending its time in flush_tlb_range(). The problem is that tlb_end_vma() is always flushing the full VMA range. The subrange that needs to be flushed can be calculated by tlb_remove_tlb_entry(). This approach was suggested by Hugh Dickins, and is also used by other arches. The speed increase is roughly 3x for 8M mappings and for larger mappings even more. Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | Merge branch 'fix' of ↵Russell King2009-04-157-17/+20
| |\ \ \ | | |_|/ | |/| | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
| | * | [ARM] pxa/em-x270: remove duplicated #includeHuang Weiyi2009-04-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicated #include in arch/arm/mach-pxa/em-x270.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Acked-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| | * | [ARM] pxa/em-x270: explicitly set .gpio_cs in TDO35S SPI chip dataMike Rapoport2009-04-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit a7bb3909b3293d503211d7f6af8ed62c1644b686 ("spi: pxa2xx_spi: introduce chipselect GPIO to simplify the common cases") the .gpio_cs field in pxa2xx_spi_chip has to be set explicitly. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| | * | [ARM] pxa: PalmTX and PalmT5 USB fixesMarek Vasut2009-04-134-12/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| | * | [ARM] pxa: add missing declaration of pxa26x_init_irq()Marek Vasut2009-04-131-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| | * | [ARM] pxa/colibri: fix missing variable name in inline functionsEric Miao2009-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even they are empty inline functions, the compiler still complains about the missing variable names. Signed-off-by: Eric Miao <eric.miao@marvell.com> Cc: Daniel Mack <daniel@caiaq.de>
* | | | Get rid of final remnants of include/asm-$(ARCH)Linus Torvalds2009-04-171-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This renames include/asm-h8300/timer.h into arch/h8300/include/asm: it was left over just because that file had been created in the -mm tree before the whole h8300 header subdirectory had been moved, and then got merged in the old location afterwards. (See commits e0b0f9e4ead2468f84c26332ec42b118e76af572: "h8300: update timer handler - new files" and 758db3f2118703a1e36374dae5d58bed963e7e0d: "[h8300] move include/asm-h8300 to arch/h8300/include/asm" for details). This also removes a left-over .gitignore file in include/asm-arm that became stale when the ARM header files were moved (which happened in multiple commits, just see "git log -- include/asm-arm" for details). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | | Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_devLinus Torvalds2009-04-17110-0/+9454
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: move include/asm-m32r/* to arch/m32r/include/asm/ m32r: move include/asm-m32r headers to arch/m32r/include/asm
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-11 15:25:52 +0000