summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)AuthorFilesLines
2012-01-22Merge tag 'v3.3-rc1' into staging/for_v3.3Mauro Carvalho Chehab3906-168752/+235688
* tag 'v3.3-rc1': (8187 commits) Linux 3.3-rc1 x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits qnx4: don't leak ->BitMap on late failure exits qnx4: reduce the insane nesting in qnx4_checkroot() qnx4: di_fname is an array, for crying out loud... KEYS: Permit key_serial() to be called with a const key pointer keys: fix user_defined key sparse messages ima: fix cred sparse warning uml: fix compile for x86-64 MPILIB: Add a missing ENOMEM check tpm: fix (ACPI S3) suspend regression nvme: fix merge error due to change of 'make_request_fn' fn type xen: using EXPORT_SYMBOL requires including export.h gpio: tps65910: Use correct offset for gpio initialization acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec intel_idle: Split up and provide per CPU initialization func ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2 tg3: Fix single-vector MSI-X code openvswitch: Fix multipart datapath dumps. ipv6: fix per device IP snmp counters ...
2012-01-21[media] az6007: CodingStyle fixesMauro Carvalho Chehab1-14/+13
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Enable the driver at the building systemMauro Carvalho Chehab2-1/+11
Add the corresponding entries to allow building this driver. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Use the right keycode for Terratec H7Mauro Carvalho Chehab2-1/+53
Instead of using a fake keycode, just for testing, use the right one, for Terratec H7. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Convert IR to use the rc_core logicMauro Carvalho Chehab1-23/+7
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Fix IR handlingMauro Carvalho Chehab1-18/+13
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Be sure to use kmalloc'ed buffer for transfersMauro Carvalho Chehab1-10/+17
USB data transfers may not work if the buffer is allocated at the stack. Be sure to use kmalloc on all places where a buffer is needed. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Protect read/write calls with a mutexMauro Carvalho Chehab1-60/+62
This will avoid interference with CI and IR I/O operations. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Driver cleanupMauro Carvalho Chehab1-43/+13
Remove commented test code, remove unused poweroff stuff, and fix the copyright data. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: code cleanups and fixesMauro Carvalho Chehab1-65/+83
Several changes were needed to make az6007 to work, producing the same commands as the original driver. This patch does that. While here, be less verbose when debug is not enabled. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] drxk: Allow enabling MERR/MVAL cfgMauro Carvalho Chehab4-2/+13
Those two settings are different when used with az6007. Add a config option to enable it. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] drxk: add support for Mpeg output clock drive strength configMauro Carvalho Chehab3-9/+10
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Use DRX-K dynamic clock modeMauro Carvalho Chehab1-4/+5
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] drxk: Allow setting it on dynamic_clock modeMauro Carvalho Chehab2-12/+19
This is used on az6007. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Use a per device private structMauro Carvalho Chehab1-6/+5
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Change it to use the MFE solution adopted at dvb-usbMauro Carvalho Chehab1-25/+17
This driver were written to use a previous solution for MFE at dvb-usb. Due to the internal API changes, change the binding to work with the new way. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Use the new MFE support at dvb-usbMauro Carvalho Chehab1-36/+38
Use the newly dvb-usb MFE support added by changeset 9bd9e3bd2c57530dfe3057dd0aa9bdb37824925d. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: improve the error messages for az6007 read/write callsMauro Carvalho Chehab1-4/+3
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Fix IR receive codeMauro Carvalho Chehab1-11/+26
The code still needs to be commented, as there's a mutex missing at the az6007_read() call. A mutex there is needed, in order to prevent RC (or CI) calls while other operations are in progress. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Simplify the code by removing an uneeded functionMauro Carvalho Chehab1-29/+0
Everything to reset the demod is already at az6007_frontend_poweron(). Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Simplify the read/write logicMauro Carvalho Chehab1-98/+87
This patch introduces no functional changes. It basically defines a macro for each different req found at the driver, and cleans the code to use them, making easier to understand the code. With regards to the IR handling code, although the original code doesn't define what's the request, it is clear, from the USB logs, that 0xc5 is for IR polling. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Change the az6007 read/write routine parameterMauro Carvalho Chehab1-28/+28
Use usb_device for those routines, as it allows using them on all places. While there, rename to better express the meaning. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Fix some init sequences and use the right firmwaresMauro Carvalho Chehab1-62/+43
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: need to define drivers name before including dvb-usb.hMauro Carvalho Chehab1-1/+1
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] drxk: Don't assume a default firmware nameMauro Carvalho Chehab4-6/+8
Move the ngene/ddbridge firmware into their drivers. There are two reasons for that: 1) The firmware used there didn't work for a few devices I tested here (Terratec H5, H6 and H7); 2) At least Terratec H7 doesn't seem to require a firmware for it to work. After this change, if firmware is not specified, the driver will use a rom-based firmware (this seems to be the case for Terratec H7, although I need to better check the USB dumps to be sure about that). In any case, the firmware seems to be optional, as the DRX-K driver don't return the firmware load error. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: make driver less verboseMauro Carvalho Chehab1-18/+17
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: move device PID's to the proper placeMauro Carvalho Chehab2-4/+2
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Replace the comments at the beginning of the driverMauro Carvalho Chehab1-3/+20
The comments there is wrong. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Get rid of az6007.hMauro Carvalho Chehab2-20/+9
The header file serves for no purpose and exports some things that should be static. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: CodingStyle cleanupMauro Carvalho Chehab1-119/+120
make checkpatch.pl happy Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Remove some dead code that doesn't seem to be neededMauro Carvalho Chehab1-63/+16
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Comment the gate_ctl mutexMauro Carvalho Chehab1-1/+5
The mutex is there to protect the I2C gate. However, for some reason, it is being called twice: [ 2103.542796] usbcore: registered new interface driver dvb_usb_az6007 [ 2103.772392] az6007: drxk_gate_ctrl: enable [ 2103.793900] az6007: drxk_gate_ctrl: enable For now, let's just comment, to allow the driver to run. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Fix the I2C code in order to handle mt2063Mauro Carvalho Chehab1-17/+30
mt2063 uses a one-byte transfer. This requires a special handling inside the i2c code. Fix it to properly accept i2c reads. This is needed to make the mt2063 to be detected. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Fix it to allow loading it without crashMauro Carvalho Chehab1-92/+98
Add some fixes to allow frontend attachment. The patch is not complete yet, as just the frontend 0 is initialized. So, more changes will be needed, including some changes at dvb-usb core. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] az6007: Fix compilation troubles at az6007Mauro Carvalho Chehab2-72/+104
Some changes are needed, in order to make az6007 compile with the upstream tree. Most of the changes are due to the upstream drxk module. Even allowing its compilation, the driver is not working yet. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-21[media] dvb: Add a new driver for az6007Mauro Carvalho Chehab2-0/+645
Import the az6007 driver from Terratec H7 source, as-is. It won't compile or run, so latter patches are needed in order to fix it. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-01-20Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds4-7/+8
gpio bug fixes for v3.3 * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: gpio: tps65910: Use correct offset for gpio initialization gpio/it8761e: Restrict it8761e gpio driver to x86. gpio-ml-ioh: cleanup __iomem annotation usage gpio-ml-ioh: cleanup NULL pointer checking gpio-pch: cleanup __iomem annotation usage gpio-pch: cleanup NULL pointer checking
2012-01-19Merge branch 'for-next-merge' of ↵Linus Torvalds7-0/+4672
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending * 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: ib_srpt: Initial SRP Target merge for v3.3-rc1
2012-01-19Merge branch 'for-next' of ↵Linus Torvalds42-478/+529
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (26 commits) target: Set additional sense length field in sense data target: Remove legacy device status check from transport_execute_tasks target: Remove __transport_execute_tasks() for each processing context target: Remove extra se_device->execute_task_lock access in fast path target: Drop se_device TCQ queue_depth usage from I/O path target: Fix possible NULL pointer with __transport_execute_tasks target: Remove TFO->check_release_cmd() fabric API caller tcm_fc: Convert ft_send_work to use target_submit_cmd target: Add target_submit_cmd() for process context fabric submission target: Make target_put_sess_cmd use target_release_cmd_kref target: Set response format in INQUIRY response target: tcm_mod_builder: small fixups Documentation/target: Fix tcm_mod_builder.py build breakage target: remove overagressive ____cacheline_aligned annoations tcm_loop: bump max_sectors target/configs: remove trailing newline from udev_path and alias iscsi-target: fix chap identifier simple_strtoul usage target: remove useless casts target: simplify target_check_cdb_and_preempt target: Move core_scsi3_check_cdb_abort_and_preempt ...
2012-01-19Merge branch 'release' of ↵Linus Torvalds164-747/+3870
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux This includes initial support for the recently published ACPI 5.0 spec. In particular, support for the "hardware-reduced" bit that eliminates the dependency on legacy hardware. APEI has patches resulting from testing on real hardware. Plus other random fixes. * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (52 commits) acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec intel_idle: Split up and provide per CPU initialization func ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2 ACPI processor: Remove unneeded cpuidle_unregister_driver call intel idle: Make idle driver more robust intel_idle: Fix a cast to pointer from integer of different size warning in intel_idle ACPI: kernel-parameters.txt : Add intel_idle.max_cstate intel_idle: remove redundant local_irq_disable() call ACPI processor: Fix error path, also remove sysdev link ACPI: processor: fix acpi_get_cpuid for UP processor intel_idle: fix API misuse ACPI APEI: Convert atomicio routines ACPI: Export interfaces for ioremapping/iounmapping ACPI registers ACPI: Fix possible alignment issues with GAS 'address' references ACPI, ia64: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64) ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64) ACPI: Store SRAT table revision ACPI, APEI, Resolve false conflict between ACPI NVS and APEI ACPI, Record ACPI NVS regions ACPI, APEI, EINJ, Refine the fix of resource conflict ...
2012-01-19tpm: fix (ACPI S3) suspend regressionStefan Berger2-0/+12
This patch fixes an (ACPI S3) suspend regression introduced in commit 68d6e6713fcb ("tpm: Introduce function to poll for result of self test") and occurring with an Infineon TPM and tpm_tis and tpm_infineon drivers active. The suspend problem occurred if the TPM was disabled and/or deactivated and therefore the TPM_PCRRead checking the result of the (asynchronous) self test returned an error code which then caused the tpm_tis driver to become inactive and this then seemed to have negatively influenced the suspend support by the tpm_infineon driver... Besides that the tpm_tis drive may stay active even if the TPM is disabled and/or deactivated. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Tested-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-19nvme: fix merge error due to change of 'make_request_fn' fn typeLinus Torvalds1-7/+1
The type of 'make_request_fn' changed in 5a7bbad27a4 ("block: remove support for bio remapping from ->make_request"), but the merge of the nvme driver didn't take that into account, and as a result the driver would compile with a warning: drivers/block/nvme.c: In function 'nvme_alloc_ns': drivers/block/nvme.c:1336:2: warning: passing argument 2 of 'blk_queue_make_request' from incompatible pointer type [enabled by default] include/linux/blkdev.h:830:13: note: expected 'void (*)(struct request_queue *, struct bio *)' but argument is of type 'int (*)(struct request_queue *, struct bio *)' It's benign, but the warning is annoying. Reported-by: Stephen Rothwell <sfr@canb.auug.org> Cc: Matthew Wilcox <matthew.r.wilcox@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-19xen: using EXPORT_SYMBOL requires including export.hStephen Rothwell1-0/+1
Fix these warnings: drivers/xen/biomerge.c:14:1: warning: data definition has no type or storage class [enabled by default] drivers/xen/biomerge.c:14:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/xen/biomerge.c:14:1: warning: parameter names (without types) in function declaration [enabled by default] And this build error: ERROR: "xen_biovec_phys_mergeable" [drivers/block/nvme.ko] undefined! Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-19Merge branch 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linuxLinus Torvalds3-54/+89
* 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux: i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH i2c-eg20t: modified the setting of transfer rate. i2c-eg20t: use i2c_add_numbered_adapter to get a fixed bus number i2c: OMAP: Add DT support for i2c controller I2C: OMAP: NACK without STP I2C: OMAP: correct SYSC register offset for OMAP4
2012-01-19Merge branch 'v4l_for_linus' of ↵Linus Torvalds47-619/+683
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits) [media] as3645a: Fix compilation by including slab.h [media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c [media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c [media] ds3000: using logical && instead of bitwise & [media] v4l2-ctrls: make control names consistent [media] DVB: dib0700, add support for Nova-TD LEDs [media] DVB: dib0700, add corrected Nova-TD frontend_attach [media] DVB: dib0700, separate stk7070pd initialization [media] DVB: dib0700, move Nova-TD Stick to a separate set [media] : add MODULE_FIRMWARE to dib0700 [media] DVB-CORE: remove superfluous DTV_CMDs [media] s5p-jpeg: adapt to recent videobuf2 changes [media] s5p-g2d: fixed a bug in controls setting function [media] s5p-mfc: Fix volatile controls setup [media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test [media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test [media] s5p-fimc: Fix incorrect control ID assignment [media] dvb_frontend: Don't call get_frontend() if idle [media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T [media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters ...
2012-01-19gpio: tps65910: Use correct offset for gpio initializationLaxman Dewangan1-1/+1
Using the correct gpio offset for setting the initial value of gpio when setting output direction. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2012-01-19Merge tag 'scsi-misc' of ↵Linus Torvalds56-1441/+1179
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 SCSI updates on 20120118 * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (49 commits) [SCSI] libfc: remove redundant timer init for fcp [SCSI] fcoe: Move fcoe_debug_logging from fcoe.h to fcoe.c [SCSI] libfc: Declare local functions static [SCSI] fcoe: fix regression on offload em matching function for initiator/target [SCSI] qla4xxx: Update driver version to 5.02.00-k12 [SCSI] qla4xxx: Cleanup modinfo display [SCSI] qla4xxx: Update license [SCSI] qla4xxx: Clear the RISC interrupt bit during FW init [SCSI] qla4xxx: Added error logging for firmware abort [SCSI] qla4xxx: Disable generating pause frames in case of FW hung [SCSI] qla4xxx: Temperature monitoring for ISP82XX core. [SCSI] megaraid: fix sparse warnings [SCSI] sg: convert to kstrtoul_from_user() [SCSI] don't change sdev starvation list order without request dispatched [SCSI] isci: fix, prevent port from getting stuck in the 'configuring' state [SCSI] isci: fix start OOB [SCSI] isci: fix io failures while wide port links are coming up [SCSI] isci: allow more time for wide port targets [SCSI] isci: enable wide port targets [SCSI] isci: Fix IO fails when pull cable from phy in x4 wideport in MPC mode. ...
2012-01-19Merge git://git.infradead.org/users/willy/linux-nvmeLinus Torvalds4-0/+1758
* git://git.infradead.org/users/willy/linux-nvme: (105 commits) NVMe: Set number of queues correctly NVMe: Version 0.8 NVMe: Set queue flags correctly NVMe: Simplify nvme_unmap_user_pages NVMe: Mark the end of the sg list NVMe: Fix DMA mapping for admin commands NVMe: Rename IO_TIMEOUT to NVME_IO_TIMEOUT NVMe: Merge the nvme_bio and nvme_prp data structures NVMe: Change nvme_completion_fn to take a dev NVMe: Change get_nvmeq to take a dev instead of a namespace NVMe: Simplify completion handling NVMe: Update Identify Controller data structure NVMe: Implement doorbell stride capability NVMe: Version 0.7 NVMe: Don't probe namespace 0 Fix calculation of number of pages in a PRP List NVMe: Create nvme_identify and nvme_get_features functions NVMe: Fix memory leak in nvme_dev_add() NVMe: Fix calls to dma_unmap_sg NVMe: Correct sg list setup in nvme_map_user_pages ...
2012-01-18Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds21-264/+290
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits) tg3: Fix single-vector MSI-X code openvswitch: Fix multipart datapath dumps. ipv6: fix per device IP snmp counters inetpeer: initialize ->redirect_genid in inet_getpeer() net: fix NULL-deref in WARN() in skb_gso_segment() net: WARN if skb_checksum_help() is called on skb requiring segmentation caif: Remove bad WARN_ON in caif_dev caif: Fix typo in Vendor/Product-ID for CAIF modems bnx2x: Disable AN KR work-around for BCM57810 bnx2x: Remove AutoGrEEEn for BCM84833 bnx2x: Remove 100Mb force speed for BCM84833 bnx2x: Fix PFC setting on BCM57840 bnx2x: Fix Super-Isolate mode for BCM84833 net: fix some sparse errors net: kill duplicate included header net: sh-eth: Fix build error by the value which is not defined net: Use device model to get driver name in skb_gso_segment() bridge: BH already disabled in br_fdb_cleanup() net: move sock_update_memcg outside of CONFIG_INET mwl8k: Fixing Sparse ENDIAN CHECK warning ...
2012-01-18Merge branches 'einj', 'intel_idle', 'misc', 'srat' and 'turbostat-ivb' into ↵Len Brown5-96/+276
release