forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/arch/arm/plat-mxc/include/mach
History
Linus Torvalds 994c0e9925 Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc 
* 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits)
  MAINTAINERS: add ARM/FREESCALE IMX6 entry
  arm/imx: merge i.MX3 and i.MX6
  arm/imx6q: add suspend/resume support
  arm/imx6q: add device tree machine support
  arm/imx6q: add smp and cpu hotplug support
  arm/imx6q: add core drivers clock, gpc, mmdc and src
  arm/imx: add gic_handle_irq function
  arm/imx6q: add core definitions and low-level debug uart
  arm/imx6q: add device tree source
  ARM: highbank: add suspend support
  ARM: highbank: Add cpu hotplug support
  ARM: highbank: add SMP support
  MAINTAINERS: add Calxeda Highbank ARM platform
  ARM: add Highbank core platform support
  ARM: highbank: add devicetree source
  ARM: l2x0: add empty l2x0_of_init
  picoxcell: add a definition of VMALLOC_END
  picoxcell: remove custom ioremap implementation
  picoxcell: add the DTS for the PC7302 board
  picoxcell: add the DTS for pc3x2 and pc3x3 devices
  ...

Fix up trivial conflicts in arch/arm/Kconfig, and some more header file
conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge
by Arnd).
2011-11-01 21:08:03 -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
clock.h
common.h Merge branch 'imx/imx6q' into next/soc 2011-11-02 02:46:55 +01:00
debug-macro.S Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:34:22 -07:00
devices-common.h Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:16:43 -07:00
dma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
entry-macro.S arm/imx: add gic_handle_irq function 2011-10-31 14:26:22 +01:00
esdhc.h mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea-baseboards.h mx5: add cpuimx51sd module and its baseboard 2010-10-19 18:45:00 +02:00
gpio.h Merge branch 'highbank/soc' into next/soc 2011-11-02 02:46:10 +01:00
hardware.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
i2c.h i2c-imx: remove init/exit hooks from platform data 2011-09-14 22:14:41 +01:00
iim.h
imx-uart.h
imxfb.h ARM: imx: dynamically register imx-fb devices 2010-11-17 10:01:27 +01:00
io.h arm/imx: remove cpu_is_xxx() check from __imx_ioremap() 2011-10-04 10:55:12 +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 mx31moboard: Add poweroff support 2011-09-20 14:53:00 +02: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 ARM: i.MX51: clean up iomux-mx51.h 2011-08-17 08:41:23 +02:00
iomux-mx53.h ARM: i.MX53: clean up iomux-mx53.h 2011-08-17 08:43:32 +02:00
iomux-v1.h ARM i.MX: get rid of wrong MXC_INTERNAL_IRQ usage 2011-07-07 10:00:00 +02:00
iomux-v3.h Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
ipu.h
iram.h ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irqs.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01: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
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
mx3x.h ARM: mx35: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
mx6q.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +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 Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features 2011-09-29 10:40:29 +02:00
mx27.h arm/imx: remove mx27_setup_weimcs() from mx27.h 2011-10-17 21:41:03 +02:00
mx31.h arm/imx: remove mx31_setup_weimcs() from mx31.h 2011-10-17 21:41:03 +02:00
mx35.h ARM: imx: Add PATA resources for other i.MX processors 2011-08-24 10:11:40 +02:00
mx50.h ARM: mx50: Add support to get the silicon revision 2011-03-23 15:08:15 +01:00
mx51.h Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup 2011-09-20 10:09:08 +02:00
mx53.h ARM: mx5/mm: consolidate TZIC map code 2011-09-20 09:55:06 +02:00
mxc.h arm/imx: remove cpu_is_xxx() from arch_idle() 2011-10-04 10:55:06 +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
sdma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
spi.h
ssi.h ASoC: imx-ssi.c: add new choices to platform configuration 2010-06-03 19:00:16 +01:00
system.h arm/imx: remove cpu_is_xxx() from arch_idle() 2011-10-04 10:55:06 +02:00
timex.h ARM i.MX: define CLOCK_TICK_RATE to bogus value 2011-07-07 09:59:58 +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: mach-mx5/mx53_ard: Add support for i.MX53 ARD board 2011-07-07 10:01:07 +02:00
usb.h
vmalloc.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00