Commit Graph

268387 Commits

Author SHA1 Message Date
hhb
5c79ff3b98 dma memcpy test:add dam thread number from 2 to 8 2012-08-13 17:56:26 +08:00
gwl
f0ea67991b Merge branch 'develop-3.0-rk2928' of ssh://10.10.10.29/rk/kernel into develop-3.0-rk2928 2012-08-13 16:39:36 +08:00
gwl
1a17aefc23 modify to enable WIFI_COUNTROL_FUNC as default 2012-08-13 16:39:23 +08:00
黄涛
86f5b0369c rk2928: register arm-pmu device 2012-08-13 16:17:26 +08:00
lw
cee1ab8448 phonepad:modify sdmmc gpio definition for phonepad 2012-08-13 13:03:43 +08:00
lw
da1e33bfb7 phonepad:add mt6620 support for phonepad board 2012-08-13 12:07:38 +08:00
黄涛
cc0132bc47 rk: make help only show rk board 2012-08-13 11:31:13 +08:00
xbw
2ecaebc366 SDMMC:
No essential changes, just to simplify the code submitted.
continue with the previous commit 3b4d3302d6
2012-08-12 14:38:27 +08:00
xbw
b4d6da95b6 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-12 13:33:05 +08:00
xbw
3b4d3302d6 SDMMC: add the power-off after closing of removing the card 2012-08-12 13:31:11 +08:00
xbw
20a22cc9d4 SDMMC: add the power-off after closing of removing the card 2012-08-12 13:20:07 +08:00
张晴
13da9d54f5 rk2928:fix alarm lose intterupt problem 2012-08-11 16:40:07 +08:00
ddl
68f440aa8b camera rk30: fix calculate ipp memory size is enough or not in try_fmt function, version update to v0.2.f 2012-08-11 16:15:47 +08:00
xbw
0e6ec11f61 sdmmc: mask the SD Ver3.0 supported 2012-08-11 12:51:47 +08:00
张晴
4ee78b7e3d rk30:phonepad:clear rtc status when enter sleep 2012-08-11 12:13:15 +08:00
lw@rock-chips.com
3e43263500 phonepad:fix alarm lose intterupt problem 2012-08-11 11:37:55 +08:00
张晴
6eb300d28f rk30:phone:Solve the power button interrupt failure 2012-08-11 10:05:07 +08:00
Zheng Yang
1995af3657 rk2928 acodec: audio record ok. 2012-08-10 20:22:23 +08:00
黄涛
a1f50a1367 rk2928: fpga: board-rk2928-fpga.c include board-rk2928-fpga-key.c 2012-08-10 16:08:29 +08:00
黄涛
0bafc5d583 rk2928: sdk: board-rk2928-sdk.c include board-rk2928-sdk-key.c 2012-08-10 16:05:08 +08:00
黄涛
a311ad50b3 rk2928: sdk: add board-rk2928-sdk-camera.c 2012-08-10 16:03:37 +08:00
许盛飞
5808110c43 rk30:auto-dimming function about light-sensor and backlight-curve 2012-08-10 15:58:43 +08:00
黄涛
cf1a1774b3 rk2928: pm: build pm.c use Thumb instruction set 2012-08-10 15:47:37 +08:00
黄涛
bb8e781915 rk2928: sdk: rename board-rk30-sdk-tps65910.c to board-rk2928-sdk-tps65910.c 2012-08-10 15:41:10 +08:00
黄涛
d81f17d7a5 rk2928: support boot mode 2012-08-10 15:33:43 +08:00
宋秀杰
08f419f626 phonepad: rt3261 add main mic and headset mic mute controls, add a solution for the speaker destroyed when playback. 2012-08-10 15:20:43 +08:00
宋秀杰
9c85cb1d28 phonepad: solve "assignment from incompatible pointer type" warning in codec driver. 2012-08-10 14:35:51 +08:00
xbw
ddb1decf73 add MTK-combo-module,continue with commit 17f39ed917 2012-08-10 14:27:55 +08:00
黄涛
c0652393eb rk: move loader.h from mach-rk30 to plat-rk 2012-08-10 14:22:32 +08:00
Zhaoyifeng
cc865eecde add reboot cmd save in grf os reg. 2012-08-10 14:06:55 +08:00
xbw
17f39ed917 add MTK-combo-module 2012-08-10 14:02:20 +08:00
xbw
a2809576ee sdmmc: continue with commit b479d89814. 2012-08-10 13:58:23 +08:00
xbw
4644fe5e5b revert the mach-rk30-Makefie. commit error in b479d89814 2012-08-10 12:31:57 +08:00
chenxing
b1be4be2e6 rk2928:sdk: add cif set rate interface 2012-08-10 11:11:02 +08:00
xbw
b479d89814 SDMMC:
1、modify the bug,some High speed card run in low speed.
2、fix the crash,due to the sdmmc interrupt occur during the machine power-on.
3、fix the crash, due to the Timeout timer and interrupt at the same time to.
4. add the sdio-INT from gpio interrupt for wake-up host.
5. add the CONFIG_WIFI_COMBO_MODULE_CONTROL_FUNC for combo-module.
2012-08-10 11:09:32 +08:00
宋秀杰
1212dde6b8 phonepad: rk29_rt3261.c set BT incall clock. 2012-08-10 10:26:17 +08:00
张晴
acfecf602c rk2928:modify gpio numbers 2012-08-10 10:24:55 +08:00
张晴
5c0b03403e rk2928:support pmic tp65910 gpio function 2012-08-10 10:11:17 +08:00
Greg Kroah-Hartman
b09b342580 Linux 3.0.40 v3.0.40 2012-08-09 08:28:18 -07:00
Darren Hart
b7a06be61b futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi()
commit 6f7b0a2a5c upstream.

If uaddr == uaddr2, then we have broken the rule of only requeueing
from a non-pi futex to a pi futex with this call. If we attempt this,
as the trinity test suite manages to do, we miss early wakeups as
q.key is equal to key2 (because they are the same uaddr). We will then
attempt to dereference the pi_mutex (which would exist had the futex_q
been properly requeued to a pi futex) and trigger a NULL pointer
dereference.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Dave Jones <davej@redhat.com>
Link: http://lkml.kernel.org/r/ad82bfe7f7d130247fbe2b5b4275654807774227.1342809673.git.dvhart@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:54 -07:00
Darren Hart
7367fdb498 futex: Fix bug in WARN_ON for NULL q.pi_state
commit f27071cb7f upstream.

The WARN_ON in futex_wait_requeue_pi() for a NULL q.pi_state was testing
the address (&q.pi_state) of the pointer instead of the value
(q.pi_state) of the pointer. Correct it accordingly.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Dave Jones <davej@redhat.com>
Link: http://lkml.kernel.org/r/1c85d97f6e5f79ec389a4ead3e367363c74bd09a.1342809673.git.dvhart@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:54 -07:00
Darren Hart
bc16cc3950 futex: Test for pi_mutex on fault in futex_wait_requeue_pi()
commit b6070a8d98 upstream.

If fixup_pi_state_owner() faults, pi_mutex may be NULL. Test
for pi_mutex != NULL before testing the owner against current
and possibly unlocking it.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Link: http://lkml.kernel.org/r/dc59890338fc413606f04e5c5b131530734dae3d.1342809673.git.dvhart@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:54 -07:00
Mikael Pettersson
e3d8d77f51 m68k: Correct the Atari ALLOWINT definition
commit c663600584 upstream.

Booting a 3.2, 3.3, or 3.4-rc4 kernel on an Atari using the
`nfeth' ethernet device triggers a WARN_ONCE() in generic irq
handling code on the first irq for that device:

WARNING: at kernel/irq/handle.c:146 handle_irq_event_percpu+0x134/0x142()
irq 3 handler nfeth_interrupt+0x0/0x194 enabled interrupts
Modules linked in:
Call Trace: [<000299b2>] warn_slowpath_common+0x48/0x6a
 [<000299c0>] warn_slowpath_common+0x56/0x6a
 [<00029a4c>] warn_slowpath_fmt+0x2a/0x32
 [<0005b34c>] handle_irq_event_percpu+0x134/0x142
 [<0005b34c>] handle_irq_event_percpu+0x134/0x142
 [<0000a584>] nfeth_interrupt+0x0/0x194
 [<001ba0a8>] schedule_preempt_disabled+0x0/0xc
 [<0005b37a>] handle_irq_event+0x20/0x2c
 [<0005add4>] generic_handle_irq+0x2c/0x3a
 [<00002ab6>] do_IRQ+0x20/0x32
 [<0000289e>] auto_irqhandler_fixup+0x4/0x6
 [<00003144>] cpu_idle+0x22/0x2e
 [<001b8a78>] printk+0x0/0x18
 [<0024d112>] start_kernel+0x37a/0x386
 [<0003021d>] __do_proc_dointvec+0xb1/0x366
 [<0003021d>] __do_proc_dointvec+0xb1/0x366
 [<0024c31e>] _sinittext+0x31e/0x9c0

After invoking the irq's handler the kernel sees !irqs_disabled()
and concludes that the handler erroneously enabled interrupts.

However, debugging shows that !irqs_disabled() is true even before
the handler is invoked, which indicates a problem in the platform
code rather than the specific driver.

The warning does not occur in 3.1 or older kernels.

It turns out that the ALLOWINT definition for Atari is incorrect.

The Atari definition of ALLOWINT is ~0x400, the stated purpose of
that is to avoid taking HSYNC interrupts.  irqs_disabled() returns
true if the 3-bit ipl & 4 is non-zero.  The nfeth interrupt runs at
ipl 3 (it's autovector 3), but 3 & 4 is zero so irqs_disabled() is
false, and the warning above is generated.

When interrupts are explicitly disabled, ipl is set to 7.  When they
are enabled, ipl is masked with ALLOWINT.  On Atari this will result
in ipl = 3, which blocks interrupts at ipl 3 and below.  So how come
nfeth interrupts at ipl 3 are received at all?  That's because ipl
is reset to 2 by Atari-specific code in default_idle(), again with
the stated purpose of blocking HSYNC interrupts.  This discrepancy
means that ipl 3 can remain blocked for longer than intended.

Both default_idle() and falcon_hblhandler() identify HSYNC with
ipl 2, and the "Atari ST/.../F030 Hardware Register Listing" agrees,
but ALLOWINT is defined as if HSYNC was ipl 3.

[As an experiment I modified default_idle() to reset ipl to 3, and
as expected that resulted in all nfeth interrupts being blocked.]

The fix is simple: define ALLOWINT as ~0x500 instead.  This makes
arch_local_irq_enable() consistent with default_idle(), and prevents
the !irqs_disabled() problems for ipl 3 interrupts.

Tested on Atari running in an Aranym VM.

Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Tested-by: Michael Schmitz <schmitzmic@googlemail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:53 -07:00
Andreas Schwab
d3be3eeedb m68k: Make sys_atomic_cmpxchg_32 work on classic m68k
commit 9e2760d18b upstream.

User space access must always go through uaccess accessors, since on
classic m68k user space and kernel space are completely separate.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Tested-by: Thorsten Glaser <tg@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:53 -07:00
Mark Brown
3b6ae1807d ASoC: wm8994: Ensure there are enough BCLKs for four channels
commit b8edf3e552 upstream.

Otherwise if someone tries to use all four channels on AIF1 with the
device in master mode we won't be able to clock out all the data.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:53 -07:00
Mark Brown
4ae4c20ceb ASoC: wm8962: Allow VMID time to fully ramp
commit 9d40e5582c upstream.

Required for reliable power up from cold.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:53 -07:00
Takashi Iwai
de4bc9fc94 ALSA: mpu401: Fix missing initialization of irq field
commit bc733d4952 upstream.

The irq field of struct snd_mpu401 is supposed to be initialized to -1.
Since it's set to zero as of now, a probing error before the irq
installation results in a kernel warning "Trying to free already-free
IRQ 0".

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=44821
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:53 -07:00
Daniel Mack
f45cd6dfe0 ALSA: snd-usb: fix clock source validity index
commit aff252a848 upstream.

uac_clock_source_is_valid() uses the control selector value to access
the bmControls bitmap of the clock source unit. This is wrong, as
control selector values start from 1, while the bitmap uses all
available bits.

In other words, "Clock Validity Control" is stored in D3..2, not D5..4
of the clock selector unit's bmControls.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Reported-by: Andreas Koch <andreas@akdesigninc.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:53 -07:00
Colin Ian King
aeaab8a0fe USB: echi-dbgp: increase the controller wait time to come out of halt.
commit f96a4216e8 upstream.

The default 10 microsecond delay for the controller to come out of
halt in dbgp_ehci_startup is too short, so increase it to 1 millisecond.

This is based on emperical testing on various USB debug ports on
modern machines such as a Lenovo X220i and an Ivybridge development
platform that needed to wait ~450-950 microseconds.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:53 -07:00
Mathias Krause
4e98953723 net/tun: fix ioctl() based info leaks
[ Upstream commits a117dacde0
  and 8bbb181308 ]

The tun module leaks up to 36 bytes of memory by not fully initializing
a structure located on the stack that gets copied to user memory by the
TUNGETIFF and SIOCGIFHWADDR ioctl()s.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:53 -07:00