2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 13:13:57 +08:00
linux-next/arch/arm/mach-mx5
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
..
board-cpuimx51.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-cpuimx51sd.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx50_rdp.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx51_3ds.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx51_babbage.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx51_efikamx.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx51_efikasb.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx53_evk.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx53_loco.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx53_smd.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
clock-mx51-mx53.c Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 11:53:35 -07:00
cpu_op-mx51.c cpufreq for freescale mx51 2010-10-22 08:24:14 +02:00
cpu_op-mx51.h cpufreq for freescale mx51 2010-10-22 08:24:14 +02:00
cpu.c ARM: mx53: Print silicon revision on boot 2011-05-19 13:11:00 +02:00
crm_regs.h ARM: imx51/53: add sdhc3/4 clock 2011-03-07 19:29:19 +01:00
devices-imx50.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx51.h ARM: mx51: Remove imx51_add_gpio_keys 2011-05-19 13:11:25 +02:00
devices-imx53.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
devices.h ARM: mx5: dynamically allocate imx-keypad devices 2011-01-12 14:50:45 +01:00
efika.h efikamx: add usb h1 support 2011-02-18 10:56:38 +01:00
ehci.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
eukrea_mbimx51-baseboard.c ARM: imx: remove #includes already available from devices-common.h 2011-05-19 13:11:08 +02:00
eukrea_mbimxsd-baseboard.c ARM: imx: remove #includes already available from devices-common.h 2011-05-19 13:11:08 +02:00
Kconfig ARM: mxc: don't allow to compile together i.MX51 and i.MX53 2011-05-19 13:11:30 +02:00
Makefile ARM: mx51: Implement code to allow mx51 to enter WFI 2011-03-23 15:08:15 +01:00
Makefile.boot ARM i.MX53: Make MX53 EVK bootable 2011-01-04 12:00:23 +01:00
mm-mx50.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mx51_efika.c ARM: imx: remove #includes already available from devices-common.h 2011-05-19 13:11:08 +02:00
system.c ARM: mx51: Implement code to allow mx51 to enter WFI 2011-03-23 15:08:15 +01:00