summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'staging-next' of ↵Linus Torvalds2011-07-25797-187777/+49400
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits) staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register. staging:iio:kfifo_buf fix double initialization of the ring device structure. staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata. staging:iio:imu fix missing register table index for some channels spectra: enable device before poking it staging: rts_pstor: Fix a miswriting staging/lirc_bt829: Return -ENODEV when no hardware is found. staging/lirc_parallel: remove pointless prototypes. staging/lirc_parallel: fix panic on rmmod staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata. Staging: zram: Fix kunmapping order Revert "gma500: Fix dependencies" gma500: Add medfield header gma500: wire up the mrst i2c bus from chip_info gma500: Fix DPU build gma500: Clean up the DPU config and make it runtime gma500: resync with Medfield progress gma500: Use the mrst helpers and power control for mode commit gma500@ Fix backlight range error gma500: More Moorestown muddle meddling means MM maybe might modeset ... Fix up fairly trivial conflicts all over, mostly due to header file cleanup conflicts, but some deleted files and some just context changes: - Documentation/feature-removal-schedule.txt - drivers/staging/bcm/headers.h - drivers/staging/brcm80211/brcmfmac/dhd_linux.c - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h - drivers/staging/brcm80211/brcmfmac/wl_iw.c - drivers/staging/et131x/et131x_netdev.c - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c - drivers/staging/rtl8192e/r8192E.h - drivers/staging/usbip/userspace/src/utils.h
| * staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.Jonathan Cameron2011-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | Build tested only. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Reported-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging:iio:kfifo_buf fix double initialization of the ring device structure.Jonathan Cameron2011-07-181-2/+0
| | | | | | | | | | | | | | | | Looks like this moved into the core at somepoint and kfifo buf got left behind. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.Jonathan Cameron2011-07-181-1/+1
| | | | | | | | | | | | | | This mean all sorts of interesting results on driver removal. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging:iio:imu fix missing register table index for some channelsJonathan Cameron2011-07-182-23/+30
| | | | | | | | | | | | | | | | | | A number of these register indexes were not set or actually wrong. This only effects sysfs reads. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * spectra: enable device before poking itAlan Cox2011-07-181-8/+10
| | | | | | | | | | | | | | Otherwise if it is off at boot time things don't go to plan. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: rts_pstor: Fix a miswritingwwang2011-07-181-1/+1
| | | | | | | | | | | | | | | | cppcheck reported: [staging/rts_pstor/sd.c:3730] -> [staging/rts_pstor/sd.c:3726]: (style) Found duplicate if expressions. It's a miswriting, and the second if expression should be "(rsp_type == SD_RSP_TYPE_R0)" Signed-off-by: wwang <wei_wang@realsil.com.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging/lirc_bt829: Return -ENODEV when no hardware is found.Dave Jones2011-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | sys_init_module: 'lirc_bt829'->init suspiciously returned 1, it should follow 0/-E convention sys_init_module: loading module anyway... Pid: 8511, comm: modprobe Tainted: G WC 3.0.0-rc6+ #73 Call Trace: [<ffffffff810b3da7>] sys_init_module+0x217/0x230 [<ffffffff815ed1d2>] system_call_fastpath+0x16/0x1b Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging/lirc_parallel: remove pointless prototypes.Dave Jones2011-07-181-3/+0
| | | | | | | | | | | | | | These are right before the actual definitions, so redundant. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging/lirc_parallel: fix panic on rmmodDave Jones2011-07-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | lirc_parallel seems to leave a bunch of stuff around after rmmod. Without the patch below modprobe ; rmmod ; modprobe will cause a panic. There are still some remaining problems, (double registration of sysfs files) but this patch is at least a start to survive the panic. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.Jonathan Cameron2011-07-181-1/+1
| | | | | | | | | | | | | | Will cause issues only on driver removal. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: zram: Fix kunmapping orderJerome Marchand2011-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | This patch fixes the unmapping order of KM_USER0/1 in handle_uncompressed_page() and zram_read() so that kmap()/kunmap() calls are correctly nested. Reported-by: Nitin Gupta <ngupta@vflare.org> Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Reviewed-by: Nitin Gupta <ngupta@vflare.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Revert "gma500: Fix dependencies"Greg Kroah-Hartman2011-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 66dca5178c70b7bb5ae1761e175569eac8708e1e. It caused build errors on some platforms: drivers/video/Kconfig:36:error: recursive dependency detected! drivers/video/Kconfig:36: symbol FB is selected by DRM_KMS_HELPER drivers/gpu/drm/Kconfig:22: symbol DRM_KMS_HELPER is selected by DRM_PSB drivers/staging/gma500/Kconfig:1: symbol DRM_PSB depends on ACPI_VIDEO Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Add medfield headerAlan Cox2011-07-161-0/+270
| | | | | | | | | | Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: wire up the mrst i2c bus from chip_infoAlan Cox2011-07-151-11/+3
| | | | | | | | | | | | | | We did the groundwork earlier now we can use it Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Fix DPU buildAlan Cox2011-07-152-5/+11
| | | | | | | | | | | | | | Fix up the merge build Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Clean up the DPU config and make it runtimeAlan Cox2011-07-1510-78/+845
| | | | | | | | | | | | | | | | We really don't want this all done by ifdeffery - and this isn't any need as it's fairly easy to sort out. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: resync with Medfield progressAlan Cox2011-07-1517-924/+917
| | | | | | | | | | Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Use the mrst helpers and power control for mode commitAlan Cox2011-07-153-6/+29
| | | | | | | | | | | | | | We want to hit the MM panel backlight when appropriate Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500@ Fix backlight range errorAlan Cox2011-07-151-7/+5
| | | | | | | | | | | | | | If we go out of range we break the pm counts on the error path Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: More Moorestown muddle meddling means MM maybe might modesetAlan Cox2011-07-153-22/+141
| | | | | | | | | | | | | | | | | | | | | | There are a least three different species we need to deal with and right now it seems the only way to sort them out is via DMI. Encapsulate the entire pile somewhere private and out of the way. Hopefully a saner method will emerge later. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Add the Oaktrail HDMI supportAlan Cox2011-07-157-69/+1401
| | | | | | | | | | | | | | | | | | | | | | This differs enough from the Cedarview HDMI sufficiently to want to keep them separated. We need to sort out the power management for Oaktrail/Moorestown in order to plumb this lot into the register handling logic. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Fix cdv warning on unused variableAlan Cox2011-07-151-2/+0
| | | | | | | | | | Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: skip getting modes via DDC on MoorestownOctavian Purdila2011-07-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moorestown does not have a DDC bus, skip getting modes via DDC. This fixes the following bug: BUG: unable to handle kernel NULL pointer dereference at 00000010 IP: [<c1172ff7>] i2c_transfer+0x17/0xb0 *pde = 00000000 Oops: 0000 [#1] Call Trace: [<c1153ae9>] drm_do_probe_ddc_edid+0x59/0x90 [<c1153cb4>] drm_get_edid+0x24/0x250 [<c11805d2>] psb_intel_ddc_get_modes+0x22/0x60 [<c117fe11>] psb_intel_lvds_get_modes+0x21/0x80 Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: fix compile warnings when CONFIG_BACKLIGHT_CLASS_DEVICE is not definedOctavian Purdila2011-07-154-30/+24
| | | | | | | | | | | | | | Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> [Fixed up for other changes, and tidied some existing variable names] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Make crtc count a property of the deviceAlan Cox2011-07-155-1/+45
| | | | | | | | | | | | | | | | | | Octavian Purdila posted a patch that sets num_crtc to 1 for Moorestown, but Oaktrail has 2 so we need to split Oaktrail/Moorestown more sensibly, and also cope with some other differences later on. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: remove the legacy PM methodOctavian Purdila2011-07-153-10/+9
| | | | | | | | | | | | | | | | | | | | PCI core only prefer one of legacy PM and new PM. And since runtime pm is implemented, which requires the new PM method, we should remove the legacy PM method. Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: allow the creation of 'stolen' memory objectsAlan Cox2011-07-152-1/+26
| | | | | | | | | | | | | | | | For things like cursors and many kinds of framebuffer set up we are actually best using the stolen memory when possible. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: add an mmap ioctlAlan Cox2011-07-154-1/+29
| | | | | | | | | | | | | | | | | | This does the same as the dumb mmap but we want them separated in the ABI in case a future extension to the dumb interface means we can't treat them the same way. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Move the 2D operations into DRMAlan Cox2011-07-155-32/+82
| | | | | | | | | | | | | | | | We currently have a test hack framebuffer mode ioctl, turn that into a DRM interface. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Cursor interfaceAlan Cox2011-07-154-11/+28
| | | | | | | | | | | | | | We need to provide an interface to create additional buffers for the cursor Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Fix dependenciesAlan Cox2011-07-151-1/+1
| | | | | | | | | | | | | | ACPI Video is used by GMA500 so we need to depend upon it Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Sort out ditherAlan Cox2011-07-153-3/+8
| | | | | | | | | | | | | | | | | | Ubuntu users reported that dithering was not being set on Poulsbo, and they have a point as we set one variable and check another which is never set. Signed-off-by: Alan Cox <alan@linux.intel.com> Tested-by: Luca Forina <luca.forina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: don't dynamically allocate the psb_gtt structAlan Cox2011-07-158-28/+17
| | | | | | | | | | | | | | | | It's part of the psb_device so just make it part of the struct not a pointer. This does cause a bit of noise shuffling indirections. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * gma500: Final polishAlan Cox2011-07-155-14/+14
| | | | | | | | | | | | | | | | | | | | | | This completes the clean up all the non Medfield C files to the point where checkpatch approves of them barring some silly 80 column whining. The Medfield stuff is still in a lot of flux but the rest is now ready for general tidy and review. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: delete westbridge codeGreg Kroah-Hartman2011-07-1267-42055/+0
| | | | | | | | | | | | | | | | | | It's been stagnant for a while with out much forward progress for a variety of different reasons. So remove it for now. It can be reverted at any time if development picks back up again. Acked-by: David Cross <odc@cypress.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: zcache: support multiple clients, prep for KVM and RAMsterDan Magenheimer2011-07-083-117/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is version 3 of an update to zcache, incorporating feedback from the list. This patch adds support to the in-kernel transcendent memory ("tmem") code and the zcache driver for multiple clients, which will be needed for both RAMster and KVM support. It also adds additional tmem callbacks to support RAMster and corresponding no-op stubs in the zcache driver. In v2, I've also taken the liberty of adding some additional sysfs variables to both surface information and allow policy control. Those experimenting with zcache should find them useful. V3 clarifies some code walking and declaring arrays. Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com> [v3: error27@gmail.com: fix array bounds/walking] [v2: konrad.wilk@oracle.com: fix bools, add check for NULL, fix a comment] [v2: sjenning@linux.vnet.ibm.com: add info/tunables for poor compression] [v2: marcusklemm@googlemail.com: add tunable for max persistent pages] Acked-by: Dan Carpenter <error27@gmail.com> Cc: Nitin Gupta <ngupta@vflare.org> Cc: linux-mm@kvack.org Cc: kvm@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * drivers:staging:rtl typo fix encryptiong to encryption.Justin P. Mattock2011-07-083-3/+3
| | | | | | | | | | | | | | | | This patch fixes a typo. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Cc: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: Remove ENE UB6250 MS card codes from keucrCho, Yu-Chen2011-07-0811-2680/+6
| | | | | | | | | | | | | | Remove ENE UB6250 MS card codes from keucr. Signed-off-by: Cho, Yu-Chen <acho@novell.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: Merge ENE UB6250 MS card codes from keucr to ↵Cho, Yu-Chen2011-07-082-11/+1632
| | | | | | | | | | | | | | | | | | drivers/usb/storage/ene_ub6250.c Merge ENE UB6250 MS card codes from keucr to drivers/usb/storage/ene_ub6250.c. Signed-off-by: Cho, Yu-Chen <acho@novell.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging:iio:light:isl29018: Convert some of the isl29018 driver to the new ↵Bryan Freed2011-07-081-90/+78
| | | | | | | | | | | | | | | | | | | | | | iio_chan_spec framework. Remove the driver's get_sensor_data() interfaces and replace them with iio_chan_spec channels. This converts 4 files to the new framework. Driver ABI change: The intensity_infrared_raw file is now intensity_ir_raw. Signed-off-by: Bryan Freed <bfreed@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging:iio: Add an iio channel type string to support proximity sensors.Bryan Freed2011-07-081-0/+1
| | | | | | | | | | | | | | | | | | Add "proximity" to the iio_chan_type_name_spec_shared string list to support proximity sensors. Now this list fully matches the declared iio_chan_type enums. Signed-off-by: Bryan Freed <bfreed@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging:iio: Reorder channel type strings to match the iio.h enums.Bryan Freed2011-07-081-5/+5
| | | | | | | | | | | | | | | | This makes comparison between the iio_chan_type_name_spec_shared strings and the iio_chan_type enums easier. Signed-off-by: Bryan Freed <bfreed@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging:iio:light:isl29018: Fix the "Init of isl29018 fails" failure.Bryan Freed2011-07-081-3/+3
| | | | | | | | | | | | | | | | | | The I2C clientdata is set to indio_dev instead of chip as of a couple weeks ago. Correct the calls to i2c_get_clientdata() accordingly. Otherwise the driver fails to initialize. Signed-off-by: Bryan Freed <bfreed@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix printk issue in rtd520.cRavishankar2011-07-081-5/+5
| | | | | | | | | | | | | | This is a patch to the rtd520.c file that fixes up a printk warning found by the checkpatch.pl tool Signed-off-by: Ravishankr <ravishakarkm32@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix line over 80 character issue in rtd520.cRavishankar2011-07-081-4/+8
| | | | | | | | | | | | | | This is a patch to the rtd520.c file that fixes up a warning: line over 80 character found by the checkpatch.pl tool Signed-off-by: Ravishankar <ravishankarkm32@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: brcm80211: Fix module parameter permissionsJean Delvare2011-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The third parameter of module_param is supposed to represent sysfs file permissions. A value of "1" makes no sense. I am changing it to "0" to align with the other module parameters in this driver. Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Henry Ptasinski <henryp@broadcom.com> Cc: Brett Rudley <brudley@broadcom.com> Cc: Roland Vossen <rvossen@broadcom.com> Cc: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: tm6000: remove unneeded check in get_next_buf()Dan Carpenter2011-07-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | We dereference "buf" on the line before so if it were NULL here we would have OOPsed earlier. Also list_entry() never returns NULL. And finally, we handled the situation where the list is empty earlier in the function. So this test isn't needed and I've removed it. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: et131x: et1310_mac.c: ConfigMacStatRegs() add missing regs to be zeroedMark Einon2011-07-081-1/+34
| | | | | | | | | | | | | | | | The comment at the top of the function states 'we need to initialize all the macstat registers to zero', but not all macstat registers are zeroed. Zero the missing registers. Tested on an ET-131x device. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: et131x: Remove spaces between tabs inserted in patch 7b7fb34d3ffaMark Einon2011-07-081-4/+4
| | | | | | | | | | | | | | I must remember to run checkpatch on 'trivial' patches too... Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud