korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 21:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
95360fd636
linux/drivers
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
..
accessibility
acpi PCI changes for the 3.7 merge window: 2012-10-01 12:05:36 -07:00
amba
ata ahci: Add identifiers for ASM106x devices 2012-09-13 00:24:29 -04:00
atm
auxdisplay
base Driver core merge for 3.7-rc1 2012-10-01 12:10:44 -07:00
bcma
block USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
bluetooth Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt 2012-09-22 22:20:37 -07:00
bus ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
cdrom
char ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
clk ARM: soc: soc-specific updates, take 2 2012-10-01 18:35:58 -07:00
clocksource ARM: soc: soc-specific updates 2012-10-01 18:24:44 -07:00
connector
cpufreq Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-09-19 11:00:07 -07:00
cpuidle
crypto Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-09-12 07:14:17 +08:00
dca
devfreq
dio
dma ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
edac sb_edac: Avoid overflow errors at memory size calculation 2012-09-25 07:38:20 -03:00
eisa
extcon Driver core merge for 3.7-rc1 2012-10-01 12:10:44 -07:00
firewire
firmware firmware: Add missing attributes to EFI variable attribute print out from sysfs 2012-09-10 16:40:30 -07:00
gpio ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
gpu PCI changes for the 3.7 merge window: 2012-10-01 12:05:36 -07:00
hid Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
hsi
hv
hwmon hwmon: (mcp3021) Add MCP3221 support 2012-09-23 21:08:36 -07:00
hwspinlock
i2c ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
ide
idle
ieee802154
iio iio: adc: add new lp8788 adc driver 2012-09-22 10:29:19 +01:00
infiniband PCI changes for the 3.7 merge window: 2012-10-01 12:05:36 -07:00
input ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
iommu PCI changes for the 3.7 merge window: 2012-10-01 12:05:36 -07:00
irqchip irqchip: fill in empty Kconfig 2012-09-24 10:07:40 -07:00
isdn Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt 2012-09-22 22:20:37 -07:00
leds ARM: tegra: i2c driver enhancements mostly related to clocking 2012-09-16 18:31:37 -07:00
lguest lguest, x86: handle guest TS bit for lazy/non-lazy fpu host models 2012-09-18 15:52:09 -07:00
macintosh macintosh/mediabay: make data used as *of_device_id.data const 2012-09-11 08:57:43 +02:00
md A few fixes for problems discovered during the 3.6 cycle. 2012-09-28 10:00:01 -07:00
media ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
memory memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl() 2012-09-26 14:04:09 -07:00
memstick
message
mfd ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
misc TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
mmc ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
mtd ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
net ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
nfc
nubus
of
oprofile
parisc
parport
pci PCI changes for the 3.7 merge window: 2012-10-01 12:05:36 -07:00
pcmcia ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
pinctrl ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
platform thinkpad_acpi: buffer overflow in fan_get_status() 2012-09-13 16:46:31 -04:00
pnp
power ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
pps
ps3
ptp
pwm
rapidio Merge commit 'v3.6-rc5' into next 2012-09-13 08:41:01 -06:00
regulator Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next 2012-09-28 14:45:07 +01:00
remoteproc ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
rpmsg rpmsg: fix dma_free_coherent dev parameter 2012-09-12 12:03:57 +03:00
rtc ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
s390 TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
sbus
scsi ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
sfi
sh sh: pfc: Fix up GPIO mux type reconfig case. 2012-09-25 11:51:05 +09:00
sn
spi ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
ssb
staging ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
target Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-10-01 09:06:36 -07:00
tc
thermal
tty ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
uio
usb ARM: soc: cleanups, part 2 2012-10-01 18:32:45 -07:00
uwb
vfio vfio: Fix virqfd release race 2012-09-21 10:48:28 -06:00
vhost
video ARM: soc: cleanups, part 2 2012-10-01 18:32:45 -07:00
virt
virtio
vlynq
vme
w1 char/misc driver merge for 3.7-rc1 2012-10-01 12:09:59 -07:00
watchdog ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
xen USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
zorro
Kconfig ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
Makefile ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00