08 May, 2010
1 commit
-
* 'v4l_for_2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB: pxa_camera: move fifo reset direct before dma start
V4L/DVB: video: testing unsigned for less than 0
V4L/DVB: mx1-camera: compile fix
V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer dereference"
V4L/DVB: ngene: Workaround for stuck DiSEqC pin
V4L/DVB: saa7146: fix regression of the av7110/budget-av driver
V4L/DVB: v4l: fix config dependencies: mxb and saa7191 are V4L2 drivers, not V4L1
V4L/DVB: feature-removal: announce videotext.h removal
V4L/DVB: V4L - vpfe capture - fix for kernel crash
V4L/DVB: gspca: make usb id 0461:0815 get handled by the right driver
V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver
V4L/DVB: gspca - sn9c20x: Correct onstack wait_queue_head declaration
V4L/DVB: saa7146: fix up bytesperline if it is an impossible value
V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails
V4L/DVB: V4L - Makfile:Removed duplicate entry of davinci
V4L/DVB: omap24xxcam: potential buffer overflow
07 May, 2010
1 commit
-
This fixes a regression of
7d58289 (mx1: prefix SOC specific defines with MX1_ and deprecate old names)
Signed-off-by: Uwe Kleine-König
Acked-by: Sascha Hauer
Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Mauro Carvalho Chehab
06 May, 2010
9 commits
-
The use of mfp_cfg_t causes build errors without including .
CC: stable@kernel.org
CC: Daniel Mack
Signed-off-by: Jakob Viketoft
Signed-off-by: Eric Miao -
On/Off contains slash in the name, which causes warning during boot.
Signed-off-by: Pavel Machek
Signed-off-by: Eric Miao -
Fix the wrong variable used in cpu_is_pxa950().
Signed-off-by: Haojian Zhuang
Signed-off-by: Eric Miao -
Update CPUID pattern of PXA9xx in head.S and fix the duplicate
entries for pxa935.Signed-off-by: Haojian Zhuang
Signed-off-by: Eric Miao -
The timeout value is in jiffies, so it should be using HZ, not a plain
number. Assume with HZ=100 '100' means 1s here and adapt accordingly.Signed-off-by: Wolfram Sang
Acked-by: Marc Zyngier
Cc: Russell King
Cc: Paul Shen
Cc: Mike Rapoport
Cc: Jean Delvare
Signed-off-by: Eric Miao -
"on/off button" was recently renamed to remove the slash character.
Follow that change in the pin polarity detection as well.While at it, fix another cosmetic coding style flaw as well.
Signed-off-by: Daniel Mack
Signed-off-by: Eric Miao -
- Bring in a CMDLINE that actually works and prints to the right tty
- Compile-in JFFS2 to boot into rootfs
- Remove unneeded options for Bluetooth and radio
- Disable CPU_FREQ as it makes the flash driver failThanks Jonathan for spotting what I messed up.
Signed-off-by: Stefan Schmidt
Acked-by: Jonathan Cameron
Signed-off-by: Eric Miao -
Signed-off-by: Igor Grinberg
Signed-off-by: Eric Miao
05 May, 2010
1 commit
-
The show_mem() and mem_init() function are assuming that the page map is
contiguous and calculates the start and end page of a bank using (map +
pfn). This fails with SPARSEMEM where pfn_to_page() must be used.Tested-by: Will Deacon
Tested-by: Marek Vasut
Signed-off-by: Catalin Marinas
Signed-off-by: Russell King
03 May, 2010
1 commit
01 May, 2010
8 commits
-
iop32x_defconfig:
In file included from include/linux/elf.h:7,
from kernel/elfcore.c:1:
arch/arm/include/asm/elf.h:101: warning: "struct task_struct" declared inside parameter list
arch/arm/include/asm/elf.h:101: warning: its scope is only this definition or declaration, which is probably not what you wantSigned-off-by: Andrew Morton
Signed-off-by: Russell King -
Test the just-allocated value for NULL rather than some other value.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)//
@@
expression x,y;
statement S;
@@x = \(kmalloc\|kcalloc\|kzalloc\)(...);
(
if ((x) == NULL) S
|
if (
- y
+ x
== NULL)
S
)
//Signed-off-by: Julia Lawall
Cc: Eric Miao
Signed-off-by: Andrew Morton
Signed-off-by: Russell King -
Just to make sure that this driver won't run on StrongArm SA1100
when both SA1100 and SA1110 cpufreq drivers are built in (usually
in multimachine config). SA1100 driver already has similar check.Signed-off-by: Dmitry Artamonow
Acked-by: Eric Miao
Acked-by: Kristoffer Ericson
Signed-off-by: Russell King -
They have StrongARM SA1110, not SA1100.
Signed-off-by: Dmitry Artamonow
Acked-by: Eric Miao
Acked-by: Kristoffer Ericson
Signed-off-by: Russell King -
Signed-off-by: Russell King
-
This patch fixes the preempt leak in the cpuidle path invoked from
cpu-hotplug. The fix is suggested by Russell King and is based
on x86 idea of calling init_idle() on the idle task when it's
re-used which also resets the preempt count amongst other thingsdump:
BUG: scheduling while atomic: swapper/0/0x00000002
Modules linked in:
Backtrace:
[] (dump_backtrace+0x0/0x110) from [] (dump_stack+0x18/0x1c)
r7:c02149e4 r6:c033df00 r5:c7836000 r4:00000000
[] (dump_stack+0x0/0x1c) from [] (__schedule_bug+0x60/0x70)
[] (__schedule_bug+0x0/0x70) from [] (schedule+0x98/0x7b8)
r5:c7836000 r4:c7836000
[] (schedule+0x0/0x7b8) from [] (cpu_idle+0xb4/0xd4)
# [] (cpu_idle+0x0/0xd4) from [] (secondary_start_kernel+0xe0/0xf0)
r5:c7836000 r4:c0205f40
[] (secondary_start_kernel+0x0/0xf0) from [] (prm_rmw_mod_reg_bits+0x88/0xa4)
r7:c02149e4 r6:00000001 r5:00000001 r4:c7836000
Backtrace aborted due to bad frame pointerCc: Catalin Marinas
Signed-off-by: Santosh Shilimkar
Signed-off-by: Russell King -
With CONFIG_KPROBES enabled two section are getting created which
leads to below build break.LOG:
AS arch/arm/kernel/entry-armv.o
arch/arm/kernel/entry-armv.S: Assembler messages:
arch/arm/kernel/entry-armv.S:431: Error: symbol ret_from_exception is in a different section
arch/arm/kernel/entry-armv.S:490: Error: symbol ret_from_exception is in a different section
arch/arm/kernel/entry-armv.S:491: Error: symbol __und_usr_unknown is in a different sectionThis was introduced by commit 4260415f6a3b92c5c986398d96c314df37a4ccbf
Reported-by: Anand Gadiyar
Signed-off-by: Santosh Shilimkar
Signed-off-by: Russell King -
MUSB can supply upto 500mA such as, AM3517 and OMAP3EVM Rev >=E and thus
the 'power' field has to hold values above 255.Signed-off-by: Ajay Kumar Gupta
Signed-off-by: Felipe Balbi
Signed-off-by: Greg Kroah-Hartman
30 Apr, 2010
1 commit
-
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working.
ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB
ARM: 6030/1: KS8695: enable console
ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT.
ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs.
ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
ARM: fix build error in arch/arm/kernel/process.c
29 Apr, 2010
1 commit
-
The switch to using GPIOLIB broke the sd/mmc card detection on the
RealView development boards if GPIO_PL061 was not selected.
This patch selects GPIO_PL061 if GPIOLIB is selected.
The sense of the return value from mmc_status has also changed
and is corrected.Signed-off-by: Colin Tuckley
Acked-by: Catalin Marinas
Signed-off-by: Russell King
27 Apr, 2010
1 commit
-
…/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (39 commits)
omap: delete unused bootloader tag variables
omap: Devkit8000: Remove unused pins
omap: Devkit8000: Change position of init calls
omap: Devkit8000: Remove unnecessary include file
omap: Devkit8000: Fix typo in pin name
omap: Devkit8000: Add missing package selection
omap: Devkit8000: Fix typo in supplies
n8x0_defconfig: remove CONFIG_NILFS2_FS override
omap: board-sdp-flash.c: Fix typos in debug output
omap4: Fix McBSP4 base address
omap: rx51_defconfig: Remove CONFIG_SYSFS_DEPRECATED*=y options
omap: rx51_defconfig: Remove duplicate phonet
omap: fix a gpmc nand problem
AM3517: initialize i2c subsystem after mux subsystem
omap: remove one of the define of INT_34XX_BENCH_MPU_EMUL
omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabled
OMAP4: Clocks: Change SPI Instance Names
omap: Devkit8000: Fix wrong usb port on Devkit8000
OMAP4: Fix for CONTROL register Base
OMAP4-HSMMC: FIX for MMC5 Controller IRQ Base
...
24 Apr, 2010
16 commits
-
They are not needed and add over 512 bytes to kernel data.
Signed-off-by: Aaro Koskinen
Signed-off-by: Tony Lindgren -
Old code from original patch contains beagle board pins that are
not available on the Devkit8000.Signed-off-by: Thomas Weber
Signed-off-by: Tony Lindgren -
Change position of calling serial and ethernet initialization.
Signed-off-by: Thomas Weber
Signed-off-by: Tony Lindgren -
Remove include otg.h.
Signed-off-by: Thomas Weber
Signed-off-by: Tony Lindgren -
Replace wrong sdr_cke[01] with sdrc_cke[01].
Signed-off-by: Thomas Weber
Signed-off-by: Tony Lindgren -
Devkit8000 uses the CUS package for OMAP3530.
This patch adds missing package selection for CUS and enables
CONFIG_MUX.Replace whitespace with tab in Kconfig.
Signed-off-by: Thomas Weber
Signed-off-by: Tony Lindgren -
Replace wrong vdss_dsi with vdds_dsi.
Signed-off-by: Thomas Weber
Signed-off-by: Tony Lindgren -
arch/arm/configs/n8x0_defconfig:1061:warning: override: reassigning to
symbol NILFS2_FSSigned-off-by: Francisco Alecrim
Signed-off-by: Tony Lindgren -
Corrected type of flash in output (OneNAND => NOR).
Removed whitespace after newline in output.
Removed double whitespace in output.Signed-off-by: Thomas Weber
Signed-off-by: Tony Lindgren -
This patch fixes the McBSP4 base address for OMAP4
Signed-off-by: Balaji T K
Signed-off-by: Tony Lindgren -
Modern udev will not work with the CONFIG_SYSFS_DEPRECATED*=y options and
it seems also that the Maemo release works without when testing with the
Maemo 2.6.28 kernel.Signed-off-by: Jarkko Nikula
Signed-off-by: Tony Lindgren -
Phonet is enabled by the commit bce54fed941e03695ab557100a4bd1e457abca42
and this duplicate gives a warning when doing make rx51_defconfig.Signed-off-by: Jarkko Nikula
Acked-by: Felipe Balbi
Signed-off-by: Tony Lindgren -
If gpmc_t isn't given, we don't need to set timing for gpmc, or it will cause
a Oops.Signed-off-by: Stanley.Miao
Signed-off-by: Tony Lindgren -
The initialize of i2c subsystem will set pinmux, so it should be done
after the initialize of mux subsystem initialization.Signed-off-by: Stanley.Miao
Signed-off-by: Tony Lindgren -
INT_34XX_BENCH_MPU_EMUL was defined twice, another is at Line 312.
Signed-off-by: Stanley.Miao
Signed-off-by: Tony Lindgren -
If CONFIG_MTD_NAND_OMAP2 is not enabled, there will be a compile error,
"gpmc_nand_init() is not defined". Add a inline noop function to fix it.Signed-off-by: Stanley.Miao
Signed-off-by: Tony Lindgren
