aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-08-15Merge branch 'for-linus' of ↵Linus Torvalds14-27/+147
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: sound/usb/format: silence uninitialized variable warnings MAINTAINERS: Add Ian Lartey as comaintaner for Wolfson devices MAINTAINERS: Make Wolfson entry also cover CODEC drivers ASoC: Only tweak WM8994 chip configuration on devices up to rev D ASoC: Optimise DSP performance for WM8994 ALSA: hda - Fix dynamic ADC change working again ALSA: hda - Restrict PCM parameters per ELD information over HDMI sound: oss: sh_dac_audio.c removed duplicated #include
2010-08-15Merge branch 'idle-release' of ↵Linus Torvalds2-56/+8
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: intel_idle: recognize Lincroft Atom Processor intel_idle: no longer EXPERIMENTAL intel_idle: disable module support intel_idle: add support for Westmere-EX intel_idle: delete power_policy modparam, and choose substate functions intel_idle: delete substates DEBUG modparam
2010-08-15Merge branch 'fix/asoc' into for-linusTakashi Iwai2-11/+19
2010-08-15Merge branch 'fix/hda' into for-linusTakashi Iwai10-15/+120
2010-08-15ALSA: sound/usb/format: silence uninitialized variable warningsDan Carpenter1-0/+8
Gcc complains that ret might be used uninitialized: sound/usb/format.c: In function ‘snd_usb_parse_audio_format’: sound/usb/format.c:354: warning: ‘ret’ may be used uninitialized in this function sound/usb/format.c:354: note: ‘ret’ was declared here sound/usb/format.c:414: warning: ‘ret’ may be used uninitialized in this function sound/usb/format.c:414: note: ‘ret’ was declared here I suppose it could be uninitialized if there is ever a UAC_VERSION_3 released. Anyway this patch is worthwhile if only to silence the gcc warning. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Daniel Mack <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-08-14intel_idle: recognize Lincroft Atom ProcessorArjan van de Ven1-0/+1
Signed-off-by: Arjan van de Ven <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-08-14Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanupLinus Torvalds225-207643/+1568
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup: defconfig reduction kbuild: drop unifdef-y support archs: replace unifdef-y with header-y include: replace unifdef-y with header-y
2010-08-14fusion: add function parameter names to kernel-docRandy Dunlap1-0/+2
Fix fusion missing kernel-doc: Warning(drivers/message/fusion/mptbase.c:649): No description found for parameter 'func_name' Warning(drivers/message/fusion/mptbase.c:8010): No description found for parameter 'cb_idx' Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-14fs/dcache: fix function param name in kernel-docRandy Dunlap1-1/+1
Fix parameter name in kernel-doc notation (causes a warning). Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-14fusion: fix non-kernel-doc comment blockRandy Dunlap1-1/+1
Fix comment begin notation not to look like kernel-doc since it's not. Removes kernel-doc warnings. Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-14mm/page-writeback: fix non-kernel-doc function commentsRandy Dunlap1-2/+2
Remove leading /** from non-kernel-doc function comments to prevent kernel-doc warnings. Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-14Documentation: move SCSI parameters to their own text fileRandy Dunlap2-126/+141
Move SCSI parameters from kernel-parameters.txt to their own text file. This continues a trend of moving non-core parameters out of kernel-parameters.txt. Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-14Merge branch 'hwmon-for-linus' of ↵Linus Torvalds21-133/+2085
git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (22 commits) hwmon: (via-cputemp) Remove bogus "SHOW" global variable hwmon: jc42 depends on I2C hwmon: (pc87427) Add a maintainer hwmon: (pc87427) Move sysfs file removal to a separate function hwmon: (pc87427) Add temperature monitoring support hwmon: (pc87427) Add support for the second logical device hwmon: (pc87427) Add support for manual fan speed control hwmon: (pc87427) Minor style cleanups hwmon: (pc87427) Handle disabled fan inputs properly hwmon: (w83627ehf) Add support for W83667HG-B hwmon: (w83627ehf) Driver cleanup hwmon: Add driver for SMSC EMC2103 temperature monitor and fan controller hwmon: Remove in[0-*]_fault from sysfs-interface hwmon: Add 4 current alarm/beep attributes to sysfs-interface hwmon: Add 3 critical limit attributes to sysfs-interface hwmon: (asc7621) Clean up and improve detect function hwmon: (it87) Export labels for internal sensors hwmon: (lm75) Add suspend/resume feature hwmon: (emc1403) Add power support hwmon: (ltc4245) Expose all GPIO pins as analog voltages ...
2010-08-14defconfig reductionSam Ravnborg197-207237/+1181
Use the defconfig files generated by "make savedefconfig" for remaining defconfig files. Signed-off-by: Sam Ravnborg <[email protected]>
2010-08-14kbuild: drop unifdef-y supportSam Ravnborg2-8/+1
unifdef-y is not used anymore - drop remaining references Signed-off-by: Sam Ravnborg <[email protected]>
2010-08-14archs: replace unifdef-y with header-ySam Ravnborg11-73/+65
unifdef-y and header-y have same semantic, so drop unifdef-y Signed-off-by: Sam Ravnborg <[email protected]>
2010-08-14include: replace unifdef-y with header-ySam Ravnborg15-325/+321
unifdef-y and header-y has same semantic. So there is no need to have both. Drop the unifdef-y variant and sort all lines again Signed-off-by: Sam Ravnborg <[email protected]>
2010-08-14Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds41-365/+1516
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (28 commits) [SCSI] qla4xxx: fix compilation warning [SCSI] make error handling more robust in the face of reservations [SCSI] tgt: fix warning [SCSI] drivers/message/fusion: Adjust confusing if indentation [SCSI] Return NEEDS_RETRY for eh commands with status BUSY [SCSI] ibmvfc: Driver version 1.0.9 [SCSI] ibmvfc: Fix terminate_rport_io [SCSI] ibmvfc: Fix rport add/delete race resulting in oops [SCSI] lpfc 8.3.16: Change LPFC driver version to 8.3.16 [SCSI] lpfc 8.3.16: FCoE Discovery and Failover Fixes [SCSI] lpfc 8.3.16: SLI Additions, updates, and code cleanup [SCSI] pm8001: introduce missing kfree [SCSI] qla4xxx: Update driver version to 5.02.00-k3 [SCSI] qla4xxx: Added AER support for ISP82xx [SCSI] qla4xxx: Handle outstanding mbx cmds on hung f/w scenarios [SCSI] qla4xxx: updated mbx_sys_info struct to sync with FW 4.6.x [SCSI] qla4xxx: clear AF_DPC_SCHEDULED flage when exit from do_dpc [SCSI] qla4xxx: Stop firmware before doing init firmware. [SCSI] qla4xxx: Use the correct request queue. [SCSI] qla4xxx: set correct value in sess->recovery_tmo ...
2010-08-14hwmon: (via-cputemp) Remove bogus "SHOW" global variableH. Peter Anvin1-1/+1
The via-cputemp hwmon driver was probably intending "typedef enum { ... } SHOW;", but the "typedef" was missing creating a global variable named "SHOW". There is absolutely no reason to have this in the global namespace. Signed-off-by: H. Peter Anvin <[email protected]> Acked-by: Harald Welte <[email protected]> Cc: Juerg Haefliger <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: jc42 depends on I2CRandy Dunlap1-0/+1
jc42 uses i2c interfaces, so it should depend on I2C. drivers/hwmon/jc42.c:426: error: implicit declaration of function 'i2c_check_functionality' drivers/hwmon/jc42.c:521: error: implicit declaration of function 'i2c_smbus_read_word_data' drivers/hwmon/jc42.c:529: error: implicit declaration of function 'i2c_smbus_write_word_data' drivers/hwmon/jc42.c:580: error: implicit declaration of function 'i2c_add_driver' drivers/hwmon/jc42.c:585: error: implicit declaration of function 'i2c_del_driver' Signed-off-by: Randy Dunlap <[email protected]> Acked-by: Guenter Roeck <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: (pc87427) Add a maintainerJean Delvare1-0/+7
As I made significant changes to the pc87427 driver, I'll be maintaining it for the year to come. Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: (pc87427) Move sysfs file removal to a separate functionJean Delvare1-32/+26
The sysfs file removal code is the same in the probe error path and in the remove function, so move it to a separate function to avoid code duplication. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-08-14hwmon: (pc87427) Add temperature monitoring supportJean Delvare3-7/+379
Add support for the 6 temperature monitoring channels of the PC87427. Note that the sensors resolution can vary, and I couldn't find a way to figure it out, so we might have to compensate in user-space. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-08-14hwmon: (pc87427) Add support for the second logical deviceJean Delvare1-42/+87
The second logical device contains the voltage and temperature registers. We have to extend the driver to support a second logical device before we can add support for these features. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-08-14hwmon: (pc87427) Add support for manual fan speed controlJean Delvare3-5/+282
Add initial support for PWM outputs of the PC87427 Super-I/O chip. Only mode change and manual fan speed control are supported. Automatic mode configuration isn't supported, and won't be until at least one board is known, which makes uses of the PWM outputs. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-08-14hwmon: (pc87427) Minor style cleanupsJean Delvare1-15/+16
Follow the best practice of the day. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-08-14hwmon: (pc87427) Handle disabled fan inputs properlyJean Delvare1-9/+58
Most fan input pins of the PC87427 can have alternate functions. Update the driver to check the configuration register and only support fan inputs which are really used for fan monitoring. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-08-14hwmon: (w83627ehf) Add support for W83667HG-BGuenter Roeck2-14/+43
Add support for W83667HG-B (very similar to the W83667HG). Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: (w83627ehf) Driver cleanupGuenter Roeck1-3/+56
- Moved fan pwm register array pointers into per-instance data. - Only read fan pwm data for installed/supported fans. - Update fan max output and fan step output information from data in registers. - Create max_output and step_output attribute files only if respective fan pwm registers exist. Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: Add driver for SMSC EMC2103 temperature monitor and fan controllerSteve Glendinning5-0/+791
SMSC's EMC2103 family of temperature/fan controllers have 1 onboard and up to 3 external temperature sensors, and allow closed-loop control of one fan. This patch adds support for them. Signed-off-by: Steve Glendinning <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: Remove in[0-*]_fault from sysfs-interfaceJean Delvare1-1/+0
Fault files are for hardware failures that can be reported. So far we've seen chips reporting such failures for temperature sensors and fans, but not for voltages. Remove in[0-*]_fault for now. It can be added back later if really needed, but I doubt it. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-08-14hwmon: Add 4 current alarm/beep attributes to sysfs-interfaceGuenter Roeck1-3/+4
Add currX_alarm, currX_min_alarm, currX_max_alarm and currX_beep attributes to the hwmon sysfs API. currX_min_alarm and currX_max_alarm are already supported by the LTC4215 and LTC4245 drivers. currX_alarm is supported by the LTC4261 driver. Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: Add 3 critical limit attributes to sysfs-interfaceGuenter Roeck1-1/+20
Added _lcrit and _crit to voltage attributes. Added _lcrit to temperature attributes. Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: (asc7621) Clean up and improve detect functionJean Delvare1-7/+2
* The dev variable is never used. * Detect functions only need to set info->type, not client->name. * Include the device address in the log message. Signed-off-by: Jean Delvare <[email protected]> Cc: George Joseph <[email protected]> Cc: Ken Milmore <[email protected]>
2010-08-14hwmon: (it87) Export labels for internal sensorsJean Delvare1-2/+44
Some voltage sensors can be wired internally to the IT87xxF chip's own power supply channels. In that case, we can inform user-space that the wiring is known by exporting proper labels for these sensors. Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: (lm75) Add suspend/resume featureShubhrajyoti Datta2-0/+40
There is a shutdown feature at suspend it can be enabled to reduce current consumption and resume it can be switched off. Signed-off-by: Shubhrajyoti Datta <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: (emc1403) Add power supportAlan Cox1-0/+33
Add back the power interface we lost due to a slight misunderstanding of the maintainers wishes. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: (ltc4245) Expose all GPIO pins as analog voltagesIra W. Snyder3-11/+211
Add support for exposing all GPIO pins as analog voltages. Though this is not an ideal use of the chip, some hardware engineers may decide that the LTC4245 meets their design requirements when studying the datasheet. The GPIO pins are sampled in round-robin fashion, meaning that a slow reader will see stale data. A userspace application can detect this, because it will get -EAGAIN when reading from a sysfs file which contains stale data. Users can choose to use this feature on a per-chip basis by using either platform data or the OF device tree (where applicable). Signed-off-by: Ira W. Snyder <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14hwmon: (pc87360) Fix device resource declarationJean Delvare1-14/+17
It's not OK to call platform_device_add_resources() multiple times in a row. Despite its name, this functions sets the resources, it doesn't add them. So we have to prepare an array with all the resources, and then call platform_device_add_resources() once. Before this fix, only the last I/O resource would be actually registered. The other I/O resources were leaked. Signed-off-by: Jean Delvare <[email protected]> Cc: Jim Cromie <[email protected]> Cc: [email protected]
2010-08-14hwmon: (k8temp) Adjust confusing if indentationJulia Lawall1-1/+2
Move the if(err) statement after the if into the if branch indicated by its indentation. The preceding if(err) test implies that err cannot be nonzero unless the if branch is taken. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r disable braces5@ position p1,p2; statement S1,S2; @@ ( if (...) { ... } | if (...) S1@p1 S2@p2 ) @script:python@ p1 << r.p1; p2 << r.p2; @@ if (p1[0].column == p2[0].column): cocci.print_main("branch",p4) cocci.print_secs("after",p5) // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-08-14Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linuxLinus Torvalds11-65/+213
* 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux: DMAENGINE: correct PL080 register header file ARM: SAMSUNG: Fix on build warning about dependency in Kconfig ARM: SMDK6410: Make virtual screen twice depth of real ARM: S3C64XX: Update consistent DMA size to 8MiB ARM: S3C64XX: Add audio support to SmartQ ARM: S3C64XX: Framebuffer fix for SmartQ5 ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file ARM: mach-real6410: add sdhc device support ARM: mach-real6410: add dm9000 ethernet support for mach-real6410 ARM: S3C64XX: Support for Real6410 Fix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c ("remove pixclock" vs "Framebuffer fix for SmartQ5")
2010-08-14Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linuxLinus Torvalds6-66/+980
* 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux: i2c/nuc900: add i2c driver support for nuc900 i2c: Enable NXP LPC support in Kconfig i2c-pxa: fix compiler warning, due to missing const i2c: davinci: bus recovery procedure to clear the bus i2c: davinci: Add cpufreq support i2c: davinci: Add suspend/resume support i2c: davinci: Add helper functions for power management i2c: davinci: misc. cleanups: remove MOD_REG_BIT and IO_ADDRESS usage i2c: davinci: Fix smbus Oops with AIC33 usage
2010-08-14Documentation: DMA-API-HOWTO.txt: rename ARCH_KMALLOC_MINALIGN to ↵FUJITA Tomonori1-3/+3
ARCH_DMA_MINALIGN ARCH_KMALLOC_MINALIGN was renamed to ARCH_DMA_MINALIGN (the commit a6eb9fe105d5de0053b261148cee56c94b4720ca). ARCH_DMA_MINALIGN must be defined instead of ARCH_KMALLOC_MINALIGN to ensure that kmalloc'ed buffer is DMA-safe. Signed-off-by: FUJITA Tomonori <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-14Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds14-147/+353
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: spi/amba_pl022: Fix probe and remove hook section annotations. spi/mpc5121: change annotations for probe and remove functions spi/bitbang: reinitialize transfer parameters for every message spi/spi-gpio: add support for controllers without MISO or MOSI pin spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes SPI100k: Fix 8-bit and RX-only transfers spi/mmc_spi: mmc_spi adaptations for SPI bus locking API spi/mmc_spi: SPI bus locking API, using mutex Fix trivial conflict in drivers/spi/mpc512x_psc_spi.c due to 'struct of_device' => 'struct platform_device' rename and __init/__exit to __devinit/__devexit fix.
2010-08-14mm: fix page table unmap for stack guard page properlyLinus Torvalds1-7/+6
We do in fact need to unmap the page table _before_ doing the whole stack guard page logic, because if it is needed (mainly 32-bit x86 with PAE and CONFIG_HIGHPTE, but other architectures may use it too) then it will do a kmap_atomic/kunmap_atomic. And those kmaps will create an atomic region that we cannot do allocations in. However, the whole stack expand code will need to do anon_vma_prepare() and vma_lock_anon_vma() and they cannot do that in an atomic region. Now, a better model might actually be to do the anon_vma_prepare() when _creating_ a VM_GROWSDOWN segment, and not have to worry about any of this at page fault time. But in the meantime, this is the straightforward fix for the issue. See https://bugzilla.kernel.org/show_bug.cgi?id=16588 for details. Reported-by: Wylda <[email protected]> Reported-by: Sedat Dilek <[email protected]> Reported-by: Mike Pagano <[email protected]> Reported-by: François Valenduc <[email protected]> Tested-by: Ed Tomlinson <[email protected]> Cc: Pekka Enberg <[email protected]> Cc: Greg KH <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2010-08-14intel_idle: no longer EXPERIMENTALLen Brown1-1/+0
This is a fully supported driver. Signed-off-by: Len Brown <[email protected]>
2010-08-14intel_idle: disable module supportLen Brown1-1/+1
Right now the module capability is cauing more trouble than it is worth. At least one distro built intel_idle as a module where it lost the init race with ACPI, making it useless. Make intel_idle bool so that if you select it, you will use it. We can restore module capability after cpuidle is enhanced to handle run-time changing of idle drivers. Signed-off-by: Len Brown <[email protected]>
2010-08-14Merge branch 'for-2636/s3c64xx' into for-linus/samsung-2635Ben Dooks8-62/+208
2010-08-14DMAENGINE: correct PL080 register header fileLinus Walleij2-2/+4
This PL008 among all other variables named PL080 doesn't seem right. Fix it. Also add some missing defined that I use in the new PL08x driver. Acked-by: Ben Dooks <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2010-08-14ARM: SAMSUNG: Fix on build warning about dependency in KconfigKukjin Kim1-1/+1
This patch fixes on following build warning. warning: (PLAT_S5P && (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5PV310) || ARCH_S3C64XX && <choice>) selects PLAT_SAMSUNG which has unmet direct dependencies (ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX) Signed-off-by: Kukjin Kim <[email protected]> Cc: Ben Dooks <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.