FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-20 16:30:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
dd58ecba48
linux/arch/arm/plat-mxc/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
..
3ds_debugboard.h mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
audmux.h MX51: Add AUDMUX ports definitions 2011-03-23 15:08:13 +01:00
board-mx31ads.h Fixing ethernet driver compilation error for i.MX31 ADS board 2010-10-19 18:45:01 +02:00
board-mx31lilly.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31lite.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31moboard.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-pcm038.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
clkdev.h [ARM] MXC: add clkdev support 2009-03-13 10:33:50 +01:00
clock.h arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block 2010-02-24 10:07:03 +01:00
common.h gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
debug-macro.S ARM: remove support for mxc91231 2011-05-19 13:11:28 +02:00
devices-common.h gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
dma.h dmaengine: Add Freescale i.MX SDMA support 2010-10-05 15:49:26 -07:00
entry-macro.S ARM: entry: remove unused irq_prio_table macro 2011-06-28 10:34:58 +01:00
esdhc.h mmc: sdhci-esdhc-imx: add card detect on custom GPIO for mx25/35 2011-03-17 15:35:04 -04:00
eukrea-baseboards.h mx5: add cpuimx51sd module and its baseboard 2010-10-19 18:45:00 +02:00
gpio.h gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
hardware.h ARM: mx3: make ioremap quirk ready for multi-SoC kernels 2011-05-19 13:11:32 +02:00
i2c.h i2c: iMX/MXC support 2009-04-07 10:18:32 +01:00
iim.h
imx-uart.h Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-06-14 13:42:43 -07:00
imxfb.h ARM: imx: dynamically register imx-fb devices 2010-11-17 10:01:27 +01:00
io.h ARM: mx3: make ioremap quirk ready for multi-SoC kernels 2011-05-19 13:11:32 +02:00
iomux-mx1.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx2x.h mx2/iomux: Set direction for CSPI2 pins 2011-03-25 08:21:34 +01:00
iomux-mx3.h ARM: iomux-imx31: allow pin_list to be const 2011-03-07 19:29:28 +01:00
iomux-mx21.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx25.h ARM: mx25: Fix typo on CAN1_RX pad setting 2011-07-15 10:11:28 +02:00
iomux-mx27.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx35.h ARM: imx35: fix ATA_DATA3 pad control address 2011-03-07 19:29:09 +01:00
iomux-mx50.h ARM: imx50: correct iomux-mx50.h wrong daisy chain settings 2011-02-18 11:01:34 +01:00
iomux-mx51.h mx51 enchance the sd/mmc HW timing compatibility on mx51 boards. 2011-03-10 14:22:18 +01:00
iomux-mx53.h Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes 2011-07-15 21:56:37 +02:00
iomux-v1.h mxc: iomuxv1: Do not use gpio_request when setting the pin as GPIO 2011-07-07 09:06:58 +02:00
iomux-v3.h MXC: iomux-v3: correct NO_PAD_CTRL definition 2011-07-07 09:07:41 +02:00
iomux.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
ipu.h i.MX31: Image Processing Unit DMA and IRQ drivers 2009-01-19 15:36:21 -07:00
iram.h ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irqs.h ARM: mxc: use ARCH_NR_GPIOS to define gpio number 2011-07-08 12:38:18 -06:00
memory.h ARM: remove support for mxc91231 2011-05-19 13:11:28 +02:00
mmc.h mxcmmc: add card detect through DAT3 possibility 2010-07-26 14:17:46 +02:00
mx1_camera.h V4L/DVB (11350): Add camera (CSI) driver for MX1 2009-04-06 21:43:58 -03:00
mx1.h MX1: Add structure, registration functions for framebuffer and rename LCDC INT 2011-03-07 19:29:36 +01:00
mx2_cam.h mx2_camera: Add soc_camera support for i.MX25/i.MX27 2010-07-28 09:28:36 +02:00
mx2x.h ARM: imx: remove deprecated symbols as all users are gone now 2010-11-17 08:58:12 +01:00
mx3_camera.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
mx3fb.h i.MX31: framebuffer driver 2009-02-26 14:00:58 -07:00
mx3x.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx21-usbhost.h USB: MXC: Add i.MX21 specific USB host controller driver. 2010-03-02 14:52:55 -08:00
mx21.h ARM: mx25: move registration of gpios to plat-mxc/gpio.c 2010-11-17 10:01:38 +01:00
mx25.h ARM: mx25: fix offset for usb host controller 2010-12-03 11:05:10 +01:00
mx27.h ARM: mx27: fix gpt4/5 base address 2011-05-19 13:11:09 +02:00
mx31.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx35.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx50.h ARM: mx50: Add support to get the silicon revision 2011-03-23 15:08:15 +01:00
mx51.h ARM: mx51: Print silicon revision on boot 2011-03-23 15:07:47 +01:00
mx53.h ARM: mx53: Fix some interrupts marked as reserved. 2011-07-07 09:07:42 +02:00
mxc_ehci.h ARM i.MX ehci: do ehci init in board specific functions 2011-02-11 08:40:45 +01:00
mxc_nand.h Fix common misspellings 2011-03-31 11:26:23 -03:00
mxc.h ARM: imx: remove some deprecated and unused #defines 2011-05-19 13:11:33 +02:00
sdma.h dmaengine i.MX SDMA: Allow to run without firmware 2010-12-03 11:04:54 +01:00
spi.h spi: add SPI driver for most known i.MX SoCs 2009-09-23 07:39:43 -07:00
ssi.h ASoC: imx-ssi.c: add new choices to platform configuration 2010-06-03 19:00:16 +01:00
system.h ARM: remove support for mxc91231 2011-05-19 13:11:28 +02:00
timex.h ARM: remove support for mxc91231 2011-05-19 13:11:28 +02:00
ulpi.h ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
usb.h imx: exit functions can/should be void 2009-05-07 16:15:58 +02:00
vmalloc.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00