Commit Graph

269086 Commits

Author SHA1 Message Date
wlq
7214eed2e0 add sc6610 modem 2012-10-10 17:48:24 +08:00
chenxing
5a21da2289 rk3066b: add gpu auto scale freq(max 600MHz) support 2012-10-10 17:25:01 +08:00
yzq
1cb63cd381 rk3066b m701: add CHG_EN PIN ctrl for large current charging 2012-10-10 15:13:39 +08:00
yzq
3ae156406a rk3066b m701:change screen stb timing 2012-10-10 15:12:00 +08:00
邱建斌
a330e24830 wm8994:
Merger i8 driver
2012-10-10 14:56:00 +08:00
邱建斌
f2b13bf6cf headset:
Merger s793x i8 headset driver
2012-10-10 14:36:44 +08:00
xbw
8bdb10d97e SDMMC: how to use gpio-interrupt to detect card rather than to use register-interrupt.
If your project is synchronized with the server after 2012-9-27, you can modify your board-xxx.c lock like the board-rk30-sdk.c int the commit.
Of course, if your project is such older, you have to cherry-pick the bellow commit
            commit 9ab32ee1a1
Author: xbw <xbw@rock-chips.com>
Date:   Thu Sep 27 21:23:07 2012 +0800

    SDMMC:use gpio-interrupt to detect card.
    Please attention to define the detect-pin name and the insert-card voltage in your board_xxxx.c.

M       arch/arm/mach-rk2928/board-rk2928-a720.c
M       arch/arm/plat-rk/include/plat/board.h
M       drivers/mmc/host/Kconfig
M       drivers/mmc/host/rk29_sdmmc.c
2012-10-10 14:09:57 +08:00
luowei
96dc961016 rk30_phonepad:add DUAL_LCDC config 2012-10-10 13:04:50 +08:00
黄涛
1847bda830 rk3066b: cpufreq: no limit gpu freq 2012-10-10 11:45:14 +08:00
linjh
8a5a298c00 rk2928-phonepad-sdk: add hi704 camera support
[reference files]
	modified:
		arch/arm/configs/rk2928_phonepad_defconfig
		arch/arm/mach-rk2928/board-rk2928-phonepad-camera.c
2012-10-10 09:59:31 +08:00
linjh
d8224526a4 rk2928-phonepad-sdk: add kxtik gsensor support
[reference files]

	modified:
	    arch/arm/configs/rk2928_phonepad_defconfig
        arch/arm/mach-rk2928/board-rk2928-phonepad.c
2012-10-09 22:43:22 +08:00
luowei
5f5bd605ab rk30_phonepad:add auto touchscreen support 2012-10-09 20:10:19 +08:00
luowei
45cf62bd9c rk30_phonepad:add auto lcd support 2012-10-09 20:02:21 +08:00
hzf
ab19a50b4d rk2928_phone_pad:add sd card support 2012-10-09 19:18:00 +08:00
xieyi
ba3e1d5c4e rk2928: act8931: switch charge current when suspend 2012-10-09 18:41:53 +08:00
宋秀杰
ef39e638be phonepad: rt3261 add HDMI codec_set_spk function. 2012-10-09 18:39:45 +08:00
黄涛
a197e87b57 rk: config: enlarge COMMAND_LINE_SIZE from 1024 to 65536 2012-10-09 18:28:34 +08:00
hzf
34a2c0832f rk2928_phone_pad:add charger display 2012-10-09 18:08:20 +08:00
黄涛
f0314f649a rk2928: clock: fix dump_clock for pll 2012-10-09 16:53:24 +08:00
黄涛
10f20d9a80 rk30: clock: fix dump_clock for pll 2012-10-09 16:53:24 +08:00
hzf
61d5cf9a6c rk2928_phonepad:add pa control io 2012-10-09 16:33:51 +08:00
chenxing
1eed25cfdc rk2928: update cpu axi freq 2012-10-09 14:57:42 +08:00
linjh
8bcede8e03 rk2928 phonepad sdk: modify lcd gpio config
[reference file]

	modified:   arch/arm/mach-rk2928/board-rk2928-phonepad.c
2012-10-09 14:17:16 +08:00
kfx
0cf0742344 move port config interface to arch/arm/plat-rk 2012-10-09 12:21:19 +08:00
hcy
2e1c5af1fa enable DLL normal mode 2012-10-09 11:38:26 +08:00
kfx
d02bbcd5f4 rk2928: port config: add port operation interface 2012-10-09 11:30:00 +08:00
zyc
6e078d3fcc camera: fix gpio request erro of setting multiple camera. 2012-10-09 10:41:59 +08:00
xieyi
100b7257b5 sensor: correct mma7660 range to 1.5g 2012-10-09 10:31:04 +08:00
yzq
1c8302e7ba rk3066b m701: add lcd_stb_pin ctrl 2012-10-09 10:27:28 +08:00
luowei
9922f72601 rk30_phonepad:delete wifi control in board file 2012-10-09 09:34:00 +08:00
宋秀杰
44360a719c phonepad: detect MCLK to protect speaker. 2012-10-09 09:09:13 +08:00
张晴
48947e93f0 rk2926:m713:slove wakeup fail 2012-10-08 15:14:59 +08:00
黄涛
269555910b Revert "rk30: scu enable speculative linefills"
This reverts commit 5adf4d05e6.
2012-10-08 14:49:06 +08:00
黄涛
ae5a33ec07 rk: configs: all enable SCHED_DEBUG for support Android 2012-10-08 14:27:52 +08:00
luowei
3eabacc78b rk30_phonepad:add get board id support 2012-10-08 14:09:15 +08:00
黄涛
cb43413bdb Merge branch 'develop-3.0' of ssh://rk29/rk/kernel into develop-3.0 2012-10-08 10:35:25 +08:00
Zheng Yang
2d947e285e rk2928:acodec: move delay position to avoid kernel schedule error. 2012-10-08 10:34:33 +08:00
黄涛
21158e22d9 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
Conflicts:
	Makefile
	drivers/mmc/core/sd.c
	drivers/net/usb/asix.c
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2400pci.h
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2500usb.h
	drivers/net/wireless/rt2x00/rt2800pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt61pci.h
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/net/wireless/rt2x00/rt73usb.h
	drivers/net/wireless/rtl818x/rtl8187/dev.c
	drivers/usb/serial/option.c
	kernel/time/timekeeping.c
2012-10-08 10:28:29 +08:00
Colin Cross
d21898f690 timekeeping: fix 32-bit overflow in get_monotonic_boottime
get_monotonic_boottime adds three nanonsecond values stored
in longs, followed by an s64.  If the long values are all
close to 1e9 the first three additions can overflow and
become negative when added to the s64.  Cast the first
value to s64 so that all additions are 64 bit.

Change-Id: Ic996d8b6fbef0b72f2d027b0d8ef5259b5c1a540
Signed-off-by: Colin Cross <ccross@android.com>
2012-10-08 09:32:23 +08:00
JP Abgrall
fe2ebf0691 netfilter: xt_qtaguid: report only uid tags to non-privileged processes
In the past, a process could only see its own stats (uid-based summary,
and details).
Now we allow any process to see other UIDs uid-based stats, but still
hide the detailed stats.

Change-Id: I7666961ed244ac1d9359c339b048799e5db9facc
Signed-off-by: JP Abgrall <jpa@google.com>
2012-10-08 09:32:07 +08:00
Greg Kroah-Hartman
24e842ae6c Linux 3.0.45 v3.0.45 2012-10-07 08:28:29 -07:00
Bart Van Assche
d71df5421f SCSI: scsi_dh_alua: Enable STPG for unavailable ports
commit e47f8976d8 upstream.

A quote from SPC-4: "While in the unavailable primary target port
asymmetric access state, the device server shall support those of
the following commands that it supports while in the active/optimized
state: [ ... ] d) SET TARGET PORT GROUPS; [ ... ]". Hence enable
sending STPG to a target port group that is in the unavailable state.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Acked-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-07 08:27:27 -07:00
Dan Williams
8fda07927a SCSI: scsi_remove_target: fix softlockup regression on hot remove
commit bc3f02a795 upstream.

John reports:
 BUG: soft lockup - CPU#2 stuck for 23s! [kworker/u:8:2202]
 [..]
 Call Trace:
  [<ffffffff8141782a>] scsi_remove_target+0xda/0x1f0
  [<ffffffff81421de5>] sas_rphy_remove+0x55/0x60
  [<ffffffff81421e01>] sas_rphy_delete+0x11/0x20
  [<ffffffff81421e35>] sas_port_delete+0x25/0x160
  [<ffffffff814549a3>] mptsas_del_end_device+0x183/0x270

...introduced by commit 3b661a9 "[SCSI] fix hot unplug vs async scan race".

Don't restart lookup of more stargets in the multi-target case, just
arrange to traverse the list once, on the assumption that new targets
are always added at the end.  There is no guarantee that the target will
change state in scsi_target_reap() so we can end up spinning if we
restart.

Acked-by: Jack Wang <jack_wang@usish.com>
LKML-Reference: <CAEhu1-6wq1YsNiscGMwP4ud0Q+MrViRzv=kcWCQSBNc8c68N5Q@mail.gmail.com>
Reported-by: John Drescher <drescherjm@gmail.com>
Tested-by: John Drescher <drescherjm@gmail.com>
Signed-off-by: Dan Williams <djbw@fb.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-07 08:27:27 -07:00
Yinghai Lu
fc3ef182a1 PCI: honor child buses add_size in hot plug configuration
commit be768912a4 upstream.

git commit c8adf9a3e8
    "PCI: pre-allocate additional resources to devices only after
	successful allocation of essential resources."

fails to take into consideration the optional-resources needed by children
devices while calculating the optional-resource needed by the bridge.

This can be a problem on some setup. For example, if a hotplug bridge has 8
children hotplug bridges, the bridge should have enough resources to accomodate
the hotplug requirements for each of its children hotplug bridges.  Currently
this is not the case.

This patch fixes the problem.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Reviewed-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Andrew Worsley <amworsley@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-07 08:27:27 -07:00
Avi Kivity
368d531593 x86/alternatives: Fix p6 nops on non-modular kernels
commit cb09cad44f upstream.

Probably a leftover from the early days of self-patching, p6nops
are marked __initconst_or_module, which causes them to be
discarded in a non-modular kernel.  If something later triggers
patching, it will overwrite kernel code with garbage.

Reported-by: Tomas Racek <tracek@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: qemu-devel@nongnu.org
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Alan Cox <alan@linux.intel.com>
Link: http://lkml.kernel.org/r/5034AE84.90708@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Ben Jencks <ben@bjencks.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-07 08:27:27 -07:00
Dan Williams
42cc576bf2 isci: fix isci_pci_probe() generates warning on efi failure path
commit 6d70a74ffd upstream.

The oem parameter image embedded in the efi variable is at an offset
from the start of the variable.  However, in the failure path we try to
free the 'orom' pointer which is only valid when the paramaters are
being read from the legacy option-rom space.

Since failure to load the oem parameters is unlikely and we keep the
memory around in the success case just defer all de-allocation to devm.

Reported-by: Don Morris <don.morris@hp.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-07 08:27:27 -07:00
Bart Van Assche
738589592a IB/srp: Avoid having aborted requests hang
commit d853667091 upstream.

We need to call scsi_done() for commands after we abort them.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Acked-by: David Dillow <dillowda@ornl.gov>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-07 08:27:27 -07:00
Bart Van Assche
7846edbf0c IB/srp: Fix use-after-free in srp_reset_req()
commit 9b796d06d5 upstream.

srp_free_req() uses the scsi_cmnd structure contents to unmap
buffers, so we must invoke srp_free_req() before we release
ownership of that structure.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Acked-by: David Dillow <dillowda@ornl.gov>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-07 08:27:27 -07:00
Patrick McHardy
0a442076e4 IPoIB: Fix use-after-free of multicast object
commit bea1e22df4 upstream.

Fix a crash in ipoib_mcast_join_task().  (with help from Or Gerlitz)

Commit c8c2afe360 ("IPoIB: Use rtnl lock/unlock when changing device
flags") added a call to rtnl_lock() in ipoib_mcast_join_task(), which
is run from the ipoib_workqueue, and hence the workqueue can't be
flushed from the context of ipoib_stop().

In the current code, ipoib_stop() (which doesn't flush the workqueue)
calls ipoib_mcast_dev_flush(), which goes and deletes all the
multicast entries.  This takes place without any synchronization with
a possible running instance of ipoib_mcast_join_task() for the same
ipoib device, leading to a crash due to NULL pointer dereference.

Fix this by making sure that the workqueue is flushed before
ipoib_mcast_dev_flush() is called.  To make that possible, we move the
RTNL-lock wrapped code to ipoib_mcast_join_finish().

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-07 08:27:26 -07:00
Wei Yongjun
d125a7eba6 can: mscan-mpc5xxx: fix return value check in mpc512x_can_get_clock()
commit f61bd0585d upstream.

In case of error, the function clk_get() returns ERR_PTR()
and never returns NULL pointer. The NULL test in the error
handling should be replaced with IS_ERR().

dpatch engine is used to auto generated this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-07 08:27:26 -07:00