]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:44:56 +0000 (16:44 +1000)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig

13 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:33:57 +0000 (16:33 +1000)]
Merge remote-tracking branch 'osd/linux-next'

13 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 22 Sep 2011 06:32:33 +0000 (16:32 +1000)]
Merge remote-tracking branch 'iommu/next'

13 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 22 Sep 2011 06:32:21 +0000 (16:32 +1000)]
Merge remote-tracking branch 'watchdog/master'

13 years agoMerge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:31:40 +0000 (16:31 +1000)]
Merge remote-tracking branch 'agp/agp-next'

13 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 22 Sep 2011 06:29:04 +0000 (16:29 +1000)]
Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

13 years agoMerge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:27:41 +0000 (16:27 +1000)]
Merge remote-tracking branch 'voltage/for-next'

13 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:26:24 +0000 (16:26 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c

13 years agoMerge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:23:41 +0000 (16:23 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'

13 years agoMerge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:22:19 +0000 (16:22 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'

13 years agoMerge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:20:51 +0000 (16:20 +1000)]
Merge remote-tracking branch 'mfd/for-next'

13 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:19:31 +0000 (16:19 +1000)]
Merge remote-tracking branch 'md/for-next'

13 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:13:12 +0000 (16:13 +1000)]
Merge remote-tracking branch 'slab/for-next'

13 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:13:03 +0000 (16:13 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

13 years agoMerge commit 'refs/next/20110921/mmc'
Stephen Rothwell [Thu, 22 Sep 2011 06:10:52 +0000 (16:10 +1000)]
Merge commit 'refs/next/20110921/mmc'

13 years agoMerge remote-tracking branch 'leds/for-mm'
Stephen Rothwell [Thu, 22 Sep 2011 05:51:21 +0000 (15:51 +1000)]
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

13 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 22 Sep 2011 05:49:35 +0000 (15:49 +1000)]
Merge remote-tracking branch 'battery/master'

13 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 22 Sep 2011 05:48:02 +0000 (15:48 +1000)]
Merge branch 'quilt/device-mapper'

13 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 05:45:55 +0000 (15:45 +1000)]
Merge remote-tracking branch 'block/for-next'

13 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 22 Sep 2011 05:42:53 +0000 (15:42 +1000)]
Merge remote-tracking branch 'input/next'

13 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Thu, 22 Sep 2011 05:41:34 +0000 (15:41 +1000)]
Merge branch 'quilt/rr'

13 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Thu, 22 Sep 2011 05:40:17 +0000 (15:40 +1000)]
Merge remote-tracking branch 'cpufreq/next'

13 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 05:38:51 +0000 (15:38 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

13 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 05:36:50 +0000 (15:36 +1000)]
Merge remote-tracking branch 'sound/for-next'

13 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 22 Sep 2011 05:31:33 +0000 (15:31 +1000)]
Merge remote-tracking branch 'crypto/master'

13 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 22 Sep 2011 05:30:14 +0000 (15:30 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c

13 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 22 Sep 2011 05:17:47 +0000 (15:17 +1000)]
Merge remote-tracking branch 'bluetooth/master'

13 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Thu, 22 Sep 2011 05:16:11 +0000 (15:16 +1000)]
Merge remote-tracking branch 'wireless/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c

13 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 22 Sep 2011 05:10:37 +0000 (15:10 +1000)]
Merge remote-tracking branch 'net/master'

Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
drivers/s390/cio/qdio_main.c

13 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 22 Sep 2011 03:21:23 +0000 (13:21 +1000)]
Merge remote-tracking branch 'slave-dma/next'

13 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Thu, 22 Sep 2011 03:19:17 +0000 (13:19 +1000)]
Merge remote-tracking branch 'scsi/master'

13 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Thu, 22 Sep 2011 03:19:13 +0000 (13:19 +1000)]
Merge remote-tracking branch 'ibft/master'

13 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Thu, 22 Sep 2011 03:19:07 +0000 (13:19 +1000)]
Merge remote-tracking branch 'swiotlb/master'

13 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 03:17:50 +0000 (13:17 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

13 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 03:16:27 +0000 (13:16 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

13 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 22 Sep 2011 03:15:10 +0000 (13:15 +1000)]
Merge remote-tracking branch 'libata/NEXT'

13 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 03:15:05 +0000 (13:15 +1000)]
Merge remote-tracking branch 'kconfig/for-next'

13 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 03:13:42 +0000 (13:13 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

13 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Thu, 22 Sep 2011 03:02:59 +0000 (13:02 +1000)]
Merge remote-tracking branch 'docs/docs-move'

13 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Thu, 22 Sep 2011 03:01:48 +0000 (13:01 +1000)]
Merge branch 'quilt/kernel-doc'

13 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 22 Sep 2011 03:00:27 +0000 (13:00 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

13 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 22 Sep 2011 02:59:16 +0000 (12:59 +1000)]
Merge branch 'quilt/jdelvare-hwmon'

13 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Thu, 22 Sep 2011 02:57:55 +0000 (12:57 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

13 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Thu, 22 Sep 2011 02:56:44 +0000 (12:56 +1000)]
Merge branch 'quilt/i2c'

13 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:55:24 +0000 (12:55 +1000)]
Merge remote-tracking branch 'hid/for-next'

13 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Thu, 22 Sep 2011 02:53:57 +0000 (12:53 +1000)]
Merge remote-tracking branch 'xfs/master'

Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c

13 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:52:45 +0000 (12:52 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:51:17 +0000 (12:51 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

13 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:45:19 +0000 (12:45 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 22 Sep 2011 02:44:05 +0000 (12:44 +1000)]
Merge remote-tracking branch 'logfs/master'

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 22 Sep 2011 02:42:52 +0000 (12:42 +1000)]
Merge remote-tracking branch 'gfs2/master'

13 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 22 Sep 2011 02:41:32 +0000 (12:41 +1000)]
Merge remote-tracking branch 'ext4/dev'

13 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:40:12 +0000 (12:40 +1000)]
Merge remote-tracking branch 'ceph/for-next'

13 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Thu, 22 Sep 2011 02:39:01 +0000 (12:39 +1000)]
Merge remote-tracking branch 'xtensa/master'

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 22 Sep 2011 02:37:51 +0000 (12:37 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 22 Sep 2011 02:36:38 +0000 (12:36 +1000)]
Merge remote-tracking branch 'tile/master'

13 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Thu, 22 Sep 2011 02:35:27 +0000 (12:35 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

13 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 22 Sep 2011 02:34:15 +0000 (12:34 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 22 Sep 2011 02:27:59 +0000 (12:27 +1000)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Thu, 22 Sep 2011 02:26:42 +0000 (12:26 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 22 Sep 2011 02:20:25 +0000 (12:20 +1000)]
Merge remote-tracking branch 'powerpc/next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:19:04 +0000 (12:19 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:17:45 +0000 (12:17 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

13 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:16:35 +0000 (12:16 +1000)]
Merge remote-tracking branch 'm68k/for-next'

13 years agoMerge remote-tracking branch 'ia64/test'
Stephen Rothwell [Thu, 22 Sep 2011 02:15:21 +0000 (12:15 +1000)]
Merge remote-tracking branch 'ia64/test'

13 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Thu, 22 Sep 2011 02:14:04 +0000 (12:14 +1000)]
Merge branch 'quilt/hexagon'

13 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:12:47 +0000 (12:12 +1000)]
Merge remote-tracking branch 'cris/for-next'

13 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 22 Sep 2011 02:11:31 +0000 (12:11 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'

13 years agoMerge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Thu, 22 Sep 2011 02:11:29 +0000 (12:11 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'

13 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:08:13 +0000 (12:08 +1000)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
drivers/gpio/Makefile

13 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 01:51:47 +0000 (11:51 +1000)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile

13 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Thu, 22 Sep 2011 01:50:25 +0000 (11:50 +1000)]
Merge remote-tracking branch 'at91/at91-next'

13 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 01:49:12 +0000 (11:49 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/boot/dts/tegra-harmony.dts
arch/arm/boot/dts/tegra-seaboard.dts
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/plat-mxc/include/mach/gpio.h

13 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 01:43:25 +0000 (11:43 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c

13 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 01:42:07 +0000 (11:42 +1000)]
Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/mach-integrator/integrator_ap.c

13 years agoMerge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Thu, 22 Sep 2011 01:40:56 +0000 (11:40 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'

13 years agoMerge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Thu, 22 Sep 2011 01:40:43 +0000 (11:40 +1000)]
Merge remote-tracking branch 'wireless-current/master'

13 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Thu, 22 Sep 2011 01:40:43 +0000 (11:40 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'

13 years agoMerge remote-tracking branch 'arm-current/master'
Stephen Rothwell [Thu, 22 Sep 2011 01:40:39 +0000 (11:40 +1000)]
Merge remote-tracking branch 'arm-current/master'

13 years agobna: PCI Probe Conf Lock Fix
Rasesh Mody [Thu, 22 Sep 2011 00:55:41 +0000 (20:55 -0400)]
bna: PCI Probe Conf Lock Fix

If register_netdev() fails now, then we call mutex_unlock(&bnad->conf_mutex);
on the error path, but it's already unlocked. So we acquire the lock in error
path which will be later unlocked after the cleanup.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agoMerge branch 'master' of github.com:davem330/net-next
David S. Miller [Thu, 22 Sep 2011 00:44:50 +0000 (20:44 -0400)]
Merge branch 'master' of github.com:davem330/net-next

13 years agohwmon: (exynos4_tmu) Remove IRQF_DISABLED
Yong Zhang [Wed, 21 Sep 2011 09:28:57 +0000 (05:28 -0400)]
hwmon: (exynos4_tmu) Remove IRQF_DISABLED

Since commit [c58543c8: genirq: Run irq handlers with interrupts disabled],
we run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).

So now this flag is a NOOP and can be removed.

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
13 years agohwmon: Add unspecified temperature thresholds to sysfs ABI
Guenter Roeck [Sun, 18 Sep 2011 18:47:48 +0000 (11:47 -0700)]
hwmon: Add unspecified temperature thresholds to sysfs ABI

Some recent temperature sensor chips provide thresholds which are not associated
with lower or upper limits. The use of those thresholds is application specific.

Provide sysfs ABI attributes to support such thresholds.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Durgadoss R <durgadoss.r@intel.com>
13 years agohwmon: (coretemp) Add support for thermal threshold attributes
Guenter Roeck [Tue, 20 Sep 2011 15:18:28 +0000 (08:18 -0700)]
hwmon: (coretemp) Add support for thermal threshold attributes

Add support for T0 and T1 temperature thresholds using the new sysfs ABI
attributes tempX_thresholdY and tempX_thresholdY_triggered.

This patch is based on commit c814a4c7c4aad795835583344353963a0a673eb0, which
was reverted. For details on the threshold registers, see IA Manual vol 3A,
which can be downloaded from here:
        http://download.intel.com/design/processor/manuals/253668.pdf

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Durgadoss R <durgadoss.r@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
13 years agohwmon/f71882fg: Make the decision wether to register fan attr. per fan
Hans de Goede [Fri, 9 Sep 2011 10:12:35 +0000 (12:12 +0200)]
hwmon/f71882fg: Make the decision wether to register fan attr. per fan

Before this patch the f71882fg driver completely fails to initialize
on systems which have reserved settings in the pwm enable register, and
it disables all auto pwm sysfs attributes if any fan is controlled by
a digital sensor reading.

This patch changes the fail to initialize into don't register any attributes
for the fan for which there are reserved settings in the pwm enable register
and also makes the not registering of auto pwm sysfs attributes a per fan
thing.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
13 years agohwmon/f71882fg: Add a f71882fg_create_fan_sysfs_files helper function
Hans de Goede [Fri, 9 Sep 2011 10:12:34 +0000 (12:12 +0200)]
hwmon/f71882fg: Add a f71882fg_create_fan_sysfs_files helper function

This is a preparation patch for not registering fan/pwm attributes for
some fans (rather then register them for all or for none).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
13 years agohwmon/f71882fg: Make all fan/pwm attr tables 2 dimensional
Hans de Goede [Fri, 9 Sep 2011 10:12:33 +0000 (12:12 +0200)]
hwmon/f71882fg: Make all fan/pwm attr tables 2 dimensional

This is a preparation patch for not registering fan/pwm attributes for
some fans (rather then register them for all or for none).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
13 years agohwmon: (pmbus) Add support for Intersil power management chips
Guenter Roeck [Sat, 30 Jul 2011 05:21:53 +0000 (22:21 -0700)]
hwmon: (pmbus) Add support for Intersil power management chips

Add support for Intersil / Zilker Labs ZL2004, ZL2006, ZL2008, ZL2105, ZL2106,
ZL6100, and ZL6105.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
13 years agohwmon: (pmbus) Always call _pmbus_read_byte in core driver
Guenter Roeck [Sat, 30 Jul 2011 05:19:39 +0000 (22:19 -0700)]
hwmon: (pmbus) Always call _pmbus_read_byte in core driver

Always call _pmbus_read_byte() instead of pmbus_read_byte() in PMBus core
driver. With this change, device specific read functions can be implemented for
all registers.

Since the device specific read_byte function is now always called, we need to be
more careful with page validations. Only fail if the passed page number is larger
than 0, since -1 means "current page".

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
13 years agohwmon: (pmbus) Replace EINVAL return codes with more appropriate errors
Guenter Roeck [Thu, 1 Sep 2011 15:34:31 +0000 (08:34 -0700)]
hwmon: (pmbus) Replace EINVAL return codes with more appropriate errors

EINVAL was over-used in the code. Replace it with more appropriate errors.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
13 years agohwmon: (pmbus) Provide more documentation
Guenter Roeck [Sat, 27 Aug 2011 18:42:30 +0000 (11:42 -0700)]
hwmon: (pmbus) Provide more documentation

Provide more documentation describing PMBus driver functionality and the API
between the PMBus core driver and PMBus chip drivers.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
13 years agohwmon: Add driver for EXYNOS4 TMU
Donggeun Kim [Wed, 7 Sep 2011 09:49:08 +0000 (18:49 +0900)]
hwmon: Add driver for EXYNOS4 TMU

This patch allows to read temperature
from TMU(Thermal Management Unit) of SAMSUNG EXYNOS4 series of SoC.

Signed-off-by: Donggeun Kim <dg77.kim@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
13 years agohwmon: (pmbus/adm1275) Add support for ADM1276
Guenter Roeck [Thu, 14 Jul 2011 18:55:35 +0000 (11:55 -0700)]
hwmon: (pmbus/adm1275) Add support for ADM1276

ADM1276 is mostly compatible to ADM1275, with added support for input power
measurement. Add support for it to the ADM1275 driver.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
13 years agohwmon: (pmbus/adm1275) Add support for second current limit
Guenter Roeck [Tue, 2 Aug 2011 18:08:57 +0000 (11:08 -0700)]
hwmon: (pmbus/adm1275) Add support for second current limit

ADM1275 supports a second current limit, which can be configured as either lower
or upper limit. Add support for it and report it as either lower or upper
critical current limit.

Also replace error return code EINVAL for unsupported pages with ENXIO as this
is more appropriate for the observed condition.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
13 years agohwmon: (pmbus) Don't return errors from driver remove functions
Guenter Roeck [Fri, 26 Aug 2011 15:12:38 +0000 (08:12 -0700)]
hwmon: (pmbus) Don't return errors from driver remove functions

Driver remove functions have an error return value, but rarely return an error
in practice. If a driver does return an error from its remove function, the
driver won't be unloaded and is expected to stay alive.

pmbus_do_remove() is defined as returning an int, but always returns 0 (no
error). Calling code passes that return value on to high level driver
remove functions, but does not evaluate it and removes driver data even if
pmbus_do_remove() returned an error (which it in practice never does). Even if
this code could never cause a real problem, it is nevertheless conceptually
wrong.

To reduce confusion and simplify the code, change pmbus_do_remove() to be a void
function, and have PMBus client drivers always return zero in their driver
remove functions.

Reported-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
13 years agohwmon: (pmbus) Add comments explaining internal driver API return values
Guenter Roeck [Fri, 26 Aug 2011 15:01:51 +0000 (08:01 -0700)]
hwmon: (pmbus) Add comments explaining internal driver API return values

Return values for functions reading/writing manufacturer specific registers are
poorly explained. Add comments to improve documentation.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
13 years agohwmon: (w83627ehf) add caseopen detection
Dmitry Artamonow [Fri, 12 Aug 2011 20:41:11 +0000 (16:41 -0400)]
hwmon: (w83627ehf) add caseopen detection

Export caseopen alarm status into userspace for Winbond W83627*
and Nuvoton NCT677[56] chips and implement alarm clear attribute.
Second caseopen alarm on NCT6776 is also supported.

Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
13 years agohwmon: (ds620) Fix handling of negative temperatures
Roland Stigge [Wed, 21 Sep 2011 17:06:11 +0000 (13:06 -0400)]
hwmon: (ds620) Fix handling of negative temperatures

Signed (negative) temperatures were not handled correctly.

Signed-off-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: stable@kernel.org # v2.6.38+
13 years agohwmon: (w83791d) rename prototype parameter from 'register' to 'reg'
Chris Peterson [Wed, 21 Sep 2011 13:52:09 +0000 (06:52 -0700)]
hwmon: (w83791d) rename prototype parameter from 'register' to 'reg'

gcc -Wextra warns "register is not at beginning of declaration" because the
compiler thinks the parameter has been marked as a 'register' variable, but
the function prototype intended to name the parameter "register" (which is a
reserved keyword).

Signed-off-by: Chris Peterson <cpeterso@cpeterso.com>
Acked-by: Marc Hulsman <m.hulsman@tudelft.nl>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
13 years agohwmon: (coretemp) Don't use threshold registers for tempX_max
Guenter Roeck [Tue, 20 Sep 2011 04:41:16 +0000 (21:41 -0700)]
hwmon: (coretemp) Don't use threshold registers for tempX_max

With commit c814a4c7c4aad795835583344353963a0a673eb0, the meaning of tempX_max
was changed. It no longer returns the value of bits 8:15 of
MSR_IA32_TEMPERATURE_TARGET, but instead returns the value of CPU threshold
register T1. tempX_max_hyst was added to reflect the value of temperature
threshold register T0.

As it turns out, T0 and T1 are used on some systems, presumably by the BIOS.
Also, T0 and T1 don't have a well defined meaning. The thresholds may be used
as upper or lower limits, and it is not guaranteed that T0 <= T1. Thus, the new
attribute mapping does not reflect the actual usage of the threshold registers.
Also, register contents are changed during runtime by an entity other than the
hwmon driver, meaning the values cached by the driver do not reflect actual
register contents.

Revert most of c814a4c7c4aad795835583344353963a0a673eb0 to address the problem.
Support for T0 and T1 will be added back in with a separate commit, using new
attribute names.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Durgadoss R <durgadoss.r@intel.com>
Acked-by: Jean Delvare <khali@linux-fr.org>