OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/plat-mxc/include/mach
History
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
 		2011-03-17 19:08:06 -07:00
..
3ds_debugboard.h mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
audmux.h MXC: Add a digital audio multiplexer driver 2009-11-14 10:30:39 +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 ARM: mxc91231: use .init_early to initialize cpu type 2011-02-10 14:23:50 +01:00
debug-macro.S ARM: imx/debug-macro: rework using the new io mapping macro 2010-11-17 08:58:11 +01:00
devices-common.h ARM: mx5: add support for the two watchdog modules 2010-12-07 20:03:11 +01:00
dma.h dmaengine: Add Freescale i.MX SDMA support 2010-10-05 15:49:26 -07:00
entry-macro.S mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
esdhc.h arm: imx: add generic esdhc device 2010-10-11 15:22:05 +02:00
eukrea-baseboards.h mx5: add cpuimx51sd module and its baseboard 2010-10-19 18:45:00 +02:00
gpio.h ARM i.MX: Move gpio initialization to SoC specific files 2011-03-07 19:29:37 +01:00
hardware.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
i2c.h i2c: iMX/MXC support 2009-04-07 10:18:32 +01:00
iim.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
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] MXC: do not include mach/hardware.h from mach/memory.h 2008-12-18 16:40:14 +01:00
iomux-mx1.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx2x.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +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 mx25: add PWM4 to iomux 2010-07-26 14:18:33 +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 ARM: imx53: add sdhc pad settings 2011-02-28 09:28:42 +01:00
iomux-mxc91231.h ARM: mxc91231/iomux: allow pin_list to be const 2011-03-07 19:29:28 +01:00
iomux-v1.h ARM i.MX: iomux v1 initialization away from initcall 2011-03-07 19:29:38 +01:00
iomux-v3.h arm: mxc: move IOMUX_CONFIG_SION definition to iomux-v3.h 2011-01-07 15:20:52 +01: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: imx5x: clean up ARCH_MX5X 2011-03-07 19:29:42 +01:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
mmc.h mxcmmc: add card detect through DAT3 possibility 2010-07-26 14:17:46 +02:00
mx1.h MX1: Add structure, registration functions for framebuffer and rename LCDC INT 2011-03-07 19:29:36 +01:00
mx1_camera.h V4L/DVB (11350): Add camera (CSI) driver for MX1 2009-04-06 21:43:58 -03: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: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01: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 core functions support except clock 2011-01-03 09:39:29 +01:00
mx51.h ARM: mx5: dynamically allocate imx-keypad devices 2011-01-12 14:50:45 +01:00
mx53.h ARM: mx5: Add watchdog support for MX53 2011-02-18 10:57:56 +01:00
mxc.h ARM: imx3x: clean up ARCH_MX3X 2011-03-07 19:29:43 +01:00
mxc91231.h ARM: imx: change static io mapping to use a function 2010-11-17 08:58:11 +01: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 Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD 2010-07-26 14:27:25 +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 i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472 2010-10-19 18:44:58 +02:00
timex.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00: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 mx31: add support for the bugbase 1.3 from buglabs 2011-02-28 09:28:46 +01: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