Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

fb09bafd · Linus Torvalds <[email protected]> · 2012-05-22 16:34:21 -07:00

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
  ...

Commit: fb09bafda67041b74a668dc9d77735e36bd33d3b
Parents: 94b5aff4 · c3c6cc91

Merge commit. Changes below are compared with the first parent: 94b5aff4.

Changes

610 files changed · +28076 −25869

File	Status	Add	Del	Content
drivers/staging/iio/Documentation/sysfs-bus-iio → Documentation/ABI/testing/sysfs-bus-iio	renamed	+24	−28	View file
Documentation/Makefile	modified	+1	−1	View file
Documentation/devicetree/bindings/arm/atmel-adc.txt	added	+65	−0	View file
Documentation/devicetree/bindings/staging/iio/adc/lpc32xx-adc.txt	added	+16	−0	View file
Documentation/devicetree/bindings/staging/iio/adc/spear-adc.txt	added	+26	−0	View file
Documentation/ioctl/ioctl-number.txt	modified	+1	−0	View file
Documentation/misc-devices/mei/.gitignore	added	+1	−0	View file
Documentation/misc-devices/mei/Makefile	added	+8	−0	View file
Documentation/misc-devices/mei/TODO	added	+2	−0	View file
drivers/staging/mei/mei-amt-version.c → Documentation/misc-devices/mei/mei-amt-version.c	renamed	+1	−1	View file
drivers/staging/mei/mei.txt → Documentation/misc-devices/mei/mei.txt	renamed	+0	−0	View file
Documentation/ramoops.txt	modified	+11	−5	View file
drivers/staging/vme/vme_api.txt → Documentation/vme_api.txt	renamed	+0	−0	View file
MAINTAINERS	modified	+21	−0	View file
arch/arm/boot/dts/at91sam9g45.dtsi	modified	+37	−0	View file
arch/arm/boot/dts/at91sam9x5.dtsi	modified	+38	−0	View file
arch/arm/mach-at91/at91sam9260.c	modified	+8	−0	View file
arch/arm/mach-at91/at91sam9260_devices.c	modified	+90	−0	View file
arch/arm/mach-at91/at91sam9g45.c	modified	+9	−0	View file
arch/arm/mach-at91/at91sam9g45_devices.c	modified	+101	−0	View file
arch/arm/mach-at91/at91sam9x5.c	modified	+6	−0	View file
arch/arm/mach-at91/board-sam9g20ek.c	modified	+14	−0	View file
arch/arm/mach-at91/board-sam9m10g45ek.c	modified	+12	−0	View file
drivers/Kconfig	modified	+4	−0	View file
drivers/Makefile	modified	+2	−0	View file
drivers/char/Kconfig	modified	+0	−8	View file
drivers/char/Makefile	modified	+0	−1	View file
drivers/char/ramoops.c	deleted	+0	−250	View before deletion
drivers/iio/Kconfig	added	+54	−0	View file
drivers/iio/Makefile	added	+13	−0	View file
drivers/iio/adc/Kconfig	added	+16	−0	View file
drivers/iio/adc/Makefile	added	+5	−0	View file
drivers/iio/adc/at91_adc.c	added	+802	−0	View file
drivers/iio/amplifiers/Kconfig	added	+17	−0	View file
drivers/iio/amplifiers/Makefile	added	+5	−0	View file
drivers/iio/amplifiers/ad8366.c	added	+222	−0	View file
drivers/staging/iio/iio_core.h → drivers/iio/iio_core.h	renamed	+6	−0	View file
drivers/staging/iio/iio_core_trigger.h → drivers/iio/iio_core_trigger.h	renamed	+0	−0	View file
drivers/staging/iio/industrialio-buffer.c → drivers/iio/industrialio-buffer.c	renamed	+56	−35	View file
drivers/staging/iio/industrialio-core.c → drivers/iio/industrialio-core.c	renamed	+40	−54	View file
drivers/staging/iio/industrialio-event.c → drivers/iio/industrialio-event.c	renamed	+7	−7	View file
drivers/staging/iio/industrialio-trigger.c → drivers/iio/industrialio-trigger.c	renamed	+12	−12	View file
drivers/staging/iio/inkern.c → drivers/iio/inkern.c	renamed	+4	−4	View file
drivers/staging/iio/kfifo_buf.c → drivers/iio/kfifo_buf.c	renamed	+1	−2	View file
drivers/misc/Kconfig	modified	+1	−0	View file
drivers/misc/Makefile	modified	+1	−0	View file
drivers/staging/mei/Kconfig → drivers/misc/mei/Kconfig	renamed	+0	−0	View file
drivers/staging/mei/Makefile → drivers/misc/mei/Makefile	renamed	+0	−0	View file
drivers/staging/mei/hw.h → drivers/misc/mei/hw.h	renamed	+0	−0	View file
drivers/staging/mei/init.c → drivers/misc/mei/init.c	renamed	+2	−2	View file
drivers/staging/mei/interface.c → drivers/misc/mei/interface.c	renamed	+1	−1	View file
drivers/staging/mei/interface.h → drivers/misc/mei/interface.h	renamed	+2	−3	View file
drivers/staging/mei/interrupt.c → drivers/misc/mei/interrupt.c	renamed	+1	−1	View file
drivers/staging/mei/iorw.c → drivers/misc/mei/iorw.c	renamed	+1	−1	View file
drivers/staging/mei/main.c → drivers/misc/mei/main.c	renamed	+17	−24	View file
drivers/staging/mei/mei_dev.h → drivers/misc/mei/mei_dev.h	renamed	+1	−1	View file
drivers/staging/mei/wd.c → drivers/misc/mei/wd.c	renamed	+38	−38	View file
drivers/net/wan/Kconfig	modified	+0	−31	View file
drivers/net/wan/Makefile	modified	+0	−5	View file
drivers/staging/Kconfig	modified	+6	−6	View file
drivers/staging/Makefile	modified	+3	−2	View file
drivers/staging/android/Kconfig	modified	+3	−27	View file
drivers/staging/android/Makefile	modified	+0	−2	View file
drivers/staging/android/alarm-dev.c	modified	+106	−31	View file
drivers/staging/android/alarm.c	deleted	+0	−601	View before deletion
drivers/staging/android/android_alarm.h	modified	+0	−59	View file
drivers/staging/android/binder.h	modified	+5	−5	View file
drivers/staging/android/logger.c	modified	+65	−48	View file
drivers/staging/android/ram_console.c	modified	+1	−1	View file
drivers/staging/android/timed_output.c	modified	+1	−0	View file
drivers/staging/bcm/Adapter.h	modified	+414	−469	View file
drivers/staging/bcm/DDRInit.c	modified	+13	−13	View file
drivers/staging/bcm/IPv6Protocol.c	modified	+228	−181	View file
drivers/staging/bcm/Misc.c	modified	+1	−1	View file
drivers/staging/comedi/Kconfig	modified	+102	−151	View file
drivers/staging/comedi/comedi.h	modified	+1	−1	View file
drivers/staging/comedi/comedi_fops.c	modified	+669	−734	View file
drivers/staging/comedi/comedidev.h	modified	+67	−5	View file
drivers/staging/comedi/drivers.c	modified	+231	−95	View file
drivers/staging/comedi/drivers/8255.c	modified	+26	−47	View file
drivers/staging/comedi/drivers/acl7225b.c	modified	+17	−38	View file
drivers/staging/comedi/drivers/addi-data/addi_common.c	modified	+1204	−2352	View file
drivers/staging/comedi/drivers/addi-data/addi_common.h	modified	+53	−92	View file
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c	modified	+9	−9	View file
drivers/staging/comedi/drivers/adl_pci6208.c	modified	+98	−165	View file
drivers/staging/comedi/drivers/adl_pci7230.c	modified	+46	−87	View file
drivers/staging/comedi/drivers/adl_pci7296.c	modified	+23	−54	View file
drivers/staging/comedi/drivers/adl_pci7432.c	modified	+53	−96	View file
drivers/staging/comedi/drivers/adl_pci8164.c	modified	+116	−185	View file
drivers/staging/comedi/drivers/adl_pci9111.c	modified	+33	−73	View file
drivers/staging/comedi/drivers/adl_pci9118.c	modified	+92	−90	View file
drivers/staging/comedi/drivers/adq12b.c	modified	+94	−156	View file
drivers/staging/comedi/drivers/adv_pci1710.c	modified	+89	−134	View file
drivers/staging/comedi/drivers/adv_pci1723.c	modified	+23	−80	View file
drivers/staging/comedi/drivers/adv_pci_dio.c	modified	+38	−92	View file
drivers/staging/comedi/drivers/aio_aio12_8.c	modified	+10	−23	View file
drivers/staging/comedi/drivers/aio_iiro_16.c	modified	+41	−72	View file
drivers/staging/comedi/drivers/amplc_dio200.c	modified	+56	−43	View file
drivers/staging/comedi/drivers/amplc_pc236.c	modified	+47	−38	View file
drivers/staging/comedi/drivers/amplc_pc263.c	modified	+48	−39	View file
drivers/staging/comedi/drivers/amplc_pci224.c	modified	+123	−133	View file
drivers/staging/comedi/drivers/amplc_pci230.c	modified	+37	−83	View file
drivers/staging/comedi/drivers/c6xdigio.c	modified	+8	−36	View file
drivers/staging/comedi/drivers/cb_das16_cs.c	modified	+2	−7	View file
drivers/staging/comedi/drivers/cb_pcidas.c	modified	+30	−79	View file
drivers/staging/comedi/drivers/cb_pcidas64.c	modified	+52	−90	View file
drivers/staging/comedi/drivers/cb_pcidda.c	modified	+78	−97	View file
drivers/staging/comedi/drivers/cb_pcidio.c	modified	+24	−107	View file
drivers/staging/comedi/drivers/cb_pcimdas.c	modified	+35	−88	View file
drivers/staging/comedi/drivers/cb_pcimdda.c	modified	+39	−93	View file
drivers/staging/comedi/drivers/comedi_bond.c	modified	+71	−145	View file
drivers/staging/comedi/drivers/comedi_parport.c	modified	+9	−29	View file
drivers/staging/comedi/drivers/comedi_test.c	modified	+166	−207	View file
drivers/staging/comedi/drivers/contec_pci_dio.c	modified	+54	−109	View file
drivers/staging/comedi/drivers/daqboard2000.c	modified	+30	−57	View file
drivers/staging/comedi/drivers/das08.c	modified	+75	−57	View file
drivers/staging/comedi/drivers/das08.h	modified	+1	−1	View file
drivers/staging/comedi/drivers/das16.c	modified	+405	−486	View file
drivers/staging/comedi/drivers/das16m1.c	modified	+85	−134	View file
drivers/staging/comedi/drivers/das1800.c	modified	+18	−43	View file
drivers/staging/comedi/drivers/das6402.c	modified	+24	−44	View file
drivers/staging/comedi/drivers/das800.c	modified	+2	−6	View file
drivers/staging/comedi/drivers/dmm32at.c	modified	+2	−13	View file
drivers/staging/comedi/drivers/dt2801.c	modified	+125	−158	View file
drivers/staging/comedi/drivers/dt2811.c	modified	+138	−171	View file
drivers/staging/comedi/drivers/dt2814.c	modified	+47	−69	View file
drivers/staging/comedi/drivers/dt2815.c	modified	+8	−34	View file
drivers/staging/comedi/drivers/dt2817.c	modified	+9	−28	View file
drivers/staging/comedi/drivers/dt282x.c	modified	+186	−211	View file
drivers/staging/comedi/drivers/dt3000.c	modified	+101	−133	View file
drivers/staging/comedi/drivers/dt9812.c	modified	+14	−13	View file
drivers/staging/comedi/drivers/dyna_pci10xx.c	modified	+26	−53	View file
drivers/staging/comedi/drivers/fl512.c	modified	+9	−38	View file
drivers/staging/comedi/drivers/gsc_hpdi.c	modified	+36	−62	View file
drivers/staging/comedi/drivers/icp_multi.c	modified	+103	−186	View file
drivers/staging/comedi/drivers/ii_pci20kc.c	modified	+9	−27	View file
drivers/staging/comedi/drivers/jr3_pci.c	modified	+28	−56	View file
drivers/staging/comedi/drivers/ke_counter.c	modified	+33	−65	View file
drivers/staging/comedi/drivers/me4000.c	modified	+165	−267	View file
drivers/staging/comedi/drivers/me_daq.c	modified	+34	−67	View file
drivers/staging/comedi/drivers/mite.h	modified	+2	−2	View file
drivers/staging/comedi/drivers/mpc624.c	modified	+105	−131	View file
drivers/staging/comedi/drivers/mpc8260cpm.c	modified	+45	−69	View file
drivers/staging/comedi/drivers/multiq3.c	modified	+9	−28	View file
drivers/staging/comedi/drivers/ni_6527.c	modified	+3	−7	View file
drivers/staging/comedi/drivers/ni_65xx.c	modified	+3	−6	View file
drivers/staging/comedi/drivers/ni_660x.c	modified	+5	−10	View file
drivers/staging/comedi/drivers/ni_670x.c	modified	+3	−9	View file
drivers/staging/comedi/drivers/ni_at_a2150.c	modified	+168	−192	View file
drivers/staging/comedi/drivers/ni_at_ao.c	modified	+100	−138	View file
drivers/staging/comedi/drivers/ni_atmio.c	modified	+36	−58	View file
drivers/staging/comedi/drivers/ni_atmio16d.c	modified	+22	−60	View file
drivers/staging/comedi/drivers/ni_daq_700.c	modified	+3	−14	View file
drivers/staging/comedi/drivers/ni_daq_dio24.c	modified	+3	−14	View file
drivers/staging/comedi/drivers/ni_labpc.c	modified	+2	−7	View file
drivers/staging/comedi/drivers/ni_labpc.h	modified	+1	−1	View file
drivers/staging/comedi/drivers/ni_labpc_cs.c	modified	+1	−9	View file
drivers/staging/comedi/drivers/ni_mio_cs.c	modified	+2	−11	View file
drivers/staging/comedi/drivers/ni_pcidio.c	modified	+58	−84	View file
drivers/staging/comedi/drivers/ni_pcimio.c	modified	+85	−113	View file
drivers/staging/comedi/drivers/ni_tio_internal.h	modified	+22	−14	View file
drivers/staging/comedi/drivers/pcl711.c	modified	+26	−49	View file
drivers/staging/comedi/drivers/pcl724.c	modified	+21	−44	View file
drivers/staging/comedi/drivers/pcl725.c	modified	+9	−28	View file
drivers/staging/comedi/drivers/pcl726.c	modified	+12	−34	View file
drivers/staging/comedi/drivers/pcl730.c	modified	+18	−39	View file
drivers/staging/comedi/drivers/pcl812.c	modified	+69	−97	View file
drivers/staging/comedi/drivers/pcl816.c	modified	+56	−97	View file
drivers/staging/comedi/drivers/pcl818.c	modified	+62	−104	View file
drivers/staging/comedi/drivers/pcm3724.c	modified	+16	−35	View file
drivers/staging/comedi/drivers/pcm3730.c	modified	+9	−28	View file
drivers/staging/comedi/drivers/pcmad.c	modified	+21	−42	View file
drivers/staging/comedi/drivers/pcmda12.c	modified	+78	−146	View file
drivers/staging/comedi/drivers/pcmmio.c	modified	+286	−377	View file
drivers/staging/comedi/drivers/pcmuio.c	modified	+228	−314	View file
drivers/staging/comedi/drivers/poc.c	modified	+86	−119	View file
drivers/staging/comedi/drivers/quatech_daqp_cs.c	modified	+4	−12	View file
drivers/staging/comedi/drivers/rtd520.c	modified	+73	−115	View file
drivers/staging/comedi/drivers/rti800.c	modified	+17	−37	View file
drivers/staging/comedi/drivers/rti802.c	modified	+9	−28	View file
drivers/staging/comedi/drivers/s526.c	modified	+205	−290	View file
drivers/staging/comedi/drivers/s626.c	modified	+60	−77	View file
drivers/staging/comedi/drivers/serial2002.c	modified	+16	−53	View file
drivers/staging/comedi/drivers/skel.c	modified	+3	−6	View file
drivers/staging/comedi/drivers/ssv_dnp.c	modified	+83	−140	View file
drivers/staging/comedi/drivers/unioxx5.c	modified	+203	−250	View file
drivers/staging/comedi/drivers/usbdux.c	modified	+85	−64	View file
drivers/staging/comedi/drivers/usbduxfast.c	modified	+37	−56	View file
drivers/staging/comedi/drivers/usbduxsigma.c	modified	+15	−33	View file
drivers/staging/comedi/drivers/vmk80xx.c	modified	+14	−95	View file
drivers/staging/comedi/internal.h	modified	+5	−1	View file
drivers/staging/et131x/et131x.c	modified	+6	−4	View file
drivers/staging/gdm72xx/Kconfig	added	+46	−0	View file
drivers/staging/gdm72xx/Makefile	added	+6	−0	View file
drivers/staging/gdm72xx/TODO	added	+5	−0	View file
drivers/staging/gdm72xx/gdm_qos.c	added	+460	−0	View file
drivers/staging/gdm72xx/gdm_qos.h	added	+93	−0	View file
drivers/staging/gdm72xx/gdm_sdio.c	added	+754	−0	View file
drivers/staging/gdm72xx/gdm_sdio.h	added	+72	−0	View file
drivers/staging/gdm72xx/gdm_usb.c	added	+798	−0	View file
drivers/staging/gdm72xx/gdm_usb.h	added	+85	−0	View file
drivers/staging/gdm72xx/gdm_wimax.c	added	+1026	−0	View file
drivers/staging/gdm72xx/gdm_wimax.h	added	+92	−0	View file
drivers/staging/gdm72xx/hci.h	added	+218	−0	View file
drivers/staging/gdm72xx/netlink_k.c	added	+150	−0	View file
drivers/staging/gdm72xx/netlink_k.h	added	+24	−0	View file
drivers/staging/gdm72xx/sdio_boot.c	added	+159	−0	View file
drivers/staging/gdm72xx/sdio_boot.h	added	+21	−0	View file
drivers/staging/gdm72xx/usb_boot.c	added	+404	−0	View file
drivers/staging/gdm72xx/usb_boot.h	added	+22	−0	View file
drivers/staging/gdm72xx/usb_ids.h	added	+82	−0	View file
drivers/staging/gdm72xx/wm_ioctl.h	added	+97	−0	View file
drivers/staging/iio/Documentation/device.txt	modified	+2	−2	View file
drivers/staging/iio/Documentation/generic_buffer.c	modified	+2	−2	View file
drivers/staging/iio/Documentation/iio_event_monitor.c	modified	+1	−1	View file
drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583	added	+6	−0	View file
drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2x7x	added	+13	−0	View file
drivers/staging/iio/Documentation/sysfs-bus-iio-ad7192	added	+20	−0	View file
drivers/staging/iio/Documentation/sysfs-bus-iio-dds	modified	+42	−39	View file
drivers/staging/iio/Documentation/sysfs-bus-iio-light	modified	+7	−8	View file
drivers/staging/iio/Documentation/trigger.txt	modified	+1	−1	View file
drivers/staging/iio/Kconfig	modified	+4	−42	View file
drivers/staging/iio/Makefile	modified	+1	−7	View file
drivers/staging/iio/TODO	modified	+1	−1	View file
drivers/staging/iio/accel/adis16201_core.c	modified	+94	−29	View file
drivers/staging/iio/accel/adis16201_ring.c	modified	+4	−5	View file
drivers/staging/iio/accel/adis16201_trigger.c	modified	+5	−5	View file
drivers/staging/iio/accel/adis16203_core.c	modified	+77	−31	View file
drivers/staging/iio/accel/adis16203_ring.c	modified	+7	−9	View file
drivers/staging/iio/accel/adis16203_trigger.c	modified	+5	−5	View file
drivers/staging/iio/accel/adis16204_core.c	modified	+81	−34	View file
drivers/staging/iio/accel/adis16204_ring.c	modified	+7	−9	View file
drivers/staging/iio/accel/adis16204_trigger.c	modified	+5	−5	View file
drivers/staging/iio/accel/adis16209_core.c	modified	+116	−43	View file
drivers/staging/iio/accel/adis16209_ring.c	modified	+7	−10	View file
drivers/staging/iio/accel/adis16209_trigger.c	modified	+5	−5	View file
drivers/staging/iio/accel/adis16220_core.c	modified	+22	−17	View file
drivers/staging/iio/accel/adis16240_core.c	modified	+92	−37	View file
drivers/staging/iio/accel/adis16240_ring.c	modified	+7	−9	View file
drivers/staging/iio/accel/adis16240_trigger.c	modified	+5	−5	View file
drivers/staging/iio/accel/kxsd9.c	modified	+9	−7	View file
drivers/staging/iio/accel/lis3l02dq_core.c	modified	+32	−18	View file
drivers/staging/iio/accel/lis3l02dq_ring.c	modified	+12	−13	View file
drivers/staging/iio/accel/sca3000_core.c	modified	+40	−26	View file
drivers/staging/iio/accel/sca3000_ring.c	modified	+6	−6	View file
drivers/staging/iio/adc/Kconfig	modified	+18	−9	View file
drivers/staging/iio/adc/Makefile	modified	+1	−0	View file
drivers/staging/iio/adc/ad7192.c	modified	+36	−45	View file
drivers/staging/iio/adc/ad7280a.c	modified	+17	−14	View file
drivers/staging/iio/adc/ad7291.c	modified	+14	−12	View file
drivers/staging/iio/adc/ad7298.h	modified	+0	−1	View file
drivers/staging/iio/adc/ad7298_core.c	modified	+45	−34	View file
drivers/staging/iio/adc/ad7298_ring.c	modified	+19	−27	View file
drivers/staging/iio/adc/ad7476.h	modified	+0	−1	View file
drivers/staging/iio/adc/ad7476_core.c	modified	+29	−31	View file
drivers/staging/iio/adc/ad7476_ring.c	modified	+14	−44	View file
drivers/staging/iio/adc/ad7606_core.c	modified	+20	−19	View file
drivers/staging/iio/adc/ad7606_par.c	modified	+1	−1	View file
drivers/staging/iio/adc/ad7606_ring.c	modified	+14	−16	View file
drivers/staging/iio/adc/ad7606_spi.c	modified	+1	−1	View file
drivers/staging/iio/adc/ad7780.c	modified	+32	−12	View file
drivers/staging/iio/adc/ad7793.c	modified	+51	−52	View file
drivers/staging/iio/adc/ad7816.c	modified	+13	−13	View file
drivers/staging/iio/adc/ad7887.h	modified	+0	−1	View file
drivers/staging/iio/adc/ad7887_core.c	modified	+11	−9	View file
drivers/staging/iio/adc/ad7887_ring.c	modified	+17	−29	View file
drivers/staging/iio/adc/ad799x.h	modified	+0	−1	View file
drivers/staging/iio/adc/ad799x_core.c	modified	+50	−12	View file
drivers/staging/iio/adc/ad799x_ring.c	modified	+14	−30	View file
drivers/staging/iio/adc/adt7310.c	modified	+20	−20	View file
drivers/staging/iio/adc/adt7410.c	modified	+20	−20	View file
drivers/staging/iio/adc/lpc32xx_adc.c	modified	+23	−12	View file
drivers/staging/iio/adc/max1363_core.c	modified	+21	−12	View file
drivers/staging/iio/adc/max1363_ring.c	modified	+5	−5	View file
drivers/staging/iio/adc/spear_adc.c	added	+448	−0	View file
drivers/staging/iio/addac/adt7316.c	modified	+76	−76	View file
drivers/staging/iio/cdc/ad7150.c	modified	+13	−11	View file
drivers/staging/iio/cdc/ad7152.c	modified	+17	−13	View file
drivers/staging/iio/cdc/ad7746.c	modified	+28	−21	View file
drivers/staging/iio/dac/Kconfig	modified	+3	−3	View file
drivers/staging/iio/dac/ad5064.c	modified	+16	−13	View file
drivers/staging/iio/dac/ad5360.c	modified	+11	−10	View file
drivers/staging/iio/dac/ad5380.c	modified	+13	−12	View file
drivers/staging/iio/dac/ad5421.c	modified	+10	−9	View file
drivers/staging/iio/dac/ad5446.c	modified	+126	−167	View file
drivers/staging/iio/dac/ad5446.h	modified	+3	−17	View file
drivers/staging/iio/dac/ad5504.c	modified	+14	−13	View file
drivers/staging/iio/dac/ad5624r_spi.c	modified	+12	−11	View file
drivers/staging/iio/dac/ad5686.c	modified	+13	−12	View file
drivers/staging/iio/dac/ad5764.c	modified	+9	−8	View file
drivers/staging/iio/dac/ad5791.c	modified	+13	−12	View file
drivers/staging/iio/dac/max517.c	modified	+8	−7	View file
drivers/staging/iio/dds/Kconfig → drivers/staging/iio/frequency/Kconfig	renamed	+0	−0	View file
drivers/staging/iio/dds/Makefile → drivers/staging/iio/frequency/Makefile	renamed	+0	−0	View file
drivers/staging/iio/dds/ad5930.c → drivers/staging/iio/frequency/ad5930.c	renamed	+6	−6	View file
drivers/staging/iio/dds/ad9832.c → drivers/staging/iio/frequency/ad9832.c	renamed	+18	−18	View file
drivers/staging/iio/dds/ad9832.h → drivers/staging/iio/frequency/ad9832.h	renamed	+0	−0	View file
drivers/staging/iio/dds/ad9834.c → drivers/staging/iio/frequency/ad9834.c	renamed	+37	−37	View file
drivers/staging/iio/dds/ad9834.h → drivers/staging/iio/frequency/ad9834.h	renamed	+0	−0	View file
drivers/staging/iio/dds/ad9850.c → drivers/staging/iio/frequency/ad9850.c	renamed	+6	−6	View file
drivers/staging/iio/dds/ad9852.c → drivers/staging/iio/frequency/ad9852.c	renamed	+6	−6	View file
drivers/staging/iio/dds/ad9910.c → drivers/staging/iio/frequency/ad9910.c	renamed	+6	−6	View file
drivers/staging/iio/dds/ad9951.c → drivers/staging/iio/frequency/ad9951.c	renamed	+6	−6	View file
drivers/staging/iio/dds/dds.h → drivers/staging/iio/frequency/dds.h	renamed	+27	−27	View file
drivers/staging/iio/gyro/adis16060_core.c	modified	+11	−7	View file
drivers/staging/iio/gyro/adis16080_core.c	modified	+10	−6	View file
drivers/staging/iio/gyro/adis16130_core.c	modified	+7	−5	View file
drivers/staging/iio/gyro/adis16260_core.c	modified	+81	−35	View file
drivers/staging/iio/gyro/adis16260_ring.c	modified	+7	−9	View file
drivers/staging/iio/gyro/adis16260_trigger.c	modified	+5	−5	View file
drivers/staging/iio/gyro/adxrs450.h	modified	+1	−1	View file
drivers/staging/iio/gyro/adxrs450_core.c	modified	+14	−10	View file
drivers/staging/iio/iio_dummy_evgen.c	modified	+2	−2	View file
drivers/staging/iio/iio_hwmon.c	modified	+2	−2	View file
drivers/staging/iio/iio_simple_dummy.c	modified	+24	−11	View file
drivers/staging/iio/iio_simple_dummy_buffer.c	modified	+9	−12	View file
drivers/staging/iio/iio_simple_dummy_events.c	modified	+4	−4	View file
drivers/staging/iio/impedance-analyzer/ad5933.c	modified	+55	−28	View file
drivers/staging/iio/imu/adis16400_core.c	modified	+90	−51	View file
drivers/staging/iio/imu/adis16400_ring.c	modified	+9	−11	View file
drivers/staging/iio/imu/adis16400_trigger.c	modified	+5	−5	View file
drivers/staging/iio/light/Kconfig	modified	+28	−9	View file
drivers/staging/iio/light/Makefile	modified	+2	−0	View file
drivers/staging/iio/light/isl29018.c	modified	+108	−103	View file
drivers/staging/iio/light/isl29028.c	added	+566	−0	View file
drivers/staging/iio/light/tsl2563.c	modified	+14	−10	View file
drivers/staging/iio/light/tsl2583.c	modified	+17	−17	View file
drivers/staging/iio/light/tsl2x7x.h	added	+100	−0	View file
drivers/staging/iio/light/tsl2x7x_core.c	added	+2082	−0	View file
drivers/staging/iio/magnetometer/Kconfig	modified	+4	−4	View file
drivers/staging/iio/magnetometer/ak8975.c	modified	+10	−9	View file
drivers/staging/iio/magnetometer/hmc5843.c	modified	+327	−195	View file
drivers/staging/iio/meter/ade7753.c	modified	+11	−11	View file
drivers/staging/iio/meter/ade7754.c	modified	+11	−11	View file
drivers/staging/iio/meter/ade7758_core.c	modified	+225	−74	View file
drivers/staging/iio/meter/ade7758_ring.c	modified	+11	−22	View file
drivers/staging/iio/meter/ade7758_trigger.c	modified	+5	−5	View file
drivers/staging/iio/meter/ade7759.c	modified	+11	−11	View file
drivers/staging/iio/meter/ade7854-i2c.c	modified	+11	−11	View file
drivers/staging/iio/meter/ade7854-spi.c	modified	+11	−11	View file
drivers/staging/iio/meter/ade7854.c	modified	+14	−14	View file
drivers/staging/iio/meter/meter.h	modified	+1	−1	View file
drivers/staging/iio/resolver/ad2s1200.c	modified	+7	−5	View file
drivers/staging/iio/resolver/ad2s1210.c	modified	+20	−18	View file
drivers/staging/iio/resolver/ad2s90.c	modified	+6	−5	View file
drivers/staging/iio/ring_sw.c	modified	+1	−1	View file
drivers/staging/iio/ring_sw.h	modified	+1	−1	View file
drivers/staging/iio/trigger/iio-trig-bfin-timer.c	modified	+5	−5	View file
drivers/staging/iio/trigger/iio-trig-gpio.c	modified	+5	−5	View file
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c	modified	+4	−4	View file
drivers/staging/iio/trigger/iio-trig-sysfs.c	modified	+5	−5	View file
drivers/staging/ipack/Kconfig	added	+20	−0	View file
drivers/staging/ipack/Makefile	added	+6	−0	View file
drivers/staging/ipack/TODO	added	+46	−0	View file
drivers/staging/ipack/bridges/Kconfig	added	+8	−0	View file
drivers/staging/ipack/bridges/Makefile	added	+1	−0	View file
drivers/staging/ipack/bridges/tpci200.c	added	+1141	−0	View file
drivers/staging/ipack/bridges/tpci200.h	added	+162	−0	View file
drivers/staging/ipack/devices/Kconfig	added	+7	−0	View file
drivers/staging/ipack/devices/Makefile	added	+1	−0	View file
drivers/staging/ipack/devices/ipoctal.c	added	+901	−0	View file
drivers/staging/ipack/devices/ipoctal.h	added	+80	−0	View file
drivers/staging/ipack/devices/scc2698.h	added	+228	−0	View file
drivers/staging/ipack/ipack.c	added	+205	−0	View file
drivers/staging/ipack/ipack.h	added	+183	−0	View file
drivers/staging/line6/config.h	deleted	+0	−48	View before deletion
drivers/staging/line6/driver.c	modified	+17	−72	View file
drivers/staging/line6/midi.c	modified	+1	−1	View file
drivers/staging/line6/midibuf.c	modified	+1	−1	View file
drivers/staging/line6/pcm.c	modified	+1	−1	View file
drivers/staging/media/as102/as102_fe.c	modified	+0	−2	View file
drivers/staging/media/as102/as102_fw.c	modified	+1	−4	View file
drivers/staging/media/as102/as102_usb_drv.c	modified	+2	−3	View file
drivers/staging/media/as102/as102_usb_drv.h	modified	+0	−2	View file
drivers/staging/media/easycap/easycap_ioctl.c	modified	+1	−0	View file
drivers/staging/media/go7007/README	modified	+1	−1	View file
drivers/staging/media/go7007/s2250-loader.c	modified	+1	−25	View file
drivers/staging/mei/TODO	deleted	+0	−10	View before deletion
drivers/staging/net/Kconfig	added	+38	−0	View file
drivers/staging/net/Makefile	added	+5	−0	View file
drivers/staging/net/TODO	added	+5	−0	View file
drivers/net/wan/pc300-falc-lh.h → drivers/staging/net/pc300-falc-lh.h	renamed	+0	−0	View file
drivers/net/wan/pc300.h → drivers/staging/net/pc300.h	renamed	+0	−0	View file
drivers/net/wan/pc300_drv.c → drivers/staging/net/pc300_drv.c	renamed	+0	−0	View file
drivers/net/wan/pc300_tty.c → drivers/staging/net/pc300_tty.c	renamed	+0	−0	View file
drivers/staging/nvec/nvec.h	modified	+1	−1	View file
drivers/staging/octeon/ethernet-rx.c	modified	+1	−1	View file
drivers/staging/octeon/ethernet-tx.c	modified	+5	−5	View file
drivers/staging/octeon/ethernet-util.h	modified	+1	−1	View file
drivers/staging/octeon/ethernet.c	modified	+1	−1	View file
drivers/staging/olpc_dcon/olpc_dcon.c	modified	+14	−15	View file
drivers/staging/olpc_dcon/olpc_dcon_xo_1.c	modified	+1	−1	View file
drivers/staging/omapdrm/Makefile	modified	+1	−0	View file
drivers/staging/omapdrm/omap_dmm_tiler.c	modified	+2	−2	View file
drivers/staging/omapdrm/omap_drv.c	modified	+5	−1	View file
drivers/staging/omapdrm/omap_drv.h	modified	+14	−0	View file
drivers/staging/omapdrm/omap_fb.c	modified	+5	−2	View file
drivers/staging/omapdrm/omap_gem.c	modified	+119	−11	View file
drivers/staging/omapdrm/omap_gem_dmabuf.c	added	+220	−0	View file
drivers/staging/omapdrm/tcm-sita.c	modified	+1	−1	View file
drivers/staging/ozwpan/README	modified	+1	−1	View file
drivers/staging/ozwpan/ozappif.h	modified	+2	−10	View file
drivers/staging/ozwpan/ozcdev.c	modified	+0	−17	View file
drivers/staging/ozwpan/ozevent.c	modified	+137	−58	View file
drivers/staging/ozwpan/ozevent.h	modified	+6	−5	View file
drivers/staging/ozwpan/ozeventdef.h	modified	+6	−13	View file
drivers/staging/ozwpan/ozhcd.c	modified	+3	−3	View file
drivers/staging/ozwpan/ozmain.c	modified	+7	−1	View file
drivers/staging/ozwpan/ozusbsvc.c	modified	+1	−1	View file
drivers/staging/panel/panel.c	modified	+1	−1	View file
drivers/staging/ramster/Kconfig	modified	+1	−1	View file
drivers/staging/ramster/cluster/tcp.c	modified	+2	−2	View file
drivers/staging/ramster/xvmalloc.c	modified	+1	−1	View file
drivers/staging/ramster/zcache-main.c	modified	+3	−3	View file
drivers/staging/rtl8187se/Makefile	modified	+1	−1	View file
drivers/staging/rtl8187se/ieee80211/dot11d.c	modified	+1	−1	View file
drivers/staging/rtl8187se/ieee80211/ieee80211.h	modified	+7	−7	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c	modified	+13	−13	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c	modified	+1	−1	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c	modified	+2	−5	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c	modified	+1	−1	View file
drivers/staging/rtl8187se/r8180.h	modified	+5	−5	View file
drivers/staging/rtl8187se/r8180_core.c	modified	+16	−17	View file
drivers/staging/rtl8187se/r8180_dm.c	modified	+8	−8	View file
drivers/staging/rtl8187se/r8180_rtl8225z2.c	modified	+2	−2	View file
drivers/staging/rtl8187se/r8180_wx.c	modified	+3	−3	View file
drivers/staging/rtl8187se/r8180_wx.h	modified	+1	−1	View file
drivers/staging/rtl8187se/r8185b_init.c	modified	+595	−734	View file
drivers/staging/rtl8192e/Kconfig	modified	+4	−0	View file
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c	modified	+0	−3	View file
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c	modified	+1	−1	View file
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c	modified	+1	−1	View file
drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h	modified	+2	−2	View file
drivers/staging/rtl8192e/rtl8192e/rtl_core.c	modified	+6	−7	View file
drivers/staging/rtl8192e/rtl8192e/rtl_core.h	modified	+1	−2	View file
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c	modified	+11	−11	View file
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c	modified	+2	−2	View file
drivers/staging/rtl8192e/rtl819x_TSProc.c	modified	+1	−1	View file
drivers/staging/rtl8192e/rtllib.h	modified	+9	−9	View file
drivers/staging/rtl8192e/rtllib_rx.c	modified	+5	−5	View file
drivers/staging/rtl8192e/rtllib_softmac.c	modified	+17	−18	View file
drivers/staging/rtl8192e/rtllib_softmac_wx.c	modified	+2	−2	View file
drivers/staging/rtl8192e/rtllib_tx.c	modified	+6	−8	View file
drivers/staging/rtl8192e/rtllib_wx.c	modified	+2	−2	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c	modified	+1	−1	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c	modified	+2	−2	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c	modified	+1	−1	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c	modified	+3	−4	View file
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c	modified	+1	−1	View file
drivers/staging/rtl8192u/r8180_93cx6.c	modified	+1	−1	View file
drivers/staging/rtl8192u/r8180_93cx6.h	modified	+1	−1	View file
drivers/staging/rtl8192u/r8192U.h	modified	+4	−5	View file
drivers/staging/rtl8192u/r8192U_core.c	modified	+30	−30	View file
drivers/staging/rtl8192u/r8192U_dm.c	modified	+37	−37	View file
drivers/staging/rtl8192u/r8192U_hw.h	modified	+1	−1	View file
drivers/staging/rtl8192u/r8192U_wx.c	modified	+6	−6	View file
drivers/staging/rtl8192u/r8192U_wx.h	modified	+1	−1	View file
drivers/staging/rtl8192u/r819xU_HTType.h	modified	+1	−1	View file
drivers/staging/rtl8192u/r819xU_cmdpkt.c	modified	+4	−8	View file
drivers/staging/rtl8192u/r819xU_firmware.c	modified	+2	−2	View file
drivers/staging/rtl8192u/r819xU_phy.c	modified	+8	−8	View file
drivers/staging/rtl8192u/r819xU_phyreg.h	modified	+1	−1	View file
drivers/staging/rtl8712/big_endian.h	deleted	+0	−94	View before deletion
drivers/staging/rtl8712/drv_types.h	modified	+1	−1	View file
drivers/staging/rtl8712/generic.h	deleted	+0	−178	View before deletion
drivers/staging/rtl8712/hal_init.c	modified	+0	−1	View file
drivers/staging/rtl8712/ieee80211.h	modified	+1	−1	View file
drivers/staging/rtl8712/if_ether.h	deleted	+0	−141	View before deletion
drivers/staging/rtl8712/ip.h	deleted	+0	−137	View before deletion
drivers/staging/rtl8712/little_endian.h	deleted	+0	−94	View before deletion
drivers/staging/rtl8712/os_intfs.c	modified	+2	−2	View file
drivers/staging/rtl8712/osdep_service.h	modified	+0	−3	View file
drivers/staging/rtl8712/rtl8712_cmd.c	modified	+3	−4	View file
drivers/staging/rtl8712/rtl8712_cmd.h	modified	+1	−1	View file
drivers/staging/rtl8712/rtl8712_efuse.c	modified	+1	−1	View file
drivers/staging/rtl8712/rtl8712_gp_bitdef.h	modified	+1	−1	View file
drivers/staging/rtl8712/rtl8712_hal.h	modified	+2	−2	View file
drivers/staging/rtl8712/rtl8712_led.c	modified	+3	−3	View file
drivers/staging/rtl8712/rtl8712_recv.c	modified	+5	−4	View file
drivers/staging/rtl8712/rtl8712_xmit.c	modified	+0	−1	View file
drivers/staging/rtl8712/rtl871x_byteorder.h	deleted	+0	−32	View before deletion
drivers/staging/rtl8712/rtl871x_cmd.c	modified	+0	−1	View file
drivers/staging/rtl8712/rtl871x_cmd.h	modified	+1	−1	View file
drivers/staging/rtl8712/rtl871x_io.h	modified	+1	−1	View file
drivers/staging/rtl8712/rtl871x_ioctl_linux.c	modified	+9	−10	View file
drivers/staging/rtl8712/rtl871x_ioctl_set.c	modified	+1	−1	View file
drivers/staging/rtl8712/rtl871x_mlme.c	modified	+4	−4	View file
drivers/staging/rtl8712/rtl871x_mlme.h	modified	+3	−3	View file
drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h	modified	+2	−2	View file
drivers/staging/rtl8712/rtl871x_recv.c	modified	+2	−2	View file
drivers/staging/rtl8712/rtl871x_xmit.c	modified	+1	−2	View file
drivers/staging/rtl8712/rtl871x_xmit.h	modified	+1	−1	View file
drivers/staging/rtl8712/swab.h	deleted	+0	−131	View before deletion
drivers/staging/rtl8712/usb_halinit.c	modified	+2	−2	View file
drivers/staging/rtl8712/usb_intf.c	modified	+17	−19	View file
drivers/staging/rtl8712/usb_ops.c	modified	+0	−1	View file
drivers/staging/rtl8712/wifi.h	modified	+0	−1	View file
drivers/staging/rtl8712/xmit_linux.c	modified	+2	−4	View file
drivers/staging/rts5139/ms.c	modified	+6	−5	View file
drivers/staging/rts5139/ms.h	modified	+0	−2	View file
drivers/staging/rts5139/ms_mg.c	modified	+2	−2	View file
drivers/staging/rts5139/rts51x.c	modified	+2	−81	View file
drivers/staging/rts5139/rts51x.h	modified	+0	−10	View file
drivers/staging/rts5139/rts51x_card.c	modified	+4	−48	View file
drivers/staging/rts5139/rts51x_card.h	modified	+0	−11	View file
drivers/staging/rts5139/rts51x_chip.c	modified	+13	−165	View file
drivers/staging/rts5139/rts51x_chip.h	modified	+6	−89	View file
drivers/staging/rts5139/rts51x_fop.c	modified	+0	−5	View file
drivers/staging/rts5139/rts51x_fop.h	modified	+0	−5	View file
drivers/staging/rts5139/rts51x_scsi.c	modified	+3	−90	View file
drivers/staging/rts5139/rts51x_scsi.h	modified	+0	−5	View file
drivers/staging/rts5139/rts51x_sys.h	deleted	+0	−54	View before deletion
drivers/staging/rts5139/rts51x_transport.c	modified	+9	−273	View file
drivers/staging/rts5139/rts51x_transport.h	modified	+0	−12	View file
drivers/staging/rts5139/sd.c	modified	+8	−134	View file
drivers/staging/rts5139/sd.h	modified	+0	−29	View file
drivers/staging/rts5139/sd_cprm.c	modified	+3	−163	View file
drivers/staging/rts5139/xd.c	modified	+5	−117	View file
drivers/staging/rts5139/xd.h	modified	+0	−2	View file
drivers/staging/rts_pstor/ms.c	modified	+1	−1	View file
drivers/staging/rts_pstor/rtsx_transport.c	modified	+2	−2	View file
drivers/staging/sep/sep_driver_config.h	modified	+3	−3	View file
drivers/staging/sep/sep_main.c	modified	+6	−6	View file
drivers/staging/serial/68360serial.c	deleted	+0	−2979	View before deletion
drivers/staging/serial/Kconfig	deleted	+0	−16	View before deletion
drivers/staging/serial/Makefile	deleted	+0	−1	View before deletion
drivers/staging/serial/TODO	deleted	+0	−6	View before deletion
drivers/staging/sm7xx/smtcfb.c	modified	+87	−145	View file
drivers/staging/sm7xx/smtcfb.h	modified	+0	−8	View file
drivers/staging/telephony/ixj.c	modified	+114	−114	View file
drivers/staging/tidspbridge/core/io_sm.c	modified	+1	−1	View file
drivers/staging/tidspbridge/core/ue_deh.c	modified	+1	−1	View file
drivers/staging/usbip/stub_dev.c	modified	+6	−6	View file
drivers/staging/usbip/usbip_common.h	modified	+17	−0	View file
drivers/staging/usbip/usbip_protocol.txt	modified	+1	−1	View file
drivers/staging/usbip/userspace/libsrc/vhci_driver.c	modified	+16	−4	View file
drivers/staging/usbip/vhci_hcd.c	modified	+4	−4	View file
drivers/staging/usbip/vhci_rx.c	modified	+1	−1	View file
drivers/staging/usbip/vhci_sysfs.c	modified	+2	−2	View file
drivers/staging/vme/Makefile	modified	+0	−7	View file
drivers/staging/vme/TODO	deleted	+0	−5	View before deletion
drivers/staging/vme/devices/Kconfig	modified	+2	−1	View file
drivers/staging/vme/devices/vme_pio2_cntr.c	modified	+1	−1	View file
drivers/staging/vme/devices/vme_pio2_core.c	modified	+1	−2	View file
drivers/staging/vme/devices/vme_pio2_gpio.c	modified	+2	−3	View file
drivers/staging/vme/devices/vme_user.c	modified	+23	−22	View file
drivers/staging/vt6655/wpa.c	modified	+2	−2	View file
drivers/staging/vt6656/dpc.c	modified	+1	−1	View file
drivers/staging/vt6656/ioctl.c	modified	+12	−12	View file
drivers/staging/vt6656/main_usb.c	modified	+1	−3	View file
drivers/staging/vt6656/wpa.c	modified	+2	−2	View file
drivers/staging/wlags49_h2/README.ubuntu	modified	+1	−1	View file
drivers/staging/wlags49_h2/hcf.c	modified	+5	−5	View file
drivers/staging/wlags49_h2/hcf.h	modified	+6	−6	View file
drivers/staging/wlags49_h2/mmd.c	modified	+6	−6	View file
drivers/staging/wlags49_h2/wl_cs.c	modified	+1	−2	View file
drivers/staging/wlags49_h2/wl_netdev.c	modified	+6	−3	View file
drivers/staging/wlags49_h2/wl_pci.c	modified	+4	−0	View file
drivers/staging/wlags49_h2/wl_profile.c	modified	+4	−4	View file
drivers/staging/wlags49_h2/wl_util.c	modified	+5	−6	View file
drivers/staging/wlan-ng/cfg80211.c	modified	+9	−1	View file
drivers/staging/wlan-ng/prism2mgmt.c	modified	+2	−2	View file
drivers/staging/xgifb/XGI_main.h	modified	+60	−161	View file
drivers/staging/xgifb/XGI_main_26.c	modified	+33	−68	View file
drivers/staging/xgifb/XGIfb.h	modified	+2	−4	View file
drivers/staging/xgifb/vb_init.c	modified	+2	−76	View file
drivers/staging/xgifb/vb_setmode.c	modified	+410	−1047	View file
drivers/staging/xgifb/vb_struct.h	modified	+0	−27	View file
drivers/staging/xgifb/vb_table.h	modified	+104	−621	View file
drivers/staging/xgifb/vgatypes.h	modified	+0	−2	View file
drivers/staging/zsmalloc/zsmalloc-main.c	modified	+22	−18	View file
drivers/staging/zsmalloc/zsmalloc_int.h	modified	+1	−1	View file
drivers/staging/vme/Kconfig → drivers/vme/Kconfig	renamed	+3	−3	View file
drivers/vme/Makefile	added	+7	−0	View file
drivers/staging/vme/boards/Kconfig → drivers/vme/boards/Kconfig	renamed	+0	−0	View file
drivers/staging/vme/boards/Makefile → drivers/vme/boards/Makefile	renamed	+0	−0	View file
drivers/staging/vme/boards/vme_vmivme7805.c → drivers/vme/boards/vme_vmivme7805.c	renamed	+0	−0	View file
drivers/staging/vme/boards/vme_vmivme7805.h → drivers/vme/boards/vme_vmivme7805.h	renamed	+0	−0	View file
drivers/staging/vme/bridges/Kconfig → drivers/vme/bridges/Kconfig	renamed	+0	−0	View file
drivers/staging/vme/bridges/Makefile → drivers/vme/bridges/Makefile	renamed	+0	−0	View file
drivers/staging/vme/bridges/vme_ca91cx42.c → drivers/vme/bridges/vme_ca91cx42.c	renamed	+4	−4	View file
drivers/staging/vme/bridges/vme_ca91cx42.h → drivers/vme/bridges/vme_ca91cx42.h	renamed	+0	−0	View file
drivers/staging/vme/bridges/vme_tsi148.c → drivers/vme/bridges/vme_tsi148.c	renamed	+110	−79	View file
drivers/staging/vme/bridges/vme_tsi148.h → drivers/vme/bridges/vme_tsi148.h	renamed	+11	−10	View file
drivers/staging/vme/vme.c → drivers/vme/vme.c	renamed	+16	−25	View file
drivers/staging/vme/vme_bridge.h → drivers/vme/vme_bridge.h	renamed	+0	−0	View file
fs/pstore/Kconfig	modified	+17	−0	View file
fs/pstore/Makefile	modified	+3	−0	View file
fs/pstore/ram.c	added	+383	−0	View file
drivers/staging/android/persistent_ram.c → fs/pstore/ram_core.c	renamed	+110	−51	View file
include/linux/Kbuild	modified	+2	−0	View file
include/linux/alarmtimer.h	modified	+3	−0	View file
drivers/staging/iio/buffer.h → include/linux/iio/buffer.h	renamed	+1	−3	View file
drivers/staging/iio/consumer.h → include/linux/iio/consumer.h	renamed	+1	−1	View file
drivers/staging/iio/driver.h → include/linux/iio/driver.h	renamed	+0	−0	View file
drivers/staging/iio/events.h → include/linux/iio/events.h	renamed	+1	−1	View file
drivers/staging/iio/iio.h → include/linux/iio/iio.h	renamed	+61	−40	View file
drivers/staging/iio/kfifo_buf.h → include/linux/iio/kfifo_buf.h	renamed	+2	−2	View file
drivers/staging/iio/machine.h → include/linux/iio/machine.h	renamed	+0	−0	View file
drivers/staging/iio/sysfs.h → include/linux/iio/sysfs.h	renamed	+0	−0	View file
drivers/staging/iio/trigger.h → include/linux/iio/trigger.h	renamed	+4	−4	View file
drivers/staging/iio/trigger_consumer.h → include/linux/iio/trigger_consumer.h	renamed	+0	−0	View file
drivers/staging/iio/types.h → include/linux/iio/types.h	renamed	+2	−0	View file
drivers/staging/mei/mei.h → include/linux/mei.h	renamed	+0	−0	View file
include/linux/platform_data/at91_adc.h	added	+61	−0	View file
drivers/staging/android/persistent_ram.h → include/linux/pstore_ram.h	renamed	+25	−5	View file
include/linux/ramoops.h	deleted	+0	−17	View before deletion
include/linux/uuid.h	modified	+4	−0	View file
drivers/staging/vme/vme.h → include/linux/vme.h	renamed	+0	−0	View file
kernel/time/alarmtimer.c	modified	+2	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-bus-iio

View file

diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
similarity index 94%
rename from drivers/staging/iio/Documentation/sysfs-bus-iio
rename to Documentation/ABI/testing/sysfs-bus-iio
index 46a995d..5bc8a47 100644
--- a/drivers/staging/iio/Documentation/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -108,7 +108,7 @@ Description:
 		physically equivalent inputs when non differential readings are
 		separately available. In differential only parts, then all that
 		is required is a consistent labeling.  Units after application
-		of scale and offset are nanofarads..
+		of scale and offset are nanofarads.
 
 What:		/sys/bus/iio/devices/iio:deviceX/in_temp_raw
 What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_raw
@@ -119,7 +119,7 @@ KernelVersion:	2.6.35
 Contact:	[email protected]
 Description:
 		Raw (unscaled no bias removal etc) temperature measurement.
-		It an axis is specified it generally means that the temperature
+		If an axis is specified it generally means that the temperature
 		sensor is associated with one part of a compound device (e.g.
 		a gyroscope axis). Units after application of scale and offset
 		are milli degrees Celsuis.
@@ -232,7 +232,7 @@ Description:
 		If known for a device, scale to be applied to <type>Y[_name]_raw
 		post addition of <type>[Y][_name]_offset in order to obtain the
 		measured value in <type> units as specified in
-		<type>[Y][_name]_raw documentation..  If shared across all in
+		<type>[Y][_name]_raw documentation.  If shared across all in
 		channels then Y and <x|y|z> are not present and the value is
 		called <type>[Y][_name]_scale. The peak modifier means this
 		value is applied to <type>Y[_name]_peak_raw values.
@@ -243,6 +243,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_accel_z_calibbias
 What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_x_calibbias
 What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibbias
 What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibbias
+What:		/sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibbias
+What:		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias
 KernelVersion:	2.6.35
 Contact:	[email protected]
 Description:
@@ -258,6 +260,8 @@ What		/sys/bus/iio/devices/iio:deviceX/in_accel_z_calibscale
 What		/sys/bus/iio/devices/iio:deviceX/in_anglvel_x_calibscale
 What		/sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibscale
 What		/sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibscale
+what		/sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale
+what		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale
 KernelVersion:	2.6.35
 Contact:	[email protected]
 Description:
@@ -276,6 +280,13 @@ Description:
 		If a discrete set of scale values are available, they
 		are listed in this attribute.
 
+What		/sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
+KernelVersion:	2.6.35
+Contact:	[email protected]
+Description:
+		Hardware applied gain factor. If shared across all channels,
+		<type>_hardwaregain is used.
+
 What:		/sys/.../in_accel_filter_low_pass_3db_frequency
 What:		/sys/.../in_magn_filter_low_pass_3db_frequency
 What:		/sys/.../in_anglvel_filter_low_pass_3db_frequency
@@ -453,10 +464,14 @@ What:		/sys/.../events/in_magn_z_raw_thresh_rising_value
 What:		/sys/.../events/in_magn_z_raw_thresh_falling_value
 What:		/sys/.../events/in_voltageY_supply_raw_thresh_rising_value
 What:		/sys/.../events/in_voltageY_supply_raw_thresh_falling_value
+What:		/sys/.../events/in_voltageY_raw_thresh_rising_value
 What:		/sys/.../events/in_voltageY_raw_thresh_falling_value
-What:		/sys/.../events/in_voltageY_raw_thresh_falling_value
-What:		/sys/.../events/in_tempY_raw_thresh_falling_value
+What:		/sys/.../events/in_tempY_raw_thresh_rising_value
 What:		/sys/.../events/in_tempY_raw_thresh_falling_value
+What:		/sys/.../events/in_illuminance0_thresh_falling_value
+what:		/sys/.../events/in_illuminance0_thresh_rising_value
+what:		/sys/.../events/in_proximity0_thresh_falling_value
+what:		/sys/.../events/in_proximity0_thresh_rising_value
 KernelVersion:	2.6.37
 Contact:	[email protected]
 Description:
@@ -490,9 +505,9 @@ What:		/sys/.../events/in_magn_z_raw_roc_rising_value
 What:		/sys/.../events/in_magn_z_raw_roc_falling_value
 What:		/sys/.../events/in_voltageY_supply_raw_roc_rising_value
 What:		/sys/.../events/in_voltageY_supply_raw_roc_falling_value
+What:		/sys/.../events/in_voltageY_raw_roc_rising_value
 What:		/sys/.../events/in_voltageY_raw_roc_falling_value
-What:		/sys/.../events/in_voltageY_raw_roc_falling_value
-What:		/sys/.../events/in_tempY_raw_roc_falling_value
+What:		/sys/.../events/in_tempY_raw_roc_rising_value
 What:		/sys/.../events/in_tempY_raw_roc_falling_value
 KernelVersion:	2.6.37
 Contact:	[email protected]
@@ -556,6 +571,8 @@ What:		/sys/.../events/in_tempY_thresh_falling_period
 What:		/sys/.../events/in_tempY_roc_rising_period
 What:		/sys/.../events/in_tempY_roc_falling_period
 What:		/sys/.../events/in_accel_x&y&z_mag_falling_period
+What:		/sys/.../events/in_intensity0_thresh_period
+What:		/sys/.../events/in_proximity0_thresh_period
 KernelVersion:	2.6.37
 Contact:	[email protected]
 Description:
@@ -718,24 +735,3 @@ Contact:	[email protected]
 Description:
 		This attribute is used to read the amount of quadrature error
 		present in the device at a given time.
-
-What:		/sys/.../iio:deviceX/ac_excitation_en
-KernelVersion:	3.1.0
-Contact:	[email protected]
-Description:
-		This attribute, if available, is used to enable the AC
-		excitation mode found on some converters. In ac excitation mode,
-		the polarity of the excitation voltage is reversed on
-		alternate cycles, to eliminate DC errors.
-
-What:		/sys/.../iio:deviceX/bridge_switch_en
-KernelVersion:	3.1.0
-Contact:	[email protected]
-Description:
-		This attribute, if available, is used to close or open the
-		bridge power down switch found on some converters.
-		In bridge applications, such as strain gauges and load cells,
-		the bridge itself consumes the majority of the current in the
-		system. To minimize the current consumption of the system,
-		the bridge can be disconnected (when it is not being used
-		using the bridge_switch_en attribute.

Documentation/Makefile

View file

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 30b656e..31d302b 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,3 +1,3 @@
 obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
 	filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \
-	pcmcia/ spi/ timers/ watchdog/src/
+	pcmcia/ spi/ timers/ watchdog/src/ misc-devices/mei/

Documentation/devicetree/bindings/arm/atmel-adc.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/atmel-adc.txt b/Documentation/devicetree/bindings/arm/atmel-adc.txt
new file mode 100644
index 0000000..c63097d
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/atmel-adc.txt
@@ -0,0 +1,65 @@
+* AT91's Analog to Digital Converter (ADC)
+
+Required properties:
+  - compatible: Should be "atmel,at91sam9260-adc"
+  - reg: Should contain ADC registers location and length
+  - interrupts: Should contain the IRQ line for the ADC
+  - atmel,adc-channel-base: Offset of the first channel data register
+  - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this
+    device
+  - atmel,adc-drdy-mask: Mask of the DRDY interruption in the ADC
+  - atmel,adc-num-channels: Number of channels available in the ADC
+  - atmel,adc-startup-time: Startup Time of the ADC in microseconds as
+    defined in the datasheet
+  - atmel,adc-status-register: Offset of the Interrupt Status Register
+  - atmel,adc-trigger-register: Offset of the Trigger Register
+  - atmel,adc-vref: Reference voltage in millivolts for the conversions
+
+Optional properties:
+  - atmel,adc-use-external: Boolean to enable of external triggers
+ 
+Optional trigger Nodes:
+  - Required properties:
+    * trigger-name: Name of the trigger exposed to the user
+    * trigger-value: Value to put in the Trigger register
+      to activate this trigger
+  - Optional properties:
+    * trigger-external: Is the trigger an external trigger?
+
+Examples:
+adc0: adc@fffb0000 {
+	compatible = "atmel,at91sam9260-adc";
+	reg = <0xfffb0000 0x100>;
+	interrupts = <20 4>;
+	atmel,adc-channel-base = <0x30>;
+	atmel,adc-channels-used = <0xff>;
+	atmel,adc-drdy-mask = <0x10000>;
+	atmel,adc-num-channels = <8>;
+	atmel,adc-startup-time = <40>;
+	atmel,adc-status-register = <0x1c>;
+	atmel,adc-trigger-register = <0x08>;
+	atmel,adc-use-external;
+	atmel,adc-vref = <3300>;
+
+	trigger@0 {
+		trigger-name = "external-rising";
+		trigger-value = <0x1>;
+		trigger-external;
+	};
+	trigger@1 {
+		trigger-name = "external-falling";
+		trigger-value = <0x2>;
+		trigger-external;
+	};
+
+	trigger@2 {
+		trigger-name = "external-any";
+		trigger-value = <0x3>;
+		trigger-external;
+	};
+
+	trigger@3 {
+		trigger-name = "continuous";
+		trigger-value = <0x6>;
+	};
+};

Documentation/devicetree/bindings/staging/iio/adc/lpc32xx-adc.txt

View file

diff --git a/Documentation/devicetree/bindings/staging/iio/adc/lpc32xx-adc.txt b/Documentation/devicetree/bindings/staging/iio/adc/lpc32xx-adc.txt
new file mode 100644
index 0000000..b3629d3
--- /dev/null
+++ b/Documentation/devicetree/bindings/staging/iio/adc/lpc32xx-adc.txt
@@ -0,0 +1,16 @@
+* NXP LPC32xx SoC ADC controller
+
+Required properties:
+- compatible: must be "nxp,lpc3220-adc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: The ADC interrupt
+
+Example:
+
+	adc@40048000 {
+		compatible = "nxp,lpc3220-adc";
+		reg = <0x40048000 0x1000>;
+		interrupt-parent = <&mic>;
+		interrupts = <39 0>;
+	};

Documentation/devicetree/bindings/staging/iio/adc/spear-adc.txt

View file

diff --git a/Documentation/devicetree/bindings/staging/iio/adc/spear-adc.txt b/Documentation/devicetree/bindings/staging/iio/adc/spear-adc.txt
new file mode 100644
index 0000000..02ea23a
--- /dev/null
+++ b/Documentation/devicetree/bindings/staging/iio/adc/spear-adc.txt
@@ -0,0 +1,26 @@
+* ST SPEAr ADC device driver
+
+Required properties:
+- compatible: Should be "st,spear600-adc"
+- reg: Address and length of the register set for the device
+- interrupt-parent: Should be the phandle for the interrupt controller
+  that services interrupts for this device
+- interrupts: Should contain the ADC interrupt
+- sampling-frequency: Default sampling frequency
+
+Optional properties:
+- vref-external: External voltage reference in milli-volts. If omitted
+  the internal voltage reference will be used.
+- average-samples: Number of samples to generate an average value. If
+  omitted, single data conversion will be used.
+
+Examples:
+
+	adc: adc@d8200000 {
+		compatible = "st,spear600-adc";
+		reg = <0xd8200000 0x1000>;
+		interrupt-parent = <&vic1>;
+		interrupts = <6>;
+		sampling-frequency = <5000000>;
+		vref-external = <2500>;	/* 2.5V VRef */
+	};

Documentation/ioctl/ioctl-number.txt

View file

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index e34b531..915f28c 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -120,6 +120,7 @@ Code  Seq#(hex)	Include File		Comments
 'G'	00-0F	linux/gigaset_dev.h	conflict!
 'H'	00-7F	linux/hiddev.h		conflict!
 'H'	00-0F	linux/hidraw.h		conflict!
+'H'	01	linux/mei.h		conflict!
 'H'	00-0F	sound/asound.h		conflict!
 'H'	20-40	sound/asound_fm.h	conflict!
 'H'	80-8F	sound/sfnt_info.h	conflict!

Documentation/misc-devices/mei/.gitignore

View file

diff --git a/Documentation/misc-devices/mei/.gitignore b/Documentation/misc-devices/mei/.gitignore
new file mode 100644
index 0000000..f356b81
--- /dev/null
+++ b/Documentation/misc-devices/mei/.gitignore
@@ -0,0 +1 @@
+mei-amt-version

Documentation/misc-devices/mei/Makefile

View file

diff --git a/Documentation/misc-devices/mei/Makefile b/Documentation/misc-devices/mei/Makefile
new file mode 100644
index 0000000..00e8c3e
--- /dev/null
+++ b/Documentation/misc-devices/mei/Makefile
@@ -0,0 +1,8 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := mei-amt-version
+HOSTCFLAGS_mei-amt-version.o += -I$(objtree)/usr/include
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)

Documentation/misc-devices/mei/TODO

View file

diff --git a/Documentation/misc-devices/mei/TODO b/Documentation/misc-devices/mei/TODO
new file mode 100644
index 0000000..6b3625d
--- /dev/null
+++ b/Documentation/misc-devices/mei/TODO
@@ -0,0 +1,2 @@
+TODO:
+	- Cleanup and split the timer function

Documentation/misc-devices/mei/mei-amt-version.c

View file

diff --git a/drivers/staging/mei/mei-amt-version.c b/Documentation/misc-devices/mei/mei-amt-version.c
similarity index 99%
rename from drivers/staging/mei/mei-amt-version.c
rename to Documentation/misc-devices/mei/mei-amt-version.c
index ac2a507..01804f2 100644
--- a/drivers/staging/mei/mei-amt-version.c
+++ b/Documentation/misc-devices/mei/mei-amt-version.c
@@ -74,7 +74,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <bits/wordsize.h>
-#include "mei.h"
+#include <linux/mei.h>
 
 /*****************************************************************************
  * Intel Management Engine Interface

Documentation/misc-devices/mei/mei.txt

View file

diff --git a/drivers/staging/mei/mei.txt b/Documentation/misc-devices/mei/mei.txt
similarity index 100%
rename from drivers/staging/mei/mei.txt
rename to Documentation/misc-devices/mei/mei.txt

Documentation/ramoops.txt

View file

diff --git a/Documentation/ramoops.txt b/Documentation/ramoops.txt
index 8fb1ba7..4ba7db2 100644
--- a/Documentation/ramoops.txt
+++ b/Documentation/ramoops.txt
@@ -3,7 +3,7 @@ Ramoops oops/panic logger
 
 Sergiu Iordache <[email protected]>
 
-Updated: 8 August 2011
+Updated: 17 November 2011
 
 0. Introduction
 
@@ -30,6 +30,11 @@ variable while setting 0 in that variable dumps only the panics.
 The module uses a counter to record multiple dumps but the counter gets reset
 on restart (i.e. new dumps after the restart will overwrite old ones).
 
+Ramoops also supports software ECC protection of persistent memory regions.
+This might be useful when a hardware reset was used to bring the machine back
+to life (i.e. a watchdog triggered). In such cases, RAM may be somewhat
+corrupt, but usually it is restorable.
+
 2. Setting the parameters
 
 Setting the ramoops parameters can be done in 2 different manners:
@@ -38,7 +43,7 @@ Setting the ramoops parameters can be done in 2 different manners:
  2. Use a platform device and set the platform data. The parameters can then
  be set through that platform data. An example of doing that is:
 
-#include <linux/ramoops.h>
+#include <linux/pstore_ram.h>
 [...]
 
 static struct ramoops_platform_data ramoops_data = {
@@ -46,6 +51,7 @@ static struct ramoops_platform_data ramoops_data = {
         .mem_address            = <...>,
         .record_size            = <...>,
         .dump_oops              = <...>,
+        .ecc                    = <...>,
 };
 
 static struct platform_device ramoops_dev = {
@@ -71,6 +77,6 @@ timestamp and a new line. The dump then continues with the actual data.
 
 4. Reading the data
 
-The dump data can be read from memory (through /dev/mem or other means).
-Getting the module parameters, which are needed in order to parse the data, can
-be done through /sys/module/ramoops/parameters/* .
+The dump data can be read from the pstore filesystem. The format for these
+files is "dmesg-ramoops-N", where N is the record number in memory. To delete
+a stored record from RAM, simply unlink the respective pstore file.

Documentation/vme_api.txt

View file

diff --git a/drivers/staging/vme/vme_api.txt b/Documentation/vme_api.txt
similarity index 100%
rename from drivers/staging/vme/vme_api.txt
rename to Documentation/vme_api.txt

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index a8e6098..aa067a9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3406,6 +3406,7 @@ IIO SUBSYSTEM AND DRIVERS
 M:	Jonathan Cameron <[email protected]>
 L:	[email protected]
 S:	Maintained
+F:	drivers/iio/
 F:	drivers/staging/iio/
 
 IKANOS/ADI EAGLE ADSL USB DRIVER
@@ -3625,6 +3626,14 @@ S:	Supported
 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]
@@ -7350,6 +7359,18 @@ S:	Maintained
 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]>

arch/arm/boot/dts/at91sam9g45.dtsi

View file

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index c804214..7dbccaf 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -199,6 +199,43 @@
 				interrupts = <25 4>;
 				status = "disabled";
 			};
+
+			adc0: adc@fffb0000 {
+				compatible = "atmel,at91sam9260-adc";
+				reg = <0xfffb0000 0x100>;
+				interrupts = <20 4>;
+				atmel,adc-use-external-triggers;
+				atmel,adc-channels-used = <0xff>;
+				atmel,adc-vref = <3300>;
+				atmel,adc-num-channels = <8>;
+				atmel,adc-startup-time = <40>;
+				atmel,adc-channel-base = <0x30>;
+				atmel,adc-drdy-mask = <0x10000>;
+				atmel,adc-status-register = <0x1c>;
+				atmel,adc-trigger-register = <0x08>;
+
+				trigger@0 {
+					trigger-name = "external-rising";
+					trigger-value = <0x1>;
+					trigger-external;
+				};
+				trigger@1 {
+					trigger-name = "external-falling";
+					trigger-value = <0x2>;
+					trigger-external;
+				};
+
+				trigger@2 {
+					trigger-name = "external-any";
+					trigger-value = <0x3>;
+					trigger-external;
+				};
+
+				trigger@3 {
+					trigger-name = "continuous";
+					trigger-value = <0x6>;
+				};
+			};
 		};
 
 		nand0: nand@40000000 {

arch/arm/boot/dts/at91sam9x5.dtsi

View file

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index dd4ed74..6b3ef43 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -190,6 +190,44 @@
 				interrupts = <27 4>;
 				status = "disabled";
 			};
+
+			adc0: adc@f804c000 {
+				compatible = "atmel,at91sam9260-adc";
+				reg = <0xf804c000 0x100>;
+				interrupts = <19 4>;
+				atmel,adc-use-external;
+				atmel,adc-channels-used = <0xffff>;
+				atmel,adc-vref = <3300>;
+				atmel,adc-num-channels = <12>;
+				atmel,adc-startup-time = <40>;
+				atmel,adc-channel-base = <0x50>;
+				atmel,adc-drdy-mask = <0x1000000>;
+				atmel,adc-status-register = <0x30>;
+				atmel,adc-trigger-register = <0xc0>;
+
+				trigger@0 {
+					trigger-name = "external-rising";
+					trigger-value = <0x1>;
+					trigger-external;
+				};
+
+				trigger@1 {
+					trigger-name = "external-falling";
+					trigger-value = <0x2>;
+					trigger-external;
+				};
+
+				trigger@2 {
+					trigger-name = "external-any";
+					trigger-value = <0x3>;
+					trigger-external;
+				};
+
+				trigger@3 {
+					trigger-name = "continuous";
+					trigger-value = <0x6>;
+				};
+			};
 		};
 
 		nand0: nand@40000000 {

arch/arm/mach-at91/at91sam9260.c

View file

diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index a27bbec..2b1e438 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -55,6 +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 @@ static struct clk *periph_clocks[] __initdata = {
 	&pioB_clk,
 	&pioC_clk,
 	&adc_clk,
+	&adc_op_clk,
 	&usart0_clk,
 	&usart1_clk,
 	&usart2_clk,

arch/arm/mach-at91/at91sam9260_devices.c

View file

diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index d556de1..0ded951 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -17,12 +17,15 @@
 #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"
 
@@ -1340,6 +1343,93 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
 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,