aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
| * omap: rx51_defconfig: Remove CONFIG_SYSFS_DEPRECATED*=y optionsJarkko Nikula2010-04-231-2/+0
| | | | | | | | | | | | | | | | | | Modern udev will not work with the CONFIG_SYSFS_DEPRECATED*=y options and it seems also that the Maemo release works without when testing with the Maemo 2.6.28 kernel. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: rx51_defconfig: Remove duplicate phonetJarkko Nikula2010-04-231-1/+0
| | | | | | | | | | | | | | | | | | Phonet is enabled by the commit bce54fed941e03695ab557100a4bd1e457abca42 and this duplicate gives a warning when doing make rx51_defconfig. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: fix a gpmc nand problemstanley.miao2010-04-231-0/+3
| | | | | | | | | | | | | | | | If gpmc_t isn't given, we don't need to set timing for gpmc, or it will cause a Oops. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * AM3517: initialize i2c subsystem after mux subsystemstanley.miao2010-04-231-2/+2
| | | | | | | | | | | | | | | | The initialize of i2c subsystem will set pinmux, so it should be done after the initialize of mux subsystem initialization. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: remove one of the define of INT_34XX_BENCH_MPU_EMULstanley.miao2010-04-231-2/+0
| | | | | | | | | | | | | | INT_34XX_BENCH_MPU_EMUL was defined twice, another is at Line 312. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabledstanley.miao2010-04-231-0/+7
| | | | | | | | | | | | | | | | If CONFIG_MTD_NAND_OMAP2 is not enabled, there will be a compile error, "gpmc_nand_init() is not defined". Add a inline noop function to fix it. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * OMAP4: Clocks: Change SPI Instance NamesAbraham Arce2010-04-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Change the name for the spi instances on omap44xx_clks to match the names omap2 spi driver gives: omap-mcspi.1 -> omap2_mcspi.1 omap-mcspi.2 -> omap2_mcspi.2 omap-mcspi.3 -> omap2_mcspi.3 omap-mcspi.4 -> omap2_mcspi.4 Signed-off-by: Abraham Arce <x0066660@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: Devkit8000: Fix wrong usb port on Devkit8000Thomas Weber2010-04-231-2/+2
| | | | | | | | | | | | | | | | Disable the nonexistent ehci port on Devkit8000. Signed-off-by: Thomas Weber <weber@corscience.de> Acked-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * OMAP4: Fix for CONTROL register BaseSantosh Shilimkar2010-04-231-1/+1
| | | | | | | | | | | | | | | | | | This patch fixes the base address of CONTROL register on OMAP4430SDP. The control base is used by peripherals like MMC1 for PBIAS configuration. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * OMAP4-HSMMC: FIX for MMC5 Controller IRQ Basekishore kadiyala2010-04-231-1/+1
| | | | | | | | | | | | | | This patch fixes HSMMC Controller5 IRQ Base. Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap3: Fix EHCI port for IGEP v2 boardEnric Balletbo i Serra2010-04-231-4/+4
| | | | | | | | | | | | | | | | IGEP v2 uses EHCI port 1 instead of EHCI port 2. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: Fix n8x0 mmc_mmc_init compile warnings and typosTony Lindgren2010-04-231-9/+9
| | | | | | | | | | | | | | Fix warning: 'return' with a value, in function returning void in n8x0_mmc_init. Also fix a search and replace typo. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap2: Fix ARM processor check for 24xxTony Lindgren2010-04-231-1/+1
| | | | | | | | | | | | | | | | The value to check is 7 for V6 instead. The code has been working as it falls through to 24xx code if the other checks fail. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap4: Fix build break when used with gcc-4.4.1 (2009-q3)Richard Woodruff2010-04-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds argument to smc calls as gcc-4.4.1 requires it otherwise the build breaks with 2009-q3 toolchanin. arch/arm/mach-omap2/omap-headsmp.S: Assembler messages: arch/arm/mach-omap2/omap-headsmp.S:36: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:55: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:63: Error: missing expression -- `smc' make[1]: *** [arch/arm/mach-omap2/omap-headsmp.o] Error 1 Signed-off-by: Richard Woodruff <r-woodruff2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: DMA: Init CDAC to zeromanjugk manjugk2010-04-221-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | The register DMA4_CDAC needs to be initialized to zero before starting DMA transfer. Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: Govindraj R <govindraj.raja@ti.com> Cc: Kevin Hilman <khilman@deeprootsystems.com> Reported-by:S, Venkatraman <svenkatr@ti.com> Signed-off-by: Manjunatha GK <manjugk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: gpio: fix incorrect matching of IRQ_TYPE_EDGE_BOTHJanusz Krzysztofik2010-04-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Since IRQ_TYPE_EDGE_BOTH is defined as (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING), testing against it with a bitwise AND also matches both single-edge cases in addition to the intended both edges case. Fix it, replacing with a more accurate expression. Created and tested againts linux-2.6.34-rc3. Applicable to 2.6.33-stable as well. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * arm: omap1: remove dead code from timer32k.cFelipe Balbi2010-04-221-15/+0
| | | | | | | | | | | | | | Trivial patch, no functional changes Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: fix clocksource_32k to start from zeroAaro Koskinen2010-04-221-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the 32k sync timer is used for sched_clock(), it should count time from the kernel boot (clocksource init) instead of the last HW reset. Otherwise printk.time values will jump suddenly during the boot: [ 0.000000] calling omap2_clk_arch_init+0x0/0x138 @ 1 [ 0.000000] initcall omap2_clk_arch_init+0x0/0x138 returned -22 after 0 usecs [ 0.000000] initcall omap2_clk_arch_init+0x0/0x138 returned with error code -22 [ 0.000000] calling omap_init_clocksource_32k+0x0/0x98 @ 1 [ 508.697937] initcall omap_init_clocksource_32k+0x0/0x98 returned 0 after 0 usecs [ 508.697967] calling omap_init_devices+0x0/0x38 @ 1 [ 508.698425] initcall omap_init_devices+0x0/0x38 returned 0 after 0 usecs This will confuse tools such as scripts/bootgraph.pl. Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into ↵Tony Lindgren2010-04-2117-39/+113
| |\ | | | | | | | | | omap-fixes-for-linus
| | * OMAP3: clock: fix enable bit used for dpll4_m4x2 clockRanjith Lohithakshan2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enable bit for dpll4_m4x2 clock should be OMAP3430_PWRDN_DSS1_SHIFT. The code erroneously uses OMAP3430_PWRDN_CAM_SHIFT which is meant for dpll4_m5x2 clock. This came into notice during a recent review of the clock tree. Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
| | * OMAP4: prcm: Use logical OR instead of bitwise ORRajendra Nayak2010-03-313-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes usage of bitwise OR in if conditions, and instead uses logical OR. Signed-off-by: Rajendra Nayak <rnayak@ti.com> Cc: Abhijit Pagare <abhijitpagare@ti.com> Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
| | * OMAP: HWMOD: Bug fixes in hwmod structure definitionsThara Gopinath2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch corrects the width of sysc_flags in hwmod sysconfig structure where the values to be stored to this variable exceed the current field width. Signed-off-by: Thara Gopinath <thara@ti.com> [paul@pwsan.com: edited to apply; rearranged structure members to pack] Signed-off-by: Paul Walmsley <paul@pwsan.com>
| | * OMAP: HWMOD: Adding clockdomain checkThara Gopinath2010-03-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds check for presence of clockdomain structure in the API omap_hwmod_get_pwrdm before trying to access the powerdomain structure. This will prevent unnecessary crashing of the system in case of a clock node with out an associated clockdomain. Signed-off-by: Thara Gopinath <thara@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * | Merge branch 'omap-fixes-for-tony' of ↵Tony Lindgren2010-03-226-21/+22
| |\ \ | | | | | | | | | | | | git://dev.omapzoom.org/pub/scm/saaguirre/linux-omap-camera into omap-fixes-for-linus
| | * | omap3: zoom2/3: Register only 1 8250 portSergio Aguirre2010-03-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no more serial ports available, so, doesn't make sense to create 4 device nodes. Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
| | * | omap3: zoom 2/3: Change debugboard serial port idSergio Aguirre2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now changed to PLAT8250_DEV_PLATFORM (= 0), because it's the only port that's going to be initialized in Zoom 2/3 boards. So, it doesn't make sense to keep the hardcoded 3 value anymore. Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
| | * | omap3: 3630sdp: Explicitly enable all UARTsSergio Aguirre2010-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | All UARTs seem physically reachable, so, enable them all. Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
| | * | omap3: zoom2/3 / 3630sdp: Don't init always all uartsSergio Aguirre2010-03-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useless, since in Zoom2/3 boards, the ports aren't even physically accessible. They must be explicitly initted in the board-zoom2.c, board-zoom3.c and board-3630sdp.c files instead. Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
| | * | omap2/3/4: serial: Remove condition for getting uart4_physSergio Aguirre2010-03-151-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This check is invalid, since we haven't filled the omap_revision var at this point. Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
| | * | OMAP3: serial: Use dev_* macros instead of printkSergio Aguirre2010-03-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we have a struct device populated at the time we are printing the errors, using dev_* macros makes more sense, as could give a better idea where the error/warning came from. Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
| | * | OMAP3: serial: Check for zero-based physical addrSergio Aguirre2010-03-151-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for protecting a wrong mapping attempt of a zero-based physical address. The result is that, no serial port will be attempted to be mapped. Also add an additional protection for NULL clocks before attempting to enable them (if above condition applies) Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
* | | | ARM: 5974/1: arm/mach-at91 Makefile: remove two blanks.Ernst Schwab2010-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cosmetic change to mach-at91 Makefile: remove two blanks introduced by earlier patches. Signed-off-by: Ernst Schwab <eschwab@online.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>