]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:55:29 +0000 (12:55 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:53:43 +0000 (12:53 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:53:36 +0000 (12:53 +1000)]
Merge remote-tracking branch 'cortex/for-next'

10 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:51:54 +0000 (12:51 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

10 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:50:14 +0000 (12:50 +1000)]
Merge remote-tracking branch 'gpio/for-next'

10 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:48:28 +0000 (12:48 +1000)]
Merge remote-tracking branch 'vhost/linux-next'

10 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:46:45 +0000 (12:46 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

10 years agoMerge remote-tracking branch 'bcon/master'
Stephen Rothwell [Thu, 19 Sep 2013 02:44:05 +0000 (12:44 +1000)]
Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig

10 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:41:51 +0000 (12:41 +1000)]
Merge remote-tracking branch 'staging/staging-next'

10 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:39:26 +0000 (12:39 +1000)]
Merge remote-tracking branch 'usb/usb-next'

10 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:37:39 +0000 (12:37 +1000)]
Merge remote-tracking branch 'leds/for-next'

10 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:35:47 +0000 (12:35 +1000)]
Merge remote-tracking branch 'regmap/for-next'

10 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:33:59 +0000 (12:33 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

10 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:33:55 +0000 (12:33 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'

10 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 19 Sep 2013 02:25:59 +0000 (12:25 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
include/linux/time-armada-370-xp.h

10 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 02:00:29 +0000 (12:00 +1000)]
Merge remote-tracking branch 'spi/for-next'

10 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 19 Sep 2013 01:54:54 +0000 (11:54 +1000)]
Merge remote-tracking branch 'selinux/master'

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:53:10 +0000 (11:53 +1000)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:53:07 +0000 (11:53 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

10 years agoMerge remote-tracking branch 'fbdev/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:51:23 +0000 (11:51 +1000)]
Merge remote-tracking branch 'fbdev/for-next'

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:49:37 +0000 (11:49 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:49:19 +0000 (11:49 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:47:20 +0000 (11:47 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:45:36 +0000 (11:45 +1000)]
Merge remote-tracking branch 'block/for-next'

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:43:54 +0000 (11:43 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 19 Sep 2013 01:42:07 +0000 (11:42 +1000)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:40:16 +0000 (11:40 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:38:35 +0000 (11:38 +1000)]
Merge remote-tracking branch 'sound/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:36:34 +0000 (11:36 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_drv.h

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 19 Sep 2013 01:34:47 +0000 (11:34 +1000)]
Merge remote-tracking branch 'crypto/master'

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 19 Sep 2013 01:33:03 +0000 (11:33 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 19 Sep 2013 01:31:11 +0000 (11:31 +1000)]
Merge remote-tracking branch 'bluetooth/master'

10 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Thu, 19 Sep 2013 01:29:14 +0000 (11:29 +1000)]
Merge remote-tracking branch 'ipsec-next/master'

Conflicts:
include/net/xfrm.h

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 19 Sep 2013 01:27:24 +0000 (11:27 +1000)]
Merge remote-tracking branch 'slave-dma/next'

10 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 19 Sep 2013 01:19:01 +0000 (11:19 +1000)]
Merge remote-tracking branch 'idle/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:17:18 +0000 (11:17 +1000)]
Merge remote-tracking branch 'pm/linux-next'

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:17:15 +0000 (11:17 +1000)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:17:03 +0000 (11:17 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 19 Sep 2013 01:16:58 +0000 (11:16 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:14:57 +0000 (11:14 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:14:34 +0000 (11:14 +1000)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:06:04 +0000 (11:06 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/nfs/direct.c
fs/nfs/file.c

10 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:03:33 +0000 (11:03 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 19 Sep 2013 01:01:49 +0000 (11:01 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 19 Sep 2013 00:59:41 +0000 (10:59 +1000)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Thu, 19 Sep 2013 00:58:01 +0000 (10:58 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 19 Sep 2013 00:56:20 +0000 (10:56 +1000)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 00:54:40 +0000 (10:54 +1000)]
Merge remote-tracking branch 'fuse/for-next'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Thu, 19 Sep 2013 00:54:36 +0000 (10:54 +1000)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 00:52:44 +0000 (10:52 +1000)]
Merge remote-tracking branch 'cifs/for-next'

10 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Thu, 19 Sep 2013 00:51:02 +0000 (10:51 +1000)]
Merge remote-tracking branch 'ceph/master'

10 years agoMerge remote-tracking branch 'aio-direct/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 00:42:30 +0000 (10:42 +1000)]
Merge remote-tracking branch 'aio-direct/for-next'

10 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 19 Sep 2013 00:40:42 +0000 (10:40 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 19 Sep 2013 00:38:59 +0000 (10:38 +1000)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 00:37:18 +0000 (10:37 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 19 Sep 2013 00:35:36 +0000 (10:35 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 19 Sep 2013 00:35:33 +0000 (10:35 +1000)]
Merge remote-tracking branch 'ia64/next'

10 years agoMerge remote-tracking branch 'h8300-remove/h8300-remove'
Stephen Rothwell [Thu, 19 Sep 2013 00:28:28 +0000 (10:28 +1000)]
Merge remote-tracking branch 'h8300-remove/h8300-remove'

10 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Thu, 19 Sep 2013 00:26:50 +0000 (10:26 +1000)]
Merge remote-tracking branch 'c6x/for-linux-next'

10 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Thu, 19 Sep 2013 00:25:11 +0000 (10:25 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

10 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 19 Sep 2013 00:23:31 +0000 (10:23 +1000)]
Merge remote-tracking branch 'arm/for-next'

10 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Thu, 19 Sep 2013 00:18:43 +0000 (10:18 +1000)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

10 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Thu, 19 Sep 2013 00:18:28 +0000 (10:18 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

10 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Thu, 19 Sep 2013 00:18:25 +0000 (10:18 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'

10 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Thu, 19 Sep 2013 00:18:24 +0000 (10:18 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'

10 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Thu, 19 Sep 2013 00:18:23 +0000 (10:18 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'

10 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Thu, 19 Sep 2013 00:18:19 +0000 (10:18 +1000)]
Merge remote-tracking branch 'ipsec/master'

10 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 19 Sep 2013 00:18:18 +0000 (10:18 +1000)]
Merge remote-tracking branch 'net/master'

10 years agoMerge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Thu, 19 Sep 2013 00:18:15 +0000 (10:18 +1000)]
Merge remote-tracking branch 'm68k-current/for-linus'

10 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Thu, 19 Sep 2013 00:18:13 +0000 (10:18 +1000)]
Merge remote-tracking branch 'arm-current/fixes'

10 years agoMerge branch '3.12-fixes' into mips-for-linux-next
Ralf Baechle [Wed, 18 Sep 2013 22:16:46 +0000 (00:16 +0200)]
Merge branch '3.12-fixes' into mips-for-linux-next

10 years agoMIPS: PCI: Use pci_resource_to_user to map pci memory space properly
Wolfgang Grandegger [Mon, 13 Dec 2010 20:48:10 +0000 (21:48 +0100)]
MIPS: PCI: Use pci_resource_to_user to map pci memory space properly

This only matter to Alchemy platforms.

Signed-off-by: Wolfgang Grandegger <wg@denx.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoBluetooth: Fix waiting for clearing of BT_SK_SUSPEND flag
Johan Hedberg [Mon, 16 Sep 2013 10:05:19 +0000 (13:05 +0300)]
Bluetooth: Fix waiting for clearing of BT_SK_SUSPEND flag

In the case of blocking sockets we should not proceed with sendmsg() if
the socket has the BT_SK_SUSPEND flag set. So far the code was only
ensuring that POLLOUT doesn't get set for non-blocking sockets using
poll() but there was no code in place to ensure that blocking sockets do
the right thing when writing to them.

This patch adds a new bt_sock_wait_ready helper function to sleep in the
sendmsg call if the BT_SK_SUSPEND flag is set, and wake up as soon as it
is unset. It also updates the L2CAP and RFCOMM sendmsg callbacks to take
advantage of this new helper function.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
10 years agoBluetooth: Fix responding to invalid L2CAP signaling commands
Johan Hedberg [Mon, 16 Sep 2013 10:05:18 +0000 (13:05 +0300)]
Bluetooth: Fix responding to invalid L2CAP signaling commands

When we have an LE link we should not respond to any data on the BR/EDR
L2CAP signaling channel (0x0001) and vice-versa when we have a BR/EDR
link we should not respond to LE L2CAP (CID 0x0005) signaling commands.
This patch fixes this issue by checking for a valid link type and
ignores data if it is wrong.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
10 years agoBluetooth: Fix sending responses to identified L2CAP response packets
Johan Hedberg [Mon, 16 Sep 2013 10:05:17 +0000 (13:05 +0300)]
Bluetooth: Fix sending responses to identified L2CAP response packets

When L2CAP packets return a non-zero error and the value is passed
onwards by l2cap_bredr_sig_cmd this will trigger a command reject packet
to be sent. However, the core specification (page 1416 in core 4.0) says
the following: "Command Reject packets should not be sent in response to
an identified Response packet.".

This patch ensures that a command reject packet is not sent for any
identified response packet by ignoring the error return value from the
response handler functions.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
10 years agoBluetooth: Fix L2CAP command reject reason
Johan Hedberg [Mon, 16 Sep 2013 10:05:16 +0000 (13:05 +0300)]
Bluetooth: Fix L2CAP command reject reason

There are several possible reason codes that can be sent in the command
reject L2CAP packet. Before this patch the code has used a hard-coded
single response code ("command not understood"). This patch adds a
helper function to map the return value of an L2CAP handler function to
the correct command reject reason.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
10 years agoBluetooth: Fix L2CAP Disconnect response for unknown CID
Johan Hedberg [Mon, 16 Sep 2013 10:05:15 +0000 (13:05 +0300)]
Bluetooth: Fix L2CAP Disconnect response for unknown CID

If we receive an L2CAP Disconnect Request for an unknown CID we should
not just silently drop it but reply with a proper Command Reject
response. This patch fixes this by ensuring that the disconnect handler
returns a proper error instead of 0 and will cause the function caller
to send the right response.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
10 years agoBluetooth: Fix L2CAP error return used for failed channel lookups
Johan Hedberg [Mon, 16 Sep 2013 10:05:14 +0000 (13:05 +0300)]
Bluetooth: Fix L2CAP error return used for failed channel lookups

The EFAULT error should only be used for memory address related errors
and ENOENT might be needed for other purposes than invalid CID errors.
This patch fixes the l2cap_config_req, l2cap_connect_create_rsp and
l2cap_create_channel_req handlers to use the unique EBADSLT error to
indicate failed lookups on a given CID.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
10 years agoBluetooth: Fix double error response for l2cap_create_chan_req
Johan Hedberg [Mon, 16 Sep 2013 10:05:13 +0000 (13:05 +0300)]
Bluetooth: Fix double error response for l2cap_create_chan_req

When an L2CAP request handler returns non-zero the calling code will
send a command reject response. The l2cap_create_chan_req function will
in some cases send its own response but then still return a -EFAULT
error which would cause two responses to be sent. This patch fixes this
by making the function return 0 after sending its own response.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
10 years agoMerge tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux...
Olof Johansson [Wed, 18 Sep 2013 21:01:39 +0000 (14:01 -0700)]
Merge tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren, OMAP DT fixes for 3.12-rc1:

OMAP device tree changes that are needed to fix regressions and avoid
electrical issues on beaglebone black.

Via Benoit Cousson <bcousson@baylibre.com>:

Fix BBB LDO voltage to avoid HDMI destruction
Fix OMAP5 wrong attribute
Fix typo in beagle xM strings
Fix missing pinmux and regulator for OMAP4 wifi
Fix missing pinmux for igep headset

* tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: igep00x0: Add pinmux configuration for MCBSP2
  ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for blaze
  ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard
  ARM: dts: OMAP5: fix ocp2scp DTS data
  ARM: dts: OMAP5: fix reg property size
  ARM: dts: am335x-bone*: add DT for BeagleBone Black
  ARM: dts: omap3-beagle-xm: fix string error in compatible property

Signed-off-by: Olof Johansson <olof@lixom.net>
10 years agoMerge tag 'omap-for-v3.12/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel...
Olof Johansson [Wed, 18 Sep 2013 21:00:43 +0000 (14:00 -0700)]
Merge tag 'omap-for-v3.12/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren, fixes for 3.12-rc1:

OMAP fixes for build warnings and cpuidle, and a few trivial typo fixes.

* tag 'omap-for-v3.12/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: mux: fix trivial typo in name
  ARM: OMAP4 SMP: Corrected a typo fucntions to functions
  ARM: OMAP4: cpuidle: fix: call cpu_cluster_pm_exit conditionally
  mailbox: remove unnecessary platform_set_drvdata()
  ARM: mach-omap2: gpmc: Fix warning when CONFIG_ARM_LPAE=y
  ARM: OMAP: fix return value check in omap_device_build_from_dt()
  ARM: OMAP4: Fix clock_get error for GPMC during boot

Signed-off-by: Olof Johansson <olof@lixom.net>
10 years agoMIPS: Fix start of free memory when using initrd
Greg Ungerer [Wed, 8 Sep 2010 05:50:43 +0000 (15:50 +1000)]
MIPS: Fix start of free memory when using initrd

Currently when using an initrd on a MIPS system the start of the bootmem region of
memory is set to the larger of the end of the kernel bss region (_end) or the end
of the initrd. In a typical memory layout where the initrd is at some address above
the kernel image this means that the start of the bootmem region will be the end of
the initrd. But when we are done processing/loading the initrd we have no way to
reclaim the memory region it occupied, and we lose a large chunk of now otherwise
empty RAM from our final running system.

The bootmem code is designed to allow this initrd to be reserved (and the code in
finalize_initrd() currently does this). When the initrd is finally processed/loaded
its reserved memory is freed.

Fix the setting of the start of the bootmem map to be the end of the kernel.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1574/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoMIPS: Quiet the building output of vmlinux.32 and vmlinux.64
Wu Zhangjin [Tue, 9 Nov 2010 16:26:34 +0000 (00:26 +0800)]
MIPS: Quiet the building output of vmlinux.32 and vmlinux.64

Based on quiet_cmd_X and cmd_X, this patch quiets the building output of
vmlinux.32 and vmlinux.64.

Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Sam Ravnborg <sam@ravnborg.org>
Patchwork: https://patchwork.linux-mips.org/patch/1766/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoMIPS: Panic messages should not end in \n.
Ralf Baechle [Wed, 18 Sep 2013 14:05:26 +0000 (16:05 +0200)]
MIPS: Panic messages should not end in \n.

Panic() is going to add a \n itself and it's annoying if a panic message rolls
of the screen on a device with no scrollback.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoMIPS: Use NUMA_NO_NODE instead of -1 for node ID.
Ralf Baechle [Wed, 18 Sep 2013 12:54:37 +0000 (14:54 +0200)]
MIPS: Use NUMA_NO_NODE instead of -1 for node ID.

Original patch by Jianguo Wu <wujianguo@huawei.com>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoMIPS: of/pci: Use of_pci_range_parser
Andrew Murray [Thu, 25 Jul 2013 16:14:25 +0000 (17:14 +0100)]
MIPS: of/pci: Use of_pci_range_parser

This patch converts the pci_load_of_ranges function to use the new common
of_pci_range_parser.

Signed-off-by: Andrew Murray <amurray@embedded-bits.co.uk>
Signed-off-by: Andrew Murray <Andrew.Murray@arm.com>
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Reviewed-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-mips@linux-mips.org
Cc: jason@lakedaemon.net
Patchwork: https://patchwork.linux-mips.org/patch/5625/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoMIPS: BCM47XX: Fix detected clock on Asus WL520GC and WL520GU
Hauke Mehrtens [Wed, 18 Sep 2013 11:33:00 +0000 (13:33 +0200)]
MIPS: BCM47XX: Fix detected clock on Asus WL520GC and WL520GU

The Asus WL520GC and WL520GU are based on the BCM5354 and clocked at
200MHz, but they do not have a clkfreq nvram variable set to the
correct value. This adds a workaround for these devices.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5843/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoMIPS: BCM47XX: Fix clock detection for BCM5354 with 200MHz clock
Hauke Mehrtens [Wed, 18 Sep 2013 11:32:59 +0000 (13:32 +0200)]
MIPS: BCM47XX: Fix clock detection for BCM5354 with 200MHz clock

Some BCM5354 SoCs are running at 200MHz, but it is not possible to read
the clock from a register like it is done on some other SoC in ssb and
bcma. These devices should have a clkfreq nvram configuration value set
to 200, read it and set the clock to the correct value.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5842/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoMIPS: BCM47XX: Get GPIO pin from nvram configuration
Hauke Mehrtens [Wed, 18 Sep 2013 11:31:15 +0000 (13:31 +0200)]
MIPS: BCM47XX: Get GPIO pin from nvram configuration

The nvram contains some gpio configuration for boards. It is stored in
a gpio<number>=name format e.g.
gpio8=wps_button
gpio4=robo_reset

This patches adds a function to parse these entries, so other driver
can use it.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5841/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoMIPS: BCM47XX: Print board name in /proc/cpuinfo
Hauke Mehrtens [Wed, 18 Sep 2013 11:29:58 +0000 (13:29 +0200)]
MIPS: BCM47XX: Print board name in /proc/cpuinfo

Do not print the constant system type "Broadcom BCM47XX" but print the
name of the actual SoC in use and the detected board.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5839/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
10 years agoMerge tag 'for_3.12-rc2/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel...
Tony Lindgren [Wed, 18 Sep 2013 19:50:45 +0000 (12:50 -0700)]
Merge tag 'for_3.12-rc2/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.12/fixes-dt

Fix BBB LDO voltage to avoid HDMI destruction
Fix OMAP5 wrong attribute
Fix typo in beagle xM strings
Fix missing pinmux and regulator for OMAP4 wifi
Fix missing pinmux for igep headset

10 years agoInput: i8042 - i8042_flush fix for a full 8042 buffer
Andrey Moiseev [Mon, 16 Sep 2013 22:17:31 +0000 (15:17 -0700)]
Input: i8042 - i8042_flush fix for a full 8042 buffer

When 8042 internal data buffer is full, the driver
erroneously decides that the controller is not present.

i8042_flush returns the number of flushed bytes, which is
in 0 - I8042_BUFFER_SIZE range inclusive. Therefore, i8042_flush
has no way to indicate an error. Moreover i8042_controller_check
takes initially full buffer (i8042_flush returned
I8042_BUFFER_SIZE) as a sign of absence of the controller.

Let's change i8042 to return success/error instead and make sure
we do not return error prematurely.

Signed-off-by: Andrey Moiseev <o2g.org.ru@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
10 years agoARM: multi_v7: add HREFv60 to multi_v7 defconfig
Linus Walleij [Mon, 16 Sep 2013 12:22:32 +0000 (14:22 +0200)]
ARM: multi_v7: add HREFv60 to multi_v7 defconfig

This is just a standard board for the Ux500, include it in the
v7 multiplatform defconfig.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
10 years agoARM: OMAP2+: mux: fix trivial typo in name
Phil Carmody [Wed, 18 Sep 2013 19:02:01 +0000 (12:02 -0700)]
ARM: OMAP2+: mux: fix trivial typo in name

Fix trivial typo in name.

Signed-off-by: Phil Carmody <phil.carmody@partner.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP4 SMP: Corrected a typo fucntions to functions
Anoop Thomas Mathew [Wed, 18 Sep 2013 19:02:00 +0000 (12:02 -0700)]
ARM: OMAP4 SMP: Corrected a typo fucntions to functions

Corrected the functions spelling mistake in the OMAP4 SMP source file.

Signed-off-by: Anoop Thomas Mathew <atm@profoundis.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP4: cpuidle: fix: call cpu_cluster_pm_exit conditionally
Vladimir Murzin [Wed, 18 Sep 2013 19:02:00 +0000 (12:02 -0700)]
ARM: OMAP4: cpuidle: fix: call cpu_cluster_pm_exit conditionally

We call cpu_cluster_pm_enter for dev->cpu == 0 only, but
cpu_cluster_pm_exit called without that check.

Because of that unhandled page fault may happen:

[    3.803405] Unable to handle kernel paging request at virtual address 00002500
[    3.810974] pgd = c0004000
[    3.813812] [00002500] *pgd=00000000
[    3.817596] Internal error: Oops: 5 [#1] SMP ARM
[    3.822418] Modules linked in:
[    3.825653] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 3.11.0-rc6+ #21
[    3.832397] task: ed86ef40 ti: ed896000 task.ti: ed896000
[    3.838073] PC is at irq_notifier+0x234/0x25c
[    3.842651] LR is at irq_notifier+0x218/0x25c
[    3.847229] pc : [<c0029ed8>]    lr : [<c0029ebc>]    psr: 80000193
[    3.847229] sp : ed897ee8  ip : 00000005  fp : 00000001
[    3.859283] r10: c0b395f0  r9 : c0b30594  r8 : c0b8c2ac
[    3.864776] r7 : ffffffff  r6 : 00000000  r5 : 00000005  r4 : 00000000
[    3.871643] r3 : 00002500  r2 : 00000000  r1 : 00000005  r0 : 44302244
[    3.878479] Flags: Nzcv  IRQs off  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
[    3.886260] Control: 10c5387d  Table: 8000404a  DAC: 00000015
[    3.892272] Process swapper/1 (pid: 0, stack limit = 0xed896240)
[    3.898590] Stack: (0xed897ee8 to 0xed898000)
[    3.903167] 7ee0:                   c0979c3a 00000001 ed897ef8 ed896000 c0014f7c 00000000
[    3.911743] 7f00: 00000005 00000000 ffffffff c0b8c2ac c0b395f0 c077c04c c0c94b48 c0b3953c
[    3.920318] 7f20: c0bcd928 00000002 c0b39524 c00cfad8 00000000 ffffffff 00000000 c00cfb10
[    3.928924] 7f40: c14e62c0 c002c1c8 c002c0ac c14e62c0 00000002 e251c37d 00000000 c0b39548
[    3.937499] 7f60: c0b395f0 c05a1bc4 e251c37d 00000000 00000005 c05a3870 edc90380 edc90380
[    3.946105] 7f80: edc90394 c14e62c0 c0b39548 00000002 c0784064 c05a3c78 c0b395e0 c14e62c0
[    3.954681] 7fa0: 00000002 c0b39548 c0bc9db8 00000000 00000001 c05a1dc0 ed896000 00000015
[    3.963287] 7fc0: c0bc9db8 ed896000 8000406a c0b30594 c0784064 c000e504 00000746 c007a528
[    3.971862] 7fe0: 00000001 0000001d 600001d3 c0bcc004 00000000 800086c4 ee0aa6a7 d2aabaa9
[    3.980499] [<c0029ed8>] (irq_notifier+0x234/0x25c) from [<c077c04c>] (notifier_call_chain+0x38/0x68)
[    3.990173] [<c077c04c>] (notifier_call_chain+0x38/0x68) from [<c00cfad8>] (cpu_pm_notify+0x20/0x38)
[    3.999786] [<c00cfad8>] (cpu_pm_notify+0x20/0x38) from [<c00cfb10>] (cpu_cluster_pm_exit+0x20/0x50)
[    4.009399] [<c00cfb10>] (cpu_cluster_pm_exit+0x20/0x50) from [<c002c1c8>] (omap_enter_idle_coupled+0x11c/0x14c)
[    4.020111] [<c002c1c8>] (omap_enter_idle_coupled+0x11c/0x14c) from [<c05a1bc4>] (cpuidle_enter_state+0x40/0xec)
[    4.030822] [<c05a1bc4>] (cpuidle_enter_state+0x40/0xec) from [<c05a3c78>] (cpuidle_enter_state_coupled+0x1f4/0x240)
[    4.041870] [<c05a3c78>] (cpuidle_enter_state_coupled+0x1f4/0x240) from [<c05a1dc0>] (cpuidle_idle_call+0x150/0x228)
[    4.052947] [<c05a1dc0>] (cpuidle_idle_call+0x150/0x228) from [<c000e504>] (arch_cpu_idle+0x8/0x38)
[    4.062499] [<c000e504>] (arch_cpu_idle+0x8/0x38) from [<c007a528>] (cpu_startup_entry+0x178/0x1e4)
[    4.071990] [<c007a528>] (cpu_startup_entry+0x178/0x1e4) from [<800086c4>] (0x800086c4)
[    4.080383] Code: e5922288 03a03b0a 13a03c25 e0823003 (e5932000)
[    4.086791] ---[ end trace d83954a84a6fa69e ]---

It is supposed that sar_base is initialized in irq_save_context, which
is called on CPU_CLUSTER_PM_ENTER notification. If this notification
has been missed and CPU_CLUSTER_PM_EXIT is received sar_base is NULL.

Fix it by calling CPU_CLUSTER_PM_{ENTER,EXIT} under the same condition.

Signed-off-by: Vladimir Murzin <murzin.v@gmail.com>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agomailbox: remove unnecessary platform_set_drvdata()
Jingoo Han [Wed, 18 Sep 2013 19:02:00 +0000 (12:02 -0700)]
mailbox: remove unnecessary platform_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: mach-omap2: gpmc: Fix warning when CONFIG_ARM_LPAE=y
Fabio Estevam [Wed, 18 Sep 2013 19:01:59 +0000 (12:01 -0700)]
ARM: mach-omap2: gpmc: Fix warning when CONFIG_ARM_LPAE=y

When CONFIG_ARM_LPAE=y the following build warning is generated:

arch/arm/mach-omap2/gpmc.c:1495:4: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' [-Wformat]

According to Documentation/printk-formats.txt '%pa' can be used to properly
print 'resource_size_t'.

Reported-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP: fix return value check in omap_device_build_from_dt()
Wei Yongjun [Wed, 18 Sep 2013 19:01:58 +0000 (12:01 -0700)]
ARM: OMAP: fix return value check in omap_device_build_from_dt()

In case of error, the function omap_device_alloc() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
10 years agoARM: OMAP4: Fix clock_get error for GPMC during boot
Tony Lindgren [Wed, 18 Sep 2013 19:01:58 +0000 (12:01 -0700)]
ARM: OMAP4: Fix clock_get error for GPMC during boot

Looks like we still have the legacy clock alias name for
omap4 GPMC (General Purpose Memory Controller), so let's
fix it for the device tree naming. There's no need to keep
the legacy naming as omap4 is DT only nowadays.

Without this fix we get the following error while booting:

[    0.440399] omap-gpmc 50000000.gpmc: error: clk_get

Reported-by: Olof Johansson <olof@lixom.net>
Cc: stable@vger.kernel.org # v3.11
Signed-off-by: Tony Lindgren <tony@atomide.com>