Commit graph

120159 commits

Author SHA1 Message Date
Sascha Hauer
9d631b835f [ARM] MXC: remove dependency to other include files from irqs.h
This patch removes the inclusion of mach/hardware.h from mach/irqs.h and
switches to more meaningful names for the irq related macros.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-18 16:40:11 +01:00
Sascha Hauer
7c99502383 [ARM] MX1/MX2 DMA: add missing local_irq_restore()
This patch adds a missing call to local_irq_restore() and fixes some
compiler warnings about unused variables for MX1.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-18 16:40:04 +01:00
Sascha Hauer
b71edbe9a0 [ARM] MX27ads: fix function name
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-18 12:27:48 +01:00
Sascha Hauer
2955de5fad [ARM] MX1: Add missing selection of ARM920T
The MX1 only has one possible CPU type, ARM920T. Select it in
Kconfig.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-18 09:32:23 +01:00
Russell King
c95a44329e Merge branch 'rmk-devel-mxc-pu-v2' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel 2008-12-17 20:05:39 +00:00
Russell King
c613bbba6f Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel 2008-12-17 20:04:45 +00:00
Russell King
cd4348339c Merge branch 'hsmmc-init' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel 2008-12-17 20:03:39 +00:00
Sascha Hauer
80eee6bca4 i.MX Framebuffer: add TFT support
With TFTs we can do 5/6/5 instead of 4/4/4. Add a bitfield for this
and use it with TFTs.

Acked-by: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 15:43:50 +01:00
Sascha Hauer
278892736e i.MX Framebuffer: rename imxfb_mach_info to imx_fb_platform_data
rename imxfb_mach_info to a name more common to kernel hackers

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 15:40:22 +01:00
Sascha Hauer
66c8719b2e i.MX Framebuffer: Cleanup Coding style
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 15:40:22 +01:00
Sascha Hauer
24b9baf7a5 i.MX Framebuffer: remove header file
Move contents of imxfb.h to imxfb.c since it is used only
in this file

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 15:40:21 +01:00
Sascha Hauer
d6ed5755ac i.MX Framebuffer: fix margins
The upper/lower and left/right margins are mixed up in the driver.
Fix it

Acked-by: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 15:40:20 +01:00
Juergen Beisert
72330b0eee i.MX Framebuffer: Use readl/writel instead of direct pointer deref
This patch prepares the current i.MX1 framebuffer driver for usage in the
whole i.MX family. It switches to readl/writel for register accesses.
Also it moves the register definitions to the driver where they belong.

Acked-by: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 15:40:19 +01:00
Sascha Hauer
74b114fe2c i.MX Framebuffer: remove gpio setup function
Remove the gpio mux setup function from i.MX framebuffer driver.
This function is platform specific and thus should be done by
the board setup. As there are currently no in-kernel users
of this driver we do not break anything.

Acked-by: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 15:40:18 +01:00
Sascha Hauer
60e8c5ab0b MAINTAINERS: Add myself as i.MX Framebuffer driver maintainer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 15:40:18 +01:00
Claudio Scordino
47fee6fedd Unused variable 'reg' removed.
Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:44 +01:00
Paulius Zaleckas
d7927e1916 patch-mxc-fiq
Drivers which are going to use it will have to select it and use
mxc_set_irq_fiq() to set FIQ mode for this interrupt.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:43 +01:00
Paulius Zaleckas
bd006a9bfe patch-mx1-UART-support
Adds support for MX1 architecture to UART driver.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:43 +01:00
Darius Augulis
5032630f39 patch-mx1-mtd-xip
Adds MTD XIP support for ARCH_MX1.

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:42 +01:00
Darius Augulis
219fed7558 patch-mx1-add-devices
Adds common devices to ARCH_MX1.

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:41 +01:00
Paulius Zaleckas
cfca8b539f patch-mxc-add-ARCH_MX1
Adds MX1 architecture to platform MXC. It will supersede mach-imx
and let it die.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:40 +01:00
Darius Augulis
d133d6a893 patch-iomux-mx1-mx2-cleanup
Fix GIUS register setup in the mxc_gpio_mode().

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:26 +01:00
Valentin Longchamp
376a960ee6 [ARM] MX31: defconfig for mx31moboard platform
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:20 +01:00
Valentin Longchamp
988d2d49f7 [ARM] MX31: basic support for mx31moboard platform
Initial support for mx31moboard platfor with 3 serial ports
and NOR Flash

Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:19 +01:00
Valentin Longchamp
a3cce2a8e2 MX31: UART5 pins definition
pins definition for UART5 when used in alternate mode 2

Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:18 +01:00
Valentin Longchamp
d1b3cc6de8 MX31: definitions for UART2 pins
UART2 pins when used in functionnal mode

Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:17 +01:00
Marc Kleine-Budde
df25f9da9f imxmmc: use readl/writel
Use readl/writel instead of direct pointer deref.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:17 +01:00
Marc Kleine-Budde
2507b0a333 imxmmc: Remove unused variables
This removes clkrt and cmdat from struct imxmci_host, they are
unused.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:16 +01:00
Marc Kleine-Budde
4b7c0e4cae imxmmc: Checkpatch cleanup
This cleans up the warnings issued by the checkpatch script
and remove the file history from the header

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:15 +01:00
Sascha Hauer
3287abbd71 [ARM] pcm037: add NAND support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:14 +01:00
Sascha Hauer
cb96cf1ad6 [ARM] MX3: add NAND support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:02 +01:00
Sascha Hauer
01f71a3719 [ARM] pcm038: Add NAND support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:58:00 +01:00
Sascha Hauer
02870978ea [ARM] MX27: Add NAND resources
This patch adds the platform device and resources for NAND
on mx27 boards.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:57:58 +01:00
Fabio Estevam
46c3d567af Add default configuration for MX31PDK board.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:57:58 +01:00
Fabio Estevam
1553a1ec83 Add basic support for MX31PDK board.
Add basic support to the MX31PDK development board, also known
as MX31 3DS or MX31 3-stack board (http://www.freescale.com/imx31pdk).

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:57:57 +01:00
Sascha Hauer
3dad21a95b [ARM] pcm037: Add support for SRAM device
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:57:56 +01:00
Guennadi Liakhovetski
ba54b95899 [ARM] pcm037: add support for the on-board LAN9217 network controller
smc911x now also supports LAN921{5,7,8} network controllers.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:57:55 +01:00
Sascha Hauer
3620c0dccf pcm038: add driver for static ram
The pcm038 module (phyCORE-i.MX27) comes with a 512 KiB static RAM which
can be battery buffered. Add mtd_ram support and configure the chip select
line, to which the sram is attached.

Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:57:54 +01:00
Guennadi Liakhovetski
4a7b98d7e7 i.MX31: fix mxc_iomux_set_pad()
mxc_iomux_set_pad() is buggy on i.MX31 - it calculates the register and
the offset therein wrongly. Fix it.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:57:24 +01:00
Sascha Hauer
1d5aa17be1 [ARM] MX3 iomux: add more pin definitions
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:46:18 +01:00
Sascha Hauer
7bd1822135 [ARM] MX1/MX2: simplify mxc_gpio_setup_multiple_pins
mxc_gpio_setup_multiple_pins used to take several ALLOC_MODE flags. Most
of them are unused, so simplify the function by removing the flags. Also,
instead of using a confusing MXC_GPIO_ALLOC_MODE_RELEASE flag in a function
having alloc in its name, add a mxc_gpio_release_multiple_pins function.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:46:14 +01:00
Julien Boibessot
d1900d3a18 [ARM] MX27: add i.MX27 SDHC1 and SDHC2 GPIO declarations
Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:46:09 +01:00
Sascha Hauer
1e7f3f48b3 MX27: Add USB pin function defines
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:44:51 +01:00
Sascha Hauer
8c8409539b [ARM] MX27ads: remove unused define
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:44:38 +01:00
Sascha Hauer
7cb3f6d268 [ARM] MX2: Add IRQ_GPIOE definition
The MX2 has 5 gpio ports, IRQ_GPIOE was missing so far.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:44:29 +01:00
Sascha Hauer
619e15508b MX27: Fix EMMA Base addresses
The EMMA (Enhanced Multimedia Engine) is divided into two parts, the
postprocessor and the preprocessor. Fix the base addresses.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:44:17 +01:00
Sascha Hauer
33ebc19d54 [ARM] MX2: DMA updates
This one updates DMA support on MX2 which got broken in:
[ARM] Hide ISA DMA API when ISA_DMA_API is unset

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 12:17:47 +01:00
Linus Torvalds
a3dd15444b Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5348/1: fix documentation wrt location of the alignment trap interface
  [ARM] Ensure linux/hardirqs.h is included where required
  [ARM] fix kernel-doc syntax
  [ARM] arch/arm/common/sa1111.c: Correct error handling code
  [ARM] 5341/2: there is no copy_page on nommu ARM
2008-12-15 16:31:05 -08:00
Linus Torvalds
7004405cb8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  Phonet: keep TX queue disabled when the device is off
  SCHED: netem: Correct documentation comment in code.
  netfilter: update rwlock initialization for nat_table
  netlabel: Compiler warning and NULL pointer dereference fix
  e1000e: fix double release of mutex
  IA64: HP_SIMETH needs to depend upon NET
  netpoll: fix race on poll_list resulting in garbage entry
  ipv6: silence log messages for locally generated multicast
  sungem: improve ethtool output with internal pcs and serdes
  tcp: tcp_vegas cong avoid fix 
  sungem: Make PCS PHY support partially work again.
2008-12-15 16:30:22 -08:00
Rusty Russell
d2ff911882 Define smp_call_function_many for UP
Otherwise those using it in transition patches (eg. kvm) can't compile
with CONFIG_SMP=n:

arch/x86/kvm/../../../virt/kvm/kvm_main.c: In function 'make_all_cpus_request':
arch/x86/kvm/../../../virt/kvm/kvm_main.c:380: error: implicit declaration of function 'smp_call_function_many'

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-12-15 16:28:57 -08:00