summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* ARM: Merge for-2635/rx1950Ben Dooks2010-05-197-7/+621
|\ | | | | | | Merge branch 'for-2635/rx1950' into for-linus/samsung2
| * ARM: RX1950: configure GPG13-15 as input before suspendVasily Khoruzhick2010-05-121-0/+11
| | | | | | | | | | | | | | | | According to datasheet GPG13-15 must be configured as input in NAND boot mode, otherwise device will not be able to wake up Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: RX1950: Add suspend/resume support for RX1950Vasily Khoruzhick2010-05-122-4/+5
| | | | | | | | | | Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabledVasily Khoruzhick2010-05-122-3/+9
| | | | | | | | | | | | | | | | | | | | If PM_H1940 is enabled, kernel _must_ be located upper then 0x30008000, because this area (0x30000000-0x30100000) can be used by bootloader. If kernel is located at 0x30008000, bootloader will corrupt kernel's code during resume. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: S3C2440: Add HP iPAQ RX1950 machine supportVasily Khoruzhick2010-05-123-0/+596
| | | | | | | | | | | | Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Denis Grigoriev <dgreenday@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/acer-n35Ben Dooks2010-05-192-10/+77
|\ \ | | | | | | | | | Merge branch 'for-2635/acer-n35' into for-linus/samsung2
| * | ARM: n30: Just call s3c24xx_init_irq() directly from machine definitionBen Dooks2010-05-071-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | The n30_init_irq() call is simply a call to s3c24xx_init_irq, so just remove it and update the machine definitions to call the IRQ initialision call directly. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: n30: Fixup gpiolib calls for mmc powerBen Dooks2010-05-071-4/+6
| | | | | | | | | | | | | | | | | | | | | Move to using gpio_request() and gpio_set_value() for the MMC power control calls. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: n30: Add support for power on/off on Acer n30 / Acer n35 MMC card readerPinkava J2010-05-071-0/+15
| | | | | | | | | | | | | | | Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: n30: Add support for MMC card reader on Acer n30 / Acer n35Pinkava J2010-05-071-0/+11
| | | | | | | | | | | | | | | Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: n35: Enable wake-up by Power button on Acer n35Pinkava J2010-05-071-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: n35: Add support for LEDs on Acer n35Pinkava J2010-05-071-0/+33
| | | | | | | | | | | | | | | Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: n30: Add RTC platform device for Acer n30 / Acer n35Pinkava J2010-05-071-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: n30: fix: suspended wrong USB port on Acer n35Pinkava J2010-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is bug in USB setup code for Acer n35 (it is related directly to s3c2410, see doc). We want suspend host port (is not connected) but device port should be active. Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: n30: Enable Acer n35 if Acer n30 is selectedPinkava J2010-05-071-0/+7
| |/ | | | | | | | | | | | | | | All code already present for Acer n35 is useless unless MACH_N35 is defined. Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> [ben-linux@fluff.org: minor edit of subject] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/samsung-clockBen Dooks2010-05-192-0/+6
|\ \ | | | | | | | | | Merge branch 'for-2635/samsung-clock' into for-linus/samsung2
| * | ARM: S5P: Add USB External Crystal clock definitionThomas Abraham2010-05-112-0/+6
| |/ | | | | | | | | | | | | | | Add USB external crystal clock definition Xusbxti to common S5P clock code. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/samsung-hwmonBen Dooks2010-05-197-9/+60
|\ \ | | | | | | | | | Merge branch 'for-2635/samsung-hwmon' into for-linus/samsung2
| * | ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsungMaurus Cuelenaere2010-05-127-9/+60
| |/ | | | | | | | | | | | | | | | | Move HWMON platform definition from plat-s3c24xx to plat-samsung and adjust mach-bast to use the new s3c_hwmon_set_platdata(). This allows usage of dev-hwmon by other Samsung SoCs. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/samsung-dmaBen Dooks2010-05-193-4/+4
|\ \ | | | | | | | | | Merge branch 'for-2635/samsung-dma' into for-linus/samsung2
| * | S3C: DMA: Change argument of s3c2410_dma_devconfigJassi Brar2010-05-173-4/+4
| |/ | | | | | | | | | | | | | | | | All other functions have the channel argument of type 'unsigned int' the s3c2410_dma_devconfig also accept the same value as argument but treat it as type 'int'. Remove this anomaly by make it 'unsigned int'. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/s5p-generalBen Dooks2010-05-198-8/+284
|\ \ | | | | | | | | | Merge branch 'for-2635/s5p-general' into for-linus/samsung2
| * | ARM: S5PV210: Add GPIOlib supportPannaga Bhushan2010-05-193-4/+277
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds GPIOlib support for S5PV210. Signed-off-by: Pannaga Bhushan <p.bhushan@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: SAMSUNGy: fix broken timer irq baseMarek Szyprowski2010-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timer interrupts range was defined as 43-47, what overlaps with VIC0 range (32-64). This was caused probably by a typo while the common interrupts definition was refactored. This patch moves timer interrupt range to safe area of 11-15 (just before uart range). This fixes the commit 87aef30eb3c5dac0491c83fe3b90bc61f1df24ec ("ARM: S5P: Change S5P_TIMER_IRQ based to 11 for SAMSUNG S5P series.") which meant to move these into the old (and previously reserved) ISA space. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [ben-linux@fluff.org: update description] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: SAMSUNG: Remove static of S5P SoCs sysclassKukjin Kim2010-05-124-3/+6
| |/ | | | | | | | | | | | | | | This patch removes static of s5p6440_sysclass, s5p6442_sysclass, and s5pv210_sysclass for defintion as extern. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/s3c24xx-generalBen Dooks2010-05-199-16/+22
|\ \ | | | | | | | | | Merge branch 'for-2635/s3c24xx-general' into for-linus/samsung2
| * | ARM: h1940: framebuffer configuration fixMike Solovyev2010-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Seems like a typo, wrong setup leads to broken image on ipaq screen. Signed-off-by: Mike Solovyev <ms@sk.2-ch.org> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: SAMSUNG: Remove old email address for ben-linux@fluff.orgBen Dooks2010-05-128-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | The address ben@fluff.org is old, ben-linux@fluff.org has been in use for a long time, and we should fixup all the occasions of the older address to avoid confusion. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C24XX: s3c24xx_mci_set_platdata should be marked __initArnaud Patard2010-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The s3c24xx_mci_set_platdata() is init time only, so should be marked as __init Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> [ben-linux@fluff.org: update description] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C24XX: fix s3c2410fb platdata passingArnaud Patard2010-05-061-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setting s3c2410fb_mach_info displays field with a struct marked as __initdata means it won't be available later for ioctls like FBIOPUT_VSCREENINFO and they will fail. Copying in s3c24xx_fb_set_platdata() is fixing this issue. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: h1940: fix touchscreen supportArnaud Patard2010-05-061-1/+2
| |/ | | | | | | | | | | | | | | The touchscreen is using the adc device so it needs to be in the device list Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: S5PV210: Bug fix on PWM TimerJongpill Lee2010-05-111-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes return value in below functions - pwm_cfg_src_is_tclk - tcfg_to_divisor - pwm_tdiv_has_div1 - pwm_tdiv_div_bits And this patch changes Copyright ordering. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: S5P6442: Bug fix on PWM TimerJongpill Lee2010-05-111-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes return value in below functions - pwm_cfg_src_is_tclk - tcfg_to_divisor - pwm_tdiv_has_div1 - pwm_tdiv_div_bits And this patch changes Copyright ordering. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: S5P6440: Bug fix on PWM TimerJongpill Lee2010-05-111-8/+16
|/ | | | | | | | | | | | | | This patch fixes return value in below functions - pwm_cfg_src_is_tclk - tcfg_to_divisor - pwm_tdiv_has_div1 - pwm_tdiv_div_bits And this patch changes Copyright ordering, and addes 'based on' information. Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* musb: fix power field to hold all possible valuesAjay Kumar Gupta2010-04-301-1/+1
| | | | | | | | | | MUSB can supply upto 500mA such as, AM3517 and OMAP3EVM Rev >=E and thus the 'power' field has to hold values above 255. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-04-2922-112/+189
|\ | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working. ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB ARM: 6030/1: KS8695: enable console ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT. ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs. ARM: 6023/1: update bcmring_defconfig to latest version and fix build error ARM: fix build error in arch/arm/kernel/process.c
| * ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIBColin Tuckley2010-04-282-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The switch to using GPIOLIB broke the sd/mmc card detection on the RealView development boards if GPIO_PL061 was not selected. This patch selects GPIO_PL061 if GPIOLIB is selected. The sense of the return value from mmc_status has also changed and is corrected. Signed-off-by: Colin Tuckley <colin.tuckley@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 6023/1: update bcmring_defconfig to latest version and fix build errorLeo Chen2010-04-221-25/+101
| | | | | | | | | | | | | | | | update bcmring_defconfig to the latest kernel version, this will fix the KAutobuild error. Signed-off-by: Leo Hao Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: fix build error in arch/arm/kernel/process.cRussell King2010-04-2119-86/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /tmp/ccJ3ssZW.s: Assembler messages: /tmp/ccJ3ssZW.s:1952: Error: can't resolve `.text' {.text section} - `.LFB1077' This is caused because: .section .data .section .text .section .text .previous does not return us to the .text section, but the .data section; this makes use of .previous dangerous if the ordering of previous sections is not known. Fix up the other users of .previous; .pushsection and .popsection are a safer pairing to use than .section and .previous. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'omap-fixes-for-linus' of ↵Linus Torvalds2010-04-2734-124/+113
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (39 commits) omap: delete unused bootloader tag variables omap: Devkit8000: Remove unused pins omap: Devkit8000: Change position of init calls omap: Devkit8000: Remove unnecessary include file omap: Devkit8000: Fix typo in pin name omap: Devkit8000: Add missing package selection omap: Devkit8000: Fix typo in supplies n8x0_defconfig: remove CONFIG_NILFS2_FS override omap: board-sdp-flash.c: Fix typos in debug output omap4: Fix McBSP4 base address omap: rx51_defconfig: Remove CONFIG_SYSFS_DEPRECATED*=y options omap: rx51_defconfig: Remove duplicate phonet omap: fix a gpmc nand problem AM3517: initialize i2c subsystem after mux subsystem omap: remove one of the define of INT_34XX_BENCH_MPU_EMUL omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabled OMAP4: Clocks: Change SPI Instance Names omap: Devkit8000: Fix wrong usb port on Devkit8000 OMAP4: Fix for CONTROL register Base OMAP4-HSMMC: FIX for MMC5 Controller IRQ Base ...
| * omap: delete unused bootloader tag variablesAaro Koskinen2010-04-231-3/+0
| | | | | | | | | | | | | | They are not needed and add over 512 bytes to kernel data. Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: Devkit8000: Remove unused pinsThomas Weber2010-04-231-20/+0
| | | | | | | | | | | | | | | | Old code from original patch contains beagle board pins that are not available on the Devkit8000. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: Devkit8000: Change position of init callsThomas Weber2010-04-231-4/+4
| | | | | | | | | | | | | | Change position of calling serial and ethernet initialization. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: Devkit8000: Remove unnecessary include fileThomas Weber2010-04-231-1/+0
| | | | | | | | | | | | | | Remove include otg.h. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: Devkit8000: Fix typo in pin nameThomas Weber2010-04-231-2/+2
| | | | | | | | | | | | | | Replace wrong sdr_cke[01] with sdrc_cke[01]. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: Devkit8000: Add missing package selectionThomas Weber2010-04-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Devkit8000 uses the CUS package for OMAP3530. This patch adds missing package selection for CUS and enables CONFIG_MUX. Replace whitespace with tab in Kconfig. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: Devkit8000: Fix typo in suppliesThomas Weber2010-04-231-1/+1
| | | | | | | | | | | | | | Replace wrong vdss_dsi with vdds_dsi. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * n8x0_defconfig: remove CONFIG_NILFS2_FS overrideFrancisco Alecrim2010-04-231-1/+0
| | | | | | | | | | | | | | | | arch/arm/configs/n8x0_defconfig:1061:warning: override: reassigning to symbol NILFS2_FS Signed-off-by: Francisco Alecrim <francisco.alecrim@openbossa.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: board-sdp-flash.c: Fix typos in debug outputThomas Weber2010-04-231-4/+4
| | | | | | | | | | | | | | | | | | Corrected type of flash in output (OneNAND => NOR). Removed whitespace after newline in output. Removed double whitespace in output. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap4: Fix McBSP4 base addressSantosh Shilimkar2010-04-231-1/+1
| | | | | | | | | | | | | | This patch fixes the McBSP4 base address for OMAP4 Signed-off-by: Balaji T K <balajitk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
OpenPOWER on IntegriCloud