leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fe6b540ac0
linux/arch/arm/plat-mxc/include/mach
History
Linus Torvalds 69f1d1a6ac Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 
* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
  ARM: S5P64X0: External Interrupt Support
  ARM: EXYNOS4: Enable MFC on Samsung NURI
  ARM: EXYNOS4: Enable MFC on universal_c210
  ARM: S5PV210: Enable MFC on Goni
  ARM: S5P: Add support for MFC device
  ARM: EXYNOS4: Add support FIMD on SMDKC210
  ARM: EXYNOS4: Add platform device and helper functions for FIMD
  ARM: EXYNOS4: Add resource definition for FIMD
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: SAMSUNG: Add IRQ_I2S0 definition
  ARM: SAMSUNG: Add platform device for idma
  ARM: EXYNOS4: Add more registers to be saved and restored for PM
  ARM: EXYNOS4: Add more register addresses of CMU
  ARM: EXYNOS4: Add platform device for dwmci driver
  ARM: EXYNOS4: configure rtc-s3c on NURI
  ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
  ARM: EXYNOS4: configure ADC on NURI
  ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
  ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
  ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
  ...

Fix up tons of silly conflicts:
 - arch/arm/mach-davinci/include/mach/psc.h
 - arch/arm/mach-exynos4/Kconfig
 - arch/arm/mach-exynos4/mach-smdkc210.c
 - arch/arm/mach-exynos4/pm.c
 - arch/arm/mach-imx/mm-imx1.c
 - arch/arm/mach-imx/mm-imx21.c
 - arch/arm/mach-imx/mm-imx25.c
 - arch/arm/mach-imx/mm-imx27.c
 - arch/arm/mach-imx/mm-imx31.c
 - arch/arm/mach-imx/mm-imx35.c
 - arch/arm/mach-mx5/mm.c
 - arch/arm/mach-s5pv210/mach-goni.c
 - arch/arm/mm/Kconfig
2011-07-26 17:41:04 -07:00
..
3ds_debugboard.h
audmux.h MX51: Add AUDMUX ports definitions 2011-03-23 15:08:13 +01:00
board-mx31ads.h
board-mx31lilly.h
board-mx31lite.h
board-mx31moboard.h
board-pcm038.h
clock.h
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 i.MX debug macro: use CONFIG_SOC_* instead of CONFIG_ARCH_* 2011-07-07 10:00:02 +02:00
devices-common.h ARM: mxc: clean up imx-dma device registration 2011-07-07 10:01:12 +02:00
dma.h
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
gpio.h gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
hardware.h ARM i.MX: remove SoC defines around header includes 2011-07-07 09:59:58 +02:00
i2c.h
iim.h
imx-uart.h
imxfb.h
io.h ARM: mx3: make ioremap quirk ready for multi-SoC kernels 2011-05-19 13:11:32 +02:00
iomux-mx1.h
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
iomux-mx25.h ARM: mx25: Fix typo on CAN1_RX pad setting 2011-07-15 10:11:28 +02:00
iomux-mx27.h
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 ARM i.MX: get rid of wrong MXC_INTERNAL_IRQ usage 2011-07-07 10:00:00 +02:00
iomux-v3.h MXC: iomux-v3: correct NO_PAD_CTRL definition 2011-07-07 09:07:41 +02:00
ipu.h
iram.h
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
mx1_camera.h
mx1.h MX1: Add structure, registration functions for framebuffer and rename LCDC INT 2011-03-07 19:29:36 +01:00
mx2_cam.h
mx2x.h
mx3_camera.h
mx3fb.h
mx3x.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx21-usbhost.h
mx21.h
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: Add SSI suport 2011-07-07 10:01:13 +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 i.MX mxc.h: use CONFIG_SOC_* instead of CONFIG_ARCH_* 2011-07-07 09:59:59 +02:00
sdma.h dmaengine: imx-sdma: pass sdma firmware name via platform data 2011-07-07 10:01:12 +02:00
spi.h
ssi.h
system.h ARM: remove support for mxc91231 2011-05-19 13:11:28 +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