]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Tue, 2 Apr 2013 02:46:46 +0000 (13:46 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'

Conflicts:
drivers/gpu/drm/i915/intel_dp.c

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:36:27 +0000 (13:36 +1100)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:34:55 +0000 (13:34 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:33:23 +0000 (13:33 +1100)]
Merge remote-tracking branch 'bluetooth/master'

11 years ago20130328/wireless-next
Stephen Rothwell [Tue, 2 Apr 2013 02:31:34 +0000 (13:31 +1100)]
20130328/wireless-next

Conflicts:
net/mac80211/sta_info.c

11 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:05:13 +0000 (13:05 +1100)]
Merge remote-tracking branch 'ipsec-next/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:00:34 +0000 (13:00 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/nfc/microread/mei.c

11 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Tue, 2 Apr 2013 01:57:15 +0000 (12:57 +1100)]
Merge remote-tracking branch 'dmaengine/next'

Conflicts:
drivers/dma/ioat/dma_v3.c

11 years ago20130328/slave-dma
Stephen Rothwell [Tue, 2 Apr 2013 01:35:53 +0000 (12:35 +1100)]
20130328/slave-dma

11 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 01:15:47 +0000 (12:15 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Tue, 2 Apr 2013 01:14:02 +0000 (12:14 +1100)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Tue, 2 Apr 2013 01:13:53 +0000 (12:13 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/base/power/qos.c

11 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Tue, 2 Apr 2013 00:49:43 +0000 (11:49 +1100)]
Merge remote-tracking branch 'idle/next'

11 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:47:50 +0000 (11:47 +1100)]
Merge remote-tracking branch 'pm/linux-next'

11 years agoMerge remote-tracking branch 'pstore/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:46:22 +0000 (11:46 +1100)]
Merge remote-tracking branch 'pstore/master'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:44:37 +0000 (11:44 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:42:46 +0000 (11:42 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/media/platform/Kconfig

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:41:20 +0000 (11:41 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:39:56 +0000 (11:39 +1100)]
Merge branch 'jdelvare-hwmon/master'

11 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:37:40 +0000 (11:37 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:36:10 +0000 (11:36 +1100)]
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c

11 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 2 Apr 2013 00:32:53 +0000 (11:32 +1100)]
Merge remote-tracking branch 'pci/next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:11:14 +0000 (11:11 +1100)]
Merge remote-tracking branch 'xfs/for-next'

Conflicts:
fs/xfs/xfs_iomap.c

11 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:09:50 +0000 (11:09 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:07:56 +0000 (11:07 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:06:23 +0000 (11:06 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:04:43 +0000 (11:04 +1100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:03:19 +0000 (11:03 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:01:56 +0000 (11:01 +1100)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 2 Apr 2013 00:00:33 +0000 (11:00 +1100)]
Merge remote-tracking branch 'f2fs/dev'

11 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 1 Apr 2013 23:59:02 +0000 (10:59 +1100)]
Merge remote-tracking branch 'ext4/dev'

11 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 1 Apr 2013 23:57:39 +0000 (10:57 +1100)]
Merge remote-tracking branch 'ext3/for_next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:56:10 +0000 (10:56 +1100)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:56:08 +0000 (10:56 +1100)]
Merge remote-tracking branch 'btrfs/next'

11 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:54:44 +0000 (10:54 +1100)]
Merge remote-tracking branch 'tile/master'

11 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:53:22 +0000 (10:53 +1100)]
Merge remote-tracking branch 'sparc-next/master'

11 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 1 Apr 2013 23:51:59 +0000 (10:51 +1100)]
Merge remote-tracking branch 'sh/sh-latest'

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 1 Apr 2013 23:50:36 +0000 (10:50 +1100)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'galak/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:48:08 +0000 (10:48 +1100)]
Merge remote-tracking branch 'galak/next'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:46:46 +0000 (10:46 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:39:54 +0000 (10:39 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:38:30 +0000 (10:38 +1100)]
Merge remote-tracking branch 'microblaze/next'

11 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:33:10 +0000 (10:33 +1100)]
Merge remote-tracking branch 'metag/for-next'

11 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:31:48 +0000 (10:31 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

11 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:30:25 +0000 (10:30 +1100)]
Merge remote-tracking branch 'ia64/next'

11 years agoMerge remote-tracking branch 'hexagon/linux-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:29:03 +0000 (10:29 +1100)]
Merge remote-tracking branch 'hexagon/linux-next'

11 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Mon, 1 Apr 2013 23:27:38 +0000 (10:27 +1100)]
Merge remote-tracking branch 'arm64/upstream'

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:26:12 +0000 (10:26 +1100)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:24:50 +0000 (10:24 +1100)]
Merge remote-tracking branch 'arc/for-next'

11 years agoMerge remote-tracking branch 'vfio-fixes/for-linus'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:23 +0000 (10:23 +1100)]
Merge remote-tracking branch 'vfio-fixes/for-linus'

11 years agoMerge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:22 +0000 (10:23 +1100)]
Merge remote-tracking branch 'rr-fixes/fixes'

11 years agoMerge remote-tracking branch 'dwmw2/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:14 +0000 (10:23 +1100)]
Merge remote-tracking branch 'dwmw2/master'

11 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:13 +0000 (10:23 +1100)]
Merge remote-tracking branch 'ide/master'

11 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:06 +0000 (10:23 +1100)]
Merge remote-tracking branch 'wireless/master'

11 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:04 +0000 (10:23 +1100)]
Merge remote-tracking branch 'sparc/master'

11 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:02 +0000 (10:23 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

11 years agoloop: prevent bdev freeing while device in use
Anatol Pomozov [Mon, 1 Apr 2013 16:47:56 +0000 (09:47 -0700)]
loop: prevent bdev freeing while device in use

struct block_device lifecycle is defined by its inode (see fs/block_dev.c) -
block_device allocated first time we access /dev/loopXX and deallocated on
bdev_destroy_inode. When we create the device "losetup /dev/loopXX afile"
we want that block_device stay alive until we destroy the loop device
with "losetup -d".

But because we do not hold /dev/loopXX inode its counter goes 0, and
inode/bdev can be destroyed at any moment. Usually it happens at memory
pressure or when user drops inode cache (like in the test below). When later in
loop_clr_fd() we want to use bdev we have use-after-free error with following
stack:

BUG: unable to handle kernel NULL pointer dereference at 0000000000000280
  bd_set_size+0x10/0xa0
  loop_clr_fd+0x1f8/0x420 [loop]
  lo_ioctl+0x200/0x7e0 [loop]
  lo_compat_ioctl+0x47/0xe0 [loop]
  compat_blkdev_ioctl+0x341/0x1290
  do_filp_open+0x42/0xa0
  compat_sys_ioctl+0xc1/0xf20
  do_sys_open+0x16e/0x1d0
  sysenter_dispatch+0x7/0x1a

To prevent use-after-free we need to grab the device in loop_set_fd()
and put it later in loop_clr_fd().

The issue is reprodusible on current Linus head and v3.3. Here is the test:

  dd if=/dev/zero of=loop.file bs=1M count=1
  while [ true ]; do
    losetup /dev/loop0 loop.file
    echo 2 > /proc/sys/vm/drop_caches
    losetup -d /dev/loop0
  done

[ Doing bdgrab/bput in loop_set_fd/loop_clr_fd is safe, because every
  time we call loop_set_fd() we check that loop_device->lo_state is
  Lo_unbound and set it to Lo_bound If somebody will try to set_fd again
  it will get EBUSY.  And if we try to loop_clr_fd() on unbound loop
  device we'll get ENXIO.

  loop_set_fd/loop_clr_fd (and any other loop ioctl) is called under
  loop_device->lo_ctl_mutex. ]

Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoMerge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
Linus Torvalds [Mon, 1 Apr 2013 22:06:34 +0000 (15:06 -0700)]
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux

Pull tegra clock driver fix from Mike Turquette:
 "Missing base address in Tegra clock driver results in non-operational
  PCIe.  On some devices this means that Ethernet will go uninitialized
  and other devices will fail.  This pull request fixes it with a single
  patch to pass the proper base address in the Tegra clock driver."

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
  clk: tegra: Allow PLLE training to succeed

11 years agoMerge tag 'for-3.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe
Linus Torvalds [Mon, 1 Apr 2013 22:06:00 +0000 (15:06 -0700)]
Merge tag 'for-3.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe

Pull FCoE fixes from Robert Love:
 "Critical patches to fix FCoE VN2VN mode with new interfaces targeting
  3.9-rc"

* tag 'for-3.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe:
  libfcoe: Fix fcoe_sysfs VN2VN mode
  libfc, fcoe, bnx2fc: Split fc_disc_init into fc_disc_{init, config}
  libfc, fcoe, bnx2fc: Always use fcoe_disc_init for discovery layer initialization
  fcoe: Fix deadlock between create and destroy paths
  bnx2fc: Make the fcoe_cltr the SCSI host parent

11 years agomwifiex: limit channel number not to overflow memory
Stone Piao [Sat, 30 Mar 2013 02:21:21 +0000 (19:21 -0700)]
mwifiex: limit channel number not to overflow memory

Limit the channel number in scan request, or the driver scan
config structure memory will be overflowed.

Cc: <stable@vger.kernel.org> # 3.5+
Signed-off-by: Stone Piao <piaoyun@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
11 years agoMerge tag 'nfc-fixes-3.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
John W. Linville [Mon, 1 Apr 2013 19:14:22 +0000 (15:14 -0400)]
Merge tag 'nfc-fixes-3.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes

Samuel Ortiz <sameo@linux.intel.com> says:

"This is the 2nd batch of NFC fixes for 3.9. This time we have:

- A crash fix for when a DGRAM LLCP socket is listening while the NFC adapter
  is physically removed.
- A potential double skb free when the LLCP socket receive queue is full.
- A fix for properly handling multiple and consecutive LLCP connections, and
  not trash the socket ack log.
- A build failure for the MEI microread physical layer, now that the MEI bus
  APIs have been merged into char-misc-next."

Signed-off-by: John W. Linville <linville@tuxdriver.com>
11 years agoMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
John W. Linville [Mon, 1 Apr 2013 19:09:48 +0000 (15:09 -0400)]
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

11 years agoMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
John W. Linville [Mon, 1 Apr 2013 19:09:28 +0000 (15:09 -0400)]
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

11 years agoclk: tegra: Allow PLLE training to succeed
Thierry Reding [Thu, 14 Mar 2013 15:27:05 +0000 (16:27 +0100)]
clk: tegra: Allow PLLE training to succeed

Under some circumstances the PLLE needs to be retrained, in which case
access to the PMC registers is required. Fix this by passing a pointer
to the PMC registers instead of NULL when registering the PLLE clock.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
11 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Mon, 1 Apr 2013 17:36:50 +0000 (13:36 -0400)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agohwmon: (tmp401) Fix device detection for TMP411B and TMP411C
Guenter Roeck [Sat, 30 Mar 2013 00:56:07 +0000 (17:56 -0700)]
hwmon: (tmp401) Fix device detection for TMP411B and TMP411C

Turns out that TMP411B and TMP411C have different and unique device IDs.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
11 years agohwmon: Add driver for LM95234
Guenter Roeck [Sun, 10 Mar 2013 23:54:19 +0000 (16:54 -0700)]
hwmon: Add driver for LM95234

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (tmp401) Add support for TMP431
Guenter Roeck [Fri, 15 Mar 2013 19:55:08 +0000 (12:55 -0700)]
hwmon: (tmp401) Add support for TMP431

TMP431 is compatible to TMP401.

Also add support for additional I2C addresses supported by TMP411B
and TMP411C.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
11 years agohwmon: (pmbus/lm25066) Add support for LM25056
Guenter Roeck [Sat, 9 Feb 2013 23:15:52 +0000 (15:15 -0800)]
hwmon: (pmbus/lm25066) Add support for LM25056

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (pmbus/lm25066) Refactor device specific coefficients
Guenter Roeck [Sat, 9 Feb 2013 22:26:51 +0000 (14:26 -0800)]
hwmon: (pmbus/lm25066) Refactor device specific coefficients

Initialize device specific coefficients from table instead of hard-coding it
to simplify adding additional chips.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (pmbus/lm25066) Clamp limit attributes
Guenter Roeck [Thu, 7 Feb 2013 04:49:12 +0000 (20:49 -0800)]
hwmon: (pmbus/lm25066) Clamp limit attributes

Limits on all supported sensors and chips have to be within 0..0x0fff,
and limits are always positive.

Clamp written values in chip driver. Also clear value cache to ensure
that the actually written value is read back and reported correctly.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (pmbus/lm25066) Report VAUX as vmon
Guenter Roeck [Wed, 6 Feb 2013 17:55:37 +0000 (09:55 -0800)]
hwmon: (pmbus/lm25066) Report VAUX as vmon

So far the driver reported the voltage on VAUX as "vout2". This was not
entirely appropriate as it is not an output voltage, and complicates
the code. Use the new virtual "VMON" register set and report the voltage
as "vmon" instead.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (max6697) Use is_visible and sysfs_create_group
Guenter Roeck [Mon, 18 Mar 2013 13:40:16 +0000 (06:40 -0700)]
hwmon: (max6697) Use is_visible and sysfs_create_group

Simplify the code and reduce its size by using is_visible to determine
valid attributes, and sysfs_create_group to create all of them with
a single call.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (adt7310) Fix sparse warning
Guenter Roeck [Mon, 18 Mar 2013 10:46:12 +0000 (03:46 -0700)]
hwmon: (adt7310) Fix sparse warning

Fix: drivers/hwmon/adt7310.c:51:16: sparse: cast to restricted __be16

Cc: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (pmbus/ltc2978) Add support for LTC2974 and LTC3883
Guenter Roeck [Sun, 27 Jan 2013 17:24:28 +0000 (09:24 -0800)]
hwmon: (pmbus/ltc2978) Add support for LTC2974 and LTC3883

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (pmbus/ltc2978) Clean up documentation
Guenter Roeck [Fri, 22 Feb 2013 15:52:39 +0000 (07:52 -0800)]
hwmon: (pmbus/ltc2978) Clean up documentation

Some sysfs attributes are only supported on LTC2978 and not on LTC3880.
Update documentation to reflect which attributes are supported for which chips.

Output current attributes supported on LTC3880 were described as providing
input current values. Fix text to reflect that the attributes provide output
current values.

"reset history" attribute descriptions were misleading and seemed to imply
that all history was reset when writing a single attribute. Replace with more
accurate text.

Replace 'internal temperature" with "chip temperature". Temperature limits
not only apply to the chip temperature, but also to external temperatures
on LTC3880, so remove the word "chip" from the attribute description.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (pmbus/ltc2978) Code cleanup
Guenter Roeck [Thu, 28 Feb 2013 16:14:45 +0000 (08:14 -0800)]
hwmon: (pmbus/ltc2978) Code cleanup

Use u16 instead of int to store cached limit attributes.
This reduces allocated data size per driver instance by 48 bytes.
Use defines for the number of pages supported by individual chips.
Use ARRAY_SIZE for loops to initialize array variables, and
initialize all variables in the same code block.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (ltc4261) Fix 'Macros with complex values' checkpatch error
Guenter Roeck [Sun, 20 Jan 2013 05:24:23 +0000 (21:24 -0800)]
hwmon: (ltc4261) Fix 'Macros with complex values' checkpatch error

Fix:
ERROR: Macros with complex values should be enclosed in parenthesis

by unwinding the problematic macros.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (ltc4245) Fix 'Macros with complex values' checkpatch error
Guenter Roeck [Thu, 10 Jan 2013 18:48:34 +0000 (10:48 -0800)]
hwmon: (ltc4245) Fix 'Macros with complex values' checkpatch error

Fix:
ERROR: Macros with complex values should be enclosed in parenthesis

by unwinding the problematic macros.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (ltc4215) Fix 'Macros with complex values' checkpatch error
Guenter Roeck [Thu, 10 Jan 2013 18:30:31 +0000 (10:30 -0800)]
hwmon: (ltc4215) Fix 'Macros with complex values' checkpatch error

Fix:
ERROR: Macros with complex values should be enclosed in parenthesis

by unwinding the problematic macros.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (ltc4151) Fix 'Avoid unnecessary line continuations' checkpatch warning
Guenter Roeck [Sun, 20 Jan 2013 05:18:41 +0000 (21:18 -0800)]
hwmon: (ltc4151) Fix 'Avoid unnecessary line continuations' checkpatch warning

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (ina2xx) Fix 'Avoid unnecessary line continuations' checkpatch warning
Guenter Roeck [Thu, 10 Jan 2013 18:04:06 +0000 (10:04 -0800)]
hwmon: (ina2xx) Fix 'Avoid unnecessary line continuations' checkpatch warning

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: Fix checkpatch warning 'quoted string split across lines'
Guenter Roeck [Thu, 10 Jan 2013 18:01:24 +0000 (10:01 -0800)]
hwmon: Fix checkpatch warning 'quoted string split across lines'

Cc: Corentin Labbe <corentin.labbe@geomatys.fr>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Juerg Haefliger <juergh@gmail.com>
Cc: Andreas Herrmann <herrmann.der.user@googlemail.com>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: Roger Lucas <vt8231@hiddenengine.co.uk>
Cc: Marc Hulsman <m.hulsman@tudelft.nl>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: Fix CamelCase checkpatch warnings
Guenter Roeck [Wed, 13 Mar 2013 23:40:39 +0000 (16:40 -0700)]
hwmon: Fix CamelCase checkpatch warnings

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Drop read/write lock
Guenter Roeck [Fri, 8 Mar 2013 15:42:00 +0000 (07:42 -0800)]
hwmon: (nct6775) Drop read/write lock

The read/write lock is acquired for each read/write operation from/to the chip.
This occurs either during initialization, when it is not needed, or during
updates, when the update_lock is held as well, and it is not needed either.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Only report VID if supported and enabled
Guenter Roeck [Tue, 26 Feb 2013 17:43:50 +0000 (09:43 -0800)]
hwmon: (nct6775) Only report VID if supported and enabled

VID is not always enabled (NCT6775, NCT6776) or supported (NCT6779).

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Detect and report additional temperature sources
Guenter Roeck [Tue, 4 Dec 2012 16:03:37 +0000 (08:03 -0800)]
hwmon: (nct6775) Detect and report additional temperature sources

Scan all temperature sources used for fan control and report if additional
monitoring registers are available.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Add support for weighted fan control
Guenter Roeck [Tue, 4 Dec 2012 17:08:29 +0000 (09:08 -0800)]
hwmon: (nct6775) Add support for weighted fan control

The NCT677X series support weighted fan control. In this mode, a secondary
temperature source is used in addition to the primary temperature source to
control fan speed. Add support for this feature.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Add support for automatic fan control
Guenter Roeck [Tue, 4 Dec 2012 17:04:52 +0000 (09:04 -0800)]
hwmon: (nct6775) Add support for automatic fan control

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Add support for pwm, pwm_mode, and pwm_enable
Guenter Roeck [Tue, 4 Dec 2012 16:30:54 +0000 (08:30 -0800)]
hwmon: (nct6775) Add support for pwm, pwm_mode, and pwm_enable

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Add power management support
Guenter Roeck [Tue, 4 Dec 2012 16:01:39 +0000 (08:01 -0800)]
hwmon: (nct6775) Add power management support

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Add support for fan debounce module parameter
Guenter Roeck [Tue, 4 Dec 2012 15:59:32 +0000 (07:59 -0800)]
hwmon: (nct6775) Add support for fan debounce module parameter

If set, fan debounce is enabled when loading the driver.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Add support for fanX_pulses sysfs attribute
Guenter Roeck [Tue, 11 Dec 2012 15:29:06 +0000 (07:29 -0800)]
hwmon: (nct6775) Add support for fanX_pulses sysfs attribute

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Add support for fan speed attributes
Guenter Roeck [Tue, 4 Dec 2012 15:56:24 +0000 (07:56 -0800)]
hwmon: (nct6775) Add support for fan speed attributes

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: (nct6775) Add support for temperature sensors
Guenter Roeck [Tue, 4 Dec 2012 11:26:05 +0000 (03:26 -0800)]
hwmon: (nct6775) Add support for temperature sensors

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
11 years agoMerge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...
Linus Torvalds [Mon, 1 Apr 2013 15:17:09 +0000 (08:17 -0700)]
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile fix from Chris Metcalf:
 "This change allows newer Tilera boot tools to work correctly with
  current (and stable) kernels by using the right filename to get the
  initramfs from the Tilera hypervisor filesystem."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: expect new initramfs name from hypervisor file system

11 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Linus Torvalds [Mon, 1 Apr 2013 15:06:30 +0000 (08:06 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes from David Miller:

 1) sadb_msg prepared for IPSEC userspace forgets to initialize the
    satype field, fix from Nicolas Dichtel.

 2) Fix mac80211 synchronization during station removal, from Johannes
    Berg.

 3) Fix IPSEC sequence number notifications when they wrap, from Steffen
    Klassert.

 4) Fix cfg80211 wdev tracing crashes when add_virtual_intf() returns an
    error pointer, from Johannes Berg.

 5) In mac80211, don't call into the channel context code with the
    interface list mutex held.  From Johannes Berg.

 6) In mac80211, if we don't actually associate, do not restart the STA
    timer, otherwise we can crash.  From Ben Greear.

 7) Missing dma_mapping_error() check in e1000, ixgb, and e1000e.  From
    Christoph Paasch.

 8) Fix sja1000 driver defines to not conflict with SH port, from Marc
    Kleine-Budde.

 9) Don't call il4965_rs_use_green with a NULL station, from Colin Ian
    King.

10) Suspend/Resume in the FEC driver fail because the buffer descriptors
    are not initialized at all the moments in which they should.  Fix
    from Frank Li.

11) cpsw and davinci_emac drivers both use the wrong interface to
    restart a stopped TX queue.  Use netif_wake_queue not
    netif_start_queue, the latter is for initialization/bringup not
    active management of the queue.  From Mugunthan V N.

12) Fix regression in rate calculations done by
    psched_ratecfg_precompute(), missing u64 type promotion.  From
    Sergey Popovich.

13) Fix length overflow in tg3 VPD parsing, from Kees Cook.

14) AOE driver fails to allocate enough headroom, resulting in crashes.
    Fix from Eric Dumazet.

15) RX overflow happens too quickly in sky2 driver because pause packet
    thresholds are not programmed correctly.  From Mirko Lindner.

16) Bonding driver manages arp_interval and miimon settings incorrectly,
    disabling one unintentionally disables both.  Fix from Nikolay
    Aleksandrov.

17) smsc75xx drivers don't program the RX mac properly for jumbo frames.
    Fix from Steve Glendinning.

18) Fix off-by-one in Codel packet scheduler.  From Vijay Subramanian.

19) Fix packet corruption in atl1c by disabling MSI support, from Hannes
    Frederic Sowa.

20) netdev_rx_handler_unregister() needs a synchronize_net() to fix
    crashes in bonding driver unload stress tests.  From Eric Dumazet.

21) rxlen field of ks8851 RX packet descriptors not interpreted
    correctly (it is 12 bits not 16 bits, so needs to be masked after
    shifting the 32-bit value down 16 bits).  Fix from Max Nekludov.

22) Fix missed RX/TX enable in sh_eth driver due to mishandling of link
    change indications.  From Sergei Shtylyov.

23) Fix crashes during spurious ECI interrupts in sh_eth driver, also
    from Sergei Shtylyov.

24) dm9000 driver initialization is done wrong for revision B devices
    with DSP PHY, from Joseph CHANG.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (53 commits)
  DM9000B: driver initialization upgrade
  sh_eth: make 'link' field of 'struct sh_eth_private' *int*
  sh_eth: workaround for spurious ECI interrupt
  sh_eth: fix handling of no LINK signal
  ks8851: Fix interpretation of rxlen field.
  net: add a synchronize_net() in netdev_rx_handler_unregister()
  MAINTAINERS: Update netxen_nic maintainers list
  atl1e: drop pci-msi support because of packet corruption
  net: fq_codel: Fix off-by-one error
  net: calxedaxgmac: Wake-on-LAN fixes
  net: calxedaxgmac: fix rx ring handling when OOM
  net: core: Remove redundant call to 'nf_reset' in 'dev_forward_skb'
  smsc75xx: fix jumbo frame support
  net: fix the use of this_cpu_ptr
  bonding: fix disabling of arp_interval and miimon
  ipv6: don't accept node local multicast traffic from the wire
  sky2: Threshold for Pause Packet is set wrong
  sky2: Receive Overflows not counted
  aoe: reserve enough headroom on skbs
  line up comment for ndo_bridge_getlink
  ...

11 years agopowerpc/512x: move mpc5121_generic platform to mpc512x_generic.
Matteo Facchinetti [Wed, 20 Mar 2013 07:41:52 +0000 (07:41 +0000)]
powerpc/512x: move mpc5121_generic platform to mpc512x_generic.

This provides a base for using 512x_generic platform on mpc5125 boards.

By this way 512x_GENERIC it could be used for all generic mpc512x boards
and kernel could be compiled with mpc512x_defconfig.

Signed-off-by: Matteo Facchinetti <matteo.facchinetti@sirius-es.it>
[agust: applied s/mpc5121/mpc512x in mpc512x_generic.c]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
11 years agopowerpc/mpc512x: create SoC devices for more nodes
Anatolij Gustschin [Thu, 24 Jan 2013 09:51:18 +0000 (10:51 +0100)]
powerpc/mpc512x: create SoC devices for more nodes

Create devices for mbx, sram, pci and gpio-leds nodes and
also move nfc compatible to of_bus_id list for automatic
nfc device creation.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
11 years agoARC: de-uglify the reg file dumping
Vineet Gupta [Fri, 22 Mar 2013 11:46:49 +0000 (17:16 +0530)]
ARC: de-uglify the reg file dumping

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>