iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
dd58ecba48
linux/arch/arm/mach-mxs/include/mach
History
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
..
clkdev.h ARM: mxs: Add clock support 2010-12-20 17:30:22 +01:00
clock.h ARM i.MX23/28: remove secondary field from struct clk. It's unused 2011-01-24 09:01:48 +01:00
common.h ARM: mxs: add ocotp read function 2011-01-21 11:36:49 +01:00
debug-macro.S ARM: mxs: Add low-level debug UART support 2010-12-20 17:29:23 +01:00
devices-common.h gpio/mxs: Change gpio-mxs into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
dma.h ARM: mxs-dma: include <linux/dmaengine.h> 2011-07-15 10:45:28 +02:00
entry-macro.S ARM: mxs: Add interrupt support 2010-12-20 10:37:56 +01:00
gpio.h ARM: mxs: Add gpio support 2010-12-20 17:29:51 +01:00
hardware.h
io.h ARM: mxs: Add helper definition and function 2010-12-13 14:49:50 +01:00
iomux-mx23.h ARM: mxs: fix typo "GPO" in iomux-mx23.h 2011-03-07 19:29:47 +01:00
iomux-mx28.h ARM: mxs: Add iomux support 2010-12-20 17:29:58 +01:00
iomux.h ARM: mxs: add helper macro for pad control 2011-03-07 19:29:45 +01:00
irqs.h
memory.h
mmc.h mmc: mxs-mmc: add mmc host driver for i.MX23/28 2011-03-15 13:49:37 -04:00
mx23.h ARM: mxs/i.MX23: make i2c defines consistent and match the reference manual 2011-05-19 13:11:21 +02:00
mx28.h ARM: mxs: make ssp error irq definition consistent 2011-03-07 19:29:54 +01:00
mxs.h ARM: mxs: Initial support for Ka-Ro TX28 2011-03-07 19:29:07 +01:00
mxsfb.h video: Add i.MX23/28 framebuffer driver 2011-03-07 19:29:30 +01:00
system.h ARM: mxs: Add reset routines 2010-12-20 10:37:52 +01:00
timex.h ARM: mxs: Add helper definition and function 2010-12-13 14:49:50 +01:00
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
vmalloc.h ARM: mxs: Add helper definition and function 2010-12-13 14:49:50 +01:00