summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2008-05-29MX27 GPIO: Ensure 8-bit operation for the NAND flashJustin Waters
This patch sets up the NAND registers to use 8-bit NAND flash. This is from the MX27ADS code, and was removed during the porting effort. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-29MX27 GPIO: Enable pullup resistors and set up chip detect for SDHCJustin Waters
The SD interface has configurable pullup resistors that need to be set. It also relies on a couple of functions to determine the state of the chip select and to pass the chip select interrupt to the platform data. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-29MXC GPIO: Add method for masking/unmasking interrupts on the port levelJustin Waters
The GPIO interrupts on the MXC platforms can be masked on either the pin or port level, but no method existed to mask them on the port level. This patch adds that support and unmasks the ports on the MX27 when an IRQ is unmasked. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-29MX27Lite: Change PMIC PRIINT pin to USBH1_SUSPJustin Waters
The PMIC uses a different GPIO pin on the Litekit than it did on the ADS. This changes the pin to the proper value. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-28MX27: Fix USB register and PMIC HeaderJustin Waters
One of the USB registers were incorrectly written, and the PMIC header file had an unnecessary ifdef in it. Signed-off-by: David Kocinski <david.kocinski@timesys.com> Acked-by: Justin Waters <justin.waters@timesys.com>
2008-05-28MXCFB: Fix mode entry for Sharp 6.4" VGA display kitJustin Waters
The values for the 6.4" display kit were incorrect. This version is tested and verified. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-28MX27Lite: Fix LCD GPIO pin requestsJustin Waters
The LCD interface on the Litekit uses two GPIO pins for power control. This patch requests them for the LCD and sets them as outputs. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-28MX27Lite: Remove useless MMC/SD codeJustin Waters
There was additional MMC code that is no longer used in the MX27 Lite file, and it causes compilation errors. Signed-off-by: Justin Waters <justin.waters@timesys.com>
2008-05-28MX27Lite: Don't initialize SSI2Justin Waters
The pins for SSI2 are used for other purposes, so we don't want to enable it. Signed-off-by: Justin Waters <justin.waters@timesys.com>
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-24Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Partially revert "Constify function pointer tables."
2008-01-24sysctl: kill binary sysctl KERN_PPC_L2CREric W. Biederman
: Stefan Roese <sr@denx.de> said: > ppc: 4xx: sysctl table check failed: /kernel/l2cr .1.31 Missing strategy > > I'm seeing this error message when booting an recent arch/ppc kernel on > 4xx platforms (tested on Ocotea and other 4xx platforms). Booting NFS > rootfs still works fine, but this message kind of makes me "nervous". > This is not seen on 4xx arch/powerpc platforms. Here the bootlog: Because the data field was never filled and a binary sysctl handler was never written this sysctl has never been usable through the sys_sysctl interface. So just remove the binary sysctl number. Making the kernel sanity checks happy. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Reported-by: Stefan Roese <sr@denx.de> Cc: Josh Boyer <jwboyer@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-01-23[SPARC64]: Partially revert "Constify function pointer tables."David S. Miller
This partially reverts 872e2be7c4056496c2871bd9b0f2fae6c374fe47 (Constify function pointer tables.) The solaris/socksys.c transformation wasn't valid: arch/sparc64/solaris/socksys.c:192: error: assignment of read-only variable ‘socksys_file_ops’ arch/sparc64/solaris/socksys.c:195: error: assignment of read-only variable ‘socksys_file_ops’ arch/sparc64/solaris/socksys.c:196: error: assignment of read-only variable ‘socksys_file_ops’ Signed-off-by: David S. Miller <davem@davemloft.net>
2008-01-23Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Constify function pointer tables. [SPARC64]: Fix section error in sparcspkr [SPARC64]: Fix of section mismatch warnings.
2008-01-23xen: disable vcpu_info placement for nowJeremy Fitzhardinge
There have been several reports of Xen guest domains locking up when using vcpu_info structure placement. Disable it for now. Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-01-22[SPARC]: Constify function pointer tables.Jan Engelhardt
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de> Signed-off-by: David S. Miller <davem@davemloft.net>
2008-01-22x86: GEODE fix a race condition in the MFGPT timer tickJordan Crouse
When we set the MFGPT timer tick, there is a chance that we'll immediately assert an event. If for some reason the IRQ routing for this clock has been setup for some other purpose, then we could end up firing an interrupt into the SMM handler or worse. This rearranges the timer tick init function to initalize the handler before we set up the MFGPT clock to make sure that even if we get an event, it will go to the handler. Furthermore, in the handler we need to make sure that we clear the event, even if the timer isn't running. Signed-off-by: Jordan Crouse <jordan.crouse@amd.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Ingo Molnar <mingo@elte.hu> Tested-by: Arnd Hannemann <hannemann@i4.informatik.rwth-aachen.de>
2008-01-22Fix file references in documentation and KconfigJohann Felix Soden
Fix typo in arch/powerpc/boot/flatdevtree_env.h. There is no Documentation/networking/ixgbe.txt. README.cycladesZ is now in Documentation/. wavelan.p.h is now in drivers/net/wireless/. HFS.txt is now Documentation/filesystems/hfs.txt. OSS-files are now in sound/oss/. Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-01-22Revert "x86: fix NMI watchdog & 'stopped time' problem"Thomas Gleixner
This reverts commit d4d25deca49ec2527a634557bf5a6cf449f85deb. It tried to fix long standing bugzilla entries, but the solution was reported to break other systems. The reporter of http://bugzilla.kernel.org/show_bug.cgi?id=9791 tracked it down to this commit and confirmed that reverting the patch restores the correct behaviour. It's too late in the release cycle to find a better solution than reverting the commit to avoid regressions. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Ingo Molnar <mingo@elte.hu>
2008-01-21[SPARC64]: Fix of section mismatch warnings.Sam Ravnborg
Fix following Section mismatch warning in sparc64: WARNING: arch/sparc64/kernel/built-in.o(.text+0x13dec): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'psycho_scan_bus' and 'psycho_pbm_init') WARNING: arch/sparc64/kernel/built-in.o(.text+0x14b58): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'sabre_scan_bus' and 'sabre_init') WARNING: arch/sparc64/kernel/built-in.o(.text+0x15ea4): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'schizo_scan_bus' and 'schizo_pbm_init') WARNING: arch/sparc64/kernel/built-in.o(.text+0x17780): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'pci_sun4v_scan_bus' and 'pci_sun4v_get_head') WARNING: arch/sparc64/kernel/built-in.o(.text+0x17d5c): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'pci_fire_scan_bus' and 'pci_fire_get_head') WARNING: arch/sparc64/kernel/built-in.o(.text+0x23860): Section mismatch: reference to .devinit.text:vio_dev_release (between 'vio_create_one' and 'vio_add') WARNING: arch/sparc64/kernel/built-in.o(.text+0x23868): Section mismatch: reference to .devinit.text:vio_dev_release (between 'vio_create_one' and 'vio_add') The pci_* were all missing __init annotations. For the vio.c case it was a function with a wrong annotation which was removed. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2008-01-21Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: tc35815: Use irq number for tc35815-mac platform device id [MIPS] Malta: Fix reading the PCI clock frequency on big-endian [MIPS] SMTC: Fix build error.
2008-01-21CRIS: add missed local_irq_restore callCyrill Gorcunov
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@akpm@linux-foundation.org>
2008-01-22tc35815: Use irq number for tc35815-mac platform device idAtsushi Nemoto
The tc35815-mac platform device used a pci bus number and a devfn to identify its target device, but the pci bus number may vary if some bus-bridges are found. Use irq number which is be unique for embedded controllers. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2008-01-22[MIPS] Malta: Fix reading the PCI clock frequency on big-endianDmitri Vorobiev
The JMPRS register on Malta boards keeps a 32-bit CPU-endian value. The readw() function assumes that the value it reads is a little-endian 16-bit number. Therefore, using readw() to obtain the value of the JMPRS register is a mistake. This error leads to incorrect reading of the PCI clock frequency on big-endian during board start-up. Change readw() to __raw_readl(). This was tested by injecting a call to printk() and verifying that the value of the jmpr variable was consistent with current setting of the JP4 "PCI CLK" jumper. Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
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-19arch: Ignore arch/i386 and arch/x86_64Josef 'Jeff' Sipek
The i386 and x86_64 arch directories contain nothing but a generated symlink to arch/x86/boot/bzImage when a tree a built. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Peter Anvin <hpa@zytor.com> Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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>