Russell King [Sat, 15 Jan 2011 13:24:02 +0000 (13:24 +0000)]
Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable
Russell King [Sat, 15 Jan 2011 12:39:04 +0000 (12:39 +0000)]
Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Eric Miao [Fri, 14 Jan 2011 17:01:00 +0000 (11:01 -0600)]
ARM: pxa: fix building issue of missing physmap.h
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Philip Rakity [Fri, 7 Jan 2011 19:27:46 +0000 (11:27 -0800)]
ARM: mmp: PXA910 drive strength FAST using wrong value
Drive strength for PXA910 is a 2 bit value but because of the mapping in
plat-pxa/mfp.h needs to be shifted up one bit to handle real
location in mfp registers. (MMP2 and PXA910 drive strength start
at bit 11 while PXA168 starts at bit 10).
Values 0, 1, 2, and 3 effectively need to be
0, 2, 4, and 6 to fit into register. 8 does not work.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Philip Rakity [Fri, 7 Jan 2011 19:26:52 +0000 (11:26 -0800)]
ARM: mmp: MMP2 drive strength FAST using wrong value
Drive strength for MMP2 is a 2 bit value but because of the mapping in
plat-pxa/mfp.h needs to be shifted up one bit to handle real
location in mfp registers. (MMP2 and PXA910 drive strength start
at bit 11 while PXA168 starts at bit 10).
Values 0, 1, 2, and 3 effectively need to be
0, 2, 4, and 6 to fit into register. 8 does not work.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Tested-by: John Watlington <wad@laptop.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Eric Miao [Wed, 12 Jan 2011 22:42:24 +0000 (16:42 -0600)]
ARM: pxa: fix recursive calls in pxa_low_gpio_chip
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Tested-by: Marek Vasut <marek.vasut@gmail.com>
Russell King [Fri, 14 Jan 2011 22:17:32 +0000 (22:17 +0000)]
Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Igor Plyatov [Fri, 14 Jan 2011 18:01:13 +0000 (19:01 +0100)]
AT91: Support for gsia18s board
The GS_IA18_S (GMS) is a carrier board from GeoSIG Ltd used with the
Stamp9G20 SoM from Taskit company.
It operate as an internet accelerometer.
Signed-off-by: Igor Plyatov <plyatov@gmail.com>
[nicolas.ferre@atmel.com: rm Kconfig, whitespace fixes, change machine name]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Sergio Tanzilli [Thu, 14 Oct 2010 00:06:26 +0000 (02:06 +0200)]
AT91: Acme Systems FOX Board G20 board files
Signed-off-by: Sergio Tanzilli <tanzilli@acmesystems.it>
[nicolas.ferre@atmel.com: whitespace fixes, change machine name]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Jesper Juhl [Mon, 10 Jan 2011 21:29:32 +0000 (22:29 +0100)]
AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Marek Vasut [Mon, 10 Jan 2011 22:53:12 +0000 (23:53 +0100)]
ARM: pxa: fix suspend/resume array index miscalculation
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Marek Vasut [Sun, 9 Jan 2011 23:29:04 +0000 (00:29 +0100)]
ARM: pxa: use cpu_has_ipr() consistently in irq.c
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Marek Vasut [Sun, 9 Jan 2011 23:29:03 +0000 (00:29 +0100)]
ARM: pxa: remove unused variable in clock-pxa3xx.c
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Marek Vasut [Sun, 9 Jan 2011 23:29:02 +0000 (00:29 +0100)]
ARM: pxa: fix warning in zeus.c
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Pavel Machek [Mon, 10 Jan 2011 22:35:34 +0000 (16:35 -0600)]
ARM: sa1111: fix typo in sa1111_retrigger_lowirq()
Signed-off-by: Pavel Machek <pma@sysgo.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Russell King [Fri, 14 Jan 2011 12:12:42 +0000 (12:12 +0000)]
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Sascha Hauer [Thu, 13 Jan 2011 15:59:25 +0000 (16:59 +0100)]
ARM mxs: clkdev related compile fixes
Since commit
6d803ba (ARM: 6483/1: arm & sh: factorised duplicated clkdev.c)
platforms need to select CLKDEV_LOOKUP instead of COMMON_CLKDEV and need
to include <linux/clkdev.h>.
Cc: Shawn Guo <shawn.guo@freescale.com>
Cc: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 14 Jan 2011 08:44:02 +0000 (09:44 +0100)]
ARM i.MX mx31_3ds: Fix MC13783 regulator names
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Lennert Buytenhek [Mon, 29 Nov 2010 10:23:26 +0000 (11:23 +0100)]
ARM: plat-stmp3xxx: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 10:22:33 +0000 (11:22 +0100)]
ARM: plat-spear: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Lennert Buytenhek [Mon, 29 Nov 2010 10:17:38 +0000 (11:17 +0100)]
ARM: plat-orion: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Lennert Buytenhek [Mon, 29 Nov 2010 10:17:17 +0000 (11:17 +0100)]
ARM: plat-omap: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 10:16:48 +0000 (11:16 +0100)]
ARM: plat-nomadik: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Rabin Vincent <rabin.vincent@stericsson.com>
Lennert Buytenhek [Mon, 29 Nov 2010 10:16:23 +0000 (11:16 +0100)]
ARM: plat-mxc: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 10:15:19 +0000 (11:15 +0100)]
ARM: w90x900: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Lennert Buytenhek [Mon, 29 Nov 2010 10:15:01 +0000 (11:15 +0100)]
ARM: versatile: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Lennert Buytenhek [Mon, 29 Nov 2010 10:14:46 +0000 (11:14 +0100)]
ARM: tegra: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 10:14:16 +0000 (11:14 +0100)]
ARM: tcc8k: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 10:13:59 +0000 (11:13 +0100)]
ARM: stmp37xx: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 10:13:40 +0000 (11:13 +0100)]
ARM: stmp378x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 10:12:34 +0000 (11:12 +0100)]
ARM: shark: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 10:12:06 +0000 (11:12 +0100)]
ARM: sa1100: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 10:07:20 +0000 (11:07 +0100)]
ARM: rpc: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Lennert Buytenhek [Mon, 29 Nov 2010 10:18:26 +0000 (11:18 +0100)]
ARM: PXA SoCs: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:40:16 +0000 (10:40 +0100)]
ARM: pnx4008: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:39:59 +0000 (10:39 +0100)]
ARM: omap2: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:39:27 +0000 (10:39 +0100)]
ARM: omap1: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:38:52 +0000 (10:38 +0100)]
ARM: nuc93x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Lennert Buytenhek [Mon, 29 Nov 2010 09:38:34 +0000 (10:38 +0100)]
ARM: ns9xxx: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Lennert Buytenhek [Mon, 29 Nov 2010 09:38:10 +0000 (10:38 +0100)]
ARM: netx: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:37:55 +0000 (10:37 +0100)]
ARM: mx3: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:37:34 +0000 (10:37 +0100)]
ARM: msm: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Gregory Bean <gbean@codeaurora.org>
Acked-by: Daniel Walker <dwalker@codeaurora.org>
Lennert Buytenhek [Mon, 29 Nov 2010 09:36:07 +0000 (10:36 +0100)]
ARM: mmp: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:35:20 +0000 (10:35 +0100)]
ARM: lpc32xx: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:34:58 +0000 (10:34 +0100)]
ARM: lh7a40x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:34:14 +0000 (10:34 +0100)]
ARM: ks8695: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:33:49 +0000 (10:33 +0100)]
ARM: ixp4xx: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:33:32 +0000 (10:33 +0100)]
ARM: ixp23xx: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:32:55 +0000 (10:32 +0100)]
ARM: ixp2000: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:32:37 +0000 (10:32 +0100)]
ARM: iop33x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Lennert Buytenhek [Mon, 29 Nov 2010 09:32:18 +0000 (10:32 +0100)]
ARM: iop32x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Lennert Buytenhek [Mon, 29 Nov 2010 09:32:01 +0000 (10:32 +0100)]
ARM: iop13xx: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Lennert Buytenhek [Mon, 29 Nov 2010 09:31:33 +0000 (10:31 +0100)]
ARM: integrator: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Lennert Buytenhek [Mon, 29 Nov 2010 09:31:06 +0000 (10:31 +0100)]
ARM: h720x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:30:40 +0000 (10:30 +0100)]
ARM: gemini: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Lennert Buytenhek [Mon, 29 Nov 2010 09:30:13 +0000 (10:30 +0100)]
ARM: footbridge: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Lennert Buytenhek [Mon, 29 Nov 2010 09:29:50 +0000 (10:29 +0100)]
ARM: ep93xx: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Ryan Mallon <ryan@bluewatersys.com>
Lennert Buytenhek [Mon, 29 Nov 2010 09:29:25 +0000 (10:29 +0100)]
ARM: ebsa110: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Lennert Buytenhek [Mon, 29 Nov 2010 09:27:47 +0000 (10:27 +0100)]
ARM: dove: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Lennert Buytenhek [Mon, 29 Nov 2010 09:27:27 +0000 (10:27 +0100)]
ARM: davinci: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:26:56 +0000 (10:26 +0100)]
ARM: clps711x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:26:37 +0000 (10:26 +0100)]
ARM: bcmring: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Scott Branden <sbranden@broadcom.com>
Lennert Buytenhek [Mon, 29 Nov 2010 09:26:19 +0000 (10:26 +0100)]
ARM: at91: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:25:51 +0000 (10:25 +0100)]
ARM:
aaec2000: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:20:21 +0000 (10:20 +0100)]
ARM: vic: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:20:06 +0000 (10:20 +0100)]
ARM: sa1111: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Lennert Buytenhek [Mon, 29 Nov 2010 09:19:01 +0000 (10:19 +0100)]
ARM: LoCoMo: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:18:39 +0000 (10:18 +0100)]
ARM: ITE 8152: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Mike Rapoport <mike@compulab.co.il>
Lennert Buytenhek [Mon, 29 Nov 2010 09:18:20 +0000 (10:18 +0100)]
ARM: gic: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Arnaud Patard (Rtp) [Thu, 13 Jan 2011 11:26:40 +0000 (12:26 +0100)]
mx51: add support for pwm
This patch is adding support for pwm1 and pwm2 devices found
on mx51.
[ this patch has been tested with pwm-backlight driver ]
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Arnaud Patard (Rtp) [Thu, 13 Jan 2011 11:26:39 +0000 (12:26 +0100)]
Fix pwm-related build failure
Commit
076762aa52de48688f6e1b6999fe58d736479f37 is adding a macro whis is
calling imx_add_mxc_pwm() but gives it 2 parameters while it's taking only
one parameters.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Lennert Buytenhek [Mon, 29 Nov 2010 09:21:01 +0000 (10:21 +0100)]
ARM: ecard: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Lennert Buytenhek [Mon, 29 Nov 2010 09:21:48 +0000 (10:21 +0100)]
ARM: core irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Lennert Buytenhek [Mon, 29 Nov 2010 09:06:57 +0000 (10:06 +0100)]
ARM: Use genirq definitions from kernel/irq/Kconfig.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Yong Shen [Wed, 12 Jan 2011 09:14:47 +0000 (17:14 +0800)]
ARM i.MX53 enable LOCO board bootup
1. Add Kconfig and Makefile entries
2. Add board definition
3. enable uart and fec for LOCO board
Signed-off-by: Yong Shen <yong.shen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Yong Shen [Wed, 12 Jan 2011 09:14:46 +0000 (17:14 +0800)]
ARM i.MX53 enable SMD board bootup
1. Add Kconfig and Makefile entries
2. Add board definition
3. enable uart and fec for SMD board
Signed-off-by: Yong Shen <yong.shen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Yong Shen [Thu, 13 Jan 2011 03:39:53 +0000 (11:39 +0800)]
ARM: i.MX53 EVK: add spi nor device
add spi board information for spi nor device
Signed-off-by: Yong Shen <yong.shen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Yong Shen [Thu, 13 Jan 2011 03:39:52 +0000 (11:39 +0800)]
ARM: i.MX53 EVK: add ecspi IOMUX setting
add ecspi IOMUX setting, also fix a bug of chip select pin order
Signed-off-by: Yong Shen <yong.shen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Yong Shen [Thu, 13 Jan 2011 03:39:51 +0000 (11:39 +0800)]
ARM: i.MX53: add IOMUX pad for ecspi
Add IOMUX pad entry for ecspi
Signed-off-by: Yong Shen <yong.shen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Donguk Ryu [Thu, 13 Jan 2011 04:40:29 +0000 (13:40 +0900)]
ARM: S5PV310: Add Support System MMU
This patch adds support System MMU for S5PV310 and S5PC210.
Signed-off-by: Donguk Ryu <du.ryu@samsung.com>
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
[kgene.kim@samsung.com: changed SYSMMU config name]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Donguk Ryu [Thu, 13 Jan 2011 04:35:31 +0000 (13:35 +0900)]
ARM: S5P: Add Support System MMU
This patch adds support System MMU which supports address transition
from virtual address to physical address. Basically, each hardware
block is connected System MMU block can use directly vitrual address
when it accesses physical memory not using physical address.
Signed-off-by: Donguk Ryu <du.ryu@samsung.com>
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
[kgene.kim@samsung.com: removed useless codes]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Linus Torvalds [Wed, 12 Jan 2011 16:40:25 +0000 (08:40 -0800)]
Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (39 commits)
i915/gtt: fix ordering causing DMAR errors on object teardown.
i915/gtt: fix ordering issues with status setup and DMAR
drm/i915/execbuffer: Reorder binding of objects to favour restrictions
drm/i915: If we hit OOM when allocating GTT pages, clear the aperture
drm/i915/evict: Ensure we completely cleanup on failure
drm/i915/execbuffer: Correctly clear the current object list upon EFAULT
drm/i915/debugfs: Show all objects in the gtt
drm/i915: Record AGP memory type upon error
drm/i915: Periodically flush the active lists and requests
drm/i915/gtt: Unmap the PCI pages after unbinding them from the GTT
drm/i915: Record the error batchbuffer on each ring
drm/i915: Include TLB miss overhead for computing WM
drm/i915: Propagate error from flushing the ring
drm/i915: detect & report PCH display error interrupts
drm/i915: cleanup rc6 code
drm/i915: fix rc6 enabling around suspend/resume
drm/i915: re-enable rc6 support for Ironlake+
drm/i915: Make the ring IMR handling private
drm/i915/ringbuffer: Simplify the ring irq refcounting
drm/i915/debugfs: Show the per-ring IMR
...
Linus Torvalds [Wed, 12 Jan 2011 16:39:15 +0000 (08:39 -0800)]
Merge branch 'tools' of git://git./linux/kernel/git/lenb/linux-idle-2.6
* 'tools' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
tools: create power/x86/x86_energy_perf_policy
tools: create power/x86/turbostat
Linus Torvalds [Wed, 12 Jan 2011 16:38:08 +0000 (08:38 -0800)]
Merge git://git./linux/kernel/git/rostedt/linux-2.6-ktest
* git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest: (30 commits)
ktest: Ask for the manditory config options instead of just failing
ktest: Copy the last good and bad configs in config_bisect
ktest: For grub reboot, use run_ssh instead of run_command
ktest: Added force stop after success and failure
ktest: Parse off the directory name in useconfig for failures
ktest: Use different temp config name for minconfig
ktest: Updated the sample.conf for the latest options
ktest: Added compare script to test ktest.pl to sample.conf
ktest: Added config_bisect test type
ktest/cleanups: Added version 0.2, ssh as options
ktest: Output something easy to parse for failure or success
ktest: Allow a test case to undefine a default value
ktest: Use $output_config instead of typing $outputdir/.config
ktest: Write to stdout if no log file is given
ktest: Use oldnoconfig instead of yes command
ktest: Update the sample config file with more documentation
ktest: New TEST_START instead of using [], and use real SHA1s
ktest: Add poweroff after halt and powercycle after reboot
ktest: Add POST_INSTALL to allow initrds to be created
ktest: Added sample.conf, new %default option format
...
Linus Torvalds [Wed, 12 Jan 2011 16:37:35 +0000 (08:37 -0800)]
Merge branch 'stable/xenbus' of git://git./linux/kernel/git/konrad/xen
* 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/xenbus: making backend support modular is too complex
xen/pci: Make xen-pcifront be dependent on XEN_XENBUS_FRONTEND
xen/xenbus: fixup checkpatch issues in xenbus_probe*
xen/netfront: select XEN_XENBUS_FRONTEND
xen/xenbus: clean up noise in xenbus_probe_frontend.c
xen/xenbus: clean up noise in xenbus_probe_backend.c
xen/xenbus: clean up noise in xenbus_probe.c
xen/xenbus: cleanup debug noise in xenbus_comms.c
xen/xenbus: clean up error handling
xen/xenbus: make frontend bus GPL
xen/xenbus: make sure backend bus is registered earlier
xenbus/frontend: register bus earlier
xen: remove xen/evtchn.h
xen: add backend driver support
xen: separate out frontend xenbus
Anton Altaparmakov [Wed, 12 Jan 2011 10:34:35 +0000 (10:34 +0000)]
NTFS: writev() fix and maintenance/contact details update
Fix writev() to not keep writing the first segment over and over again
instead of moving onto subsequent segments and update the NTFS entry in
MAINTAINERS to reflect that Tuxera Inc. now supports the NTFS driver.
Signed-off-by: Anton Altaparmakov <anton@tuxera.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Fabio Estevam [Wed, 1 Dec 2010 13:11:47 +0000 (11:11 -0200)]
ARM: mx5: dynamically allocate imx-keypad devices
Add support for dynamical allocation of imx-keypad on mx5 platform.
After moving to dynamically registration of the keypad, the keypad clock
name needs to change accordingly.
The reason is that the original mx5 keypad platform_device id was 0,
now we use id=-1 as per arch/arm/plat-mxc/devices/platform-imx-keypad.c.
Tested keypad successfully on a MX51_3DS board.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Fabio Estevam [Wed, 1 Dec 2010 13:11:46 +0000 (11:11 -0200)]
ARM: mx5: dynamically allocate pwm devices
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Shawn Guo [Tue, 4 Jan 2011 06:20:52 +0000 (14:20 +0800)]
ARM: mxs: Change duart device to use amba-pl011
The mxs duart is actually an amba-pl011 device. This commit changes
the duart device code to dynamically allocate amba-pl011 device,
so that drivers/serial/amba-pl011.c can be used on mxs.
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Darius Augulis [Wed, 12 Jan 2011 05:50:51 +0000 (14:50 +0900)]
serial: samsung: fix device name
Swap device and driver names in serial/samsung.c
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Amit Daniel Kachhap [Wed, 12 Jan 2011 04:40:04 +0000 (13:40 +0900)]
ARM: SAMSUNG: Add support for clock debugging through debug-fs interface
This patch adds support for clock information exposed to debug-fs interface.
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
[kgene.kim@samsung.com: removed useless empty lines]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Len Brown [Wed, 12 Jan 2011 04:06:28 +0000 (23:06 -0500)]
Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools
Len Brown [Sat, 23 Oct 2010 03:53:03 +0000 (23:53 -0400)]
tools: create power/x86/x86_energy_perf_policy
MSR_IA32_ENERGY_PERF_BIAS first became available on Westmere Xeon.
It is implemented in all Sandy Bridge processors -- mobile, desktop and server.
It is expected to become increasingly important in subsequent generations.
x86_energy_perf_policy is a user-space utility to set the
hardware energy vs performance policy hint in the processor.
Most systems would benefit from "x86_energy_perf_policy normal"
at system startup, as the hardware default is maximum performance
at the expense of energy efficiency.
See x86_energy_perf_policy.8 man page for more information.
Background:
Linux-2.6.36 added "epb" to /proc/cpuinfo to indicate
if an x86 processor supports MSR_IA32_ENERGY_PERF_BIAS,
without actually modifying the MSR.
In March, 2010, Venkatesh Pallipadi proposed a small driver
that programmed MSR_IA32_ENERGY_PERF_BIAS, based on
the cpufreq governor in use. It also offered
a boot-time cmdline option to override.
http://lkml.org/lkml/2010/3/4/457
But hiding the hardware policy behind the
governor choice was deemed "kinda icky".
In June, 2010, I proposed a generic user/kernel API to
generalize the power/performance policy trade-off.
"RFC: /sys/power/policy_preference"
http://lkml.org/lkml/2010/6/16/399
That is my preference for implementing this capability,
but I received no support on the list.
So in September, 2010, I sent x86_energy_perf_policy.c to LKML,
a user-space utility that scribbles directly to the MSR.
http://lkml.org/lkml/2010/9/28/246
Here is that same utility, after responding to some review feedback,
to live in tools/power/, where it is easily found.
Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown [Sat, 23 Oct 2010 03:53:03 +0000 (23:53 -0400)]
tools: create power/x86/turbostat
turbostat is a Linux tool to observe proper operation
of Intel(R) Turbo Boost Technology.
turbostat displays the actual processor frequency
on x86 processors that include APERF and MPERF MSRs.
Note that turbostat is of limited utility on Linux
kernels 2.6.29 and older, as acpi_cpufreq cleared
APERF/MPERF up through that release.
On Intel Core i3/i5/i7 (Nehalem) and newer processors,
turbostat also displays residency in idle power saving states,
which are necessary for diagnosing any cpuidle issues
that may have an effect on turbo-mode.
See the turbostat.8 man page for example usage.
Signed-off-by: Len Brown <len.brown@intel.com>
Dave Airlie [Wed, 12 Jan 2011 01:39:48 +0000 (11:39 +1000)]
i915/gtt: fix ordering causing DMAR errors on object teardown.
Previous to the last GTT rework we always rewrote the GTT then unmapped the
object, somehow this got reversed in the rework in 2.6.37-rc5 timeframe.
This fix needs to go to stable in an alternate form since the code changed.
This fixes DMAR reports on my Ironlake HP2540p.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Wed, 12 Jan 2011 01:38:37 +0000 (11:38 +1000)]
i915/gtt: fix ordering issues with status setup and DMAR
This code was setting up the status page before setting the DMAR-is-on-bit,
so we were getting DMAR errors on the status page. Reverse the two bits
of init code to the correct result.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Wed, 12 Jan 2011 00:49:03 +0000 (10:49 +1000)]
Merge branch 'drm-intel-fixes' of ssh:///linux/kernel/git/ickle/drm-intel
* 'drm-intel-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: (37 commits)
drm/i915/execbuffer: Reorder binding of objects to favour restrictions
drm/i915: If we hit OOM when allocating GTT pages, clear the aperture
drm/i915/evict: Ensure we completely cleanup on failure
drm/i915/execbuffer: Correctly clear the current object list upon EFAULT
drm/i915/debugfs: Show all objects in the gtt
drm/i915: Record AGP memory type upon error
drm/i915: Periodically flush the active lists and requests
drm/i915/gtt: Unmap the PCI pages after unbinding them from the GTT
drm/i915: Record the error batchbuffer on each ring
drm/i915: Include TLB miss overhead for computing WM
drm/i915: Propagate error from flushing the ring
drm/i915: detect & report PCH display error interrupts
drm/i915: cleanup rc6 code
drm/i915: fix rc6 enabling around suspend/resume
drm/i915: re-enable rc6 support for Ironlake+
drm/i915: Make the ring IMR handling private
drm/i915/ringbuffer: Simplify the ring irq refcounting
drm/i915/debugfs: Show the per-ring IMR
drm/i915: Mask USER interrupts on gen6 (until required)
drm/i915: Handle ringbuffer stalls when flushing
...
Linus Torvalds [Wed, 12 Jan 2011 00:32:41 +0000 (16:32 -0800)]
Merge git://git./linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (67 commits)
cxgb4vf: recover from failure in cxgb4vf_open()
netfilter: ebtables: make broute table work again
netfilter: fix race in conntrack between dump_table and destroy
ah: reload pointers to skb data after calling skb_cow_data()
ah: update maximum truncated ICV length
xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC
ehea: Increase the skb array usage
net/fec: remove config FEC2 as it's used nowhere
pcnet_cs: add new_id
tcp: disallow bind() to reuse addr/port
net/r8169: Update the function of parsing firmware
net: ppp: use {get,put}_unaligned_be{16,32}
CAIF: Fix IPv6 support in receive path for GPRS/3G
arp: allow to invalidate specific ARP entries
net_sched: factorize qdisc stats handling
mlx4: Call alloc_etherdev to allocate RX and TX queues
net: Add alloc_netdev_mqs function
caif: don't set connection request param size before copying data
cxgb4vf: fix mailbox data/control coherency domain race
qlcnic: change module parameter permissions
...
Linus Torvalds [Wed, 12 Jan 2011 00:32:20 +0000 (16:32 -0800)]
Merge git://git./linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix bootup regression due to perf init ordering.
Linus Torvalds [Wed, 12 Jan 2011 00:31:41 +0000 (16:31 -0800)]
Merge branch 'next' of git://git./linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits)
powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA
powerpc/pseries: Fix VPHN build errors on non-SMP systems
powerpc/83xx: add mpc8308_p1m DMA controller device-tree node
powerpc/83xx: add DMA controller to mpc8308 device-tree node
powerpc/512x: try to free dma descriptors in case of allocation failure
powerpc/512x: add MPC8308 dma support
powerpc/512x: fix the hanged dma transfer issue
powerpc/512x: scatter/gather dma fix
powerpc/powermac: Make auto-loading of therm_pm72 possible
of/address: Use propper endianess in get_flags
powerpc/pci: Use printf extension %pR for struct resource
powerpc: Remove unnecessary casts of void ptr
powerpc: Disable VPHN polling during a suspend operation
powerpc/pseries: Poll VPA for topology changes and update NUMA maps
powerpc: iommu: Add device name to iommu error printks
powerpc: Record vma->phys_addr in ioremap()
powerpc: Update compat_arch_ptrace
powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S
powerpc/time: printk time stamp init not correct
powerpc: Minor cleanups for machdep.h
...
projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / log