q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/arm/mach-davinci/include/mach
History
Linus Torvalds 16ee792e45 Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 
* 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits)
  ARM: tegra: update defconfig
  arm/tegra: Harmony: Configure PMC for low-level interrupts
  arm/tegra: device tree support for ventana board
  arm/tegra: add support for ventana pinmuxing
  arm/tegra: prepare Seaboard pinmux code for derived boards
  arm/tegra: pinmux: ioremap registers
  gpio/tegra: Convert to a platform device
  arm/tegra: Convert pinmux driver to a platform device
  arm/dt: Tegra: Add pinmux node to tegra20.dtsi
  arm/tegra: Prep boards for gpio/pinmux conversion to pdevs
  ARM: mx5: fix clock usage for suspend
  ARM i.MX entry-macro.S: remove now unused code
  ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER
  ARM i.MX tzic: add handle_irq function
  ARM i.MX avic: add handle_irq function
  ARM: mx25: Add the missing IIM base definition
  ARM i.MX avic: convert to use generic irq chip
  mx31moboard: Add poweroff support
  ARM: mach-qong: Add watchdog support
  ARM: davinci: AM18x: Add wl1271/wlan support
  ...

Fix up conflicts in:
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-mx5/devices-imx53.h
	arch/arm/plat-mxc/include/mach/memory.h
2011-11-01 20:31:25 -07:00
..
aemif.h davinci: add support for aemif timing configuration 2010-09-24 07:40:26 -07:00
asp.h ASoC: davinci: let platform data define edma queue numbers 2010-07-20 09:57:20 +01:00
cdce949.h davinci: add support for CDCE949 clock synthesizer 2010-02-04 13:29:58 -08:00
clock.h davinci: major rework of clock, PLL, PSC infrastructure 2009-04-23 09:31:00 -07:00
common.h Davinci: iotable based ioremap() interception 2010-05-13 10:05:31 -07:00
cp_intc.h Davinci: aintc/cpintc - use ioremap() 2010-05-13 10:05:28 -07:00
cpufreq.h davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator 2009-11-25 10:21:37 -08:00
cpuidle.h davinci: cpuidle: move mapping of DDR2 controller registers out of driver 2010-02-04 13:29:38 -08:00
cputype.h Fix common misspellings 2011-03-31 11:26:23 -03:00
da8xx.h davinci: da850: add support for SATA interface 2011-07-08 11:13:08 +05:30
ddr2.h ARM: mach-davinci: remove mach/memory.h 2011-10-13 12:49:47 -04:00
debug-macro.S ARM: mach-davinci: clean up debug-macro.S 2011-09-26 10:11:28 -04:00
dm355.h DaVinci: move AEMIF #define's to the proper headers 2010-05-06 15:02:06 -07:00
dm365.h davinci: cleanup mdio arch code and switch to phy_id 2010-09-24 07:40:30 -07:00
dm644x.h davinci: cleanup mdio arch code and switch to phy_id 2010-09-24 07:40:30 -07:00
dm646x.h davinci: dm6467/T EVM: fix setting up of reference clock rate 2011-07-06 16:48:45 +05:30
edma.h davinci: remove unused DA830_edma_ch enum 2011-03-11 10:48:28 -08:00
entry-macro.S ARM: entry: remove unused irq_prio_table macro 2011-06-28 10:34:58 +01:00
gpio-davinci.h ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
gpio.h ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
hardware.h davinci: move DM64XX_VDD3P3V_PWDN to devices.c 2011-05-23 22:18:26 +05:30
i2c.h Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
io.h ARM: io: make iounmap() a simple macro 2010-12-08 13:57:04 +00:00
irqs.h Davinci: tnetv107x IRQ definitions 2010-05-06 15:02:05 -07:00
keyscan.h Input: davinci_keyscan - add device_enable method to platform data 2010-01-06 00:17:11 -08:00
mmc.h mmc: davinci: Add support for set_power callback 2011-09-17 15:53:23 +05:30
mux.h ARM: davinci: DA850: Add GPIO pinmux configuration for wl1271 2011-09-17 15:53:22 +05:30
nand.h nand: davinci: add support for timing configuration 2010-09-24 07:40:26 -07:00
pm.h davinci: add power management support 2010-02-04 13:29:55 -08:00
psc.h ARM: davinci: correct MDSTAT_STATE_MASK 2011-09-07 14:23:02 +05:30
serial.h ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset 2011-09-26 10:11:27 -04:00
spi.h davinci: spi: move event queue parameter to platform data 2011-02-28 14:53:29 -08:00
sram.h davinci: add SRAM allocator 2009-05-28 15:18:13 -07:00
system.h Davinci: watchdog reset separation across socs 2010-05-06 15:02:09 -07:00
time.h davinci: Add watchdog base address flexibility 2009-05-26 08:20:31 -07:00
timex.h davinci: explain CLOCK_TICK_RATE of 27MHz in include/mach/timex.h 2010-02-04 13:29:41 -08:00
tnetv107x.h davinci: add tnetv107x ssp platform device 2011-03-15 08:17:22 -07:00
uncompress.h ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset 2011-09-26 10:11:27 -04:00
usb.h DaVinci: rename setup_usb() to davinci_setup_usb() 2009-11-25 10:21:33 -08:00
vmalloc.h davinci: Move IO device mapping macros from io.h to hardware.h 2009-08-26 10:57:01 +03:00