summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of ↵Linus Torvalds2008-08-081-111/+124
|\ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: fix SNDCTL_DSP_SYNC support in Freescale 8610 sound drivers
| * ALSA: ASoC: fix SNDCTL_DSP_SYNC support in Freescale 8610 sound driversTimur Tabi2008-08-041-111/+124
| | | | | | | | | | | | | | | | | | | | | | | | If an OSS application calls SNDCTL_DSP_SYNC, then ALSA will call the driver's _hw_params and _prepare functions again. On the Freescale MPC8610 DMA ASoC driver, this caused the DMA controller to be unneccessarily re-programmed, and apparently it doesn't like that. The DMA will then not operate when instructed. This patch relocates much of the DMA programming to fsl_dma_open(), which is called only once. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Fix up duplicate '__s3c2410wdt_stop()' functionLinus Torvalds2008-08-081-11/+0
| | | | | | | | | | | | | | Looks like somebody didn't get enough sleep. Noticed-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge branch 'for-linus' of ↵Linus Torvalds2008-08-08139-0/+0
|\ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
| * | Move all of include/asm-m68knommu to arch/m68knommu/include/asm.Greg Ungerer2008-08-07139-0/+0
| | | | | | | | | | | | | | | | | | | | | With the current kbuild infrastructure in place no other changes are required for this to work. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
* | | powerpc/iseries: remove the old viocons driverStephen Rothwell2008-08-084-1179/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver was declared obsolete over 2 years ago, the alternative console driver for legacy iSeries (hvc_iseries) was made the default over 1 year ago and this driver has been build broken for over 3 months, so remove it. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | Merge branch 'for_linus' of ↵Linus Torvalds2008-08-0830-592/+685
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (23 commits) V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers. V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams V4L/DVB (8611): Add suspend/resume to pxa_camera driver V4L/DVB (8610): Add suspend/resume capabilities to soc_camera. V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity. V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4 V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1 V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash. V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519. V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x. V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508. V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation. V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option. V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source. V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup. V4L/DVB (8564): fix vino driver build error V4L/DVB (8563): fix drivers/media/video/arv.c compilation V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select V4L/DVB (8558): media/video/Kconfig: fix a typo ...
| * | | V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers.Laurent Pinchart2008-08-062-23/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Data buffers on the stack are not allowed for USB I/O. Use dynamically allocated buffers instead. Signed-off-by: Bruce Schmid <duck@freescale.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcamsLaurent Pinchart2008-08-061-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Bison Electronics 5986:0300 and 5986:0303 webcams require the UVC_QUIRK_PROBE_MINMAX quirk. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8611): Add suspend/resume to pxa_camera driverRobert Jarzmik2008-08-061-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PXA suspend switches off DMA core, which loses all context of previously assigned descriptors. As pxa_camera driver relies on DMA transfers, setup the lost descriptors on resume and retrigger frame acquisition if needed. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8610): Add suspend/resume capabilities to soc_camera.Robert Jarzmik2008-08-062-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add suspend/resume hooks to call soc operation specific suspend and resume functions. This ensures the camera chip has been previously resumed, as well as the camera bus. These hooks in camera chip drivers should save/restore chip context between suspend and resume time. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity.Paul Mundt2008-08-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So, platform_driver_unregister() doesn't actually have a return value, nor do any of the void __exit routines. It's reassuring to know that people copy and paste blindly. This completely blew up my compiler. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV ↵Robert Lowery2008-08-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dual Digital 4 quoting Robert Lowery: I think I've found the cause of the oops. [...] BTW it appears I have fixed my tuning problems with the updated patch below. This reverts a change Mauro made a while back. All is good now :) [...] The good news is that I've got a better patch that definitely works this time and even better, makes use of the standard firmware (rather than the Australian specific one). ...based on an earlier patch by Hans-Frieder Vogt: http://www.linuxtv.org/pipermail/linux-dvb/2008-May/026280.html Signed-off-by: Robert Lowery <rlowery@exemail.com.au> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1Rabin Vincent2008-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bad mini/max check in setting control values (the gamma in zc3xx could be set to null). Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash.Jean-Francois Moine2008-08-064-115/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash is due to USB exchanges done at interrupt level. These exchanges, tied to autogain, are now done by the application. Also, there is a fix about autogain start. Concerned subdrivers: etoms, pac7311, sonixj and spca561. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519.Jean-Francois Moine2008-08-061-251/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The hflip and vflip controls work for ov519 - ov7670 only. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid ProEugeniy Meshcheryakov2008-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pinnacle Hybrid Pro (2304:0226) requires mts_firmware flag to have any sound. Without this flag it is useful only for watching silent movies. Signed-off-by: Eugeniy Meshcheryakov <eugen@debian.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 ↵Jean-Francois Moine2008-08-064-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and vc023x. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508.Jean-Francois Moine2008-08-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug introduced in changeset 6de914aaad86. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation.Jean-Francois Moine2008-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option.Jean-Francois Moine2008-08-066-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This option is changed to GSPCA_DEBUG and it is set by default in gspca.h. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup ↵Jean-Francois Moine2008-08-061-125/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | source. The values from win traces do not seem to work while the webcams did work with gspca v1. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 ↵Jean-Francois Moine2008-08-061-16/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus init cleanup. The hflip and vflip controls work for ov7670 only. This bridge/sensor inverts blue and red - not fixed. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8564): fix vino driver build errorYoichi Yuasa2008-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vino driver needs #include <media/v4l2-ioctl.h> drivers/media/video/vino.c: In function 'vino_ioctl': drivers/media/video/vino.c:4364: error: implicit declaration of function 'video_usercopy' make[3]: *** [drivers/media/video/vino.o] Error 1 Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8563): fix drivers/media/video/arv.c compilationAdrian Bunk2008-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the following compile errors: <-- snip --> ... CC [M] drivers/media/video/arv.o /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: In function 'ar_ioctl': /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:544: error: implicit declaration of function 'video_usercopy' /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: At top level: /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:758: error: unknown field 'type' specified in initializer make[4]: *** [drivers/media/video/arv.o] Error 1 <-- snip --> Reported-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER selectAdrian Bunk2008-08-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also for the new DVB_DRX397XD driver the FW_LOADER select and the corresponding dependency on HOTPLUG can be removed. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8558): media/video/Kconfig: fix a typoMauro Carvalho Chehab2008-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Hermann Gausterer for pointing this issue. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8552): gspca: Bad pixel format in the spca508 subdriver.Jean-Francois Moine2008-08-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The pixel format should have been changed in changeset 6de914aaad86. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8550): gspca: Change a bit the init of ov7660 and Sonix JPEG bridges.Jean-Francois Moine2008-08-061-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set back some values of gspcav1 in init of sonixj sensor ov7660. Add some comments. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | | V4L/DVB (8549a): fix kernel-doc warning, function name, and docbook filenameRandy Dunlap2008-08-062-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change function name in kernel-doc and add kernel-doc for parameter @index: Warning(linhead//drivers/media/video/videodev.c:2090): No description found for parameter 'index' Also change source file name in DocBook/videobook.tmpl to match the new source file name. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | | Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6Linus Torvalds2008-08-0814-267/+734
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03 hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07 hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle hwmon: ad7414 driver hwmon: (thmc50) Add support for critical temperature limits hwmon: (adm9240) Remove EXPERIMENTAL dependency hwmon: (w83627hf) Drop reset module parameter hwmon: (w83627hf) Add pwm_enable sysfs interface hwmon: (w83791d) Use fan divisor bits from vbat register hwmon: (f71882fg) Delete needless forward declarations hwmon: (dme1737) Add support for the SMSC SCH5027 hwmon: (dme1737) Skip detection if forced hwmon: (dme1737) Cleanups
| * | | | hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03Andrew Paprocki2008-08-062-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The it8705 chip supports 16-bit fan tachometers in revisions at least >= 0x03 (Version G). This patch enables 16-bit fan readings on all revisions >= 0x03 just like the it8712, it8716, and it8718 chips. Signed-off-by: Andrew Paprocki <andrew@ishiboo.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07Andrew Paprocki2008-08-062-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The it8712 chip supports 16-bit fan tachometers in revisions >= 0x07. Revisions >= 0x08 dropped support for 8-bit fan divisor registers. The patch enables 16-bit fan readings on all revisions >= 0x07 just like the it8716 and it8718 chips. Signed-off-by: Andrew Paprocki <andrew@ishiboo.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpusFrank Myhr2008-08-061-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMD NPT 0Fh cpus use 6 bit VID codes. Successive codes with msb 0 describe 25mV decrements, while those with msb 1 describe 12.5mV decrements. Existing hwmon-vid.c is correct only for codes with msb 0; add support for the codes with msb 1. Ref: p 309, Table 71 AMD Publication 32559, BIOS and Kernel Developer's Guide for AMD NPT Family 0Fh Processors http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf Signed-off-by: Frank Myhr <fmyhr@fhmtech.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyleFrank Myhr2008-08-061-69/+71
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Frank Myhr <fmyhr@fhmtech.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: ad7414 driverSean MacLennan2008-08-063-0/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Driver for the Analog Devices AD7414 temperature monitoring chip. Signed-off-by: Sean MacLennan <smaclennan@pikatech.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (thmc50) Add support for critical temperature limitsKrzysztof Helt2008-08-061-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add critical temperature limits to the driver. These limits are read only. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (adm9240) Remove EXPERIMENTAL dependencyGrant Coady2008-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The adm9240 driver is in the kernel for three years now, time to remove the EXPERIMENTAL dependency. Signed-off-by: Grant Coady <gcoady.lk@gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (w83627hf) Drop reset module parameterJean Delvare2008-08-062-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the reset parameter of the w83627hf driver. It seems it wasn't that useful. It was dropped from the Linux 2.4 version of this driver back in July 2004. The only users who have reported that they were still using this parameter, needed it to switch the chip from automatic fan speed control back to manual mode. Now that the driver creates pwmN_enable sysfs files, users will be able to use these files instead, which is way less agressive. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Dominik Geyer <dominik.geyer@gmx.de>
| * | | | hwmon: (w83627hf) Add pwm_enable sysfs interfaceDominik Geyer2008-08-061-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for pwm_enable sysfs interface for the w83627hf driver. Signed-off-by: Dominik Geyer <dominik.geyer@gmx.de> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (w83791d) Use fan divisor bits from vbat registerMarc Hulsman2008-08-062-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update w83791d with fan bits in vbat mon register (7.48 of the datasheet). This change allows all fans to have a divisor of 128, and fixes a problem with incorrectly reported fan speeds. Signed-off-by: Marc Hulsman <m.hulsman@tudelft.nl> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (f71882fg) Delete needless forward declarationsJean Delvare2008-08-061-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions aren't used before being defined, so there's no point in forward-declaring them. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Hans de Goede <j.w.r.degoede@hhs.nl>
| * | | | hwmon: (dme1737) Add support for the SMSC SCH5027Juerg Haefliger2008-08-063-81/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the SCH5027. The differences to the DME1737 are: - No support for programmable temp offsets - In auto mode, PWM outputs stay on min value if temp goes below low threshold and can't be programmed to fully turn off - Different voltage scaling - No VID input Signed-off-by: Juerg Haefliger <juergh@gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (dme1737) Skip detection if forcedJuerg Haefliger2008-08-061-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip the checking of the device ID register in the hwmon register block if the force_id option is used. Signed-off-by: Juerg Haefliger <juergh@gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | | | hwmon: (dme1737) CleanupsJuerg Haefliger2008-08-061-47/+47
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix names of attribute structs to make them more consistent with the rest of the code. Minor comment changes. Signed-off-by: Juerg Haefliger <juergh at gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2008-08-0870-3746/+3837
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (70 commits) [WATCHDOG] more coding style clean-up's [WATCHDOG] sbc8360.c - move stop code into a function [WATCHDOG] Coding style - Indentation - part 2 [WATCHDOG] Coding style - Indentation - part 1 [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs [WATCHDOG] mpc8xxx_wdt: fix build [WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g [WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt [WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs [WATCHDOG] mpc83xx_wdt: convert to the OF platform driver [WATCHDOG] pcwd: a couple of watchdogs escaped conversion [WATCHDOG] Clean-up includes [WATCHDOG] hpwdt.c - fix double includes [WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl [WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl [WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style [WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl [WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl [WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl [WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl ...
| * | | | [WATCHDOG] more coding style clean-up'sWim Van Sebroeck2008-08-0640-227/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More coding style clean-up's. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | | | [WATCHDOG] sbc8360.c - move stop code into a functionWim Van Sebroeck2008-08-061-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the sbc8360.c watchdog stop code into a seperate function. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | | | [WATCHDOG] Coding style - Indentation - part 2Wim Van Sebroeck2008-08-0654-428/+428
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the watchdog drivers into line with coding style. This patch takes cares of the indentation as described in chapter 1. Main changes: * Re-structure the ioctl switch call for all drivers as follows: switch (cmd) { case WDIOC_GETSUPPORT: case WDIOC_GETSTATUS: case WDIOC_GETBOOTSTATUS: case WDIOC_GETTEMP: case WDIOC_SETOPTIONS: case WDIOC_KEEPALIVE: case WDIOC_SETTIMEOUT: case WDIOC_GETTIMEOUT: case WDIOC_GETTIMELEFT: default: } This to make the migration from the drivers to the uniform watchdog device driver easier in the future. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | | | [WATCHDOG] Coding style - Indentation - part 1Wim Van Sebroeck2008-08-066-121/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the watchdog drivers into line with coding style. This patch takes cares of the indentation as described in chapter 1: The preferred way to ease multiple indentation levels in a switch statement is to align the "switch" and its subordinate "case" labels in the same column instead of "double-indenting" the "case" labels. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>