Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

d79df0b1 · Linus Torvalds <[email protected]> · 2010-05-21 15:26:46 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (577 commits)
  Staging: ramzswap: Handler for swap slot free callback
  swap: Add swap slot free callback to block_device_operations
  swap: Add flag to identify block swap devices
  Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one
  Staging: vt6655: use ETH_DATA_LEN macro instead of custom one
  Staging: vt6655: use ETH_FCS_LEN macro instead of custom one
  Staging: vt6656: use ETH_HLEN macro instead of custom one
  Staging: comedi: quatech_daqp_cs.c Replace eos semaphore with a completion.
  Staging: dt3155v4l: remove private memory allocator
  Staging: crystalhd: Remove typedefs from driver
  Staging: winbond: Fix for pointer name format issue in mds.c
  Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs
  Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefs
  Staging: comedi: Altered the way printk is used in 8255.c
  staging: iio: adis16350 and similar IMU driver
  Staging: iio: max1363 Fix two bugs in single_channel_from_ring
  Staging: iio: adis16220 extract bin_attribute structures from state
  Staging: iio: adis16220 vibration sensor driver
  Staging: comedi: Kconfig dependancy fixes
  Staging: comedi: fix up build error from last Kconfig changes
  ...

Commit: d79df0b1eda0099a22cbcece01ce5e7d222450de
Parents: 6e80e8ed · c8d1a126

Merge commit. Changes below are compared with the first parent: 6e80e8ed.

Changes

733 files changed · +56053 −51708

File	Status	Add	Del	Content
drivers/staging/Kconfig	modified	+9	−9	View file
drivers/staging/Makefile	modified	+5	−6	View file
drivers/staging/adis16255/Kconfig	added	+11	−0	View file
drivers/staging/adis16255/Makefile	added	+1	−0	View file
drivers/staging/adis16255/adis16255.c	added	+466	−0	View file
drivers/staging/adis16255/adis16255.h	added	+12	−0	View file
drivers/staging/arlan/Kconfig	deleted	+0	−15	View before deletion
drivers/staging/arlan/Makefile	deleted	+0	−3	View before deletion
drivers/staging/arlan/arlan-main.c	deleted	+0	−1883	View before deletion
drivers/staging/arlan/arlan-proc.c	deleted	+0	−1210	View before deletion
drivers/staging/arlan/arlan.h	deleted	+0	−535	View before deletion
drivers/staging/asus_oled/asus_oled.c	modified	+1	−1	View file
drivers/staging/batman-adv/CHANGELOG	modified	+14	−0	View file
drivers/staging/batman-adv/Makefile	modified	+2	−2	View file
drivers/staging/batman-adv/README	modified	+173	−82	View file
drivers/staging/batman-adv/TODO	modified	+3	−20	View file
drivers/staging/batman-adv/aggregation.c	modified	+39	−6	View file
drivers/staging/batman-adv/aggregation.h	modified	+4	−3	View file
drivers/staging/batman-adv/bat_sysfs.c	added	+484	−0	View file
drivers/staging/batman-adv/proc.h → drivers/staging/batman-adv/bat_sysfs.h	renamed	+8	−19	View file
drivers/staging/batman-adv/bitarray.c	modified	+52	−24	View file
drivers/staging/batman-adv/bitarray.h	modified	+1	−1	View file
drivers/staging/batman-adv/device.c	modified	+22	−15	View file
drivers/staging/batman-adv/device.h	modified	+1	−1	View file
drivers/staging/batman-adv/hard-interface.c	modified	+273	−257	View file
drivers/staging/batman-adv/hard-interface.h	modified	+10	−10	View file
drivers/staging/batman-adv/hash.c	modified	+1	−1	View file
drivers/staging/batman-adv/hash.h	modified	+1	−1	View file
drivers/staging/batman-adv/main.c	modified	+33	−27	View file
drivers/staging/batman-adv/main.h	modified	+13	−10	View file
drivers/staging/batman-adv/originator.c	modified	+282	−13	View file
drivers/staging/batman-adv/originator.h	modified	+5	−2	View file
drivers/staging/batman-adv/packet.h	modified	+1	−1	View file
drivers/staging/batman-adv/proc.c	deleted	+0	−670	View before deletion
drivers/staging/batman-adv/ring_buffer.c	modified	+1	−1	View file
drivers/staging/batman-adv/ring_buffer.h	modified	+1	−1	View file
drivers/staging/batman-adv/routing.c	modified	+155	−66	View file
drivers/staging/batman-adv/routing.h	modified	+1	−1	View file
drivers/staging/batman-adv/send.c	modified	+104	−45	View file
drivers/staging/batman-adv/send.h	modified	+3	−3	View file
drivers/staging/batman-adv/soft-interface.c	modified	+20	−10	View file
drivers/staging/batman-adv/soft-interface.h	modified	+1	−1	View file
drivers/staging/batman-adv/translation-table.c	modified	+73	−19	View file
drivers/staging/batman-adv/translation-table.h	modified	+5	−3	View file
drivers/staging/batman-adv/types.h	modified	+41	−13	View file
drivers/staging/batman-adv/vis.c	modified	+262	−91	View file
drivers/staging/batman-adv/vis.h	modified	+8	−11	View file
drivers/staging/comedi/Kconfig	modified	+1276	−8	View file
drivers/staging/comedi/Makefile	modified	+0	−1	View file
drivers/staging/comedi/comedi.h	modified	+121	−81	View file
drivers/staging/comedi/comedi_compat32.c	modified	+1	−2	View file
drivers/staging/comedi/comedi_fops.c	modified	+136	−106	View file
drivers/staging/comedi/comedi_fops.h	modified	+1	−0	View file
drivers/staging/comedi/comedi_ksyms.c	deleted	+0	−69	View before deletion
drivers/staging/comedi/comedidev.h	modified	+6	−28	View file
drivers/staging/comedi/comedilib.h	modified	+7	−163	View file
drivers/staging/comedi/drivers.c	modified	+62	−50	View file
drivers/staging/comedi/drivers/8253.h	modified	+2	−1	View file
drivers/staging/comedi/drivers/8255.c	modified	+11	−5	View file
drivers/staging/comedi/drivers/8255.h	modified	+0	−22	View file
drivers/staging/comedi/drivers/Makefile	modified	+125	−120	View file
drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h	modified	+2	−4	View file
drivers/staging/comedi/drivers/addi-data/addi_common.c	modified	+6	−7	View file
drivers/staging/comedi/drivers/addi-data/addi_common.h	modified	+1	−1	View file
drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h	modified	+1	−3	View file
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c	modified	+3	−3	View file
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h	modified	+1	−15	View file
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c	modified	+2	−2	View file
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c	modified	+55	−39	View file
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c	modified	+2	−2	View file
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c	modified	+1	−1	View file
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h	modified	+1	−1	View file
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c	modified	+82	−109	View file
drivers/staging/comedi/drivers/adl_pci6208.c	modified	+5	−5	View file
drivers/staging/comedi/drivers/adl_pci7230.c	added	+206	−0	View file
drivers/staging/comedi/drivers/adl_pci9111.c	modified	+15	−26	View file
drivers/staging/comedi/drivers/adl_pci9118.c	modified	+570	−287	View file
drivers/staging/comedi/drivers/adv_pci1710.c	modified	+15	−12	View file
drivers/staging/comedi/drivers/adv_pci1723.c	modified	+89	−64	View file
drivers/staging/comedi/drivers/adv_pci_dio.c	modified	+19	−17	View file
drivers/staging/comedi/drivers/aio_aio12_8.c	modified	+2	−2	View file
drivers/staging/comedi/drivers/amplc_dio200.c	modified	+3	−3	View file
drivers/staging/comedi/drivers/amplc_pci224.c	modified	+58	−58	View file
drivers/staging/comedi/drivers/amplc_pci230.c	modified	+66	−66	View file
drivers/staging/comedi/drivers/cb_das16_cs.c	modified	+10	−6	View file
drivers/staging/comedi/drivers/cb_pcidas64.c	modified	+50	−44	View file
drivers/staging/comedi/drivers/cb_pcimdas.c	modified	+2	−0	View file
drivers/staging/comedi/drivers/cb_pcimdda.c	modified	+2	−1	View file
drivers/staging/comedi/drivers/comedi_bond.c	modified	+6	−7	View file
drivers/staging/comedi/drivers/comedi_parport.c	modified	+5	−5	View file
drivers/staging/comedi/drivers/das08.c	modified	+82	−74	View file
drivers/staging/comedi/drivers/das08.h	modified	+1	−1	View file
drivers/staging/comedi/drivers/das08_cs.c	modified	+4	−1	View file
drivers/staging/comedi/drivers/das16.c	modified	+90	−69	View file
drivers/staging/comedi/drivers/das1800.c	modified	+5	−5	View file
drivers/staging/comedi/drivers/dt2801.c	modified	+1	−1	View file
drivers/staging/comedi/drivers/dt2811.c	modified	+76	−115	View file
drivers/staging/comedi/drivers/dt2814.c	modified	+19	−19	View file
drivers/staging/comedi/drivers/dt282x.c	modified	+107	−118	View file
drivers/staging/comedi/drivers/dt3000.c	modified	+7	−14	View file
drivers/staging/comedi/drivers/icp_multi.h	modified	+1	−2	View file
drivers/staging/comedi/drivers/me_daq.c	modified	+1	−0	View file
drivers/staging/comedi/drivers/mite.c	modified	+1	−1	View file
drivers/staging/comedi/drivers/mite.h	modified	+0	−2	View file
drivers/staging/comedi/drivers/mpc624.c	modified	+104	−81	View file
drivers/staging/comedi/drivers/ni_6527.c	modified	+3	−4	View file
drivers/staging/comedi/drivers/ni_65xx.c	modified	+23	−24	View file
drivers/staging/comedi/drivers/ni_660x.c	modified	+5	−6	View file
drivers/staging/comedi/drivers/ni_670x.c	modified	+3	−8	View file
drivers/staging/comedi/drivers/ni_at_ao.c	modified	+3	−3	View file
drivers/staging/comedi/drivers/ni_daq_700.c	modified	+8	−5	View file
drivers/staging/comedi/drivers/ni_daq_dio24.c	modified	+4	−0	View file
drivers/staging/comedi/drivers/ni_labpc.c	modified	+3	−4	View file
drivers/staging/comedi/drivers/ni_labpc_cs.c	modified	+3	−1	View file
drivers/staging/comedi/drivers/ni_mio_cs.c	modified	+3	−2	View file
drivers/staging/comedi/drivers/ni_pcidio.c	modified	+11	−14	View file
drivers/staging/comedi/drivers/ni_pcimio.c	modified	+53	−54	View file
drivers/staging/comedi/drivers/plx9080.h	modified	+2	−2	View file
drivers/staging/comedi/drivers/quatech_daqp_cs.c	modified	+23	−19	View file
drivers/staging/comedi/drivers/skel.c	modified	+12	−9	View file
drivers/staging/comedi/drivers/ssv_dnp.c	modified	+45	−41	View file
drivers/staging/comedi/drivers/unioxx5.c	modified	+1	−1	View file
drivers/staging/comedi/drivers/usbdux.c	modified	+6	−7	View file
drivers/staging/comedi/drivers/usbduxfast.c	modified	+27	−22	View file
drivers/staging/comedi/internal.h	added	+12	−0	View file
drivers/staging/comedi/kcomedilib/Makefile	modified	+2	−7	View file
drivers/staging/comedi/kcomedilib/data.c	deleted	+0	−92	View before deletion
drivers/staging/comedi/kcomedilib/dio.c	deleted	+0	−95	View before deletion
drivers/staging/comedi/kcomedilib/get.c	deleted	+0	−293	View before deletion
drivers/staging/comedi/kcomedilib/kcomedilib_main.c	modified	+79	−444	View file
drivers/staging/comedi/kcomedilib/ksyms.c	deleted	+0	−146	View before deletion
drivers/staging/comedi/pci_ids.h	deleted	+0	−31	View before deletion
drivers/staging/comedi/proc.c	modified	+10	−13	View file
drivers/staging/comedi/range.c	modified	+21	−15	View file
drivers/staging/comedi/wrapper.h	deleted	+0	−25	View before deletion
drivers/staging/crystalhd/TODO	modified	+0	−1	View file
drivers/staging/crystalhd/bc_dts_defs.h	modified	+31	−41	View file
drivers/staging/crystalhd/bc_dts_glob_lnx.h	modified	+59	−60	View file
drivers/staging/crystalhd/bc_dts_types.h	modified	+1	−24	View file
drivers/staging/crystalhd/bcm_70012_regs.h	modified	+12	−12	View file
drivers/staging/crystalhd/crystalhd_cmds.c	modified	+91	−87	View file
drivers/staging/crystalhd/crystalhd_cmds.h	modified	+10	−11	View file
drivers/staging/crystalhd/crystalhd_fw_if.h	modified	+27	−33	View file
drivers/staging/crystalhd/crystalhd_hw.c	modified	+104	−108	View file
drivers/staging/crystalhd/crystalhd_hw.h	modified	+57	−64	View file
drivers/staging/crystalhd/crystalhd_lnx.c	modified	+40	−36	View file
drivers/staging/crystalhd/crystalhd_lnx.h	modified	+5	−5	View file
drivers/staging/crystalhd/crystalhd_misc.c	modified	+50	−50	View file
drivers/staging/crystalhd/crystalhd_misc.h	modified	+27	−28	View file
drivers/staging/cx25821/cx25821-audio-upstream.c	modified	+2	−4	View file
drivers/staging/cx25821/cx25821-video-upstream-ch2.c	modified	+2	−4	View file
drivers/staging/cx25821/cx25821-video-upstream.c	modified	+2	−2	View file
drivers/staging/cxt1e1/Kconfig	added	+22	−0	View file
drivers/staging/cxt1e1/Makefile	added	+19	−0	View file
drivers/staging/cxt1e1/comet.c	added	+568	−0	View file
drivers/staging/cxt1e1/comet.h	added	+366	−0	View file
drivers/staging/cxt1e1/comet_tables.c	added	+561	−0	View file
drivers/staging/cxt1e1/comet_tables.h	added	+85	−0	View file
drivers/staging/cxt1e1/functions.c	added	+368	−0	View file
drivers/staging/cxt1e1/hwprobe.c	added	+402	−0	View file
drivers/staging/cxt1e1/libsbew.h	added	+581	−0	View file
drivers/staging/cxt1e1/linux.c	added	+1356	−0	View file
drivers/staging/cxt1e1/musycc.c	added	+2185	−0	View file
drivers/staging/cxt1e1/musycc.h	added	+460	−0	View file
drivers/staging/cxt1e1/ossiRelease.c	added	+39	−0	View file
drivers/staging/cxt1e1/pmc93x6_eeprom.c	added	+561	−0	View file
drivers/staging/cxt1e1/pmc93x6_eeprom.h	added	+60	−0	View file
drivers/staging/cxt1e1/pmcc4.h	added	+155	−0	View file
drivers/staging/cxt1e1/pmcc4_cpld.h	added	+124	−0	View file
drivers/staging/cxt1e1/pmcc4_defs.h	added	+82	−0	View file
drivers/staging/cxt1e1/pmcc4_drv.c	added	+1860	−0	View file
drivers/staging/cxt1e1/pmcc4_ioctls.h	added	+81	−0	View file
drivers/staging/cxt1e1/pmcc4_private.h	added	+296	−0	View file
drivers/staging/cxt1e1/pmcc4_sysdep.h	added	+62	−0	View file
drivers/staging/cxt1e1/sbe_bid.h	added	+61	−0	View file
drivers/staging/cxt1e1/sbe_promformat.h	added	+157	−0	View file
drivers/staging/cxt1e1/sbecom_inline_linux.h	added	+310	−0	View file
drivers/staging/cxt1e1/sbecrc.c	added	+137	−0	View file
drivers/staging/cxt1e1/sbeid.c	added	+217	−0	View file
drivers/staging/cxt1e1/sbeproc.c	added	+358	−0	View file
drivers/staging/cxt1e1/sbeproc.h	added	+52	−0	View file
drivers/staging/cxt1e1/sbew_ioc.h	added	+136	−0	View file
drivers/staging/dream/Kconfig	modified	+4	−7	View file
drivers/staging/dream/Makefile	modified	+2	−1	View file
drivers/staging/dream/TODO	modified	+0	−1	View file
drivers/staging/dream/camera/msm_vfe8x_proc.c	modified	+1	−1	View file
drivers/staging/dream/pmem.c	modified	+12	−15	View file
drivers/staging/dream/qdsp5/audio_out.c	modified	+0	−9	View file
drivers/staging/dream/smd/Kconfig	deleted	+0	−26	View before deletion
drivers/staging/dream/smd/Makefile	deleted	+0	−7	View before deletion
drivers/staging/dream/smd/rpc_server_dog_keepalive.c	deleted	+0	−68	View before deletion
drivers/staging/dream/smd/rpc_server_time_remote.c	deleted	+0	−77	View before deletion
drivers/staging/dream/smd/smd.c	deleted	+0	−1330	View before deletion
drivers/staging/dream/smd/smd_private.h	deleted	+0	−171	View before deletion
drivers/staging/dream/smd/smd_qmi.c	deleted	+0	−855	View before deletion
drivers/staging/dream/smd/smd_rpcrouter.c	deleted	+0	−1261	View before deletion
drivers/staging/dream/smd/smd_rpcrouter.h	deleted	+0	−193	View before deletion
drivers/staging/dream/smd/smd_rpcrouter_device.c	deleted	+0	−377	View before deletion
drivers/staging/dream/smd/smd_rpcrouter_servers.c	deleted	+0	−230	View before deletion
drivers/staging/dream/smd/smd_tty.c	deleted	+0	−208	View before deletion
drivers/staging/dream/synaptics_i2c_rmi.c	modified	+7	−21	View file
drivers/staging/dt3155/allocator.c	modified	+8	−8	View file
drivers/staging/dt3155/allocator.h	modified	+2	−2	View file
drivers/staging/dt3155/dt3155.h	modified	+17	−27	View file
drivers/staging/dt3155/dt3155_drv.c	modified	+196	−184	View file
drivers/staging/dt3155/dt3155_io.c	modified	+7	−17	View file
drivers/staging/dt3155/dt3155_isr.c	modified	+145	−152	View file
drivers/staging/dt3155/dt3155_isr.h	modified	+1	−1	View file
drivers/staging/dt3155v4l/Kconfig	added	+20	−0	View file
drivers/staging/dt3155v4l/Makefile	added	+1	−0	View file
drivers/staging/dt3155v4l/dt3155v4l.c	added	+1200	−0	View file
drivers/staging/dt3155v4l/dt3155v4l.h	added	+224	−0	View file
drivers/staging/echo/echo.c	modified	+1	−1	View file
drivers/staging/et131x/et1310_address_map.h	modified	+3	−4	View file
drivers/staging/et131x/et1310_eeprom.c	modified	+4	−4	View file
drivers/staging/et131x/et1310_phy.c	modified	+1	−1	View file
drivers/staging/et131x/et1310_rx.c	modified	+27	−28	View file
drivers/staging/et131x/et1310_rx.h	modified	+2	−3	View file
drivers/staging/et131x/et1310_tx.c	modified	+1	−1	View file
drivers/staging/et131x/et131x_initpci.c	modified	+9	−3	View file
drivers/staging/et131x/et131x_isr.c	modified	+2	−4	View file
drivers/staging/et131x/et131x_netdev.c	modified	+5	−9	View file
drivers/staging/frontier/alphatrack.c	modified	+17	−17	View file
drivers/staging/frontier/tranzport.c	modified	+19	−17	View file
drivers/staging/go7007/go7007-fw.c	modified	+4	−8	View file
drivers/staging/go7007/go7007-usb.c	modified	+1	−2	View file
drivers/staging/go7007/go7007-v4l2.c	modified	+1	−3	View file
drivers/staging/go7007/saa7134-go7007.c	modified	+1	−2	View file
drivers/staging/go7007/wis-saa7113.c	modified	+1	−0	View file
drivers/staging/go7007/wis-saa7115.c	modified	+1	−0	View file
drivers/staging/go7007/wis-tw9903.c	modified	+1	−0	View file
drivers/staging/hv/Kconfig	modified	+7	−1	View file
drivers/staging/hv/Makefile	modified	+6	−5	View file
drivers/staging/hv/TODO	modified	+0	−3	View file
drivers/staging/hv/BlkVsc.c → drivers/staging/hv/blkvsc.c	renamed	+2	−2	View file
drivers/staging/hv/blkvsc_drv.c	modified	+25	−20	View file
drivers/staging/hv/Channel.c → drivers/staging/hv/channel.c	renamed	+141	−54	View file
drivers/staging/hv/Channel.h → drivers/staging/hv/channel.h	renamed	+1	−1	View file
drivers/staging/hv/ChannelInterface.c → drivers/staging/hv/channel_interface.c	renamed	+1	−1	View file
drivers/staging/hv/ChannelInterface.h → drivers/staging/hv/channel_interface.h	renamed	+1	−1	View file
drivers/staging/hv/ChannelMgmt.c → drivers/staging/hv/channel_mgmt.c	renamed	+208	−20	View file
drivers/staging/hv/ChannelMgmt.h → drivers/staging/hv/channel_mgmt.h	renamed	+3	−3	View file
drivers/staging/hv/Connection.c → drivers/staging/hv/connection.c	renamed	+19	−12	View file
drivers/staging/hv/Hv.c → drivers/staging/hv/hv.c	renamed	+13	−15	View file
drivers/staging/hv/Hv.h → drivers/staging/hv/hv.h	renamed	+0	−0	View file
drivers/staging/hv/hv_utils.c	added	+295	−0	View file
drivers/staging/hv/logging.h	modified	+0	−7	View file
drivers/staging/hv/NetVsc.c → drivers/staging/hv/netvsc.c	renamed	+59	−45	View file
drivers/staging/hv/NetVsc.h → drivers/staging/hv/netvsc.h	renamed	+4	−3	View file
drivers/staging/hv/NetVscApi.h → drivers/staging/hv/netvsc_api.h	renamed	+1	−8	View file
drivers/staging/hv/netvsc_drv.c	modified	+119	−124	View file
drivers/staging/hv/osd.c	modified	+70	−0	View file
drivers/staging/hv/RingBuffer.c → drivers/staging/hv/ring_buffer.c	renamed	+9	−7	View file
drivers/staging/hv/RingBuffer.h → drivers/staging/hv/ring_buffer.h	renamed	+0	−0	View file
drivers/staging/hv/rndis.h	modified	+1	−1	View file
drivers/staging/hv/RndisFilter.c → drivers/staging/hv/rndis_filter.c	renamed	+29	−27	View file
drivers/staging/hv/RndisFilter.h → drivers/staging/hv/rndis_filter.h	renamed	+1	−1	View file
drivers/staging/hv/StorVsc.c → drivers/staging/hv/storvsc.c	renamed	+31	−23	View file
drivers/staging/hv/StorVscApi.h → drivers/staging/hv/storvsc_api.h	renamed	+1	−1	View file
drivers/staging/hv/storvsc_drv.c	modified	+27	−27	View file
drivers/staging/hv/utils.h	added	+119	−0	View file
drivers/staging/hv/VersionInfo.h → drivers/staging/hv/version_info.h	renamed	+4	−3	View file
drivers/staging/hv/Vmbus.c → drivers/staging/hv/vmbus.c	renamed	+16	−17	View file
drivers/staging/hv/vmbus.h	modified	+1	−1	View file
drivers/staging/hv/VmbusApi.h → drivers/staging/hv/vmbus_api.h	renamed	+18	−0	View file
drivers/staging/hv/VmbusChannelInterface.h → drivers/staging/hv/vmbus_channel_interface.h	renamed	+0	−0	View file
drivers/staging/hv/vmbus_drv.c	modified	+61	−35	View file
drivers/staging/hv/VmbusPacketFormat.h → drivers/staging/hv/vmbus_packet_format.h	renamed	+1	−0	View file
drivers/staging/hv/VmbusPrivate.h → drivers/staging/hv/vmbus_private.h	renamed	+6	−6	View file
drivers/staging/hv/vstorage.h	modified	+1	−1	View file
drivers/staging/iio/Documentation/iio_utils.h	modified	+171	−95	View file
drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c	modified	+152	−85	View file
drivers/staging/iio/Documentation/sysfs-class-iio	added	+294	−0	View file
drivers/staging/iio/Documentation/userspace.txt	modified	+1	−1	View file
drivers/staging/iio/Kconfig	modified	+2	−0	View file
drivers/staging/iio/Makefile	modified	+2	−0	View file
drivers/staging/iio/accel/Kconfig	modified	+25	−0	View file
drivers/staging/iio/accel/Makefile	modified	+11	−0	View file
drivers/staging/iio/accel/accel.h	modified	+8	−4	View file
drivers/staging/iio/accel/adis16209.h	added	+193	−0	View file
drivers/staging/iio/accel/adis16209_core.c	added	+615	−0	View file
drivers/staging/iio/accel/adis16209_ring.c	added	+266	−0	View file
drivers/staging/iio/accel/adis16209_trigger.c	added	+124	−0	View file
drivers/staging/iio/accel/adis16220.h	added	+147	−0	View file
drivers/staging/iio/accel/adis16220_core.c	added	+670	−0	View file
drivers/staging/iio/accel/adis16240.h	added	+218	−0	View file
drivers/staging/iio/accel/adis16240_core.c	added	+599	−0	View file
drivers/staging/iio/accel/adis16240_ring.c	added	+254	−0	View file
drivers/staging/iio/accel/adis16240_trigger.c	added	+124	−0	View file
drivers/staging/iio/accel/inclinometer.h	added	+23	−0	View file
drivers/staging/iio/accel/kxsd9.c	modified	+51	−37	View file
drivers/staging/iio/accel/lis3l02dq.h	modified	+0	−4	View file
drivers/staging/iio/accel/lis3l02dq_core.c	modified	+90	−83	View file
drivers/staging/iio/accel/lis3l02dq_ring.c	modified	+11	−13	View file
drivers/staging/iio/accel/sca3000.h	modified	+2	−0	View file
drivers/staging/iio/accel/sca3000_core.c	modified	+87	−91	View file
drivers/staging/iio/accel/sca3000_ring.c	modified	+26	−9	View file
drivers/staging/iio/adc/Kconfig	modified	+8	−3	View file
drivers/staging/iio/adc/Makefile	modified	+1	−1	View file
drivers/staging/iio/adc/adc.h	modified	+15	−0	View file
drivers/staging/iio/adc/max1363.h	modified	+57	−65	View file
drivers/staging/iio/adc/max1363_core.c	modified	+792	−315	View file
drivers/staging/iio/adc/max1363_ring.c	modified	+55	−27	View file
drivers/staging/iio/chrdev.h	modified	+1	−1	View file
drivers/staging/iio/gyro/Kconfig	added	+13	−0	View file
drivers/staging/iio/gyro/Makefile	added	+7	−0	View file
drivers/staging/iio/gyro/adis16260.h	added	+175	−0	View file
drivers/staging/iio/gyro/adis16260_core.c	added	+661	−0	View file
drivers/staging/iio/gyro/adis16260_ring.c	added	+256	−0	View file
drivers/staging/iio/gyro/adis16260_trigger.c	added	+124	−0	View file
drivers/staging/iio/gyro/gyro.h	added	+43	−0	View file
drivers/staging/iio/iio.h	modified	+42	−5	View file
drivers/staging/iio/imu/Kconfig	added	+33	−0	View file
drivers/staging/iio/imu/Makefile	added	+14	−0	View file
drivers/staging/iio/imu/adis16300.h	added	+194	−0	View file
drivers/staging/iio/imu/adis16300_core.c	added	+768	−0	View file
drivers/staging/iio/imu/adis16300_ring.c	added	+233	−0	View file
drivers/staging/iio/imu/adis16300_trigger.c	added	+127	−0	View file
drivers/staging/iio/imu/adis16350.h	added	+193	−0	View file
drivers/staging/iio/imu/adis16350_core.c	added	+736	−0	View file
drivers/staging/iio/imu/adis16350_ring.c	added	+286	−0	View file
drivers/staging/iio/imu/adis16350_trigger.c	added	+127	−0	View file
drivers/staging/iio/imu/adis16400.h	added	+229	−0	View file
drivers/staging/iio/imu/adis16400_core.c	added	+800	−0	View file
drivers/staging/iio/imu/adis16400_ring.c	added	+245	−0	View file
drivers/staging/iio/imu/adis16400_trigger.c	added	+127	−0	View file
drivers/staging/iio/industrialio-core.c	modified	+27	−33	View file
drivers/staging/iio/industrialio-ring.c	modified	+28	−47	View file
drivers/staging/iio/industrialio-trigger.c	modified	+12	−8	View file
drivers/staging/iio/light/tsl2563.c	modified	+15	−3	View file
drivers/staging/iio/magnetometer/magnet.h	added	+31	−0	View file
drivers/staging/iio/ring_generic.h	modified	+21	−29	View file
drivers/staging/iio/ring_sw.c	modified	+26	−24	View file
drivers/staging/iio/sysfs.h	modified	+14	−1	View file
drivers/staging/iio/trigger/iio-trig-gpio.c	modified	+63	−68	View file
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c	modified	+2	−2	View file
drivers/staging/line6/control.h	modified	+123	−43	View file
drivers/staging/line6/driver.c	modified	+5	−5	View file
drivers/staging/line6/dumprequest.c	modified	+1	−2	View file
drivers/staging/line6/pod.c	modified	+2	−4	View file
drivers/staging/line6/variax.c	modified	+2	−3	View file
drivers/staging/memrar/Kconfig	added	+15	−0	View file
drivers/staging/memrar/Makefile	added	+2	−0	View file
drivers/staging/memrar/TODO	added	+43	−0	View file
drivers/staging/memrar/memrar-abi	added	+89	−0	View file
drivers/staging/memrar/memrar.h	added	+155	−0	View file
drivers/staging/memrar/memrar_allocator.c	added	+432	−0	View file
drivers/staging/memrar/memrar_allocator.h	added	+149	−0	View file
drivers/staging/memrar/memrar_handler.c	added	+996	−0	View file
drivers/staging/netwave/Kconfig	deleted	+0	−11	View before deletion
drivers/staging/netwave/Makefile	deleted	+0	−1	View before deletion
drivers/staging/netwave/TODO	deleted	+0	−7	View before deletion
drivers/staging/netwave/netwave_cs.c	deleted	+0	−1364	View before deletion
drivers/staging/otus/80211core/cagg.c	modified	+21	−13	View file
drivers/staging/otus/80211core/ccmd.c	modified	+2	−1	View file
drivers/staging/otus/80211core/cfunc.c	modified	+2	−1	View file
drivers/staging/otus/80211core/cic.c	modified	+6	−3	View file
drivers/staging/otus/80211core/cinit.c	modified	+2	−1	View file
drivers/staging/otus/80211core/cmm.c	modified	+95	−49	View file
drivers/staging/otus/80211core/cmmap.c	modified	+68	−35	View file
drivers/staging/otus/80211core/cmmsta.c	modified	+81	−42	View file
drivers/staging/otus/80211core/coid.c	modified	+2	−1	View file
drivers/staging/otus/80211core/cpsmgr.c	modified	+2	−1	View file
drivers/staging/otus/80211core/ctxrx.c	modified	+53	−28	View file
drivers/staging/otus/80211core/queue.c	modified	+3	−2	View file
drivers/staging/otus/80211core/ratectrl.c	modified	+2	−1	View file
drivers/staging/otus/hal/hpani.c	modified	+14	−19	View file
drivers/staging/otus/hal/hpani.h	modified	+3	−4	View file
drivers/staging/otus/hal/hpfw2.c	modified	+1	−1	View file
drivers/staging/otus/hal/hpfwu.c	modified	+1	−1	View file
drivers/staging/otus/hal/hpfwu_2k.c	modified	+1	−1	View file
drivers/staging/otus/hal/hpfwu_BA.c	modified	+1	−1	View file
drivers/staging/otus/hal/hpfwu_OTUS_RC.c	modified	+1	−1	View file
drivers/staging/otus/hal/hpfwuinit.c	modified	+1	−1	View file
drivers/staging/otus/hal/hpmain.c	modified	+18	−12	View file
drivers/staging/otus/hal/hpreg.c	modified	+754	−832	View file
drivers/staging/otus/ioctl.c	modified	+20	−17	View file
drivers/staging/otus/usbdrv.c	modified	+4	−2	View file
drivers/staging/otus/wwrap.c	modified	+0	−1	View file
drivers/staging/otus/zdusb.c	modified	+2	−4	View file
drivers/staging/panel/panel.c	modified	+2	−3	View file
drivers/staging/phison/phison.c	modified	+2	−2	View file
drivers/staging/poch/Kconfig	deleted	+0	−6	View before deletion
drivers/staging/poch/Makefile	deleted	+0	−1	View before deletion
drivers/staging/poch/README	deleted	+0	−136	View before deletion
drivers/staging/poch/poch.c	deleted	+0	−1443	View before deletion
drivers/staging/poch/poch.h	deleted	+0	−35	View before deletion
drivers/staging/pohmelfs/config.c	modified	+18	−23	View file
drivers/staging/pohmelfs/crypto.c	modified	+19	−19	View file
drivers/staging/pohmelfs/dir.c	modified	+7	−7	View file
drivers/staging/pohmelfs/inode.c	modified	+32	−32	View file
drivers/staging/pohmelfs/net.c	modified	+19	−19	View file
drivers/staging/pohmelfs/netfs.h	modified	+9	−8	View file
drivers/staging/quatech_usb2/quatech_usb2.c	modified	+6	−6	View file
drivers/staging/ramzswap/TODO	deleted	+0	−5	View before deletion
drivers/staging/ramzswap/ramzswap_drv.c	modified	+31	−636	View file
drivers/staging/ramzswap/ramzswap_drv.h	modified	+4	−47	View file
drivers/staging/ramzswap/ramzswap_ioctl.h	modified	+3	−11	View file
drivers/staging/rar_register/Kconfig	modified	+14	−14	View file
drivers/staging/rar_register/rar_register.c	modified	+335	−275	View file
drivers/staging/rar_register/rar_register.h	modified	+11	−51	View file
drivers/staging/rt2860/chip/mac_pci.h	modified	+20	−21	View file
drivers/staging/rt2860/chip/mac_usb.h	modified	+26	−29	View file
drivers/staging/rt2860/chip/rtmp_mac.h	modified	+26	−26	View file
drivers/staging/rt2860/chip/rtmp_phy.h	modified	+149	−189	View file
drivers/staging/rt2860/chips/rt3070.c	modified	+2	−2	View file
drivers/staging/rt2860/chips/rt3090.c	modified	+2	−2	View file
drivers/staging/rt2860/chips/rt30xx.c	modified	+3	−6	View file
drivers/staging/rt2860/common/cmm_aes.c	modified	+1	−1	View file
drivers/staging/rt2860/common/cmm_data.c	modified	+5	−3	View file
drivers/staging/rt2860/common/cmm_mac_pci.c	modified	+1	−1	View file
drivers/staging/rt2860/common/cmm_mac_usb.c	modified	+1	−1	View file
drivers/staging/rt2860/common/cmm_wpa.c	modified	+8	−10	View file
drivers/staging/rt2860/common/spectrum.c	modified	+4	−3	View file
drivers/staging/rt2860/mlme.h	modified	+1	−1	View file
drivers/staging/rt2860/pci_main_dev.c	modified	+20	−17	View file
drivers/staging/rt2860/rt_linux.c	modified	+26	−25	View file
drivers/staging/rt2860/rt_linux.h	modified	+5	−9	View file
drivers/staging/rt2860/rt_main_dev.c	modified	+10	−10	View file
drivers/staging/rt2860/rt_pci_rbus.c	modified	+10	−14	View file
drivers/staging/rt2860/rt_usb.c	modified	+7	−13	View file
drivers/staging/rt2860/rtmp.h	modified	+197	−213	View file
drivers/staging/rt2860/sta/assoc.c	modified	+0	−1	View file
drivers/staging/rt2860/sta_ioctl.c	modified	+7	−8	View file
drivers/staging/rt2860/usb_main_dev.c	modified	+3	−2	View file
drivers/staging/rt2870/Kconfig	modified	+1	−1	View file
drivers/staging/rt2870/common/rtusb_bulk.c	modified	+22	−20	View file
drivers/staging/rt2870/common/rtusb_data.c	modified	+4	−4	View file
drivers/staging/rt2870/common/rtusb_io.c	modified	+17	−22	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c	modified	+2	−4	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c	modified	+1	−2	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c	modified	+1	−2	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c	modified	+1	−2	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_module.c	modified	+2	−5	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c	modified	+0	−4	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c	modified	+11	−9	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c	modified	+0	−4	View file
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c	modified	+2	−4	View file
drivers/staging/rtl8187se/r8180_core.c	modified	+1039	−1037	View file
drivers/staging/rtl8187se/r8180_rtl8225z2.c	modified	+78	−51	View file
drivers/staging/rtl8192e/Makefile	modified	+1	−0	View file
drivers/staging/rtl8192e/ieee80211.h	modified	+1	−1	View file
drivers/staging/rtl8192e/ieee80211/ieee80211.h	modified	+1	−1	View file
drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c	modified	+2	−4	View file
drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c	modified	+1	−2	View file
drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c	modified	+1	−2	View file
drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_wep.c	modified	+1	−2	View file
drivers/staging/rtl8192e/ieee80211/ieee80211_module.c	modified	+3	−6	View file
drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c	modified	+1	−1	View file
drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c	modified	+8	−9	View file
drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c	modified	+2	−4	View file
drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h	modified	+1	−167	View file
drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c	modified	+3	−35	View file
drivers/staging/rtl8192e/r8190_rtl8256.c	modified	+2	−2	View file
drivers/staging/rtl8192e/r8192E_core.c	modified	+8	−6	View file
drivers/staging/rtl8192e/r8192_pm.c	modified	+2	−4	View file
drivers/staging/rtl8192e/r8192_pm.h	modified	+0	−4	View file
drivers/staging/rtl8192su/Kconfig	modified	+1	−0	View file
drivers/staging/rtl8192su/Makefile	modified	+1	−1	View file
drivers/staging/rtl8192su/ieee80211/ieee80211.h	modified	+1	−1	View file
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c	modified	+2	−4	View file
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c	modified	+1	−2	View file
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c	modified	+1	−2	View file
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c	modified	+1	−2	View file
drivers/staging/rtl8192su/ieee80211/ieee80211_module.c	modified	+3	−6	View file
drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h	modified	+13	−11	View file
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c	modified	+1	−1	View file
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c	modified	+8	−9	View file
drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c	modified	+2	−4	View file
drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h	modified	+0	−1	View file
drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c	modified	+2	−10	View file
drivers/staging/rtl8192su/r8180_93cx6.c	deleted	+0	−146	View before deletion
drivers/staging/rtl8192su/r8180_93cx6.h	deleted	+0	−40	View before deletion
drivers/staging/rtl8192su/r8192SU_led.c	added	+2347	−0	View file
drivers/staging/rtl8192su/r8192SU_led.h	added	+93	−0	View file
drivers/staging/rtl8192su/r8192S_firmware.c	modified	+248	−255	View file
drivers/staging/rtl8192su/r8192S_phy.c	modified	+84	−110	View file
drivers/staging/rtl8192su/r8192U.h	modified	+19	−22	View file
drivers/staging/rtl8192su/r8192U_core.c	modified	+294	−332	View file
drivers/staging/rtl8192su/r819xU_cmdpkt.c	modified	+225	−438	View file
drivers/staging/rtl8192su/r819xU_cmdpkt.h	modified	+179	−187	View file
drivers/staging/rtl8192u/dot11d.h	modified	+26	−26	View file
drivers/staging/rtl8192u/ieee80211.h	modified	+254	−294	View file
drivers/staging/rtl8192u/ieee80211/api.c	modified	+1	−3	View file
drivers/staging/rtl8192u/ieee80211/ieee80211.h	modified	+1	−1	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c	modified	+2	−4	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c	modified	+1	−2	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c	modified	+1	−2	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c	modified	+1	−2	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c	modified	+3	−6	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c	modified	+1	−1	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c	modified	+10	−10	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c	modified	+0	−1	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c	modified	+2	−5	View file
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h	modified	+1	−2	View file
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c	modified	+4	−5	View file
drivers/staging/rtl8192u/ieee80211_crypt.h	modified	+1	−1	View file
drivers/staging/rtl8192u/r8192U_core.c	modified	+6	−6	View file
drivers/staging/rtl8192u/r819xU_cmdpkt.c	modified	+0	−1	View file
drivers/staging/sep/sep_driver.c	modified	+0	−1	View file
drivers/staging/serqt_usb2/serqt_usb2.c	modified	+13	−13	View file
drivers/staging/sm7xx/smtcfb.c	modified	+8	−10	View file
drivers/staging/sm7xx/smtcfb.h	modified	+1	−1	View file
drivers/staging/strip/Kconfig	deleted	+0	−22	View before deletion
drivers/staging/strip/Makefile	deleted	+0	−1	View before deletion
drivers/staging/strip/TODO	deleted	+0	−7	View before deletion
drivers/staging/strip/strip.c	deleted	+0	−2823	View before deletion
drivers/staging/ti-st/Kconfig	added	+25	−0	View file
drivers/staging/ti-st/Makefile	added	+7	−0	View file
drivers/staging/arlan/TODO → drivers/staging/ti-st/TODO	renamed	+16	−4	View file
drivers/staging/ti-st/bt_drv.c	added	+502	−0	View file
drivers/staging/ti-st/bt_drv.h	added	+61	−0	View file
drivers/staging/ti-st/fm.h	added	+13	−0	View file
drivers/staging/ti-st/st.h	added	+90	−0	View file
drivers/staging/ti-st/st_core.c	added	+1062	−0	View file
drivers/staging/ti-st/st_core.h	added	+98	−0	View file
drivers/staging/ti-st/st_kim.c	added	+754	−0	View file
drivers/staging/ti-st/st_kim.h	added	+150	−0	View file
drivers/staging/ti-st/st_ll.c	added	+147	−0	View file
drivers/staging/ti-st/st_ll.h	added	+62	−0	View file
drivers/staging/ti-st/sysfs-uim	added	+16	−0	View file
drivers/staging/udlfb/udlfb.c	modified	+31	−31	View file
drivers/staging/usbip/stub_rx.c	modified	+2	−2	View file
drivers/staging/usbip/usbip_common.h	modified	+1	−1	View file
drivers/staging/usbip/vhci_hcd.c	modified	+1	−1	View file
drivers/staging/usbip/vhci_tx.c	modified	+1	−1	View file
drivers/staging/vme/boards/vme_vmivme7805.c	modified	+0	−1	View file
drivers/staging/vme/bridges/vme_ca91cx42.c	modified	+64	−51	View file
drivers/staging/vme/bridges/vme_tsi148.c	modified	+198	−198	View file
drivers/staging/vme/bridges/vme_tsi148.h	modified	+16	−10	View file
drivers/staging/vme/devices/vme_user.c	modified	+15	−3	View file
drivers/staging/vme/vme.c	modified	+2	−2	View file
drivers/staging/vt6655/80211hdr.h	modified	+23	−23	View file
drivers/staging/vt6655/80211mgr.c	modified	+44	−44	View file
drivers/staging/vt6655/80211mgr.h	modified	+44	−44	View file
drivers/staging/vt6655/IEEE11h.c	modified	+3	−3	View file
drivers/staging/vt6655/IEEE11h.h	modified	+1	−1	View file
drivers/staging/vt6655/aes_ccmp.c	modified	+5	−5	View file
drivers/staging/vt6655/baseband.c	modified	+32	−32	View file
drivers/staging/vt6655/baseband.h	modified	+26	−26	View file
drivers/staging/vt6655/bssdb.c	modified	+107	−107	View file
drivers/staging/vt6655/bssdb.h	modified	+74	−74	View file
drivers/staging/vt6655/card.c	modified	+107	−107	View file
drivers/staging/vt6655/card.h	modified	+79	−79	View file
drivers/staging/vt6655/datarate.c	modified	+26	−26	View file
drivers/staging/vt6655/datarate.h	modified	+18	−18	View file
drivers/staging/vt6655/desc.h	modified	+7	−5	View file
drivers/staging/vt6655/device.h	modified	+15	−13	View file
drivers/staging/vt6655/device_main.c	modified	+48	−45	View file
drivers/staging/vt6655/dpc.c	modified	+92	−92	View file
drivers/staging/vt6655/dpc.h	modified	+3	−3	View file
drivers/staging/vt6655/hostap.c	modified	+6	−7	View file
drivers/staging/vt6655/hostap.h	modified	+2	−2	View file
drivers/staging/vt6655/ioctl.c	modified	+16	−16	View file
drivers/staging/vt6655/ioctl.h	modified	+5	−5	View file
drivers/staging/vt6655/iwctl.c	modified	+15	−16	View file
drivers/staging/vt6655/key.c	modified	+18	−18	View file
drivers/staging/vt6655/key.h	modified	+15	−15	View file
drivers/staging/vt6655/mac.c	modified	+4	−4	View file
drivers/staging/vt6655/mac.h	modified	+26	−26	View file
drivers/staging/vt6655/mib.c	modified	+3	−3	View file
drivers/staging/vt6655/mib.h	modified	+1	−1	View file
drivers/staging/vt6655/michael.c	modified	+12	−12	View file
drivers/staging/vt6655/michael.h	modified	+4	−4	View file
drivers/staging/vt6655/power.c	modified	+13	−13	View file
drivers/staging/vt6655/power.h	modified	+14	−14	View file
drivers/staging/vt6655/rc4.c	modified	+2	−2	View file
drivers/staging/vt6655/rc4.h	modified	+1	−1	View file
drivers/staging/vt6655/rf.c	modified	+11	−11	View file
drivers/staging/vt6655/rf.h	modified	+7	−7	View file
drivers/staging/vt6655/rxtx.c	modified	+255	−255	View file
drivers/staging/vt6655/rxtx.h	modified	+42	−42	View file
drivers/staging/vt6655/srom.c	modified	+27	−27	View file
drivers/staging/vt6655/srom.h	modified	+1	−1	View file
drivers/staging/vt6655/tether.c	modified	+1	−1	View file
drivers/staging/vt6655/tether.h	modified	+12	−19	View file
drivers/staging/vt6655/tkip.c	modified	+1	−1	View file
drivers/staging/vt6655/tkip.h	modified	+1	−1	View file
drivers/staging/vt6655/ttype.h	modified	+0	−22	View file
drivers/staging/vt6655/vntwifi.c	modified	+71	−71	View file
drivers/staging/vt6655/vntwifi.h	modified	+71	−71	View file
drivers/staging/vt6655/wcmd.c	modified	+52	−52	View file
drivers/staging/vt6655/wcmd.h	modified	+13	−13	View file
drivers/staging/vt6655/wctl.c	modified	+2	−2	View file
drivers/staging/vt6655/wmgr.c	modified	+336	−336	View file
drivers/staging/vt6655/wmgr.h	modified	+48	−48	View file
drivers/staging/vt6655/wpa.c	modified	+7	−7	View file
drivers/staging/vt6655/wpa.h	modified	+7	−7	View file
drivers/staging/vt6655/wpa2.c	modified	+8	−8	View file
drivers/staging/vt6655/wpa2.h	modified	+7	−7	View file
drivers/staging/vt6655/wpactl.c	modified	+9	−10	View file
drivers/staging/vt6655/wroute.c	modified	+3	−3	View file
drivers/staging/vt6656/80211hdr.h	modified	+33	−50	View file
drivers/staging/vt6656/80211mgr.c	modified	+44	−44	View file
drivers/staging/vt6656/80211mgr.h	modified	+68	−68	View file
drivers/staging/vt6656/aes_ccmp.c	modified	+274	−290	View file
drivers/staging/vt6656/aes_ccmp.h	modified	+1	−1	View file
drivers/staging/vt6656/baseband.c	modified	+53	−61	View file
drivers/staging/vt6656/baseband.h	modified	+26	−33	View file
drivers/staging/vt6656/bssdb.c	modified	+173	−229	View file
drivers/staging/vt6656/bssdb.h	modified	+100	−152	View file
drivers/staging/vt6656/card.c	modified	+34	−34	View file
drivers/staging/vt6656/card.h	modified	+28	−34	View file
drivers/staging/vt6656/channel.c	modified	+6	−6	View file
drivers/staging/vt6656/channel.h	modified	+5	−5	View file
drivers/staging/vt6656/control.c	modified	+38	−49	View file
drivers/staging/vt6656/control.h	modified	+14	−17	View file
drivers/staging/vt6656/datarate.c	modified	+32	−39	View file
drivers/staging/vt6656/datarate.h	modified	+19	−20	View file
drivers/staging/vt6656/desc.h	modified	+4	−8	View file
drivers/staging/vt6656/device.h	modified	+110	−108	View file
drivers/staging/vt6656/dpc.c	modified	+155	−150	View file
drivers/staging/vt6656/dpc.h	modified	+9	−18	View file
drivers/staging/vt6656/firmware.c	modified	+3	−3	View file
drivers/staging/vt6656/firmware.h	modified	+4	−5	View file
drivers/staging/vt6656/hostap.c	modified	+13	−14	View file
drivers/staging/vt6656/hostap.h	modified	+3	−6	View file
drivers/staging/vt6656/int.c	modified	+141	−110	View file
drivers/staging/vt6656/int.h	modified	+3	−9	View file
drivers/staging/vt6656/iocmd.h	modified	+164	−189	View file
drivers/staging/vt6656/ioctl.c	modified	+28	−19	View file
drivers/staging/vt6656/ioctl.h	modified	+6	−9	View file
drivers/staging/vt6656/iowpa.h	modified	+1	−3	View file
drivers/staging/vt6656/iwctl.c	modified	+31	−21	View file
drivers/staging/vt6656/iwctl.h	modified	+1	−4	View file
drivers/staging/vt6656/key.c	modified	+39	−48	View file
drivers/staging/vt6656/key.h	modified	+25	−37	View file
drivers/staging/vt6656/mac.c	modified	+6	−8	View file
drivers/staging/vt6656/mac.h	modified	+5	−4	View file
drivers/staging/vt6656/main_usb.c	modified	+117	−106	View file
drivers/staging/vt6656/mib.c	modified	+74	−41	View file
drivers/staging/vt6656/mib.h	modified	+96	−96	View file
drivers/staging/vt6656/michael.c	modified	+88	−93	View file
drivers/staging/vt6656/michael.h	modified	+5	−7	View file
drivers/staging/vt6656/power.c	modified	+11	−47	View file
drivers/staging/vt6656/power.h	modified	+11	−34	View file
drivers/staging/vt6656/rc4.c	modified	+42	−42	View file
drivers/staging/vt6656/rc4.h	modified	+7	−6	View file
drivers/staging/vt6656/rf.c	modified	+16	−16	View file
drivers/staging/vt6656/rf.h	modified	+15	−18	View file
drivers/staging/vt6656/rndis.h	modified	+1	−2	View file
drivers/staging/vt6656/rxtx.c	modified	+462	−406	View file
drivers/staging/vt6656/rxtx.h	modified	+23	−23	View file
drivers/staging/vt6656/srom.h	modified	+1	−1	View file
drivers/staging/vt6656/tcrc.c	modified	+12	−11	View file
drivers/staging/vt6656/tcrc.h	modified	+4	−7	View file
drivers/staging/vt6656/tether.c	modified	+22	−23	View file
drivers/staging/vt6656/tether.h	modified	+14	−19	View file
drivers/staging/vt6656/tkip.c	modified	+1	−1	View file
drivers/staging/vt6656/tkip.h	modified	+2	−5	View file
drivers/staging/vt6656/tmacro.h	modified	+1	−3	View file
drivers/staging/vt6656/ttype.h	modified	+1	−56	View file
drivers/staging/vt6656/upc.h	modified	+2	−6	View file
drivers/staging/vt6656/usbpipe.c	modified	+72	−66	View file
drivers/staging/vt6656/usbpipe.h	modified	+24	−27	View file
drivers/staging/vt6656/wcmd.c	modified	+80	−92	View file
drivers/staging/vt6656/wcmd.h	modified	+11	−25	View file
drivers/staging/vt6656/wctl.c	modified	+13	−10	View file
drivers/staging/vt6656/wctl.h	modified	+5	−8	View file
drivers/staging/vt6656/wmgr.c	modified	+460	−500	View file
drivers/staging/vt6656/wmgr.h	modified	+69	−111	View file
drivers/staging/vt6656/wpa.c	modified	+7	−7	View file
drivers/staging/vt6656/wpa.h	modified	+8	−8	View file
drivers/staging/vt6656/wpa2.c	modified	+27	−23	View file
drivers/staging/vt6656/wpa2.h	modified	+10	−10	View file
drivers/staging/vt6656/wpactl.c	modified	+14	−11	View file
drivers/staging/vt6656/wpactl.h	modified	+2	−7	View file
drivers/staging/wavelan/Kconfig	deleted	+0	−38	View before deletion
drivers/staging/wavelan/Makefile	deleted	+0	−2	View before deletion
drivers/staging/wavelan/TODO	deleted	+0	−7	View before deletion
drivers/staging/wavelan/i82586.h	deleted	+0	−413	View before deletion
drivers/staging/wavelan/wavelan.c	deleted	+0	−4383	View before deletion
drivers/staging/wavelan/wavelan.h	deleted	+0	−370	View before deletion
drivers/staging/wavelan/wavelan.p.h	deleted	+0	−696	View before deletion
drivers/staging/wavelan/wavelan_cs.c	deleted	+0	−4601	View before deletion
drivers/staging/wavelan/wavelan_cs.h	deleted	+0	−386	View before deletion
drivers/staging/wavelan/wavelan_cs.p.h	deleted	+0	−766	View before deletion
drivers/staging/winbond/README → drivers/staging/winbond/TODO	renamed	+2	−1	View file
drivers/staging/winbond/core.h	modified	+8	−6	View file
drivers/staging/winbond/localpara.h	modified	+228	−224	View file
drivers/staging/winbond/mac_structures.h	modified	+156	−186	View file
drivers/staging/winbond/mds.c	modified	+162	−162	View file
drivers/staging/winbond/mds_f.h	modified	+10	−10	View file
drivers/staging/winbond/mds_s.h	modified	+86	−87	View file
drivers/staging/winbond/mlme_s.h	modified	+140	−148	View file
drivers/staging/winbond/mlmetxrx.c	modified	+31	−31	View file
drivers/staging/winbond/mlmetxrx_f.h	modified	+3	−3	View file
drivers/staging/winbond/mto.c	modified	+129	−170	View file
drivers/staging/winbond/mto.h	modified	+82	−97	View file
drivers/staging/winbond/phy_calibration.c	modified	+3	−6	View file
drivers/staging/winbond/phy_calibration.h	modified	+77	−100	View file
drivers/staging/winbond/reg.c	modified	+1847	−2138	View file
drivers/staging/winbond/scan_s.h	modified	+71	−81	View file
drivers/staging/winbond/sme_api.h	modified	+71	−140	View file
drivers/staging/winbond/sysdef.h	modified	+3	−15	View file
drivers/staging/winbond/wb35reg.c	modified	+305	−313	View file
drivers/staging/winbond/wb35reg_f.h	modified	+54	−50	View file
drivers/staging/winbond/wb35reg_s.h	modified	+110	−111	View file
drivers/staging/winbond/wb35rx.c	modified	+123	−135	View file
drivers/staging/winbond/wb35tx_f.h	modified	+10	−8	View file
drivers/staging/winbond/wbhal_f.h	modified	+79	−58	View file
drivers/staging/winbond/wbhal_s.h	modified	+242	−260	View file
drivers/staging/winbond/wblinux_f.h	modified	+10	−9	View file
drivers/staging/winbond/wbusb.c	modified	+84	−103	View file
drivers/staging/winbond/wbusb_s.h	modified	+8	−15	View file
drivers/staging/wlags49_h2/Kconfig	modified	+1	−1	View file
drivers/staging/wlags49_h2/README.wlags49	modified	+1	−1	View file
drivers/staging/wlags49_h2/ap_h2.c	modified	+40	−40	View file
drivers/staging/wlags49_h2/debug.h	modified	+59	−45	View file
drivers/staging/wlags49_h2/dhf.c	modified	+67	−76	View file
drivers/staging/wlags49_h2/dhf.h	modified	+28	−28	View file
drivers/staging/wlags49_h2/dhfcfg.h	modified	+59	−59	View file
drivers/staging/wlags49_h2/hcf.c	modified	+10	−5	View file
drivers/staging/wlags49_h2/wl_cs.c	modified	+13	−19	View file
drivers/staging/wlags49_h2/wl_cs.h	modified	+0	−4	View file
drivers/staging/wlags49_h2/wl_internal.h	modified	+2	−6	View file
drivers/staging/wlags49_h2/wl_main.c	modified	+2	−1	View file
drivers/staging/wlags49_h2/wl_netdev.c	modified	+8	−31	View file
drivers/staging/wlags49_h2/wl_priv.c	modified	+7	−4	View file
drivers/staging/wlags49_h2/wl_profile.c	modified	+429	−528	View file
drivers/staging/wlags49_h2/wl_sysfs.c	modified	+2	−1	View file
drivers/staging/wlags49_h2/wl_wext.c	modified	+1	−8	View file
drivers/staging/wlags49_h25/Kconfig	modified	+1	−1	View file
drivers/staging/wlan-ng/hfa384x_usb.c	modified	+77	−77	View file
drivers/staging/wlan-ng/p80211conv.c	modified	+2	−3	View file
drivers/staging/wlan-ng/p80211req.c	modified	+3	−2	View file
drivers/staging/wlan-ng/p80211wext.c	modified	+159	−240	View file
drivers/staging/wlan-ng/prism2fw.c	modified	+22	−14	View file
drivers/staging/wlan-ng/prism2sta.c	modified	+37	−34	View file
drivers/staging/wlan-ng/prism2usb.c	modified	+65	−0	View file
include/linux/blkdev.h	modified	+2	−0	View file
include/linux/swap.h	modified	+1	−0	View file
mm/swapfile.c	modified	+5	−0	View file

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

drivers/staging/Kconfig

View file

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 5589616..b5c3b30 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -59,8 +59,6 @@ source "drivers/staging/wlan-ng/Kconfig"
 
 source "drivers/staging/echo/Kconfig"
 
-source "drivers/staging/poch/Kconfig"
-
 source "drivers/staging/otus/Kconfig"
 
 source "drivers/staging/rt2860/Kconfig"
@@ -113,6 +111,8 @@ source "drivers/staging/vme/Kconfig"
 
 source "drivers/staging/rar_register/Kconfig"
 
+source "drivers/staging/memrar/Kconfig"
+
 source "drivers/staging/sep/Kconfig"
 
 source "drivers/staging/iio/Kconfig"
@@ -127,19 +127,19 @@ source "drivers/staging/batman-adv/Kconfig"
 
 source "drivers/staging/samsung-laptop/Kconfig"
 
-source "drivers/staging/strip/Kconfig"
+source "drivers/staging/sm7xx/Kconfig"
 
-source "drivers/staging/arlan/Kconfig"
+source "drivers/staging/dt3155/Kconfig"
 
-source "drivers/staging/wavelan/Kconfig"
+source "drivers/staging/dt3155v4l/Kconfig"
 
-source "drivers/staging/netwave/Kconfig"
+source "drivers/staging/crystalhd/Kconfig"
 
-source "drivers/staging/sm7xx/Kconfig"
+source "drivers/staging/cxt1e1/Kconfig"
 
-source "drivers/staging/dt3155/Kconfig"
+source "drivers/staging/ti-st/Kconfig"
 
-source "drivers/staging/crystalhd/Kconfig"
+source "drivers/staging/adis16255/Kconfig"
 
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING

drivers/staging/Makefile

View file

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ec45d4b..e330dd5 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -12,7 +12,6 @@ obj-$(CONFIG_USB_IP_COMMON)	+= usbip/
 obj-$(CONFIG_W35UND)		+= winbond/
 obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
 obj-$(CONFIG_ECHO)		+= echo/
-obj-$(CONFIG_POCH)		+= poch/
 obj-$(CONFIG_OTUS)		+= otus/
 obj-$(CONFIG_RT2860)		+= rt2860/
 obj-$(CONFIG_RT2870)		+= rt2870/
@@ -37,6 +36,7 @@ obj-$(CONFIG_FB_UDL)		+= udlfb/
 obj-$(CONFIG_HYPERV)		+= hv/
 obj-$(CONFIG_VME_BUS)		+= vme/
 obj-$(CONFIG_RAR_REGISTER)	+= rar_register/
+obj-$(CONFIG_MRST_RAR_HANDLER)	+= memrar/
 obj-$(CONFIG_DX_SEP)		+= sep/
 obj-$(CONFIG_IIO)		+= iio/
 obj-$(CONFIG_RAMZSWAP)		+= ramzswap/
@@ -44,11 +44,10 @@ obj-$(CONFIG_WLAGS49_H2)	+= wlags49_h2/
 obj-$(CONFIG_WLAGS49_H25)	+= wlags49_h25/
 obj-$(CONFIG_BATMAN_ADV)	+= batman-adv/
 obj-$(CONFIG_SAMSUNG_LAPTOP)	+= samsung-laptop/
-obj-$(CONFIG_STRIP)		+= strip/
-obj-$(CONFIG_ARLAN)		+= arlan/
-obj-$(CONFIG_WAVELAN)		+= wavelan/
-obj-$(CONFIG_PCMCIA_WAVELAN)	+= wavelan/
-obj-$(CONFIG_PCMCIA_NETWAVE)	+= netwave/
 obj-$(CONFIG_FB_SM7XX)		+= sm7xx/
 obj-$(CONFIG_DT3155)		+= dt3155/
+obj-$(CONFIG_VIDEO_DT3155)	+= dt3155v4l/
 obj-$(CONFIG_CRYSTALHD)		+= crystalhd/
+obj-$(CONFIG_CXT1E1)		+= cxt1e1/
+obj-$(CONFIG_TI_ST)		+= ti-st/
+obj-$(CONFIG_ADIS16255)		+= adis16255/

drivers/staging/adis16255/Kconfig

View file

diff --git a/drivers/staging/adis16255/Kconfig b/drivers/staging/adis16255/Kconfig
new file mode 100644
index 0000000..a642be6
--- /dev/null
+++ b/drivers/staging/adis16255/Kconfig
@@ -0,0 +1,11 @@
+config ADIS16255
+	tristate "Ananlog Devices ADIS16250/16255"
+	depends on SPI && SYSFS
+	---help---
+	If you say yes here you get support for the Analog Devices
+	ADIS16250/16255 Low Power Gyroscope. The driver exposes
+	orientation and gyroscope value, as well as sample rate
+	to the sysfs.
+
+	This driver can also be built as a module. If so, the module
+	will be called adis16255.

drivers/staging/adis16255/Makefile

View file

diff --git a/drivers/staging/adis16255/Makefile b/drivers/staging/adis16255/Makefile
new file mode 100644
index 0000000..8c39081
--- /dev/null
+++ b/drivers/staging/adis16255/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ADIS16255)		+= adis16255.o

drivers/staging/adis16255/adis16255.c

View file

diff --git a/drivers/staging/adis16255/adis16255.c b/drivers/staging/adis16255/adis16255.c
new file mode 100644
index 0000000..1ba11f0
--- /dev/null
+++ b/drivers/staging/adis16255/adis16255.c
@@ -0,0 +1,466 @@
+/*
+ * Analog Devices ADIS16250/ADIS16255 Low Power Gyroscope
+ *
+ * Written by: Matthias Brugger <[email protected]>
+ *
+ * Copyright (C) 2010 Fraunhofer Institute for Integrated Circuits
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/*
+ * The driver just has a bare interface to the sysfs (sample rate in Hz,
+ * orientation (x, y, z) and gyroscope data in °/sec.
+ *
+ * It should be added to iio subsystem when this has left staging.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/errno.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+
+#include <linux/interrupt.h>
+#include <linux/sysfs.h>
+#include <linux/stat.h>
+#include <linux/delay.h>
+
+#include <linux/gpio.h>
+
+#include <linux/spi/spi.h>
+#include <linux/workqueue.h>
+
+#include "adis16255.h"
+
+#define ADIS_STATUS        0x3d
+#define ADIS_SMPL_PRD_MSB  0x37
+#define ADIS_SMPL_PRD_LSB  0x36
+#define ADIS_MSC_CTRL_MSB  0x35
+#define ADIS_MSC_CTRL_LSB  0x34
+#define ADIS_GPIO_CTRL     0x33
+#define ADIS_ALM_SMPL1     0x25
+#define ADIS_ALM_MAG1      0x21
+#define ADIS_GYRO_SCALE    0x17
+#define ADIS_GYRO_OUT      0x05
+#define ADIS_SUPPLY_OUT    0x03
+#define ADIS_ENDURANCE     0x01
+
+/*
+ * data structure for every sensor
+ *
+ * @dev:       Driver model representation of the device.
+ * @spi:       Pointer to the spi device which will manage i/o to spi bus.
+ * @data:      Last read data from device.
+ * @irq_adis:  GPIO Number of IRQ signal
+ * @irq:       irq line manage by kernel
+ * @negative:  indicates if sensor is upside down (negative == 1)
+ * @direction: indicates axis (x, y, z) the sensor is meassuring
+ */
+struct spi_adis16255_data {
+	struct device dev;
+	struct spi_device *spi;
+	s16 data;
+	int irq;
+	u8 negative;
+	char direction;
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int spi_adis16255_read_data(struct spi_adis16255_data *spiadis,
+					u8 adr,
+					u8 *rbuf)
+{
+	struct spi_device *spi = spiadis->spi;
+	struct spi_message msg;
+	struct spi_transfer xfer1, xfer2;
+	u8 *buf, *rx;
+	int ret;
+
+	buf = kzalloc(4, GFP_KERNEL);
+	if (buf == NULL)
+		return -ENOMEM;
+
+	rx = kzalloc(4, GFP_KERNEL);
+	if (rx == NULL) {
+		ret = -ENOMEM;
+		goto err_buf;
+	}
+
+	buf[0] = adr;
+
+	spi_message_init(&msg);
+	memset(&xfer1, 0, sizeof(xfer1));
+	memset(&xfer2, 0, sizeof(xfer2));
+
+	xfer1.tx_buf = buf;
+	xfer1.rx_buf = buf + 2;
+	xfer1.len = 2;
+	xfer1.delay_usecs = 9;
+
+	xfer2.tx_buf = rx + 2;
+	xfer2.rx_buf = rx;
+	xfer2.len = 2;
+
+	spi_message_add_tail(&xfer1, &msg);
+	spi_message_add_tail(&xfer2, &msg);
+
+	ret = spi_sync(spi, &msg);
+	if (ret == 0) {
+		rbuf[0] = rx[0];
+		rbuf[1] = rx[1];
+	}
+
+	kfree(rx);
+err_buf:
+	kfree(buf);
+
+	return ret;
+}
+
+static int spi_adis16255_write_data(struct spi_adis16255_data *spiadis,
+					u8 adr1,
+					u8 adr2,
+					u8 *wbuf)
+{
+	struct spi_device *spi = spiadis->spi;
+	struct spi_message   msg;
+	struct spi_transfer  xfer1, xfer2;
+	u8       *buf, *rx;
+	int         ret;
+
+	buf = kmalloc(4, GFP_KERNEL);
+	if (buf == NULL)
+		return -ENOMEM;
+
+	rx = kzalloc(4, GFP_KERNEL);
+	if (rx == NULL) {
+		ret = -ENOMEM;
+		goto err_buf;
+	}
+
+	spi_message_init(&msg);
+	memset(&xfer1, 0, sizeof(xfer1));
+	memset(&xfer2, 0, sizeof(xfer2));
+
+	buf[0] = adr1 | 0x80;
+	buf[1] = *wbuf;
+
+	buf[2] = adr2 | 0x80;
+	buf[3] = *(wbuf + 1);
+
+	xfer1.tx_buf = buf;
+	xfer1.rx_buf = rx;
+	xfer1.len = 2;
+	xfer1.delay_usecs = 9;
+
+	xfer2.tx_buf = buf+2;
+	xfer2.rx_buf = rx+2;
+	xfer2.len = 2;
+
+	spi_message_add_tail(&xfer1, &msg);
+	spi_message_add_tail(&xfer2, &msg);
+
+	ret = spi_sync(spi, &msg);
+	if (ret != 0)
+		dev_warn(&spi->dev, "write data to %#x %#x failed\n",
+				buf[0], buf[2]);
+
+	kfree(rx);
+err_buf:
+	kfree(buf);
+	return ret;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static irqreturn_t adis_irq_thread(int irq, void *dev_id)
+{
+	struct spi_adis16255_data *spiadis = dev_id;
+	int status;
+	u16 value = 0;
+
+	status =  spi_adis16255_read_data(spiadis, ADIS_GYRO_OUT, (u8 *)&value);
+	if (status != 0) {
+		dev_warn(&spiadis->spi->dev, "SPI FAILED\n");
+		goto exit;
+	}
+
+	/* perform on new data only... */
+	if (value & 0x8000) {
+		/* delete error and new data bit */
+		value = value & 0x3fff;
+		/* set negative value */
+		if (value & 0x2000)
+			value = value | 0xe000;
+
+		if (likely(spiadis->negative))
+			value = -value;
+
+		spiadis->data = (s16) value;
+	}
+
+exit:
+	return IRQ_HANDLED;
+}
+
+/*-------------------------------------------------------------------------*/
+
+ssize_t adis16255_show_data(struct device *device,
+		struct device_attribute *da,
+		char *buf)
+{
+	struct spi_adis16255_data *spiadis = dev_get_drvdata(device);
+	return snprintf(buf, PAGE_SIZE, "%d\n", spiadis->data);
+}
+DEVICE_ATTR(data, S_IRUGO , adis16255_show_data, NULL);
+
+ssize_t adis16255_show_direction(struct device *device,
+		struct device_attribute *da,
+		char *buf)
+{
+	struct spi_adis16255_data *spiadis = dev_get_drvdata(device);
+	return snprintf(buf, PAGE_SIZE, "%c\n", spiadis->direction);
+}
+DEVICE_ATTR(direction, S_IRUGO , adis16255_show_direction, NULL);
+
+ssize_t adis16255_show_sample_rate(struct device *device,
+		struct device_attribute *da,
+		char *buf)
+{
+	struct spi_adis16255_data *spiadis = dev_get_drvdata(device);
+	int status = 0;
+	u16 value = 0;
+	int ts = 0;
+
+	status = spi_adis16255_read_data(spiadis, ADIS_SMPL_PRD_MSB,
+				(u8 *)&value);
+	if (status != 0)
+		return -EINVAL;
+
+	if (value & 0x80) {
+		/* timebase = 60.54 ms */
+		ts = 60540 * ((0x7f & value) + 1);
+	} else {
+		/* timebase = 1.953 ms */
+		ts = 1953 * ((0x7f & value) + 1);
+	}
+
+	return snprintf(buf, PAGE_SIZE, "%d\n", (1000*1000)/ts);
+}
+DEVICE_ATTR(sample_rate, S_IRUGO , adis16255_show_sample_rate, NULL);
+
+static struct attribute *adis16255_attributes[] = {
+	&dev_attr_data.attr,
+	&dev_attr_direction.attr,
+	&dev_attr_sample_rate.attr,
+	NULL
+};
+
+static const struct attribute_group adis16255_attr_group = {
+	.attrs = adis16255_attributes,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int spi_adis16255_shutdown(struct spi_adis16255_data *spiadis)
+{
+	u16 value = 0;
+	/* turn sensor off */
+	spi_adis16255_write_data(spiadis,
+			ADIS_SMPL_PRD_MSB, ADIS_SMPL_PRD_LSB,
+			(u8 *)&value);
+	spi_adis16255_write_data(spiadis,
+			ADIS_MSC_CTRL_MSB, ADIS_MSC_CTRL_LSB,
+			(u8 *)&value);
+	return 0;
+}
+
+static int spi_adis16255_bringup(struct spi_adis16255_data *spiadis)
+{
+	int status = 0;
+	u16 value = 0;
+
+	status = spi_adis16255_read_data(spiadis, ADIS_GYRO_SCALE,
+				(u8 *)&value);
+	if (status != 0)
+		goto err;
+	if (value != 0x0800) {
+		dev_warn(&spiadis->spi->dev, "Scale factor is none default"
+				"value (%.4x)\n", value);
+	}
+
+	/* timebase = 1.953 ms, Ns = 0 -> 512 Hz sample rate */
+	value =  0x0001;
+	status = spi_adis16255_write_data(spiadis,
+				ADIS_SMPL_PRD_MSB, ADIS_SMPL_PRD_LSB,
+				(u8 *)&value);
+	if (status != 0)
+		goto err;
+
+	/* start internal self-test */
+	value = 0x0400;
+	status = spi_adis16255_write_data(spiadis,
+				ADIS_MSC_CTRL_MSB, ADIS_MSC_CTRL_LSB,
+				(u8 *)&value);
+	if (status != 0)
+		goto err;
+
+	/* wait 35 ms to finish self-test */
+	msleep(35);
+
+	value = 0x0000;
+	status = spi_adis16255_read_data(spiadis, ADIS_STATUS,
+				(u8 *)&value);
+	if (status != 0)
+		goto err;
+
+	if (value & 0x23) {
+		if (value & 0x20) {
+			dev_warn(&spiadis->spi->dev, "self-test error\n");
+			status = -ENODEV;
+			goto err;
+		} else if (value & 0x3)	{
+			dev_warn(&spiadis->spi->dev, "Sensor voltage"
+						"out of range.\n");
+			status = -ENODEV;
+			goto err;
+		}
+	}
+
+	/* set interrupt to active high on DIO0 when data ready */
+	value = 0x0006;
+	status = spi_adis16255_write_data(spiadis,
+				ADIS_MSC_CTRL_MSB, ADIS_MSC_CTRL_LSB,
+				(u8 *)&value);
+	if (status != 0)
+		goto err;
+	return status;
+
+err:
+	spi_adis16255_shutdown(spiadis);
+	return status;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static int spi_adis16255_probe(struct spi_device *spi)
+{
+
+	struct adis16255_init_data *init_data = spi->dev.platform_data;
+	struct spi_adis16255_data  *spiadis;
+	int status = 0;
+
+	spiadis = kzalloc(sizeof(*spiadis), GFP_KERNEL);
+	if (!spiadis)
+		return -ENOMEM;
+
+	spiadis->spi = spi;
+	spiadis->direction = init_data->direction;
+
+	if (init_data->negative)
+		spiadis->negative = 1;
+
+	status = gpio_request(init_data->irq, "adis16255");
+	if (status != 0)
+		goto err;
+
+	status = gpio_direction_input(init_data->irq);
+	if (status != 0)
+		goto gpio_err;
+
+	spiadis->irq = gpio_to_irq(init_data->irq);
+
+	status = request_threaded_irq(spiadis->irq,
+			NULL, adis_irq_thread,
+			IRQF_DISABLED, "adis-driver", spiadis);
+
+	if (status != 0) {
+		dev_err(&spi->dev, "IRQ request failed\n");
+		goto gpio_err;
+	}
+
+	dev_dbg(&spi->dev, "GPIO %d IRQ %d\n", init_data->irq, spiadis->irq);
+
+	dev_set_drvdata(&spi->dev, spiadis);
+	status = sysfs_create_group(&spi->dev.kobj, &adis16255_attr_group);
+	if (status != 0)
+		goto irq_err;
+
+	status = spi_adis16255_bringup(spiadis);
+	if (status != 0)
+		goto irq_err;
+
+	dev_info(&spi->dev, "spi_adis16255 driver added!\n");
+
+	return status;
+
+irq_err:
+	free_irq(spiadis->irq, spiadis);
+gpio_err:
+	gpio_free(init_data->irq);
+err:
+	kfree(spiadis);
+	return status;
+}
+
+static int spi_adis16255_remove(struct spi_device *spi)
+{
+	struct spi_adis16255_data  *spiadis    = dev_get_drvdata(&spi->dev);
+
+	spi_adis16255_shutdown(spiadis);
+
+	free_irq(spiadis->irq, spiadis);
+	gpio_free(irq_to_gpio(spiadis->irq));
+
+	sysfs_remove_group(&spiadis->spi->dev.kobj, &adis16255_attr_group);
+
+	kfree(spiadis);
+
+	dev_info(&spi->dev, "spi_adis16255 driver removed!\n");
+	return 0;
+}
+
+static struct spi_driver spi_adis16255_drv = {
+	.driver = {
+		.name =  "spi_adis16255",
+		.owner = THIS_MODULE,
+	},
+	.probe = spi_adis16255_probe,
+	.remove =   __devexit_p(spi_adis16255_remove),
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int __init spi_adis16255_init(void)
+{
+	return spi_register_driver(&spi_adis16255_drv);
+}
+module_init(spi_adis16255_init);
+
+static void __exit spi_adis16255_exit(void)
+{
+	spi_unregister_driver(&spi_adis16255_drv);
+}
+module_exit(spi_adis16255_exit);
+
+MODULE_AUTHOR("Matthias Brugger");
+MODULE_DESCRIPTION("SPI device driver for ADIS16255 sensor");
+MODULE_LICENSE("GPL");

drivers/staging/adis16255/adis16255.h

View file

diff --git a/drivers/staging/adis16255/adis16255.h b/drivers/staging/adis16255/adis16255.h
new file mode 100644
index 0000000..03e0700
--- /dev/null
+++ b/drivers/staging/adis16255/adis16255.h
@@ -0,0 +1,12 @@
+#ifndef ADIS16255_H
+#define ADIS16255_H
+
+#include <linux/types.h>
+
+struct adis16255_init_data {
+	char direction;
+	u8   negative;
+	int  irq;
+};
+
+#endif