linux/arch/arm/plat-mxc/devices
Linus Torvalds dd58ecba48 Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (35 commits)
  ARM: msm: platsmp: determine number of CPU cores at boot time
  ARM: Tegra: Seaboard: Fix I2C bus numbering for ADT7461
  ARM: Tegra: Trimslice: Tri-state DAP3 pinmux
  ARM: orion5x: fixup 5181 MPP mask check
  ARM: mxs-dma: include <linux/dmaengine.h>
  ARM: i.MX53: consistently use MX53_UART_PAD_CTRL for uart txd/rxd/rts/cts
  ARM: i.MX53: UARTn_CTS pin should not change RTS input select
  ARM: i.MX53: UARTn_TXD pin should not change RXD input select
  ARM: mx25: Fix typo on CAN1_RX pad setting
  iomux-mx53: add missing 'IOMUX_CONFIG_SION' for some I2C pad definitions
  ARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: LPC32XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: CNS3XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: i.MX53: Fix IOMUX type o's
  ARM i.MX dma: Fix burstsize settings
  mach-mx5: fix the I2C clock parents
  ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0
  ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h
  ARM: mx53: Fix some interrupts marked as reserved.
  MXC: iomux-v3: correct NO_PAD_CTRL definition
  ...

Fix up trivial conflict in arch/arm/mach-imx/mach-mx31_3ds.c
2011-07-25 11:53:35 -07:00
..
Kconfig video i.MX: remove mx1 compile time dependencies 2011-05-19 13:11:26 +02:00
Makefile gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
platform-fec.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-flexcan.c ARM: mx3: introduce SOC_IMX31 and SOC_IMX35 2010-11-19 21:54:35 +01:00
platform-fsl-usb2-udc.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-gpio_keys.c ARM: imx: Add gpio-keys to plat-mxc 2010-10-26 16:24:04 +02:00
platform-gpio-mxc.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
platform-imx2-wdt.c ARM: mx5: Add watchdog support for MX53 2011-02-18 10:57:56 +01:00
platform-imx21-hcd.c ARM: imx: dynamically allocate imx21-hcd devices 2010-11-17 10:01:33 +01:00
platform-imx_udc.c ARM: imx: dynamically allocate imx_udc device 2010-11-17 10:01:20 +01:00
platform-imx-dma.c ARM: mxc: imx-dma on imx25 has no other TO version but TO1 2011-07-07 09:07:38 +02:00
platform-imx-fb.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-imx-i2c.c arm: mx50_rdp: add i2c bus support 2011-01-19 09:58:21 +01:00
platform-imx-keypad.c ARM: mx5: dynamically allocate imx-keypad devices 2011-01-12 14:50:45 +01:00
platform-imx-ssi.c ARM: mx51: Fix the address space length for SSI 2011-07-07 09:07:39 +02:00
platform-imx-uart.c ARM i.MX53: Make MX53 EVK bootable 2011-01-04 12:00:23 +01:00
platform-imxdi_rtc.c ARM: mxc: fix buggy '.end' of IORESOURCE_MEM in device codes 2011-03-23 15:08:14 +01:00
platform-ipu-core.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-mx1-camera.c ARM: imx: dynamically allocate mx1-camera device 2010-11-17 10:01:22 +01:00
platform-mx2-camera.c ARM: mx25: dynamically allocate mx2-camera devices 2010-11-19 21:53:48 +01:00
platform-mxc_nand.c ARM: mx5: introduce SOC_IMX51 2010-12-03 11:05:13 +01:00
platform-mxc_pwm.c ARM: mx5: dynamically allocate pwm devices 2011-01-12 14:50:09 +01:00
platform-mxc_rnga.c ARM: mx3: dynamically allocate mxc_rnga devices 2010-11-19 21:54:35 +01:00
platform-mxc_rtc.c ARM: mx3: dynamically allocate "mxc_rtc" devices 2011-05-19 13:11:16 +02:00
platform-mxc_w1.c ARM: mx3: introduce SOC_IMX31 and SOC_IMX35 2010-11-19 21:54:35 +01:00
platform-mxc-ehci.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-mxc-mmc.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-sdhci-esdhc-imx.c ARM i.MX53 enable sdhc support on EVK board 2011-01-07 15:20:53 +01:00
platform-spi_imx.c spi/imx: use soc name in spi device type naming scheme 2011-07-14 13:47:02 -06:00