]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:48:37 +0000 (13:48 +1000)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
include/linux/cgroup.h

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:44:02 +0000 (13:44 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

11 years agoMerge remote-tracking branch 'input-mt/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:42:26 +0000 (13:42 +1000)]
Merge remote-tracking branch 'input-mt/for-next'

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 28 Jun 2013 03:40:47 +0000 (13:40 +1000)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:39:06 +0000 (13:39 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:37:30 +0000 (13:37 +1000)]
Merge remote-tracking branch 'modules/modules-next'

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:35:44 +0000 (13:35 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:33:42 +0000 (13:33 +1000)]
Merge remote-tracking branch 'sound/for-next'

11 years agoMerge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:32:06 +0000 (13:32 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'

11 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:30:27 +0000 (13:30 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/i915/intel_sdvo.c

11 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:22:09 +0000 (13:22 +1000)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/drm_vm.c

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 28 Jun 2013 03:20:29 +0000 (13:20 +1000)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 28 Jun 2013 03:18:52 +0000 (13:18 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:13:55 +0000 (13:13 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

11 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 28 Jun 2013 03:12:19 +0000 (13:12 +1000)]
Merge remote-tracking branch 'bluetooth/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 28 Jun 2013 03:10:15 +0000 (13:10 +1000)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
net/wireless/nl80211.c

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 28 Jun 2013 03:01:49 +0000 (13:01 +1000)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/renesas/sh_eth.c
fs/select.c

11 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 28 Jun 2013 03:00:10 +0000 (13:00 +1000)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:58:24 +0000 (12:58 +1000)]
Merge remote-tracking branch 'target-updates/for-next'

11 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:56:17 +0000 (12:56 +1000)]
Merge remote-tracking branch 'scsi/for-next'

11 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 28 Jun 2013 02:54:40 +0000 (12:54 +1000)]
Merge remote-tracking branch 'dlm/next'

11 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:53:03 +0000 (12:53 +1000)]
Merge remote-tracking branch 'ubi/linux-next'

11 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:51:27 +0000 (12:51 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 28 Jun 2013 02:49:49 +0000 (12:49 +1000)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:49:45 +0000 (12:49 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c

11 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Fri, 28 Jun 2013 02:48:04 +0000 (12:48 +1000)]
Merge remote-tracking branch 'idle/next'

11 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:39:52 +0000 (12:39 +1000)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
MAINTAINERS

11 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:38:07 +0000 (12:38 +1000)]
Merge remote-tracking branch 'libata/for-next'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:36:25 +0000 (12:36 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 28 Jun 2013 02:34:22 +0000 (12:34 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:32:46 +0000 (12:32 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:31:10 +0000 (12:31 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:29:09 +0000 (12:29 +1000)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Fri, 28 Jun 2013 02:25:19 +0000 (12:25 +1000)]
Merge remote-tracking branch 'pci/next'

Conflicts:
arch/ia64/sn/kernel/io_init.c
drivers/acpi/pci_root.c
drivers/pci/probe.c
include/linux/aer.h

11 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:17:13 +0000 (12:17 +1000)]
Merge remote-tracking branch 'vfs/for-next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:15:33 +0000 (12:15 +1000)]
Merge remote-tracking branch 'xfs/for-next'

Conflicts:
fs/xfs/xfs_log_cil.c
fs/xfs/xfs_log_recover.c

11 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:12:27 +0000 (12:12 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:10:17 +0000 (12:10 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:08:41 +0000 (12:08 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:04:23 +0000 (12:04 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 28 Jun 2013 02:02:27 +0000 (12:02 +1000)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:00:51 +0000 (12:00 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 28 Jun 2013 01:59:16 +0000 (11:59 +1000)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 28 Jun 2013 01:51:08 +0000 (11:51 +1000)]
Merge remote-tracking branch 'fscache/fscache'

11 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 28 Jun 2013 01:49:34 +0000 (11:49 +1000)]
Merge remote-tracking branch 'f2fs/dev'

11 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 28 Jun 2013 01:41:48 +0000 (11:41 +1000)]
Merge remote-tracking branch 'ext4/dev'

11 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 28 Jun 2013 01:40:14 +0000 (11:40 +1000)]
Merge remote-tracking branch 'ext3/for_next'

11 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Fri, 28 Jun 2013 01:38:40 +0000 (11:38 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 01:37:01 +0000 (11:37 +1000)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Fri, 28 Jun 2013 01:35:27 +0000 (11:35 +1000)]
Merge remote-tracking branch 'ceph/master'

Conflicts:
drivers/block/rbd.c

11 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Fri, 28 Jun 2013 01:33:48 +0000 (11:33 +1000)]
Merge remote-tracking branch 'xtensa/for_next'

11 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 28 Jun 2013 01:32:12 +0000 (11:32 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 28 Jun 2013 01:28:31 +0000 (11:28 +1000)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Fri, 28 Jun 2013 01:26:55 +0000 (11:26 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 28 Jun 2013 01:19:36 +0000 (11:19 +1000)]
Merge remote-tracking branch 'powerpc/next'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 01:17:59 +0000 (11:17 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Fri, 28 Jun 2013 01:16:26 +0000 (11:16 +1000)]
Merge remote-tracking branch 'microblaze/next'

11 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 01:14:53 +0000 (11:14 +1000)]
Merge remote-tracking branch 'metag/for-next'

11 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 01:13:19 +0000 (11:13 +1000)]
Merge remote-tracking branch 'm68k/for-next'

Conflicts:
arch/cris/arch-v32/drivers/Kconfig

11 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Fri, 28 Jun 2013 01:11:45 +0000 (11:11 +1000)]
Merge remote-tracking branch 'ia64/next'

11 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 01:10:06 +0000 (11:10 +1000)]
Merge remote-tracking branch 'cris/for-next'

11 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Fri, 28 Jun 2013 01:08:26 +0000 (11:08 +1000)]
Merge remote-tracking branch 'arm64/upstream'

Conflicts:
include/uapi/linux/kvm.h

11 years agoMerge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Fri, 28 Jun 2013 01:08:24 +0000 (11:08 +1000)]
Merge remote-tracking branch 'xilinx/arm-next'

Conflicts:
arch/arm/mach-highbank/highbank.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-spear/spear13xx.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/platsmp.c
drivers/clocksource/Makefile
drivers/clocksource/tegra20_timer.c

11 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Fri, 28 Jun 2013 01:08:18 +0000 (11:08 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 01:06:44 +0000 (11:06 +1000)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 01:05:11 +0000 (11:05 +1000)]
Merge remote-tracking branch 'arc/for-next'

11 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Fri, 28 Jun 2013 01:03:28 +0000 (11:03 +1000)]
Merge remote-tracking branch 'ide/master'

11 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Fri, 28 Jun 2013 01:03:26 +0000 (11:03 +1000)]
Merge remote-tracking branch 'crypto-current/master'

11 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Fri, 28 Jun 2013 01:03:20 +0000 (11:03 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'

11 years agoMerge remote-tracking branch 'arc-current/for-curr'
Stephen Rothwell [Fri, 28 Jun 2013 01:03:18 +0000 (11:03 +1000)]
Merge remote-tracking branch 'arc-current/for-curr'

11 years agoMerge remote-tracking branch 'origin/master'
Stephen Rothwell [Fri, 28 Jun 2013 00:55:05 +0000 (10:55 +1000)]
Merge remote-tracking branch 'origin/master'

11 years agoMerge branches 'af_ib', 'cxgb4', 'misc', 'ocrdma', 'qib' and 'srp' into for-next
Roland Dreier [Thu, 27 Jun 2013 23:46:18 +0000 (16:46 -0700)]
Merge branches 'af_ib', 'cxgb4', 'misc', 'ocrdma', 'qib' and 'srp' into for-next

11 years agoIB/srp: Skip host settle delay
Bart Van Assche [Wed, 12 Jun 2013 13:24:25 +0000 (15:24 +0200)]
IB/srp: Skip host settle delay

The SRP initiator implements host reset by reconnecting to the SRP
target.  That means that communication with the target is possible as
soon as host reset finished. Hence skip the host settle delay.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Sebastian Riemer <sebastian.riemer@profitbricks.com>
Reviewed-by: Christoph Hellwig <hch@infradead.org>
Acked-by: David Dillow <dillowda@ornl.gov>
Signed-off-by: Roland Dreier <roland@purestorage.com>
11 years agoIB/srp: Avoid skipping srp_reset_host() after a transport error
Bart Van Assche [Wed, 12 Jun 2013 13:23:04 +0000 (15:23 +0200)]
IB/srp: Avoid skipping srp_reset_host() after a transport error

The SCSI error handler assumes that the transport layer is operational
if an eh_abort_handler() returns SUCCESS.  Hence srp_abort() only
should return SUCCESS if sending the ABORT TASK task management
function succeeded.  This patch avoids the SCSI error handler skipping
the srp_reset_host() call after a transport layer error.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Acked-by: David Dillow <dillowda@ornl.gov>
Signed-off-by: Roland Dreier <roland@purestorage.com>
11 years agoIB/srp: Fix remove_one crash due to resource exhaustion
Dotan Barak [Wed, 12 Jun 2013 13:20:36 +0000 (15:20 +0200)]
IB/srp: Fix remove_one crash due to resource exhaustion

If the add_one callback fails during driver load no resources are
allocated so there isn't a need to release any resources. Trying
to clean the resource may lead to the following kernel panic:

    BUG: unable to handle kernel NULL pointer dereference at (null)
    IP: [<ffffffffa0132331>] srp_remove_one+0x31/0x240 [ib_srp]
    RIP: 0010:[<ffffffffa0132331>]  [<ffffffffa0132331>] srp_remove_one+0x31/0x240 [ib_srp]
    Process rmmod (pid: 4562, threadinfo ffff8800dd738000, task ffff8801167e60c0)
    Call Trace:
     [<ffffffffa024500e>] ib_unregister_client+0x4e/0x120 [ib_core]
     [<ffffffffa01361bd>] srp_cleanup_module+0x15/0x71 [ib_srp]
     [<ffffffff810ac6a4>] sys_delete_module+0x194/0x260
     [<ffffffff8100b0f2>] system_call_fastpath+0x16/0x1b

Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
Reviewed-by: Eli Cohen <eli@mellanox.co.il>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Acked-by: Sebastian Riemer <sebastian.riemer@profitbricks.com>
Acked-by: David Dillow <dillowda@ornl.gov>
Signed-off-by: Roland Dreier <roland@purestorage.com>
11 years agodrm/qxl: add support for cursor hotspot.
Dave Airlie [Thu, 20 Jun 2013 01:48:53 +0000 (11:48 +1000)]
drm/qxl: add support for cursor hotspot.

This uses the cursor hotspot info from userspace and passes
it to the qxl hw layer.

Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agodrm: add hotspot support for cursors.
Dave Airlie [Thu, 20 Jun 2013 01:48:52 +0000 (11:48 +1000)]
drm: add hotspot support for cursors.

So it looks like for virtual hw cursors on QXL we need to inform
the "hw" device what the cursor hotspot parameters are. This
makes sense if you think the host has to draw the cursor and interpret
clicks from it. However the current modesetting interface doesn't support
passing the hotspot information from userspace.

This implements a new cursor ioctl, that takes the hotspot info as well,
userspace can try calling the new interface and if it gets -ENOSYS it means
its on an older kernel and can just fallback.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agodrm/tilcdc: Clear bits of register we're going to set.
Pantelis Antoniou [Fri, 21 Jun 2013 18:52:28 +0000 (13:52 -0500)]
drm/tilcdc: Clear bits of register we're going to set.

Bits weren't cleared so resolution changes didn't work.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agodrm/tilcdc fixing i2c/slave initialization race
Darren Etheridge [Fri, 21 Jun 2013 18:52:27 +0000 (13:52 -0500)]
drm/tilcdc fixing i2c/slave initialization race

In certain senarios drm will initialize before i2c this means that i2c
slave devices like the nxp tda998x will fail to be probed.  This patch
detects this condition then defers the probe of the slave device and
the tilcdc main driver.

Signed-off-by: Darren Etheridge <detheridge@ti.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agodrm/tilcdc: whitespace fixes and tidyup
Darren Etheridge [Fri, 21 Jun 2013 18:52:26 +0000 (13:52 -0500)]
drm/tilcdc: whitespace fixes and tidyup

keeping checkpatch happy.

Signed-off-by: Darren Etheridge <detheridge@ti.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agodrm/tilcdc: adding more guards to prevent selection of invalid modes
Darren Etheridge [Fri, 21 Jun 2013 18:52:25 +0000 (13:52 -0500)]
drm/tilcdc: adding more guards to prevent selection of invalid modes

The tilcdc has a number of limitations for the allowed sizes of
the various adjustable timing parameter.  Some modes are outside
of these timings.  This commit will prune modes that report timings
that will overflow the allowed sizes in the tilcdc.

Signed-off-by: Darren Etheridge <detheridge@ti.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agodrm/tilcdc: fixing off by one errors found on analyzer
Darren Etheridge [Fri, 21 Jun 2013 18:52:24 +0000 (13:52 -0500)]
drm/tilcdc: fixing off by one errors found on analyzer

When hooking up to an HDMI analyzer noticed some timings were
off by one.  Referring to the hardware technical reference manual
for the lcd controller some of the timing registers use 0 to
represent 1.  This patch addresses that issue.

Signed-off-by: Darren Etheridge <detheridge@ti.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agodrm/tilcdc: adding some more devicetree config
Darren Etheridge [Fri, 21 Jun 2013 18:52:23 +0000 (13:52 -0500)]
drm/tilcdc: adding some more devicetree config

Adding support for max-pixelclock and max-width device tree
entries. As some devices that use the tilcdc hardware module
have restrictions on the allowed/tested values.  Also update DT
bindings document to reflect new parameters.

Signed-off-by: Darren Etheridge <detheridge@ti.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agodrm/tilcdc: support pixel widths greater than 1024
Darren Etheridge [Fri, 21 Jun 2013 18:52:22 +0000 (13:52 -0500)]
drm/tilcdc: support pixel widths greater than 1024

TI LCD controller version 2 has an extended eleventh
bit that enables horizontal resolutions greater than
1024 pixels to be specified (upto 2048).  This patch
adds support for setting this bit on LCDC V2.

Signed-off-by: Darren Etheridge <detheridge@ti.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agoMerge branch 'kbuild/kbuild' into kbuild/for-next
Michal Marek [Thu, 27 Jun 2013 22:53:22 +0000 (00:53 +0200)]
Merge branch 'kbuild/kbuild' into kbuild/for-next

11 years agoimprove modalias building
Jan Beulich [Wed, 29 May 2013 12:18:56 +0000 (13:18 +0100)]
improve modalias building

For one, there's no point in the respective pieces to be rebuilt
unconditionally on each and every rebuild.

Second there's no need to invent a custom rule for generating the .s
file from the .c source - we can simply use the generic rule here.

And finally, $(obj) should be used to refer to files in the build tree
(rather than spelling out the subdirectory).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
11 years agodrm/mgag200: Added resolution and bandwidth limits for various G200e products.
Julia Lemire [Thu, 27 Jun 2013 17:38:59 +0000 (13:38 -0400)]
drm/mgag200: Added resolution and bandwidth limits for various G200e products.

At the larger resolutions, the g200e series sometimes struggles with
maintaining a proper output.  Problems like flickering or black bands appearing
on screen can occur.  In order to avoid this, limitations regarding resolutions
and bandwidth have been added for the different variations of the g200e series.
This code was ported from the old xorg mga driver.

Signed-off-by: Julia Lemire <jlemire@matrox.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agoscripts/mod: Spelling s/DEVICEVTABLE/DEVICETABLE/
Geert Uytterhoeven [Fri, 17 May 2013 12:18:35 +0000 (14:18 +0200)]
scripts/mod: Spelling s/DEVICEVTABLE/DEVICETABLE/

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
11 years agochar/agp: replace numeric with standard PM state macros
Yijing Wang [Thu, 27 Jun 2013 12:52:36 +0000 (20:52 +0800)]
char/agp: replace numeric with standard PM state macros

Use standard PM state macros PCI_Dx instead of numeric 0/1/2..

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agoMerge branch 'acpi-hotplug-next' into linux-next
Rafael J. Wysocki [Thu, 27 Jun 2013 19:59:12 +0000 (21:59 +0200)]
Merge branch 'acpi-hotplug-next' into linux-next

* acpi-hotplug-next:
  ACPI / processor: Drop unused variable from processor_perflib.c
  ACPI / processor: Remove unused macros in processor_driver.c

11 years agoMerge branch 'pm-assorted'
Rafael J. Wysocki [Thu, 27 Jun 2013 19:58:22 +0000 (21:58 +0200)]
Merge branch 'pm-assorted'

* pm-assorted:
  PM / QoS: Add pm_qos and dev_pm_qos to events-power.txt
  PM / QoS: Add dev_pm_qos_request tracepoints
  PM / QoS: Add pm_qos_request tracepoints
  PM / QoS: Add pm_qos_update_target/flags tracepoints
  PM / QoS: Update Documentation/power/pm_qos_interface.txt
  PM / Sleep: Print last wakeup source on failed wakeup_count write
  PM / QoS: correct the valid range of pm_qos_class
  PM / wakeup: Adjust messaging for wake events during suspend
  PM / Runtime: Update .runtime_idle() callback documentation
  PM / Runtime: Rework the "runtime idle" helper routine
  PM / Hibernate: print physical addresses consistently with other parts of kernel

11 years agoMerge branch 'pm-cpufreq'
Rafael J. Wysocki [Thu, 27 Jun 2013 19:56:05 +0000 (21:56 +0200)]
Merge branch 'pm-cpufreq'

* pm-cpufreq: (41 commits)
  cpufreq: tegra: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: s3c64xx: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: omap: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: imx6q: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: exynos: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: dbx500: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: davinci: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: arm-big-little: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: powernow-k8: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: pcc: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: e_powersaver: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: ACPI: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: s3c2416: fix forgotten driver_data conversions
  cpufreq: make __cpufreq_notify_transition() static
  cpufreq: Fix minor formatting issues
  cpufreq: Fix governor start/stop race condition
  cpufreq: Simplify userspace governor
  cpufreq: X86_AMD_FREQ_SENSITIVITY: select CPU_FREQ_TABLE
  cpufreq: tegra: create CONFIG_ARM_TEGRA_CPUFREQ
  cpufreq: S3C2416/S3C64XX: select CPU_FREQ_TABLE
  ...

11 years agoMerge branch 'pm-cpufreq-arm' into pm-cpufreq
Rafael J. Wysocki [Thu, 27 Jun 2013 19:47:03 +0000 (21:47 +0200)]
Merge branch 'pm-cpufreq-arm' into pm-cpufreq

* pm-cpufreq-arm:
  cpufreq: tegra: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: s3c64xx: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: omap: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: imx6q: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: exynos: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: dbx500: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: davinci: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: arm-big-little: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: s3c2416: fix forgotten driver_data conversions

11 years agoMerge branch 'pm-cpufreq-assorted' into pm-cpufreq
Rafael J. Wysocki [Thu, 27 Jun 2013 19:46:45 +0000 (21:46 +0200)]
Merge branch 'pm-cpufreq-assorted' into pm-cpufreq

* pm-cpufreq-assorted: (21 commits)
  cpufreq: powernow-k8: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: pcc: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: e_powersaver: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: ACPI: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: make __cpufreq_notify_transition() static
  cpufreq: Fix minor formatting issues
  cpufreq: Fix governor start/stop race condition
  cpufreq: Simplify userspace governor
  cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
  cpufreq: kirkwood: Select CPU_FREQ_TABLE option
  cpufreq: big.LITTLE needs cpufreq table
  cpufreq: SPEAr needs cpufreq table
  cpufreq: powerpc: Add cpufreq driver for Freescale e500mc SoCs
  cpufreq: remove unnecessary cpufreq_cpu_{get|put}() calls
  cpufreq: MAINTAINERS: Add git tree path for ARM specific updates
  cpufreq: rename index as driver_data in cpufreq_frequency_table
  cpufreq: Don't create empty /sys/devices/system/cpu/cpufreq directory
  cpufreq: Move get_cpu_idle_time() to cpufreq.c
  cpufreq: governors: Move get_governor_parent_kobj() to cpufreq.c
  cpufreq: Add EXPORT_SYMBOL_GPL for have_governor_per_policy
  ...

11 years agoMerge branch 'pm-cpufreq-Kconfig' into pm-cpufreq
Rafael J. Wysocki [Thu, 27 Jun 2013 19:44:48 +0000 (21:44 +0200)]
Merge branch 'pm-cpufreq-Kconfig' into pm-cpufreq

* pm-cpufreq-Kconfig:
  cpufreq: X86_AMD_FREQ_SENSITIVITY: select CPU_FREQ_TABLE
  cpufreq: tegra: create CONFIG_ARM_TEGRA_CPUFREQ
  cpufreq: S3C2416/S3C64XX: select CPU_FREQ_TABLE
  cpufreq: pxa: select CPU_FREQ_TABLE
  cpufreq: powerpc: CBE_RAS: select CPU_FREQ_TABLE
  cpufreq: imx: select CPU_FREQ_TABLE
  cpufreq: highbank: remove select CPU_FREQ_TABLE
  cpufreq: exynos: select CPU_FREQ_TABLE
  cpufreq: davinci: select CPU_FREQ_TABLE
  cpufreq: cris: select CPU_FREQ_TABLE
  cpufreq: blackfin: enable driver for CONFIG_BFIN_CPU_FREQ

11 years agoMerge branch 'pm-omap'
Rafael J. Wysocki [Thu, 27 Jun 2013 19:42:13 +0000 (21:42 +0200)]
Merge branch 'pm-omap'

* pm-omap:
  PM / AVS: SmartReflex: use devm_* API to initialize SmartReflex
  PM / AVS: SmartReflex: use omap_sr * for enable/disable interface
  PM / AVS: SmartReflex: use omap_sr * for minmax interfaces
  PM / AVS: SmartReflex: use omap_sr * for errgen interfaces
  PM / AVS: SmartReflex: fix driver name
  PM / AVS: SmartReflex: disable runtime PM on driver remove
  PM / AVS: SmartReflex: disable errgen before vpbound disable

11 years agoMerge branch 'pm-devfreq'
Rafael J. Wysocki [Thu, 27 Jun 2013 19:42:07 +0000 (21:42 +0200)]
Merge branch 'pm-devfreq'

* pm-devfreq:
  MAINTAINERS: update mailing list for devfreq(DVFS).
  PM / devfreq: fix typo "CPU_EXYNOS4.12" twice
  PM / devfreq: fix missing unlock on error in exynos4_busfreq_pm_notifier_event()
  PM / devfreq: add comments and Documentation
  PM / devfreq: account suspend/resume for stats
  PM / devfreq: Add Exynos5-bus devfreq driver for Exynos5250
  PM / devfreq: Move exynos4 devfreq driver into a new sub-directory

11 years agoMerge branch 'pm-cpuidle'
Rafael J. Wysocki [Thu, 27 Jun 2013 19:41:21 +0000 (21:41 +0200)]
Merge branch 'pm-cpuidle'

* pm-cpuidle:
  cpuidle: Fix ARCH_NEEDS_CPU_IDLE_COUPLED dependency warning
  cpuidle: Comment the driver's framework code
  cpuidle: simplify multiple driver support
  ARM: zynq: Add cpuidle support
  cpuidle: improve governor Kconfig options

11 years agoMerge branch 'pnp'
Rafael J. Wysocki [Thu, 27 Jun 2013 19:40:53 +0000 (21:40 +0200)]
Merge branch 'pnp'

* pnp:
  pnp: restore automatic resolution of DMA conflicts

11 years agoMerge branch 'freezer'
Rafael J. Wysocki [Thu, 27 Jun 2013 19:40:44 +0000 (21:40 +0200)]
Merge branch 'freezer'

* freezer:
  af_unix: use freezable blocking calls in read
  sigtimedwait: use freezable blocking call
  nanosleep: use freezable blocking call
  futex: use freezable blocking call
  select: use freezable blocking call
  epoll: use freezable blocking call
  binder: use freezable blocking calls
  freezer: add new freezable helpers using freezer_do_not_count()
  freezer: convert freezable helpers to static inline where possible
  freezer: convert freezable helpers to freezer_do_not_count()
  freezer: skip waking up tasks with PF_FREEZER_SKIP set
  freezer: shorten freezer sleep time using exponential backoff
  lockdep: check that no locks held at freeze time
  lockdep: remove task argument from debug_check_no_locks_held
  freezer: add unsafe versions of freezable helpers for CIFS
  freezer: add unsafe versions of freezable helpers for NFS