summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | hwmon: (w83795) Avoid reading the same register twiceJean Delvare2010-10-281-2/+9
| | | | | | | | | | | | | | | | | | | | | Shorten driver load time by avoiding duplicate register access during initialization. This saves 112 ms on modprobe on my test system. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Rework beep_enable implementationJean Delvare2010-10-281-38/+2
| | | | | | | | | | | | | | | | | | | | | | | | Handle beep_enable just like all other beep bits. It doesn't need anything special, so let's avoid redundant code. This also saves a duplicate register read at initialization time. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Report PECI agent Tbase valuesJean Delvare2010-10-281-0/+13
| | | | | | | | | | | | | | | | | | | | | On systems with PECI, report PECI agent Tbase temperature values. This is informative only. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Properly handle negative temperaturesJean Delvare2010-10-281-13/+7
| | | | | | | | | | | | | | | | | | | | | The temperature registers hold regular 2's complement values, no need to add any arithmetics. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Rename temperature limit attributesJean Delvare2010-10-281-10/+10
| | | | | | | | | | | | | | | | | | | | | Follow the standard for temperature limit attribute naming, so that libsensors will pick the values. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Fix PWM duty cycle frequency attributesJean Delvare2010-10-281-28/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PWM duty cycle frequenty attributes are improperly named (fanN_div instead of pwmN_div) and contain raw values instead of actual frequencies. Rename them and fix their contents. Also improve the logic when the user asks for a new frequency, to always pick the closest supported frequency. The algorithm could certainly be optimized, but the operation is infrequent enough that I don't think it's worth the effort. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Add support for dynamic in0-2 limitsJean Delvare2010-10-281-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | The W83795G can be configured to set the in0, in1 and/or in2 voltage limits dynamically based on VID input pins. Switch the respective sysfs attributes to read-only. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Fix LSB reading of fan speedsJean Delvare2010-10-281-5/+5
| | | | | | | | | | | | | | | | | | | | | Misplaced parentheses caused the wrong register value to be read, resulting in random LSB for fan speed values and limits. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Clean up probe functionJean Delvare2010-10-281-57/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The data structure is zalloc'd, so no need to set individual fields to 0 explicitly. * Refactor the handling of pins that can be used for either temperature or voltage monitoring. * Misc other clean-ups. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Fix in17-in20 gain factorJean Delvare2010-10-281-3/+3
| | | | | | | | | | | | | | | | | | | | | Gain bit set means 1x gain and cleared means 8x gain, not the other way around. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Only start monitoring if neededJean Delvare2010-10-281-3/+10
| | | | | | | | | | | | | | | | | | This saves an SMBus write if monitoring was already enabled. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Add const markersJean Delvare2010-10-281-8/+10
| | | | | | | | | | | | | | | | | | | | | Attribute structures can be made const. Same for the I2C address list. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Only create fan[1-8]_target files when neededJean Delvare2010-10-281-23/+4
| | | | | | | | | | | | | | | | | | | | | | | | Only create fan[1-8]_target files when the fan in question can be controlled (PWM output is present.) Also name these files according to the standard. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Move PWM attributes to a dedidated arrayJean Delvare2010-10-281-10/+8
| | | | | | | | | | | | | | | | | | | | | Use a dedicated 2D array for PWM attributes. This way, PWM attributes are handled the same way as other attributes, this is more consistent. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Use 2D arrays for many device attributesJean Delvare2010-10-281-29/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 2D arrays for in, fan, temp and dts device attributes. Using linear arrays is too risky as we have to skip some groups depending on the device model and configuration. Adding or removing an attribute would let the driver build silently but then it would crash at runtime. With 2D arrays, the consistency checking happens at build time, which is much safer. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Merge w83795_create_files and w83795_remove_filesJean Delvare2010-10-281-38/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions w83795_create_files and w83795_remove_files iterate over the same set of files, just calling a different function. Merge them into a single function which takes the action as a parameter. This saves code, and also ensure that file creation and deletion are in sync. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Move file creation to a separate function tooJean Delvare2010-10-281-55/+66
| | | | | | | | | | | | | | | | | | | | | Function w83795_probe() is way too big, move file creation to a separate function to make it more readable. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Move files removal to a separate functionJean Delvare2010-10-281-50/+31
| | | | | | | | | | | | | | | | | | | | | | | | Sysfs files must be removed on device removal but also when device registration fails. Move the code to a separate function to avoid code redundancy. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Improve detection routineJean Delvare2010-10-281-23/+57
| | | | | | | | | | | | | | | | | | | | | Check for additional identification registers. Improve debugging messages on failed detection. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Refactor bank selectionJean Delvare2010-10-281-43/+50
| | | | | | | | | | | | | | | | | | | | | | | | Move the bank selection code to a separate function, to avoid duplicating it in read and write functions. Improve error reporting on register access error. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Drop duplicate enumJean Delvare2010-10-281-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | Enum chips and chip_types are redundant, get rid of the former. Fix the detection code to properly identify the chip variant and name the client accordingly. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (w83795) Misc cleanupsJean Delvare2010-10-281-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Improve driver description. * Drop unused macro. * Drop unreachable code. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: New driver for the W83795G/ADG monitoring chipsWei Song2010-10-283-0/+2149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is still much work needed, but I wanted to give Wei the credit he deserves. I've merged some of my own fixes already, to make gcc and checkpatch happy. Individual fixes and improvements from me will follow. [JD: Fix build errors] [JD: Coding style cleanups] [JD: Get rid of forward declarations] [JD: Drop VID support] [JD: Drop fault output control feature] [JD: Use lowercase for inline function names] [JD: Use strict variants of the strtol/ul functions] [JD: Shorten the read and write function names] Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (s3c-hwmon) Depend on S3C_ADCMaurus Cuelenaere2010-10-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This way we don't need to modify Kconfig every time a new SoC comes along to make this driver support it. Also fix some typos while I'm at it. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Reviewed-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (s3c-hwmon) Use a real mutexThomas Gleixner2010-10-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The semaphore which protects the ADC is semantically a mutex. Use a real mutex. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm75) Trivial changes to pacify the checkpatchShubhrajyoti D2010-10-281-21/+23
| | | | | | | | | | | | | | | | | | | | | Some trivial changes to pacify the checkpatch. Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm75) Make the writing to sysfs more robustShubhrajyoti D2010-10-281-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we get the checkpatch warning consider using strict_strtol in preference to simple_strtol. Also we should not allow any partially numeric values. Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Add support for the W83L771W/GJean Delvare2010-10-283-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | I was wondering if that chip ever existed publicly... Apparently yes, so add support for it. Signed-off-by: Jean Delvare <khali@linux-fr.org> Tested-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
| * | hwmon: (lm90) Add support for update_interval sysfs attributeGuenter Roeck2010-10-281-5/+92
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Introduce capability flag to indicate broken ALERT functionalityGuenter Roeck2010-10-281-3/+6
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Introduce chip parameter structureGuenter Roeck2010-10-281-32/+60
| | | | | | | | | | | | | | | | | | | | | | | | Instead of using switch/case and if statements in probe, define chip specific functionality in a parameter structure array. Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Rearrange code to no longer require forward declarationsGuenter Roeck2010-10-281-267/+256
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Add support for max6695 and max6696Guenter Roeck2010-10-283-24/+247
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Add support for extra features of max6659Guenter Roeck2010-10-282-10/+64
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Add explicit support for max6659Guenter Roeck2010-10-282-13/+23
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Simplify set_temp11 register calculationsGuenter Roeck2010-10-281-27/+28
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Introduce function to delete sysfs filesGuenter Roeck2010-10-281-7/+11
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Introduce device feature bitsGuenter Roeck2010-10-281-14/+26
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (lm90) Fix checkpatch errorsGuenter Roeck2010-10-281-25/+51
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: Add tempX_emergency attribute to sysfs ABIGuenter Roeck2010-10-281-0/+15
| | | | | | | | | | | | | | | Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (k8temp) Remove superfluous CPU family checkAndreas Herrmann2010-10-281-29/+22
| | | | | | | | | | | | | | | | | | | | | | | | The family check in k8temp is not required because the driver is already bound to a northbridge device only used with K8 CPUs. Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds2010-10-281365-148532/+421095
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits) Staging: brcm80211: fix usage of roundup in structures Staging: bcm: fix up network device reference counting Staging: keucr: fix up US_ macro change staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. staging: brcm80211: Remove unnecessary header files. staging: brcm80211: Remove unnecessary includes from bcmutils.c staging: brcm80211: Removed unnecessary pktsetprio() function. Staging: brcm80211: remove typedefs.h Staging: brcm80211: remove uintptr typedef usage Staging: hv: remove struct vmbus_channel_interface Staging: hv: remove Open from struct vmbus_channel_interface Staging: hv: storvsc: call vmbus_open directly Staging: hv: netvsc: call vmbus_open directly Staging: hv: channel: export vmbus_open to modules Staging: hv: remove Close from struct vmbus_channel_interface Staging: hv: netvsc: call vmbus_close directly Staging: hv: storvsc: call vmbus_close directly Staging: hv: channel: export vmbus_close to modules Staging: hv: remove SendPacket from struct vmbus_channel_interface Staging: hv: storvsc: call vmbus_sendpacket directly ... Fix up conflicts in drivers/staging/cx25821/cx25821-audio-upstream.c drivers/staging/cx25821/cx25821-audio.h due to warring whitespace cleanups (neither of which were all that great)
| * | | Staging: brcm80211: fix usage of roundup in structuresGreg Kroah-Hartman2010-10-282-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the roundup macro is sane, it can't be used in structure definitions, or the build breaks.. For now, create a "broken_roundup()" macro to get everything building again, but in the end, fixing these structures to use a proper size value is the correct thing to do. Cc: Brett Rudley <brudley@broadcom.com> Cc: Henry Ptasinski <henryp@broadcom.com> Cc: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | Staging: bcm: fix up network device reference countingGreg Kroah-Hartman2010-10-281-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way network devices are reference counted does not include poking around in the reference count itself. This breaks when the reference count is changed to be a different type. Fix the driver to do the proper function calls instead. Cc: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | Staging: keucr: fix up US_ macro changeGreg Kroah-Hartman2010-10-283-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The usb tree renamed the USB storage defines to make more sense, so this driver needs the changes as well so that things will compile properly. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | Merge 'staging-next' to Linus's treeGreg Kroah-Hartman2010-10-281365-148540/+421108
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * | staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.Henry Ptasinski2010-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basename-apiversion-codeversion construction for firmware filenames is not used by most other firmware files, adds complexity, and is not providing any value. Rename the firmware files using just basename-apiversion. Users of the brcmfmac driver will need to update the linux-firmware package to get the renamed files, or manually rename their installed firmware files. Signed-off-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * | staging: brcm80211: Remove unnecessary header files.Henry Ptasinski2010-10-212-101/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These header files are no longer needed. Signed-off-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * | staging: brcm80211: Remove unnecessary includes from bcmutils.cHenry Ptasinski2010-10-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed includ of bcmip.h and vlan.h, as they're no longer needed. Signed-off-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * | staging: brcm80211: Removed unnecessary pktsetprio() function.Henry Ptasinski2010-10-213-77/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is completely unnecessary, as packet classification is done higher up in the stack. As used, the function actually mis-classifies frames in some cases since it overwrites the classification done by the stack. Signed-off-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>