summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2008-05-28MX27 Serial: Disable all UARTS but the firstJustin Waters
The Lite kit only uses the first UART. The rest have been scavenged for pins. This disables all UARTS but the first so that there are no more pin conflicts. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-28MXC GPIO: Fix datain reading for MX27Justin Waters
The GPIO pins for the MX27 are read differently than those on the MX31. Rather than reading the Data Register (DR), you must read the Sample Status Register (SSR). Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-23Clean up MX27 CRM Register DefinitionsJustin Waters
The MX27 crm_regs.h file was a complete mess, obviously hastily ported from the MX31 version, which was also a mess. I cleaned it up quite a bit, although more work still needs to be done such as fixing the naming conventions. This is build tested on the MX27 Lite Kit. It may break MX27 builds. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-23MX27 DPTC: Remove Vestigal CodeJustin Waters
The Dynamic Processor Temperature Control Module is significantly different on the MX27 as compared to the MX31. It seems that some MX31 code slipped into the MX27 devices file, but essentially did nothing except try to register a device that didn't have a driver. I removed this code. I also fixed an issue with the Kconfig where you could select the DPTC module without the power management chip enabled, which causes a compilation error. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-21MX27LITE: Miscellaneous code cleanupJustin Waters
There were a lot of carryovers from the MX27 ADS code that were either useless or just plain wrong. This commit gets rid of these issues. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-21MX27LITE: Modify GPIO pins for SDHC2Justin Waters
The SDHC2 uses GPIO pins for WP and CD signals. This patch assigns these pins to that interface. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-21MX27: Add ability to enable individual Secure Digital controllersJustin Waters
Enabling the SD interface on the MX27 chip will enable all of the interfaces. Since we only use one of them, we should be able to flip them on and off individually. Ultimately, we'd like to do this is the board-specific file, but that will require additional work. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-20MX27LITE_GPIO: Fix pins for USBOTG interfaceJustin Waters
The USBOTG interface uses two GPIO pins for its PWR_EN and OC signals. These pins are associated with the OTG interface and the PWR_EN is cleared since the power enable signal for the power controller is low-true. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-20Update pin configuration for USB Host 2 on the Lite Kit.Justin Waters
The USB Host 2 on the MX27 Litekit uses the USB_POWER and USB_OC_B pins for power and overcurrent detect, respectively. In order to make them function properly, we need to assign those pins to the Host 2 driver and change the H2PM field of the USB_CTRL register on the i.MX27. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-20MX27LITE_GPIO: Fix GPIO conflicts between USB Host 2 and SPI 1Justin Waters
USB Host 2 and SPI 1 only conflict with one pin. If the SPI bus is not using the slave select 2 (SS2) pin (which the Atlas chip does not), then you can use both the SPI 1 and USB Host 2 interfaces simultaneously. This patch disables the MSB of the slave select if Host 2 is enabled. This will limit SPI1 to only 4 slaves instead of 8. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-16MX27Litekit: Update NOR Flash partition tableJustin Waters
The NOR flash on the Litekit is significantly smaller than that on the ADS board. This breaks the partitions into three blocks: one for LogicLoader, one for the LogicLoader configuration data, and one for miscellaneous use. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-14Backport mach-types to include mx27litekitJustin Waters
The mach-type for the i.MX27 litekit is not in 2.6.24. This is a backport from another version of the kernel. It was provided to us by LogicPD. Signed-off-by: John Scherzer <john.scherzer@timesys.com> Acked-by: Justin Waters <justin.waters@timesys.com>
2008-05-14i.MX27 Litekit board supportJustin Waters
The i.MX27 Litekit is based off of Freescale's i.MX27 processor. This patch adds the basic board support files and memory map information for this board. Signed-off-by: John Scherzer <john.scherzer@timesys.com> Acked-by: Justin Waters <justin.waters@timesys.com>
2008-02-27Fixed default config fileDaniel Schaeffer
Changes to be committed: modified: arch/arm/configs/imx27ads_defconfig
2008-02-26Fixed MXC IDE compile bugsDaniel Schaeffer
2008-02-14Added TimeSys logoDaniel Schaeffer
Changes to be committed: modified: arch/arm/configs/imx27ads_defconfig modified: drivers/video/logo/Kconfig modified: drivers/video/logo/Makefile modified: drivers/video/logo/logo.c new file: drivers/video/logo/logo_ts_clut224.ppm
2008-02-14Update mx27 kernel configDaniel Schaeffer
Changes to be committed: modified: arch/arm/configs/imx27ads_defconfig
2008-02-01Fixed power managment APIDaniel Schaeffer
Changes to be committed: modified: arch/arm/mach-mx27/pm.c
2008-02-01Merge branch '2.6.24' into 2.6.24-imx27Daniel Schaeffer
Conflicts: MAINTAINERS Makefile arch/arm/Kconfig arch/arm/oprofile/Kconfig drivers/Makefile drivers/ata/Kconfig drivers/ata/Makefile drivers/char/watchdog/Kconfig drivers/char/watchdog/Makefile drivers/ide/Kconfig drivers/input/touchscreen/Kconfig drivers/input/touchscreen/Makefile drivers/mmc/card/block.c drivers/mmc/card/sdio_uart.c drivers/mmc/core/Makefile drivers/mmc/core/mmc_ops.c drivers/mmc/core/sdio.c drivers/mmc/core/sdio_bus.c drivers/mmc/core/sdio_cis.c drivers/mmc/core/sdio_io.c drivers/mmc/core/sdio_irq.c drivers/mmc/core/sdio_ops.c drivers/mmc/host/Kconfig drivers/mmc/host/Makefile drivers/mmc/host/au1xmmc.c drivers/mmc/host/tifm_sd.c drivers/mtd/maps/Makefile drivers/pcmcia/Kconfig drivers/pcmcia/Makefile fs/exec.c include/linux/mmc/card.h include/linux/mmc/host.h include/linux/mmc/sdio_func.h include/linux/mmc/sdio_ids.h include/linux/mod_devicetable.h mm/hugetlb.c scripts/mod/file2alias.c
2008-01-30Fixed Kconfig merge errorDaniel Schaeffer
On branch 2.6.23-imx27 Changes to be committed: modified: arch/arm/mach-mx3/Kconfig
2008-01-30Merge branch '2.6.23' into 2.6.22.6-imx27Daniel Schaeffer
Conflicts: Documentation/kernel-parameters.txt Makefile arch/arm/Kconfig arch/arm/Makefile arch/arm/mach-mx3/Kconfig arch/arm/mach-mx3/Makefile arch/arm/mach-mx3/mm.c arch/arm/mach-mx3/mx31ads.c arch/arm/mm/Kconfig arch/arm/plat-mxc/Kconfig arch/arm/plat-mxc/Makefile arch/arm/plat-mxc/irq.c block/cfq-iosched.c drivers/ata/ahci.c drivers/ata/libata-core.c drivers/char/watchdog/Kconfig drivers/firewire/fw-sbp2.c drivers/md/dm-crypt.c drivers/media/video/pwc/pwc-if.c drivers/mmc/card/Kconfig drivers/mmc/card/queue.c drivers/mmc/core/Makefile drivers/mmc/core/bus.c drivers/mmc/core/core.c drivers/mmc/core/host.c drivers/mmc/core/mmc.c drivers/mmc/core/sd.c drivers/mmc/core/sd_ops.c drivers/mmc/host/at91_mci.c drivers/mmc/host/sdhci.c drivers/net/bonding/bond_main.c drivers/net/fec.c drivers/net/forcedeth.c drivers/net/r8169.c drivers/net/sky2.c drivers/rtc/Kconfig drivers/rtc/Makefile drivers/spi/Kconfig drivers/spi/Makefile drivers/usb/gadget/Makefile drivers/usb/gadget/gadget_chips.h drivers/usb/host/ehci.h drivers/video/logo/logo.c drivers/w1/slaves/Makefile fs/9p/conv.c fs/direct-io.c fs/exec.c fs/ocfs2/file.c fs/signalfd.c fs/sysfs/file.c include/asm-arm/arch-mxc/dma.h include/asm-arm/arch-mxc/entry-macro.S include/asm-arm/arch-mxc/hardware.h include/asm-arm/arch-mxc/io.h include/asm-arm/arch-mxc/irqs.h include/asm-arm/arch-mxc/memory.h include/asm-arm/arch-mxc/mx31.h include/asm-arm/arch-mxc/mxc.h include/asm-arm/arch-mxc/system.h include/asm-arm/arch-mxc/timex.h include/asm-arm/arch-mxc/uncompress.h include/asm-arm/arch-mxc/vmalloc.h include/linux/fsl_devices.h include/linux/ioprio.h kernel/lockdep_proc.c kernel/signal.c mm/hugetlb.c mm/readahead.c net/bluetooth/rfcomm/tty.c net/bridge/br_device.c net/core/dev.c net/ieee80211/softmac/ieee80211softmac_assoc.c net/ieee80211/softmac/ieee80211softmac_wx.c net/ipv4/netfilter/nf_conntrack_proto_icmp.c net/ipv4/tcp_input.c net/netfilter/nf_conntrack_proto_sctp.c
2008-01-30Removed linux-2.6.22-mx-codetest.patchDaniel Schaeffer
modified: arch/arm/kernel/irq.c modified: fs/exec.c modified: kernel/Makefile deleted: kernel/codetest.c deleted: kernel/ctswic.h modified: kernel/exit.c modified: kernel/fork.c modified: kernel/sched.c
2008-01-20Merge branch 'omap-fixes' of ↵Russell King
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: ARM: OMAP1: Fix compile for board-nokia770 ARM: OMAP1: Keymap fix for f-sample and p2-sample
2008-01-20[ARM] 4748/1: dca: source drivers/dca/Kconfig in arch/arm/Kconfig to fix warningDan Williams
'select' used by config symbol 'INTEL_IOATDMA' refers to undefined symbol 'DCA' Although drivers/dma is currently the only user future drivers outside of drivers/dma may select this option so it is better to add this to arch/arm/Kconfig than move DCA to drivers/dma/Kconfig. Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-01-20[ARM] pxa: don't rely on r2 being preserved over a function callRussell King
r2 is not guaranteed to be preserved over a function call, so relying on it to store the link register over the call to sleep_phys_sp() is unreliable. Store the link register on the stack instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-01-18ARM: OMAP1: Fix compile for board-nokia770Daniel Walker
Fix compile for board-nokia770 Signed-off-by: Daniel Walker <dwalker@mvista.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2008-01-18ARM: OMAP1: Keymap fix for f-sample and p2-sampleVivek Kutal
Keymap fix for f-sample and p2-sample. Signed-off-by: Vivek Kutal <vivek.kutal@celunite.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2008-01-15Fix ARM profiling/instrumentation configurationLinus Torvalds
Commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 ("Combine instrumentation menus in kernel/Kconfig.instrumentation") broke ARM profiling support, since ARM has some extra Kconfig options and doesn't just use the common OPROFILE/KPROBES config options. Rather than just revert the thing outright, or add ARM-specific knowledge to the generic Kconfig.instrumentation file (where the only and whole point was to be generic, not too architecture-specific), this just makes ARM not use the generic version, since it doesn't suit it. So create an arm-specific version of Kconfig.instrumentation instead, and use that. Acked-by: Ingo Molnar <mingo@elte.hu> Acked-by: Russell King <rmk+lkml@arm.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-01-10[ARM] vfp: fix fuitod/fsitod instructionsRussell King
These two instructions exceptionally take a single precision register as their operand. This means we can't use vfp_get_dm() to read the register number - we need to use vfp_get_sm() instead. Add a flag to indicate this exception to the general rule. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-01-06[ARM] 4691/1: add missing i2c_board_info struct for at91rm9200Jan Altenberg
- Add missing i2c_board_info struct for at91rm9200 Signed-off-by: Jan Altenberg <jan.altenberg@linutronix.de> Acked-by: Andrew Victor <avictor.za@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-01-03[ARM] 4735/1: Unbreak pxa25x suspend/resumeRichard Purdie
Suspend/resume on the pxa25x was fairly obviously broken in revision 711be5ccfe9a02ba560aa918a008c31ea4760163. This patch fixes the damage by adding back the missing code. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-12-17[ARM] 4694/1: IXP4xx: Update clockevent support for shutdown and resumeKevin Hilman
Add proper support for CLOCK_EVT_MODE_RESUME and in the process fix CLOCK_EVT_MODE_SHUTDOWN so that only the enable bits are toggled for both. Signed-off-by: Kevin Hilman <khilman@mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-12-17[ARM] 4710/1: Fix coprocessor 14 usage for debug messages via ICEDCCUwe Kleine-König
According to ARM7TDMI Technical Reference Manual (ARM DDI 0210C) writing to the DCC data write register coproc dest registers are 1 and 0, not 0 and 1. ARM920T TRM (ARM DDI 0151C) agrees on that. Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-12-08Merge branch 'pxa-fixes'Russell King
2007-12-08[ARM] 4667/1: CM-X270 fixesMike Rapoport
Change printk to dev_dbg in ITE 8152 driver and remove printk in ITE 8152 ISR. Move PCI intialization from ->scan to ->preinit method Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-29Merge branches 'at91-fixes' and 'pxa-fixes'Russell King
2007-11-29[ARM] 4675/1: pxa: fix mfp address definition error for pxa320eric miao
Signed-off-by: bridge wu <bridge.wu@marvell.com> Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] 4665/1: fix __und_usr wrt accessing the undefined insn in user spaceNicolas Pitre
The ldrt fixup code expects r9 to be set. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] 4659/1: remove possibilities for spurious false negative with ↵Nicolas Pitre
__kuser_cmpxchg The ARM __kuser_cmpxchg routine is meant to implement an atomic cmpxchg in user space. It however can produce spurious false negative if a processor exception occurs in the middle of the operation. Normally this is not a problem since cmpxchg is typically called in a loop until it succeeds to implement an atomic increment for example. Some use cases which don't involve a loop require that the operation be 100% reliable though. This patch changes the implementation so to reattempt the operation after an exception has occurred in the critical section rather than abort it. Here's a simple program to test the fix (don't use CONFIG_NO_HZ in your kernel as this depends on a sufficiently high interrupt rate): #include <stdio.h> typedef int (__kernel_cmpxchg_t)(int oldval, int newval, int *ptr); #define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0) int main() { int i, x = 0; for (i = 0; i < 100000000; i++) { int v = x; if (__kernel_cmpxchg(v, v+1, &x)) printf("failed at %d: %d vs %d\n", i, v, x); } printf("done with %d vs %d\n", i, x); return 0; } Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] 4661/1: fix do_undefinstr wrt the enabling of IRQsNicolas Pitre
The lock is acquired with spin_lock_irqsave() and released in the not-found case with spin_unlock_irqrestore(). Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] uengine: fix memset size errorLi Zefan
The size passing to memset is wrong. And here we can replace kmalloc with kzalloc. Signed-off-by Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] 4648/1: i.MX/MX1 ensure more complete AITC initializationPavel Pisa
The AITC code did not allow to start kernel, if bootloader manipulates with interrupt level mask. The change ensures, that NIMASK is initialized into correct state and that interrupts enable registers are cleared. Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] 4611/2: AT91: Fix GPIO buttons pins on SAM9261-EK.Andrew Victor
The incorrect GPIO pins are being initialized for the buttons on the Atmel AT91SAM9261-EK board. This buggy configuration turns LCD screen blue... Signed-off-by: Nicolas Ferre <nicolas.ferre@rfo.atmel.com> Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] 4650/1: AT91: New-style init of I2C, support for i2c-gpioAndrew Victor
The AT91 I2C driver is currently marked as "broken" due to hardware issues. This patch enables AT91-based platforms to also use the bitbanged GPIO for I2C. This updates platform setup logic (setting up an i2c-gpio device using the same pins as the i2c-at91 device, unless only the BROKEN driver is enabled). Also make use of the new-style initialization of I2C devices using i2c_register_board_info(). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] 4604/2: AT91: Master clock divistor on SAM9Andrew Victor
The calculation for the Master clock divisor (MDIV) is different on the SAM9 processors than on the AT91RM9200. Orignal patch from Sascha Erlacher. Also use the defined AT91_PMC_PRES instead of hard-coded bitmasks. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] PXA ssp: unlock when ssp tries to close an invalid portRoel Kluin
Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-26[ARM] 4652/1: pxa: fix a typo of pxa27x usb host clk definitioneric miao
CKEN_USBHOST should be used instead of CKEN_USB for usb host Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-16Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4638/1: pxa: use PXA3xx specific macros to define clks [ARM] remove useless setting of VM_RESERVED
2007-11-16[ARM] 4638/1: pxa: use PXA3xx specific macros to define clkseric miao
PXA3xx uses its own clk_pxa3xx_cken_ops, modify the code to use the PXA3xx specific macros to define its clocks Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-11-13Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6Linus Torvalds
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: hwmon: (i5k_amb) Convert macros to C functions hwmon: (w83781d) Add missing curly braces hwmon: (abituguru3) Identify ABit IP35 Pro as such hwmon: (f75375s) pwmX_mode sysfs files writable for f75375 variant hwmon: (f75375s) On n2100 systems, set fans to full speed on boot hwmon: (f75375s) Allow setting up fans with platform_data hwmon: (f75375s) Add new style bindings hwmon: (lm70) Convert semaphore to mutex hwmon: (applesmc) Add support for Mac Pro 2 x Quad-Core hwmon: (abituguru3) Add support for 2 new motherboards hwmon: (ibmpex) Change printk to dev_{info,err} macros hwmon: (i5k_amb) New memory temperature sensor driver hwmon: (f75375s) fix pwm mode setting hwmon: (ibmpex.c) fix NULL dereference hwmon: (sis5595) Split sis5595_attributes_opt hwmon: (sis5595) Add individual alarm files hwmon: (w83627hf) push nr+1 offset into *_REG_FAN macros and simplify hwmon: (w83627hf) hoist nr-1 offset out of show-store-temp-X hwmon: Add power meter spec to Documentation/hwmon/sysfs-interface