]> Git Repo - linux.git/commitdiff
Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <[email protected]>
Tue, 22 May 2012 23:34:21 +0000 (16:34 -0700)
committerLinus Torvalds <[email protected]>
Tue, 22 May 2012 23:34:21 +0000 (16:34 -0700)
Pull staging tree changes from Greg Kroah-Hartman:
 "Here is the big staging tree pull request for the 3.5-rc1 merge
  window.

  Loads of changes here, and we just narrowly added more lines than we
  added:
   622 files changed, 28356 insertions(+), 26059 deletions(-)

  But, good news is that there is a number of subsystems that moved out
  of the staging tree, to their respective "real" portions of the
  kernel.

  Code that moved out was:
- iio core code
- mei driver
- vme core and bridge drivers

  There was one broken network driver that moved into staging as a step
  before it is removed from the tree (pc300), and there was a few new
  drivers added to the tree:
- new iio drivers
- gdm72xx wimax USB driver
- ipack subsystem and 2 drivers

  All of the movements around have acks from the various subsystem
  maintainers, and all of this has been in the linux-next tree for a
  while.

Signed-off-by: Greg Kroah-Hartman <[email protected]>"
Fixed up various trivial conflicts, along with a non-trivial one found
in -next and pointed out by Olof Johanssen: a clean - but incorrect -
merge of the arch/arm/boot/dts/at91sam9g20.dtsi file.  Fix up manually
as per Stephen Rothwell.

* tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)
  Staging: bcm: Remove two unused variables from Adapter.h
  Staging: bcm: Removes the volatile type definition from Adapter.h
  Staging: bcm: Rename all "INT" to "int" in Adapter.h
  Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h
  Staging: bcm: Correctly format all comments in Adapter.h
  Staging: bcm: Fix all whitespace issues in Adapter.h
  Staging: bcm: Properly format braces in Adapter.h
  Staging: ipack/bridges/tpci200: remove unneeded casts
  Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant
  Staging: ipack: remove board_name and bus_name fields from struct ipack_device
  Staging: ipack: improve the register of a bus and a device in the bus.
  staging: comedi: cleanup all the comedi_driver 'detach' functions
  staging: comedi: remove all 'default N' in Kconfig
  staging: line6/config.h: Delete unused header
  staging: gdm72xx depends on NET
  staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices
  staging: drm/omap: initial dmabuf/prime import support
  staging: drm/omap: dmabuf/prime mmap support
  pstore/ram: Add ECC support
  pstore/ram: Switch to persistent_ram routines
  ...

19 files changed:
1  2 
MAINTAINERS
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
drivers/Kconfig
drivers/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/Kconfig
drivers/staging/android/Makefile
drivers/staging/media/as102/as102_usb_drv.c
drivers/staging/octeon/ethernet-tx.c
drivers/staging/ramster/cluster/tcp.c
include/linux/Kbuild

diff --combined MAINTAINERS
index a8e6098559957562279128a00154895617e51755,7c10c1985272ab0341bff427e0a4d63bd0193f9f..aa067a95ce116e60bf14b4e1aabc4a354d937409
@@@ -640,6 -640,13 +640,6 @@@ S:        Maintaine
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 -ARM/ADI ROADRUNNER MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-ixp23xx/
 -F:    arch/arm/mach-ixp23xx/include/mach/
 -
  ARM/ADS SPHERE MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -739,10 -746,7 +739,10 @@@ M:       Barry Song <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-prima2/
 -F:    drivers/dma/sirf-dma*
 +F:    drivers/dma/sirf-dma.c
 +F:    drivers/i2c/busses/i2c-sirf.c
 +F:    drivers/pinctrl/pinctrl-sirf.c
 +F:    drivers/spi/spi-sirf.c
  
  ARM/EBSA110 MACHINE SUPPORT
  M:    Russell King <[email protected]>
@@@ -855,11 -859,21 +855,11 @@@ M:      Dan Williams <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/INTEL IXP2000 ARM ARCHITECTURE
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/INTEL IXDP2850 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/INTEL IXP23XX ARM ARCHITECTURE
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Imre Kaloz <[email protected]>
  M:    Krzysztof Halasa <[email protected]>
@@@ -894,12 -908,11 +894,12 @@@ ARM/MAGICIAN MACHINE SUPPOR
  M:    Philipp Zabel <[email protected]>
  S:    Maintained
  
 -ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
 -M:    Lennert Buytenhek <[email protected]>
 -M:    Nicolas Pitre <[email protected]>
 +ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
 +M:    Jason Cooper <[email protected]>
 +M:    Andrew Lunn <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Odd Fixes
 +S:    Maintained
 +F:    arch/arm/mach-dove/
  F:    arch/arm/mach-kirkwood/
  F:    arch/arm/mach-mv78xx0/
  F:    arch/arm/mach-orion5x/
@@@ -1318,21 -1331,6 +1318,21 @@@ M:    Nicolas Ferre <[email protected]
  S:    Supported
  F:    drivers/tty/serial/atmel_serial.c
  
 +ATMEL DMA DRIVER
 +M:    Nicolas Ferre <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/dma/at_hdmac.c
 +F:    drivers/dma/at_hdmac_regs.h
 +F:    arch/arm/mach-at91/include/mach/at_hdmac.h
 +
 +ATMEL ISI DRIVER
 +M:    Josh Wu <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/media/video/atmel-isi.c
 +F:    include/media/atmel-isi.h
 +
  ATMEL LCDFB DRIVER
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected]
@@@ -1350,22 -1348,10 +1350,22 @@@ M:   Nicolas Ferre <[email protected]
  S:    Supported
  F:    drivers/spi/spi-atmel.*
  
 +ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
 +M:    Nicolas Ferre <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/misc/atmel_tclib.c
 +F:    drivers/clocksource/tcb_clksrc.c
 +
 +ATMEL TSADCC DRIVER
 +M:    Josh Wu <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/input/touchscreen/atmel_tsadcc.c
 +
  ATMEL USBA UDC DRIVER
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
  S:    Supported
  F:    drivers/usb/gadget/atmel_usba_udc.*
  
@@@ -1445,7 -1431,6 +1445,7 @@@ F:      include/linux/backlight.
  BATMAN ADVANCED
  M:    Marek Lindner <[email protected]>
  M:    Simon Wunderlich <[email protected]>
 +M:    Antonio Quartulli <[email protected]>
  L:    [email protected]
  W:    http://www.open-mesh.org/
  S:    Maintained
@@@ -1613,7 -1598,6 +1613,7 @@@ F:      include/linux/bcma
  
  BROCADE BFA FC SCSI DRIVER
  M:    Jing Huang <[email protected]>
 +M:    Krishna C Gudipati <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bfa/
@@@ -1747,7 -1731,6 +1747,7 @@@ S:      Supporte
  F:    include/linux/capability.h
  F:    security/capability.c
  F:    security/commoncap.c 
 +F:    kernel/capability.c
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <[email protected]>
@@@ -1826,12 -1809,6 +1826,12 @@@ L:    [email protected] (moderate
  S:    Maintained
  F:    Documentation/zh_CN/
  
 +CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 +M:    Alexander Shishkin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/chipidea/
 +
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
  M:    Roopa Prabhu <[email protected]>
@@@ -1991,9 -1968,10 +1991,9 @@@ S:     Maintaine
  F:    drivers/net/ethernet/ti/cpmac.c
  
  CPU FREQUENCY DRIVERS
 -M:    Dave Jones <[email protected]>
 +M:    Rafael J. Wysocki <[email protected]>
  L:    [email protected]
 -W:    http://www.codemonkey.org.uk/projects/cpufreq/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
 +L:    [email protected]
  S:    Maintained
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
@@@ -3406,6 -3384,7 +3406,7 @@@ IIO SUBSYSTEM AND DRIVER
  M:    Jonathan Cameron <[email protected]>
  L:    [email protected]
  S:    Maintained
+ F:    drivers/iio/
  F:    drivers/staging/iio/
  
  IKANOS/ADI EAGLE ADSL USB DRIVER
@@@ -3541,6 -3520,12 +3542,6 @@@ M:     Deepak Saxena <[email protected]
  S:    Maintained
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
 -INTEL IXP2000 ETHERNET DRIVER
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/xscale/ixp2000/
 -
  INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
  M:    Jeff Kirsher <[email protected]>
  M:    Jesse Brandeburg <[email protected]>
@@@ -3625,6 -3610,14 +3626,14 @@@ S:    Supporte
  W:    http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
  F:    drivers/net/wireless/iwmc3200wifi/
  
+ INTEL MANAGEMENT ENGINE (mei)
+ M:    Tomas Winkler <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    include/linux/mei.h
+ F:    drivers/misc/mei/*
+ F:    Documentation/mei/*
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
@@@ -3650,7 -3643,7 +3659,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/icplus/ipg.*
  
  IPATH DRIVER
 -M:    Mike Marciniszyn <infinipath@qlogic.com>
 +M:    Mike Marciniszyn <infinipath@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/infiniband/hw/ipath/
@@@ -4053,7 -4046,6 +4062,7 @@@ F:      Documentation/scsi/53c700.tx
  F:    drivers/scsi/53c700*
  
  LED SUBSYSTEM
 +M:    Bryan Wu <[email protected]>
  M:    Richard Purdie <[email protected]>
  S:    Maintained
  F:    drivers/leds/
@@@ -5150,13 -5142,19 +5159,13 @@@ F:   Documentation/powerpc/eeh-pci-error-
  PCI SUBSYSTEM
  M:    Bjorn Helgaas <[email protected]>
  L:    [email protected]
 -Q:    http://patchwork.kernel.org/project/linux-pci/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci.git
 +Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/linux.git
  S:    Supported
  F:    Documentation/PCI/
  F:    drivers/pci/
  F:    include/linux/pci*
  
 -PCI HOTPLUG
 -M:    Bjorn Helgaas <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/pci/hotplug
 -
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -5219,7 -5217,7 +5228,7 @@@ S:      Maintaine
  F:    include/linux/personality.h
  
  PHONET PROTOCOL
 -M:    Remi Denis-Courmont <remi.denis-courmont@nokia.com>
 +M:    Remi Denis-Courmont <courmisch@gmail.com>
  S:    Supported
  F:    Documentation/networking/phonet.txt
  F:    include/linux/phonet.h
@@@ -5246,14 -5244,6 +5255,14 @@@ M:    Linus Walleij <linus.walleij@linaro.
  S:    Maintained
  F:    drivers/pinctrl/
  
 +PIN CONTROLLER - ST SPEAR
 +M:    Viresh Kumar <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +W:    http://www.st.com/spear
 +S:    Maintained
 +F:    driver/pinctrl/spear/
 +
  PKTCDVD DRIVER
  M:    Peter Osterlund <[email protected]>
  S:    Maintained
@@@ -5477,7 -5467,7 +5486,7 @@@ L:      [email protected]
  S:    Maintained
  
  QIB DRIVER
 -M:    Mike Marciniszyn <infinipath@qlogic.com>
 +M:    Mike Marciniszyn <infinipath@intel.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/qib/
@@@ -5627,13 -5617,14 +5636,13 @@@ F:   net/rds
  READ-COPY UPDATE (RCU)
  M:    Dipankar Sarma <[email protected]>
  M:    "Paul E. McKenney" <[email protected]>
 -W:    http://www.rdrop.com/users/paulmck/rclock/
 +W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/
 +X:    Documentation/RCU/torture.txt
  F:    include/linux/rcu*
 -F:    include/linux/srcu*
  F:    kernel/rcu*
 -F:    kernel/srcu*
  X:    kernel/rcutorture.c
  
  REAL TIME CLOCK (RTC) SUBSYSTEM
@@@ -5910,11 -5901,11 +5919,11 @@@ F:   Documentation/scsi/st.tx
  F:    drivers/scsi/st*
  
  SCTP PROTOCOL
 -M:    Vlad Yasevich <vladislav.yasevich@hp.com>
 +M:    Vlad Yasevich <vyasevich@gmail.com>
  M:    Sridhar Samudrala <[email protected]>
  L:    [email protected]
  W:    http://lksctp.sourceforge.net
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/sctp.txt
  F:    include/linux/sctp.h
  F:    include/net/sctp/
@@@ -5979,7 -5970,7 +5988,7 @@@ SECURITY SUBSYSTE
  M:    James Morris <[email protected]>
  L:    [email protected] (suggested Cc:)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
 -W:    http://security.wiki.kernel.org/
 +W:    http://kernsec.org/
  S:    Supported
  F:    security/
  
@@@ -6150,15 -6141,6 +6159,15 @@@ S:    Maintaine
  F:    include/linux/sl?b*.h
  F:    mm/sl?b.c
  
 +SLEEPABLE READ-COPY UPDATE (SRCU)
 +M:    Lai Jiangshan <[email protected]>
 +M:    "Paul E. McKenney" <[email protected]>
 +W:    http://www.rdrop.com/users/paulmck/RCU/
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    include/linux/srcu*
 +F:    kernel/srcu*
 +
  SMC91x ETHERNET DRIVER
  M:    Nicolas Pitre <[email protected]>
  S:    Odd Fixes
@@@ -6358,6 -6340,21 +6367,6 @@@ F:     arch/arm/mach-spear*/clock.
  F:    arch/arm/plat-spear/clock.c
  F:    arch/arm/plat-spear/include/plat/clock.h
  
 -SPEAR PAD MULTIPLEXING SUPPORT
 -M:    Viresh Kumar <[email protected]>
 -L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.st.com/spear
 -S:    Maintained
 -F:    arch/arm/plat-spear/include/plat/padmux.h
 -F:    arch/arm/plat-spear/padmux.c
 -F:    arch/arm/mach-spear*/spear*xx.c
 -F:    arch/arm/mach-spear*/include/mach/generic.h
 -F:    arch/arm/mach-spear3xx/spear3*0.c
 -F:    arch/arm/mach-spear3xx/spear3*0_evb.c
 -F:    arch/arm/mach-spear6xx/spear600.c
 -F:    arch/arm/mach-spear6xx/spear600_evb.c
 -
  SPI SUBSYSTEM
  M:    Grant Likely <[email protected]>
  L:    [email protected]
@@@ -6688,16 -6685,6 +6697,16 @@@ L:    [email protected] (moderat
  S:    Maintained
  F:    sound/soc/codecs/twl4030*
  
 +TI WILINK WIRELESS DRIVERS
 +M:    Luciano Coelho <[email protected]>
 +L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/wl12xx
 +W:    http://wireless.kernel.org/en/users/Drivers/wl1251
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
 +S:    Maintained
 +F:    drivers/net/wireless/ti/
 +F:    include/linux/wl12xx.h
 +
  TIPC NETWORK LAYER
  M:    Jon Maloy <[email protected]>
  M:    Allan Stephens <[email protected]>
@@@ -6905,14 -6892,6 +6914,14 @@@ F:    Documentation/cdrom
  F:    drivers/cdrom/cdrom.c
  F:    include/linux/cdrom.h
  
 +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 +M:    Vinayak Holikatti <[email protected]>
 +M:    Santosh Y <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/scsi/ufs.txt
 +F:    drivers/scsi/ufs/
 +
  UNSORTED BLOCK IMAGES (UBI)
  M:    Artem Bityutskiy <[email protected]>
  W:    http://www.linux-mtd.infradead.org/
@@@ -7059,14 -7038,6 +7068,14 @@@ W:    http://pegasus2.sourceforge.net
  S:    Maintained
  F:    drivers/net/usb/pegasus.*
  
 +USB PHY LAYER
 +M:    Felipe Balbi <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 +S:    Maintained
 +F:    drivers/usb/phy/
 +F:    drivers/usb/otg/
 +
  USB PRINTER DRIVER (usblp)
  M:    Pete Zaitcev <[email protected]>
  L:    [email protected]
@@@ -7350,6 -7321,18 +7359,18 @@@ S:    Maintaine
  F:    drivers/vlynq/vlynq.c
  F:    include/linux/vlynq.h
  
+ VME SUBSYSTEM
+ M:    Martyn Welch <[email protected]>
+ M:    Manohar Vanga <[email protected]>
+ M:    Greg Kroah-Hartman <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
+ F:    Documentation/vme_api.txt
+ F:    drivers/staging/vme/
+ F:    drivers/vme/
+ F:    include/linux/vme*
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <[email protected]>
  M:    "VMware, Inc." <[email protected]>
@@@ -7470,6 -7453,23 +7491,6 @@@ M:     Miloslav Trmac <[email protected]
  S:    Maintained
  F:    drivers/input/misc/wistron_btns.c
  
 -WL1251 WIRELESS DRIVER
 -M:    Luciano Coelho <[email protected]>
 -L:    [email protected]
 -W:    http://wireless.kernel.org/en/users/Drivers/wl1251
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 -S:    Maintained
 -F:    drivers/net/wireless/wl1251/*
 -
 -WL1271 WIRELESS DRIVER
 -M:    Luciano Coelho <[email protected]>
 -L:    [email protected]
 -W:    http://wireless.kernel.org/en/users/Drivers/wl12xx
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
 -S:    Maintained
 -F:    drivers/net/wireless/wl12xx/
 -F:    include/linux/wl12xx.h
 -
  WL3501 WIRELESS PCMCIA CARD DRIVER
  M:    Arnaldo Carvalho de Melo <[email protected]>
  L:    [email protected]
index a27bbec50ca3056fc570604420e934e08dfe2f40,63d4432960a97a6f13ac67049e7536c06c7f1a9c..2b1e438ed87869320362678421486dc0caa058fd
@@@ -55,6 -55,13 +55,13 @@@ static struct clk adc_clk = 
        .pmc_mask       = 1 << AT91SAM9260_ID_ADC,
        .type           = CLK_TYPE_PERIPHERAL,
  };
+ static struct clk adc_op_clk = {
+       .name           = "adc_op_clk",
+       .type           = CLK_TYPE_PERIPHERAL,
+       .rate_hz        = 5000000,
+ };
  static struct clk usart0_clk = {
        .name           = "usart0_clk",
        .pmc_mask       = 1 << AT91SAM9260_ID_US0,
@@@ -166,6 -173,7 +173,7 @@@ static struct clk *periph_clocks[] __in
        &pioB_clk,
        &pioC_clk,
        &adc_clk,
+       &adc_op_clk,
        &usart0_clk,
        &usart1_clk,
        &usart2_clk,
@@@ -268,6 -276,18 +276,6 @@@ static void __init at91sam9260_register
        clk_register(&pck1);
  }
  
 -static struct clk_lookup console_clock_lookup;
 -
 -void __init at91sam9260_set_console_clock(int id)
 -{
 -      if (id >= ARRAY_SIZE(usart_clocks_lookups))
 -              return;
 -
 -      console_clock_lookup.con_id = "usart";
 -      console_clock_lookup.clk = usart_clocks_lookups[id].clk;
 -      clkdev_add(&console_clock_lookup);
 -}
 -
  /* --------------------------------------------------------------------
   *  GPIO
   * -------------------------------------------------------------------- */
index d556de1411143e986ef049dcd015d6564f415861,be0eb2642439124cf13c02d3d2df20bfce7a2f40..0ded951f785af1f31c7cba305f191a5f137ea096
  #include <linux/platform_device.h>
  #include <linux/i2c-gpio.h>
  
+ #include <linux/platform_data/at91_adc.h>
  #include <mach/board.h>
  #include <mach/cpu.h>
  #include <mach/at91sam9260.h>
  #include <mach/at91sam9260_matrix.h>
  #include <mach/at91_matrix.h>
  #include <mach/at91sam9_smc.h>
+ #include <mach/at91_adc.h>
  
  #include "generic.h"
  
@@@ -702,8 -705,25 +705,8 @@@ static struct platform_device at91sam92
        .num_resources  = ARRAY_SIZE(tcb1_resources),
  };
  
 -#if defined(CONFIG_OF)
 -static struct of_device_id tcb_ids[] = {
 -      { .compatible = "atmel,at91rm9200-tcb" },
 -      { /*sentinel*/ }
 -};
 -#endif
 -
  static void __init at91_add_device_tc(void)
  {
 -#if defined(CONFIG_OF)
 -      struct device_node *np;
 -
 -      np = of_find_matching_node(NULL, tcb_ids);
 -      if (np) {
 -              of_node_put(np);
 -              return;
 -      }
 -#endif
 -
        platform_device_register(&at91sam9260_tcb0_device);
        platform_device_register(&at91sam9260_tcb1_device);
  }
@@@ -1212,6 -1232,14 +1215,6 @@@ void __init at91_register_uart(unsigne
                at91_uarts[portnr] = pdev;
  }
  
 -void __init at91_set_serial_console(unsigned portnr)
 -{
 -      if (portnr < ATMEL_MAX_UART) {
 -              atmel_default_console_device = at91_uarts[portnr];
 -              at91sam9260_set_console_clock(at91_uarts[portnr]->id);
 -      }
 -}
 -
  void __init at91_add_device_serial(void)
  {
        int i;
                if (at91_uarts[i])
                        platform_device_register(at91_uarts[i]);
        }
 -
 -      if (!atmel_default_console_device)
 -              printk(KERN_INFO "AT91: No default serial console defined.\n");
  }
  #else
  void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
 -void __init at91_set_serial_console(unsigned portnr) {}
  void __init at91_add_device_serial(void) {}
  #endif
  
@@@ -1340,6 -1372,93 +1343,93 @@@ void __init at91_add_device_cf(struct a
  void __init at91_add_device_cf(struct at91_cf_data * data) {}
  #endif
  
+ /* --------------------------------------------------------------------
+  *  ADCs
+  * -------------------------------------------------------------------- */
+ #if IS_ENABLED(CONFIG_AT91_ADC)
+ static struct at91_adc_data adc_data;
+ static struct resource adc_resources[] = {
+       [0] = {
+               .start  = AT91SAM9260_BASE_ADC,
+               .end    = AT91SAM9260_BASE_ADC + SZ_16K - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = AT91SAM9260_ID_ADC,
+               .end    = AT91SAM9260_ID_ADC,
+               .flags  = IORESOURCE_IRQ,
+       },
+ };
+ static struct platform_device at91_adc_device = {
+       .name           = "at91_adc",
+       .id             = -1,
+       .dev            = {
+                               .platform_data          = &adc_data,
+       },
+       .resource       = adc_resources,
+       .num_resources  = ARRAY_SIZE(adc_resources),
+ };
+ static struct at91_adc_trigger at91_adc_triggers[] = {
+       [0] = {
+               .name = "timer-counter-0",
+               .value = AT91_ADC_TRGSEL_TC0 | AT91_ADC_TRGEN,
+       },
+       [1] = {
+               .name = "timer-counter-1",
+               .value = AT91_ADC_TRGSEL_TC1 | AT91_ADC_TRGEN,
+       },
+       [2] = {
+               .name = "timer-counter-2",
+               .value = AT91_ADC_TRGSEL_TC2 | AT91_ADC_TRGEN,
+       },
+       [3] = {
+               .name = "external",
+               .value = AT91_ADC_TRGSEL_EXTERNAL | AT91_ADC_TRGEN,
+               .is_external = true,
+       },
+ };
+ static struct at91_adc_reg_desc at91_adc_register_g20 = {
+       .channel_base = AT91_ADC_CHR(0),
+       .drdy_mask = AT91_ADC_DRDY,
+       .status_register = AT91_ADC_SR,
+       .trigger_register = AT91_ADC_MR,
+ };
+ void __init at91_add_device_adc(struct at91_adc_data *data)
+ {
+       if (!data)
+               return;
+       if (test_bit(0, &data->channels_used))
+               at91_set_A_periph(AT91_PIN_PC0, 0);
+       if (test_bit(1, &data->channels_used))
+               at91_set_A_periph(AT91_PIN_PC1, 0);
+       if (test_bit(2, &data->channels_used))
+               at91_set_A_periph(AT91_PIN_PC2, 0);
+       if (test_bit(3, &data->channels_used))
+               at91_set_A_periph(AT91_PIN_PC3, 0);
+       if (data->use_external_triggers)
+               at91_set_A_periph(AT91_PIN_PA22, 0);
+       data->num_channels = 4;
+       data->startup_time = 10;
+       data->registers = &at91_adc_register_g20;
+       data->trigger_number = 4;
+       data->trigger_list = at91_adc_triggers;
+       adc_data = *data;
+       platform_device_register(&at91_adc_device);
+ }
+ #else
+ void __init at91_add_device_adc(struct at91_adc_data *data) {}
+ #endif
  /* -------------------------------------------------------------------- */
  /*
   * These devices are always present and don't need any board-specific
   */
  static int __init at91_add_standard_devices(void)
  {
 +      if (of_have_populated_dt())
 +              return 0;
 +
        at91_add_device_rtt();
        at91_add_device_watchdog();
        at91_add_device_tc();
index f2054495a655b3285dd90a77c5dfeb6cf2abb629,30865c6b9936bd1f73e85432492b351e08779903..4792682d52b9962df1d227a3deb4370244260476
@@@ -176,6 -176,12 +176,12 @@@ static struct clk vdec_clk = 
        .type           = CLK_TYPE_PERIPHERAL,
  };
  
+ static struct clk adc_op_clk = {
+       .name           = "adc_op_clk",
+       .type           = CLK_TYPE_PERIPHERAL,
+       .rate_hz        = 13200000,
+ };
  static struct clk *periph_clocks[] __initdata = {
        &pioA_clk,
        &pioB_clk,
        &isi_clk,
        &udphs_clk,
        &mmc1_clk,
+       &adc_op_clk,
        // irq0
  };
  
@@@ -242,6 -249,8 +249,8 @@@ static struct clk_lookup periph_clocks_
        CLKDEV_CON_ID("pioC", &pioC_clk),
        CLKDEV_CON_ID("pioD", &pioDE_clk),
        CLKDEV_CON_ID("pioE", &pioDE_clk),
+       /* Fake adc clock */
+       CLKDEV_CON_ID("adc_clk", &tsc_clk),
  };
  
  static struct clk_lookup usart_clocks_lookups[] = {
@@@ -288,6 -297,18 +297,6 @@@ static void __init at91sam9g45_register
        clk_register(&pck1);
  }
  
 -static struct clk_lookup console_clock_lookup;
 -
 -void __init at91sam9g45_set_console_clock(int id)
 -{
 -      if (id >= ARRAY_SIZE(usart_clocks_lookups))
 -              return;
 -
 -      console_clock_lookup.con_id = "usart";
 -      console_clock_lookup.clk = usart_clocks_lookups[id].clk;
 -      clkdev_add(&console_clock_lookup);
 -}
 -
  /* --------------------------------------------------------------------
   *  GPIO
   * -------------------------------------------------------------------- */
index 35bd42d02195be3555e4b347fde6de2848bddaa8,0c6d9fe41eecc6fe14b1e2e23a3769706fd808f2..f6747246d64911ab3c61cc2a38ffd2c80c1f7fb4
  #include <linux/i2c-gpio.h>
  #include <linux/atmel-mci.h>
  
+ #include <linux/platform_data/at91_adc.h>
  #include <linux/fb.h>
  #include <video/atmel_lcdc.h>
  
+ #include <mach/at91_adc.h>
  #include <mach/board.h>
  #include <mach/at91sam9g45.h>
  #include <mach/at91sam9g45_matrix.h>
@@@ -69,7 -72,15 +72,7 @@@ static struct platform_device at_hdmac_
  
  void __init at91_add_device_hdmac(void)
  {
 -#if defined(CONFIG_OF)
 -      struct device_node *of_node =
 -              of_find_node_by_name(NULL, "dma-controller");
 -
 -      if (of_node)
 -              of_node_put(of_node);
 -      else
 -#endif
 -              platform_device_register(&at_hdmac_device);
 +      platform_device_register(&at_hdmac_device);
  }
  #else
  void __init at91_add_device_hdmac(void) {}
@@@ -1086,8 -1097,25 +1089,8 @@@ static struct platform_device at91sam9g
        .num_resources  = ARRAY_SIZE(tcb1_resources),
  };
  
 -#if defined(CONFIG_OF)
 -static struct of_device_id tcb_ids[] = {
 -      { .compatible = "atmel,at91rm9200-tcb" },
 -      { /*sentinel*/ }
 -};
 -#endif
 -
  static void __init at91_add_device_tc(void)
  {
 -#if defined(CONFIG_OF)
 -      struct device_node *np;
 -
 -      np = of_find_matching_node(NULL, tcb_ids);
 -      if (np) {
 -              of_node_put(np);
 -              return;
 -      }
 -#endif
 -
        platform_device_register(&at91sam9g45_tcb0_device);
        platform_device_register(&at91sam9g45_tcb1_device);
  }
@@@ -1181,6 -1209,104 +1184,104 @@@ void __init at91_add_device_tsadcc(stru
  #endif
  
  
+ /* --------------------------------------------------------------------
+  *  ADC
+  * -------------------------------------------------------------------- */
+ #if IS_ENABLED(CONFIG_AT91_ADC)
+ static struct at91_adc_data adc_data;
+ static struct resource adc_resources[] = {
+       [0] = {
+               .start  = AT91SAM9G45_BASE_TSC,
+               .end    = AT91SAM9G45_BASE_TSC + SZ_16K - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = AT91SAM9G45_ID_TSC,
+               .end    = AT91SAM9G45_ID_TSC,
+               .flags  = IORESOURCE_IRQ,
+       }
+ };
+ static struct platform_device at91_adc_device = {
+       .name           = "at91_adc",
+       .id             = -1,
+       .dev            = {
+                               .platform_data  = &adc_data,
+       },
+       .resource       = adc_resources,
+       .num_resources  = ARRAY_SIZE(adc_resources),
+ };
+ static struct at91_adc_trigger at91_adc_triggers[] = {
+       [0] = {
+               .name = "external-rising",
+               .value = 1,
+               .is_external = true,
+       },
+       [1] = {
+               .name = "external-falling",
+               .value = 2,
+               .is_external = true,
+       },
+       [2] = {
+               .name = "external-any",
+               .value = 3,
+               .is_external = true,
+       },
+       [3] = {
+               .name = "continuous",
+               .value = 6,
+               .is_external = false,
+       },
+ };
+ static struct at91_adc_reg_desc at91_adc_register_g45 = {
+       .channel_base = AT91_ADC_CHR(0),
+       .drdy_mask = AT91_ADC_DRDY,
+       .status_register = AT91_ADC_SR,
+       .trigger_register = 0x08,
+ };
+ void __init at91_add_device_adc(struct at91_adc_data *data)
+ {
+       if (!data)
+               return;
+       if (test_bit(0, &data->channels_used))
+               at91_set_gpio_input(AT91_PIN_PD20, 0);
+       if (test_bit(1, &data->channels_used))
+               at91_set_gpio_input(AT91_PIN_PD21, 0);
+       if (test_bit(2, &data->channels_used))
+               at91_set_gpio_input(AT91_PIN_PD22, 0);
+       if (test_bit(3, &data->channels_used))
+               at91_set_gpio_input(AT91_PIN_PD23, 0);
+       if (test_bit(4, &data->channels_used))
+               at91_set_gpio_input(AT91_PIN_PD24, 0);
+       if (test_bit(5, &data->channels_used))
+               at91_set_gpio_input(AT91_PIN_PD25, 0);
+       if (test_bit(6, &data->channels_used))
+               at91_set_gpio_input(AT91_PIN_PD26, 0);
+       if (test_bit(7, &data->channels_used))
+               at91_set_gpio_input(AT91_PIN_PD27, 0);
+       if (data->use_external_triggers)
+               at91_set_A_periph(AT91_PIN_PD28, 0);
+       data->num_channels = 8;
+       data->startup_time = 40;
+       data->registers = &at91_adc_register_g45;
+       data->trigger_number = 4;
+       data->trigger_list = at91_adc_triggers;
+       adc_data = *data;
+       platform_device_register(&at91_adc_device);
+ }
+ #else
+ void __init at91_add_device_adc(struct at91_adc_data *data) {}
+ #endif
  /* --------------------------------------------------------------------
   *  RTT
   * -------------------------------------------------------------------- */
@@@ -1716,6 -1842,14 +1817,6 @@@ void __init at91_register_uart(unsigne
                at91_uarts[portnr] = pdev;
  }
  
 -void __init at91_set_serial_console(unsigned portnr)
 -{
 -      if (portnr < ATMEL_MAX_UART) {
 -              atmel_default_console_device = at91_uarts[portnr];
 -              at91sam9g45_set_console_clock(at91_uarts[portnr]->id);
 -      }
 -}
 -
  void __init at91_add_device_serial(void)
  {
        int i;
                if (at91_uarts[i])
                        platform_device_register(at91_uarts[i]);
        }
 -
 -      if (!atmel_default_console_device)
 -              printk(KERN_INFO "AT91: No default serial console defined.\n");
  }
  #else
  void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
 -void __init at91_set_serial_console(unsigned portnr) {}
  void __init at91_add_device_serial(void) {}
  #endif
  
   */
  static int __init at91_add_standard_devices(void)
  {
 +      if (of_have_populated_dt())
 +              return 0;
 +
        at91_add_device_hdmac();
        at91_add_device_rtc();
        at91_add_device_rtt();
index 3d615532ae5c6ea9ae5c74757c30b2dce164c6c9,291b0fe9172f412178e87f692929a7c4689f3fa8..6860d3451100321a8bfd8930c6d5bc96e5fc3b9e
@@@ -32,6 -32,8 +32,8 @@@
  #include <linux/regulator/fixed.h>
  #include <linux/regulator/consumer.h>
  
+ #include <linux/platform_data/at91_adc.h>
  #include <mach/hardware.h>
  #include <asm/setup.h>
  #include <asm/mach-types.h>
@@@ -65,6 -67,20 +67,6 @@@ static void __init ek_init_early(void
  {
        /* Initialize processor: 18.432 MHz crystal */
        at91_initialize(18432000);
 -
 -      /* DBGU on ttyS0. (Rx & Tx only) */
 -      at91_register_uart(0, 0, 0);
 -
 -      /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
 -      at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
 -                         | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
 -                         | ATMEL_UART_RI);
 -
 -      /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
 -      at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
 -
 -      /* set serial console to ttyS0 (ie, DBGU) */
 -      at91_set_serial_console(0);
  }
  
  /*
@@@ -304,6 -320,16 +306,16 @@@ static void __init ek_add_device_button
  static void __init ek_add_device_buttons(void) {}
  #endif
  
+ /*
+  * ADCs
+  */
+ static struct at91_adc_data ek_adc_data = {
+       .channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3),
+       .use_external_triggers = true,
+       .vref = 3300,
+ };
  #if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)
  static struct regulator_consumer_supply ek_audio_consumer_supplies[] = {
        REGULATOR_SUPPLY("AVDD", "0-001b"),
@@@ -358,16 -384,6 +370,16 @@@ static struct i2c_board_info __initdat
  static void __init ek_board_init(void)
  {
        /* Serial */
 +      /* DBGU on ttyS0. (Rx & Tx only) */
 +      at91_register_uart(0, 0, 0);
 +
 +      /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
 +      at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
 +                         | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
 +                         | ATMEL_UART_RI);
 +
 +      /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
 +      at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
        at91_add_device_serial();
        /* USB Host */
        at91_add_device_usbh(&ek_usbh_data);
        ek_add_device_gpio_leds();
        /* Push Buttons */
        ek_add_device_buttons();
+       /* ADCs */
+       at91_add_device_adc(&ek_adc_data);
        /* PCK0 provides MCLK to the WM8731 */
        at91_set_B_periph(AT91_PIN_PC1, 0);
        /* SSC (for WM8731) */
index 9a87f0b072f86cadc92b91e7f62aa981133ab56b,337abd2f0c1a0334672ae79b6f42ac16453b3c58..63163dc7df46c4b416fadf21031c393716861fcc
@@@ -27,6 -27,8 +27,8 @@@
  #include <linux/atmel-mci.h>
  #include <linux/delay.h>
  
+ #include <linux/platform_data/at91_adc.h>
  #include <mach/hardware.h>
  #include <video/atmel_lcdc.h>
  #include <media/soc_camera.h>
@@@ -53,6 -55,16 +55,6 @@@ static void __init ek_init_early(void
  {
        /* Initialize processor: 12.000 MHz crystal */
        at91_initialize(12000000);
 -
 -      /* DGBU on ttyS0. (Rx & Tx only) */
 -      at91_register_uart(0, 0, 0);
 -
 -      /* USART0 not connected on the -EK board */
 -      /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
 -      at91_register_uart(AT91SAM9G45_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
 -
 -      /* set serial console to ttyS0 (ie, DBGU) */
 -      at91_set_serial_console(0);
  }
  
  /*
@@@ -305,6 -317,14 +307,14 @@@ static struct at91_tsadcc_data ek_tsadc
        .ts_sample_hold_time    = 0x0a,
  };
  
+ /*
+  * ADCs
+  */
+ static struct at91_adc_data ek_adc_data = {
+       .channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) | BIT(6) | BIT(7),
+       .use_external_triggers = true,
+       .vref = 3300,
+ };
  
  /*
   * GPIO Buttons
@@@ -447,12 -467,6 +457,12 @@@ static struct platform_device *devices[
  static void __init ek_board_init(void)
  {
        /* Serial */
 +      /* DGBU on ttyS0. (Rx & Tx only) */
 +      at91_register_uart(0, 0, 0);
 +
 +      /* USART0 not connected on the -EK board */
 +      /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
 +      at91_register_uart(AT91SAM9G45_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
        at91_add_device_serial();
        /* USB HS Host */
        at91_add_device_usbh_ohci(&ek_usbh_hs_data);
        at91_add_device_lcdc(&ek_lcdc_data);
        /* Touch Screen */
        at91_add_device_tsadcc(&ek_tsadcc_data);
+       /* ADC */
+       at91_add_device_adc(&ek_adc_data);
        /* Push Buttons */
        ek_add_device_buttons();
        /* AC97 */
diff --combined drivers/Kconfig
index 63b81826cb558b6a80d339bccf8f74a3183a619d,e245779443da2a120f42afab2d7f9a438637693d..bfc918633fd9275f856d53e280fae9be2f8ba698
@@@ -140,8 -140,8 +140,12 @@@ source "drivers/virt/Kconfig
  
  source "drivers/devfreq/Kconfig"
  
 +source "drivers/extcon/Kconfig"
 +
 +source "drivers/memory/Kconfig"
 +
+ source "drivers/iio/Kconfig"
+ source "drivers/vme/Kconfig"
  endmenu
diff --combined drivers/Makefile
index 265b506a15be3cda883258646031baeaf8313542,08b78e035468c1b0cbbcf7e1504d9cbd90a1732e..35d5181c8ef2d876b5c7789e2541380548fba30f
@@@ -134,5 -134,5 +134,7 @@@ obj-$(CONFIG_VIRT_DRIVERS) += virt
  obj-$(CONFIG_HYPERV)          += hv/
  
  obj-$(CONFIG_PM_DEVFREQ)      += devfreq/
 +obj-$(CONFIG_EXTCON)          += extcon/
 +obj-$(CONFIG_MEMORY)          += memory/
+ obj-$(CONFIG_IIO)             += iio/
+ obj-$(CONFIG_VME_BUS)         += vme/
diff --combined drivers/misc/Kconfig
index 757fbd0f2a145ff133649eca29e1467b061615d4,c9104282ec956159eef34cb616204633cf97aaa5..2661f6e366f9c70ed1b3534005260cc650200f3a
@@@ -452,32 -452,14 +452,32 @@@ config ARM_CHARLC
          still useful.
  
  config BMP085
 -      tristate "BMP085 digital pressure sensor"
 +      bool
 +      depends on SYSFS
 +
 +config BMP085_I2C
 +      tristate "BMP085 digital pressure sensor on I2C"
 +      select BMP085
 +      select REGMAP_I2C
        depends on I2C && SYSFS
        help
 -        If you say yes here you get support for the Bosch Sensortec
 -        BMP085 digital pressure sensor.
 +        Say Y here if you want to support Bosch Sensortec's digital pressure
 +        sensor hooked to an I2C bus.
  
          To compile this driver as a module, choose M here: the
 -        module will be called bmp085.
 +        module will be called bmp085-i2c.
 +
 +config BMP085_SPI
 +      tristate "BMP085 digital pressure sensor on SPI"
 +      select BMP085
 +      select REGMAP_SPI
 +      depends on SPI_MASTER && SYSFS
 +      help
 +        Say Y here if you want to support Bosch Sensortec's digital pressure
 +        sensor hooked to an SPI bus.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called bmp085-spi.
  
  config PCH_PHUB
        tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB"
@@@ -508,6 -490,14 +508,6 @@@ config USB_SWITCH_FSA948
          stereo and mono audio, video, microphone and UART data to use
          a common connector port.
  
 -config MAX8997_MUIC
 -      tristate "MAX8997 MUIC Support"
 -      depends on MFD_MAX8997
 -      help
 -        If you say yes here you get support for the MUIC device of
 -        Maxim MAX8997 PMIC.
 -        The MAX8997 MUIC is a USB port accessory detector and switch.
 -
  source "drivers/misc/c2port/Kconfig"
  source "drivers/misc/eeprom/Kconfig"
  source "drivers/misc/cb710/Kconfig"
@@@ -516,4 -506,5 +516,5 @@@ source "drivers/misc/ti-st/Kconfig
  source "drivers/misc/lis3lv02d/Kconfig"
  source "drivers/misc/carma/Kconfig"
  source "drivers/misc/altera-stapl/Kconfig"
+ source "drivers/misc/mei/Kconfig"
  endmenu
diff --combined drivers/misc/Makefile
index 162861788c6debea92fefc4177ba1085d823c004,0f6af6a13345e0f2ce4c43791e9a26b2574a8cab..456972faaeb3a53475495cc7b14b340069f67b8a
@@@ -11,8 -11,6 +11,8 @@@ obj-$(CONFIG_ATMEL_PWM)               += atmel_pwm.
  obj-$(CONFIG_ATMEL_SSC)               += atmel-ssc.o
  obj-$(CONFIG_ATMEL_TCLIB)     += atmel_tclib.o
  obj-$(CONFIG_BMP085)          += bmp085.o
 +obj-$(CONFIG_BMP085_I2C)      += bmp085-i2c.o
 +obj-$(CONFIG_BMP085_SPI)      += bmp085-spi.o
  obj-$(CONFIG_ICS932S401)      += ics932s401.o
  obj-$(CONFIG_LKDTM)           += lkdtm.o
  obj-$(CONFIG_TIFM_CORE)               += tifm_core.o
@@@ -50,3 -48,5 +50,4 @@@ obj-y                         += lis3lv02d
  obj-y                         += carma/
  obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
  obj-$(CONFIG_ALTERA_STAPL)    +=altera-stapl/
 -obj-$(CONFIG_MAX8997_MUIC)    += max8997-muic.o
+ obj-$(CONFIG_INTEL_MEI)               += mei/
diff --combined drivers/staging/Kconfig
index 32bd967f4262116e7947ceee15ac4c20387bdfbd,7e0e5e4317a88d09bdc810579289118d54d73cd5..05e33c700750767c3e5455be7dfac45a652acb17
@@@ -24,8 -24,6 +24,6 @@@ menuconfig STAGIN
  
  if STAGING
  
- source "drivers/staging/serial/Kconfig"
  source "drivers/staging/et131x/Kconfig"
  
  source "drivers/staging/slicoss/Kconfig"
@@@ -68,12 -66,12 +66,10 @@@ source "drivers/staging/octeon/Kconfig
  
  source "drivers/staging/serqt_usb2/Kconfig"
  
 -source "drivers/staging/quatech_usb2/Kconfig"
 -
  source "drivers/staging/vt6655/Kconfig"
  
  source "drivers/staging/vt6656/Kconfig"
  
- source "drivers/staging/vme/Kconfig"
  source "drivers/staging/sep/Kconfig"
  
  source "drivers/staging/iio/Kconfig"
@@@ -114,12 -112,12 +110,12 @@@ source "drivers/staging/cptm1217/Kconfi
  
  source "drivers/staging/ste_rmi4/Kconfig"
  
- source "drivers/staging/mei/Kconfig"
  source "drivers/staging/nvec/Kconfig"
  
  source "drivers/staging/media/Kconfig"
  
+ source "drivers/staging/net/Kconfig"
  source "drivers/staging/omapdrm/Kconfig"
  
  source "drivers/staging/android/Kconfig"
@@@ -130,6 -128,8 +126,10 @@@ source "drivers/staging/ramster/Kconfig
  
  source "drivers/staging/ozwpan/Kconfig"
  
 +source "drivers/staging/ccg/Kconfig"
 +
+ source "drivers/staging/ipack/Kconfig"
+ source "drivers/staging/gdm72xx/Kconfig"
  endif # STAGING
diff --combined drivers/staging/Makefile
index eae8a21f46b893394d89de50b59ed47946846b62,30901057bd1af4b73a4f951b12b570ed22021499..a987b3ad380be083ea133ce77db0538cd212f787
@@@ -3,8 -3,8 +3,8 @@@
  # fix for build system bug...
  obj-$(CONFIG_STAGING)         += staging.o
  
- obj-y                         += serial/
  obj-y                         += media/
+ obj-y                         += net/
  obj-$(CONFIG_ET131X)          += et131x/
  obj-$(CONFIG_SLICOSS)         += slicoss/
  obj-$(CONFIG_USBIP_CORE)      += usbip/
@@@ -25,10 -25,12 +25,11 @@@ obj-$(CONFIG_TRANZPORT)            += frontier
  obj-$(CONFIG_IDE_PHISON)      += phison/
  obj-$(CONFIG_LINE6_USB)               += line6/
  obj-$(CONFIG_USB_SERIAL_QUATECH2)     += serqt_usb2/
 -obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/
  obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
  obj-$(CONFIG_VT6655)          += vt6655/
  obj-$(CONFIG_VT6656)          += vt6656/
  obj-$(CONFIG_VME_BUS)         += vme/
+ obj-$(CONFIG_IPACK_BUS)               += ipack/
  obj-$(CONFIG_DX_SEP)            += sep/
  obj-$(CONFIG_IIO)             += iio/
  obj-$(CONFIG_ZRAM)            += zram/
@@@ -49,11 -51,10 +50,11 @@@ obj-$(CONFIG_FT1000)               += ft1000
  obj-$(CONFIG_SPEAKUP)         += speakup/
  obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)     += cptm1217/
  obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)  += ste_rmi4/
- obj-$(CONFIG_INTEL_MEI)               += mei/
  obj-$(CONFIG_MFD_NVEC)                += nvec/
  obj-$(CONFIG_DRM_OMAP)                += omapdrm/
  obj-$(CONFIG_ANDROID)         += android/
  obj-$(CONFIG_PHONE)           += telephony/
  obj-$(CONFIG_RAMSTER)         += ramster/
  obj-$(CONFIG_USB_WPAN_HCD)    += ozwpan/
 +obj-$(CONFIG_USB_G_CCG)               += ccg/
+ obj-$(CONFIG_WIMAX_GDM72XX)   += gdm72xx/
index c706635f3f8225dc9d5534fdf2f8f0b5952a34b8,63f98223760bcd9ee5272098e8e5c936ce63325b..0e16b594460fb86d81c7813419afe65fd5b125e6
@@@ -25,17 -25,9 +25,9 @@@ config ANDROID_LOGGE
        tristate "Android log driver"
        default n
  
- config ANDROID_PERSISTENT_RAM
-       bool
-       depends on HAVE_MEMBLOCK
-       select REED_SOLOMON
-       select REED_SOLOMON_ENC8
-       select REED_SOLOMON_DEC8
  config ANDROID_RAM_CONSOLE
        bool "Android RAM buffer console"
-       depends on !S390 && !UML && HAVE_MEMBLOCK
-       select ANDROID_PERSISTENT_RAM
+       depends on !S390 && !UML && HAVE_MEMBLOCK && PSTORE_RAM=y
        default n
  
  config ANDROID_TIMED_OUTPUT
@@@ -53,31 -45,17 +45,15 @@@ config ANDROID_LOW_MEMORY_KILLE
        ---help---
          Register processes to be killed when memory is low
  
- config ANDROID_INTF_ALARM
 -source "drivers/staging/android/switch/Kconfig"
 -
+ config ANDROID_INTF_ALARM_DEV
        bool "Android alarm driver"
        depends on RTC_CLASS
        default n
        help
          Provides non-wakeup and rtc backed wakeup alarms based on rtc or
          elapsed realtime, and a non-wakeup alarm on the monotonic clock.
-         Also provides an interface to set the wall time which must be used
-         for elapsed realtime to work.
- config ANDROID_INTF_ALARM_DEV
-       bool "Android alarm device"
-       depends on ANDROID_INTF_ALARM
-       default y
-       help
-         Exports the alarm interface to user-space.
+         Also exports the alarm interface to user-space.
  
- config ANDROID_ALARM_OLDDRV_COMPAT
-       bool "Android Alarm compatability with old drivers"
-       depends on ANDROID_INTF_ALARM
-       default n
-       help
-         Provides preprocessor alias to aid compatability with
-         older out-of-tree drivers that use the Android Alarm
-         in-kernel API. This will be removed eventually.
  endif # if ANDROID
  
  endmenu
index 045d17bde5243f02ee4356415d402cc7ee1595bc,4677e7b0e07a29e660cee4c2996d197041ac2c60..98711e2b2afa65d48d1b1950529ef605f575e13d
@@@ -1,10 -1,9 +1,8 @@@
  obj-$(CONFIG_ANDROID_BINDER_IPC)      += binder.o
  obj-$(CONFIG_ASHMEM)                  += ashmem.o
  obj-$(CONFIG_ANDROID_LOGGER)          += logger.o
- obj-$(CONFIG_ANDROID_PERSISTENT_RAM)  += persistent_ram.o
  obj-$(CONFIG_ANDROID_RAM_CONSOLE)     += ram_console.o
  obj-$(CONFIG_ANDROID_TIMED_OUTPUT)    += timed_output.o
  obj-$(CONFIG_ANDROID_TIMED_GPIO)      += timed_gpio.o
  obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)       += lowmemorykiller.o
- obj-$(CONFIG_ANDROID_INTF_ALARM)      += alarm.o
 -obj-$(CONFIG_ANDROID_SWITCH)          += switch/
  obj-$(CONFIG_ANDROID_INTF_ALARM_DEV)  += alarm-dev.o
index 6875c88e7becbac0a2ca29c6416a1999afc511c5,36150e5c62de9deebbb8101137a3cd19c8007466..aaf1bc2ad1b20bd8f48ec3c779c8ea27c005913a
@@@ -367,7 -367,7 +367,7 @@@ static int as102_usb_probe(struct usb_i
        ENTER();
  
        /* This should never actually happen */
-       if ((sizeof(as102_usb_id_table) / sizeof(struct usb_device_id)) !=
+       if (ARRAY_SIZE(as102_usb_id_table) !=
            (sizeof(as102_device_names) / sizeof(const char *))) {
                pr_err("Device names table invalid size");
                return -EINVAL;
  
        as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL);
        if (as102_dev == NULL) {
 -              err("%s: kzalloc failed", __func__);
 +              dev_err(&intf->dev, "%s: kzalloc failed\n", __func__);
                return -ENOMEM;
        }
  
        /* Assign the user-friendly device name */
-       for (i = 0; i < (sizeof(as102_usb_id_table) /
-                        sizeof(struct usb_device_id)); i++) {
+       for (i = 0; i < ARRAY_SIZE(as102_usb_id_table); i++) {
                if (id == &as102_usb_id_table[i]) {
                        as102_dev->name = as102_device_names[i];
                        as102_dev->elna_cfg = as102_elna_cfg[i];
        ret = usb_register_dev(intf, &as102_usb_class_driver);
        if (ret < 0) {
                /* something prevented us from registering this driver */
 -              err("%s: usb_register_dev() failed (errno = %d)",
 -                  __func__, ret);
 +              dev_err(&intf->dev,
 +                      "%s: usb_register_dev() failed (errno = %d)\n",
 +                      __func__, ret);
                goto failed;
        }
  
index 5877b2c64e2ab8e57757d81b4f0b17e6b952b759,2d4fcea892f7043227de72d12c3f3bc3fc831958..5631dd9f8201488935799adf5e413611e238d1bd
@@@ -62,7 -62,7 +62,7 @@@
   * You can define GET_SKBUFF_QOS() to override how the skbuff output
   * function determines which output queue is used. The default
   * implementation always uses the base queue for the port. If, for
-  * example, you wanted to use the skb->priority fieid, define
+  * example, you wanted to use the skb->priority field, define
   * GET_SKBUFF_QOS as: #define GET_SKBUFF_QOS(skb) ((skb)->priority)
   */
  #ifndef GET_SKBUFF_QOS
@@@ -165,8 -165,8 +165,8 @@@ int cvm_oct_xmit(struct sk_buff *skb, s
  #endif
  
        /*
-        * Prefetch the private data structure.  It is larger that one
-        * cache line.
+        * Prefetch the private data structure.  It is larger than the
+        * one cache line.
         */
        prefetch(priv);
  
         * See if we can put this skb in the FPA pool. Any strange
         * behavior from the Linux networking stack will most likely
         * be caused by a bug in the following code. If some field is
-        * in use by the network stack and get carried over when a
-        * buffer is reused, bad thing may happen.  If in doubt and
+        * in use by the network stack and gets carried over when a
+        * buffer is reused, bad things may happen.  If in doubt and
         * you dont need the absolute best performance, disable the
         * define REUSE_SKBUFFS_WITHOUT_FREE. The reuse of buffers has
         * shown a 25% increase in performance under some loads.
        }
        if (unlikely
            (skb->truesize !=
 -           sizeof(*skb) + skb_end_pointer(skb) - skb->head)) {
 +           sizeof(*skb) + skb_end_offset(skb))) {
                /*
                   printk("TX buffer truesize has been changed\n");
                 */
index b9721c1055b1688f23ba94013d3d729e345aa4e2,3490192f8ca27d0d9b6ee27f5c5ba662d5cf9fee..d0a07d722b61546cb21b0dc350d9b5153381520f
@@@ -111,7 -111,7 +111,7 @@@ static struct socket *r2net_listen_sock
   * r2net_wq.  teardown detaches the callbacks before destroying the workqueue.
   * quorum work is queued as sock containers are shutdown.. stop_listening
   * tears down all the node's sock containers, preventing future shutdowns
-  * and queued quroum work, before canceling delayed quorum work and
+  * and queued quorum work, before canceling delayed quorum work and
   * destroying the work queue.
   */
  static struct workqueue_struct *r2net_wq;
@@@ -660,7 -660,7 +660,7 @@@ out
  
  /*
   * we register callbacks so we can queue work on events before calling
-  * the original callbacks.  our callbacks our careful to test user_data
+  * the original callbacks.  our callbacks are careful to test user_data
   * to discover when they've reaced with r2net_unregister_callbacks().
   */
  static void r2net_register_callbacks(struct sock *sk,
@@@ -2106,7 -2106,7 +2106,7 @@@ static int r2net_open_listening_sock(__
        r2net_listen_sock = sock;
        INIT_WORK(&r2net_listen_work, r2net_accept_many);
  
 -      sock->sk->sk_reuse = 1;
 +      sock->sk->sk_reuse = SK_CAN_REUSE;
        ret = sock->ops->bind(sock, (struct sockaddr *)&sin, sizeof(sin));
        if (ret < 0) {
                printk(KERN_ERR "ramster: Error %d while binding socket at "
diff --combined include/linux/Kbuild
index 0237b84ba541fa35a7ce23170eecef02b2df6f3e,b344a664c1f12e7ee1e3465056b4a106917888d7..39737839ce291591008ff8673b11ab2b69b9f3db
@@@ -167,6 -167,7 +167,6 @@@ header-y += if_arp.
  header-y += if_bonding.h
  header-y += if_bridge.h
  header-y += if_cablemodem.h
 -header-y += if_ec.h
  header-y += if_eql.h
  header-y += if_ether.h
  header-y += if_fc.h
@@@ -185,6 -186,7 +185,6 @@@ header-y += if_pppox.
  header-y += if_slip.h
  header-y += if_strip.h
  header-y += if_team.h
 -header-y += if_tr.h
  header-y += if_tun.h
  header-y += if_tunnel.h
  header-y += if_vlan.h
@@@ -238,6 -240,7 +238,7 @@@ header-y += map_to_7segment.
  header-y += matroxfb.h
  header-y += mdio.h
  header-y += media.h
+ header-y += mei.h
  header-y += mempolicy.h
  header-y += meye.h
  header-y += mii.h
@@@ -330,7 -333,6 +331,7 @@@ header-y += scc.
  header-y += sched.h
  header-y += screen_info.h
  header-y += sdla.h
 +header-y += seccomp.h
  header-y += securebits.h
  header-y += selinux_netlink.h
  header-y += sem.h
@@@ -380,6 -382,7 +381,7 @@@ header-y += unistd.
  header-y += usbdevice_fs.h
  header-y += utime.h
  header-y += utsname.h
+ header-y += uuid.h
  header-y += uvcvideo.h
  header-y += v4l2-mediabus.h
  header-y += v4l2-subdev.h
This page took 0.157903 seconds and 4 git commands to generate.