leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16642a2e7b
linux/arch/arm/mach-omap1
History
Linus Torvalds 8f446a7a06 ARM: soc: driver specific changes 
- A long-coming conversion of various platforms to a common LED
   infrastructure
 - AT91 is moved over to use the newer MCI driver for MMC
 - Pincontrol conversions for samsung platforms
 - DT bindings for gscaler on samsung
 - i2c driver fixes for tegra, acked by i2c maintainer
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJQaO48AAoJEIwa5zzehBx3excP/ieEkRhvfnWxdYST6ekvGIQr
 nEyskOh2rVjgYKmSXUJyKSbvG+7bZ8VIxvPvojeAJ/R84pTFMzbR2F0CaPKzAuSW
 inDt6c0Bnx1NZlfUTAoXcz7feyq9zHYNs9BCLoPU0bYNchCCqcWSKzqnpXk2ph/P
 LFnmNa0j6a4E3QJYAjM2zFvc3Tgk+MWTq1fWwNFvsWTh2WbQtmB/iGnzT5Xs4XQh
 u1SSx5tz0lcF5zQRGmJhXgL5+nnIP4sRwRUBAkpe3Gv5cM6WBVEBRDANa5QpbUL2
 RXK5YyCTIln2Me4bPk32zEBLjiZ/WXbmiA2uwoqVgy6XToubemDXd0PtKmjj5tZ1
 BkTD1DND7BKBEQnJj/GBECEdvx2FbrKfruoPcJHvXPZ7Svn5Dt/MWYJQIkRFkuhL
 zlVNoDGWlU8nScGrgmTM56UvWmGWC3UFsWSgdVQNfW9yEva+G1FvRUwUH02Ip5Ad
 4r28JFIn6zyjtM99ZHipU6C6Rze2ordC7fl5X5LBLkVOobioblxCAhIhcqkhfKsk
 rFriNsdfYs7SrJA7mK7GzvaMEJgp/5o1noJKXI7ZBcLI8yYagzbQbPu/vGi6G6d3
 0xC7NaTEJbtoXoDAtmtilLRxmw0YCXgVBBGua0K2YKpcRwnzCHNbV4gsLMnDuOXS
 HP4M96LxLHJlLGCxhEme
 =ck7M
 -----END PGP SIGNATURE-----

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM soc driver specific changes from Olof Johansson:
 - A long-coming conversion of various platforms to a common LED
   infrastructure
 - AT91 is moved over to use the newer MCI driver for MMC
 - Pincontrol conversions for samsung platforms
 - DT bindings for gscaler on samsung
 - i2c driver fixes for tegra, acked by i2c maintainer

Fix up conflicts as per Olof.

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
  drivers: bus: omap_l3: use resources instead of hardcoded irqs
  pinctrl: exynos: Fix wakeup IRQ domain registration check
  pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
  pinctrl: exynos: Correct the detection of wakeup-eint node
  pinctrl: exynos: Mark exynos_irq_demux_eint as inline
  pinctrl: exynos: Handle only unmasked wakeup interrupts
  pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
  pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
  drivers: bus: Move the OMAP interconnect driver to drivers/bus/
  i2c: tegra: dynamically control fast clk
  i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20
  ARM: tegra: clock: remove unused clock entry for i2c
  ARM: tegra: clock: add connection name in i2c clock entry
  i2c: tegra: pass proper name for getting clock
  ARM: tegra: clock: add i2c fast clock entry in clock table
  ARM: EXYNOS: Adds G-Scaler device from Device Tree
  ARM: EXYNOS: Add clock support for G-Scaler
  ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled platform
  ARM: dts: Add pinctrl node entries for SAMSUNG EXYNOS4210 SoC
  ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used
  ...
2012-10-01 18:46:13 -07:00
..
include/mach ARM: OMAP1: Move irda.h from plat to mach 2012-09-20 15:03:58 -07:00
ams-delta-fiq-handler.S ARM: OMAP1: Move board-ams-delta.h from plat to mach 2012-09-20 15:02:19 -07:00
ams-delta-fiq.c ARM: OMAP1: Move board-ams-delta.h from plat to mach 2012-09-20 15:02:19 -07:00
board-ams-delta.c ARM: OMAP1: Move board-ams-delta.h from plat to mach 2012-09-20 15:02:19 -07:00
board-fsample.c ARM: OMAP1: Move flash.h from plat to mach 2012-09-20 15:02:47 -07:00
board-generic.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
board-h2-mmc.c ARM: omap: remove mmc platform data dma_mask and initialization 2012-07-31 12:06:23 +01:00
board-h2.c ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
board-h2.h
board-h3-mmc.c ARM: omap: remove mmc platform data dma_mask and initialization 2012-07-31 12:06:23 +01:00
board-h3.c ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
board-h3.h
board-htcherald.c ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
board-innovator.c ARM: OMAP1: Move flash.h from plat to mach 2012-09-20 15:02:47 -07:00
board-nand.c ARM: OMAP1: board files: deduplicate and clean some NAND-related code 2012-04-13 06:34:31 -06:00
board-nokia770.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
board-osk.c ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
board-palmte.c ARM: OMAP1: Move irda.h from plat to mach 2012-09-20 15:03:58 -07:00
board-palmtt.c ARM: OMAP1: Move irda.h from plat to mach 2012-09-20 15:03:58 -07:00
board-palmz71.c ARM: OMAP1: Move irda.h from plat to mach 2012-09-20 15:03:58 -07:00
board-perseus2.c ARM: OMAP1: Move flash.h from plat to mach 2012-09-20 15:02:47 -07:00
board-sx1-mmc.c ARM: OMAP1: Move board-sx1.h from plat to mach 2012-09-20 15:02:38 -07:00
board-sx1.c ARM: OMAP1: Move irda.h from plat to mach 2012-09-20 15:03:58 -07:00
board-voiceblue.c ARM: OMAP1: Move flash.h from plat to mach 2012-09-20 15:02:47 -07:00
clock_data.c smatch and string-wrapping cleanups for the OMAP subarch code. 2012-09-12 20:42:36 -07:00
clock.c ARM: OMAP: unwrap strings 2012-09-12 02:57:10 -06:00
clock.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
common.h arm-soc: sweeping late_initcall cleanup 2012-05-26 13:14:01 -07:00
devices.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
dma.c smatch and string-wrapping cleanups for the OMAP subarch code. 2012-09-12 20:42:36 -07:00
flash.c ARM: OMAP1: Move flash.h from plat to mach 2012-09-20 15:02:47 -07:00
fpga.c ARM: OMAP2+: declare file-local functions as static 2012-04-13 06:34:26 -06:00
gpio7xx.c ARM: OMAP: Move gpio.h to include/linux/platform_data 2012-09-12 18:06:30 -07:00
gpio15xx.c ARM: OMAP: Move gpio.h to include/linux/platform_data 2012-09-12 18:06:30 -07:00
gpio16xx.c ARM: OMAP: Move gpio.h to include/linux/platform_data 2012-09-12 18:06:30 -07:00
i2c.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
id.c ARM: OMAP: add includes for missing prototypes 2012-04-13 06:34:26 -06:00
io.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
iomap.h ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
irq.c ARM: OMAP: add includes for missing prototypes 2012-04-13 06:34:26 -06:00
Kconfig ARM: OMAP1: fix compilation issue in board-sx1.c 2012-05-08 17:16:24 -07:00
lcd_dma.c ARM: OMAP: unwrap strings 2012-09-12 02:57:10 -06:00
mailbox.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
Makefile ARM: mach-omap1: retire custom LED code 2012-08-01 11:22:13 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mcbsp.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
mux.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
ocpi.c ARM: OMAP1: OCPI: move to mach-omap1/ 2012-04-13 06:34:27 -06:00
opp_data.c ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
opp.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
pm_bus.c PM: Move clock-related definitions and headers to separate file 2011-08-25 15:34:19 +02:00
pm.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
pm.h
reset.c ARM: OMAP: add includes for missing prototypes 2012-04-13 06:34:26 -06:00
serial.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
sleep.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
sram.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
time.c ARM: mach-omap1: retire custom LED code 2012-08-01 11:22:13 +08:00
timer32k.c ARM: mach-omap1: retire custom LED code 2012-08-01 11:22:13 +08:00
timer.c ARM: OMAP: Add flag to indicate if a timer needs a manual reset 2012-06-14 02:39:47 -07:00
usb.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00