]>
git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/log
Russell King [Sat, 15 Aug 2009 15:49:31 +0000 (16:49 +0100)]
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Sascha Hauer [Thu, 13 Aug 2009 08:04:44 +0000 (10:04 +0200)]
mx21ads: Fix framebuffer platform data
struct imx_fb_platform_data has changed and the mx21ads was
forgotten to change. Fix it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 13 Aug 2009 08:02:30 +0000 (10:02 +0200)]
MX21: Compilation fix for devices.c
The OTG devices are only available on i.MX27, so ifdef
them out for i.MX21.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Wed, 12 Aug 2009 09:29:21 +0000 (11:29 +0200)]
mx31moboard: two GPIOS are used to reset other microcontrolers on the robot
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Wed, 12 Aug 2009 09:29:20 +0000 (11:29 +0200)]
mx31moboard: initialize 4 input gpios for mx31moboard
These gpios are exported to userspace and are here to be used as
a selector
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Wed, 12 Aug 2009 09:29:19 +0000 (11:29 +0200)]
mx31moboard: support for the 4 leds used on mx31moboard
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Wed, 12 Aug 2009 09:29:18 +0000 (11:29 +0200)]
mx31: define various GPIOs used on mx31moboard
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Luotao Fu [Thu, 18 Jun 2009 14:44:18 +0000 (16:44 +0200)]
pcm037: mux configuration for predefined gpio line
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Luotao Fu [Thu, 18 Jun 2009 12:15:22 +0000 (14:15 +0200)]
pcm043: mux configuration for predefined gpio line
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Luotao Fu [Thu, 18 Jun 2009 10:21:51 +0000 (12:21 +0200)]
pcm038: mux configuration for predefined gpio line
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Sascha Hauer [Fri, 20 Mar 2009 18:25:01 +0000 (19:25 +0100)]
MX31 Fix spi clock names
Fix the SPI clock names to match the device names.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 17 Apr 2009 14:52:25 +0000 (16:52 +0200)]
mx3x: Fixup USB base addresses
The i.MX31 and the i.MX35 have different USB base addresses. Adjust
the resources accordingly.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Luotao Fu [Thu, 6 Aug 2009 09:19:39 +0000 (11:19 +0200)]
mx27: add support for phytec pca100 (phyCARD-s) board
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Tue, 17 Mar 2009 14:43:54 +0000 (15:43 +0100)]
i.MX35 clock support: Add USB clocks
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 19 Dec 2008 13:32:15 +0000 (14:32 +0100)]
MX31: add spi controller devices/resources
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 19 Dec 2008 13:32:14 +0000 (14:32 +0100)]
MX2: Add SPI devices/resources
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Mon, 10 Aug 2009 16:33:12 +0000 (18:33 +0200)]
mx31moboard: move usb otg support back to moboard common file
since all boards finally have this device
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Mon, 10 Aug 2009 16:33:11 +0000 (18:33 +0200)]
mx31moboard: added usb xcvr reset for mx31moboard
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Mon, 10 Aug 2009 16:33:10 +0000 (18:33 +0200)]
mx31: added one more pin definition
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Dmitriy Taychenachev [Fri, 31 Jul 2009 11:29:23 +0000 (20:29 +0900)]
MXC: add iomux pins configuration support for MXC91231
Signed-off-by: Dmitriy Taychenachev <dimichxp@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Dmitriy Taychenachev [Fri, 31 Jul 2009 11:29:22 +0000 (20:29 +0900)]
MXC: add basic MXC91231 support
Signed-off-by: Dmitriy Taychenachev <dimichxp@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Lothar Waßmann [Wed, 15 Jul 2009 13:19:34 +0000 (15:19 +0200)]
i.MX25 iomux definitions (corrected version)
Signed-off-by: Lothar Wassmann <LW@KARO-electronics.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 15 Jul 2009 07:31:15 +0000 (09:31 +0200)]
fix mx35 wrong clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 09:32:46 +0000 (11:32 +0200)]
Freescale i.MX25 PDK (3ds) board support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 09:32:12 +0000 (11:32 +0200)]
Add i.MX25 support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 19 Jun 2009 09:08:07 +0000 (11:08 +0200)]
mxc pwm: add mx25 support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 09:16:22 +0000 (11:16 +0200)]
iomux-v3: Allow for a runtime base address
also, check for a valid pad_ctrl_ofs before changing the
pad control register.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 27 May 2009 16:09:54 +0000 (18:09 +0200)]
MXC: i.MX25 timer support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 25 May 2009 08:50:52 +0000 (10:50 +0200)]
MXC: use variable for irq controller base in entry-macro.S
This allows us to determine the irq controller base address
on runtime.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Daniel Mack [Thu, 25 Jun 2009 10:37:16 +0000 (12:37 +0200)]
ARM: MX3: add ckil clock
The CKIL clock source is used by the upcoming RTC driver, so we need
to export it.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 20 Jul 2009 06:18:47 +0000 (08:18 +0200)]
ARM: mxc: Fix i2c_board_info definitions
Fix i2c_board_info definitions - we were defining the 'type' field
of these structures twice since the first argument of I2C_BOARD_INFO
sets this field. Move the second definition into I2C_BOARD_INFO().
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Russell King [Thu, 13 Aug 2009 13:22:39 +0000 (14:22 +0100)]
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Nicolas Pitre [Wed, 12 Aug 2009 03:28:51 +0000 (23:28 -0400)]
[ARM] add MAINTAINERS entry for Orion/Kirkwood/etc.
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Ron Lee [Mon, 10 Aug 2009 12:53:48 +0000 (18:23 +0530)]
[ARM] Kirkwood: Initialise SATA for OpenRD-Base
Signed-off-by: Ron Lee <ron@debian.org>
Signed-off-by: Dhaval Vasa <dhaval.vasa@einfochips.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Dhaval Vasa [Mon, 10 Aug 2009 12:07:34 +0000 (17:37 +0530)]
[ARM] Kirkwood: Marvell OpenRD-Base board support
reference:
http://open-rd.org
http://code.google.com/p/openrd
This patch is tested for:
1. Boot from DRAM/NAND flash
2. NAND read/write/erase
3. GbE0
4. USB read/write
FIXME:
1. SD/UART1 selection
2. MPP configuration (currently, default)
3. PEX
Signed-off-by: Dhaval Vasa <dhaval.vasa@einfochips.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Lennert Buytenhek [Mon, 3 Aug 2009 14:25:12 +0000 (16:25 +0200)]
¶ARM] Orion5x: fix cpu window mapping for
88f6183
On the
88f6183 , orion5x's setup_cpu_win() fails to ever program any
mbus bridge remap registers, which causes transactions for PCI/PCIe
IO/MEM space to get sent to random mbus targets. Adding a check for
the 6183 in orion5x_cpu_win_can_remap() is necessary and sufficient
to make PCIe wlan cards work on the 6183 reference design.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Siddarth Gore [Tue, 9 Jun 2009 09:11:02 +0000 (14:41 +0530)]
[ARM] Kirkwood: Add support for 6281-A1
Signed-off-by: Siddarth Gore <gores@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Simon Guinot [Mon, 22 Jun 2009 19:45:01 +0000 (21:45 +0200)]
[ARM] orion5x: Add LaCie NAS d2Network support
This patch add support for the d2 Network and the Big Disk Network
LaCie boards.
Signed-off-by: Simon Guinot <sguinot@lacie.com>
Acked-by: Christopher Moore <moore@free.fr>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Eric Benard [Thu, 16 Jul 2009 14:26:34 +0000 (16:26 +0200)]
Add support for Eukrea's MBIMX27
MBIMX27 is the evaluation board for CPUIMX27 and integrates : a
QVGA TFT, a SPI touchscreen controler, a SDCard connector wired to
SDHC1.
Signed-off-by: Eric Benard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Eric Benard [Thu, 16 Jul 2009 14:26:33 +0000 (16:26 +0200)]
Add support for Eukrea's CPUIMX27
CPUIMX27 is built around Freescale's i.MX27 and has up to 64MB of
NOR Flash, up to 512MB of NAND Flash and up to 256MB of mDDR,
it includes an ethernet PHY in MII mode, an I2C RTC and a
ST16554 QuadUART on nCS3.
Signed-off-by: Eric Benard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
javier Martin [Wed, 15 Jul 2009 13:26:21 +0000 (15:26 +0200)]
MX27: Add USB platform devices and resources
This adds clocks and resources for usb in i.mx27 SoC.
Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Daniel Mack [Thu, 25 Jun 2009 12:11:52 +0000 (14:11 +0200)]
MX3: add additional USB pins to iomux
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 25 Jun 2009 12:11:51 +0000 (14:11 +0200)]
ehci mxc: Fix clocks
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Daniel Mack [Thu, 25 Jun 2009 12:11:50 +0000 (14:11 +0200)]
MX3: Add USB platform devices and resources
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Sat, 7 Feb 2009 12:37:29 +0000 (13:37 +0100)]
[ARM] MXC: remove the now unused #ifndef CONFIG_COMMON_CLKDEV
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Sat, 7 Feb 2009 12:34:01 +0000 (13:34 +0100)]
[ARM] MXC: Switch MX1 to clkdev support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 3 Jun 2009 09:22:32 +0000 (11:22 +0200)]
MXC PLL decoding: calculate mfn value with less magic
Also, use cpu_is_* macros rather than CONFIG_ARCH_*
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 19 Jun 2009 09:35:08 +0000 (11:35 +0200)]
MXC: pwm driver fixes
- fix off-by-one error in divider calculation
- disable pwm in pwm_disable
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 27 May 2009 16:26:51 +0000 (18:26 +0200)]
MXC gpio interrupt support: move register definitions to .c file
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 15 Jun 2009 10:36:25 +0000 (12:36 +0200)]
mxc gpio: CONFIG_ARCH_* -> cpu_is_*()
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Tue, 23 Jun 2009 11:21:42 +0000 (13:21 +0200)]
pcm038: Add support for SJA1000 on baseboard
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Tue, 23 Jun 2009 11:21:28 +0000 (13:21 +0200)]
pcm037: Add support for SJA1000 on baseboard
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 19 Mar 2009 07:25:41 +0000 (08:25 +0100)]
imxfb: Add support for multiple displays
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 29 Jun 2009 09:41:09 +0000 (11:41 +0200)]
imxfb: use resource_size() macro
This fixes an off-by-one error. Also, use dev_err instead of printk
in probe() function.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 18 Mar 2009 10:29:31 +0000 (11:29 +0100)]
imxfb: calculate bpix value from bits_per_pixel
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Tue, 23 Jun 2009 10:14:39 +0000 (12:14 +0200)]
mx1: Codingstyle: Let the compiler count arrays
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Tue, 23 Jun 2009 10:12:00 +0000 (12:12 +0200)]
mx3: Codingstyle: Let the compiler count arrays
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Tue, 23 Jun 2009 10:04:36 +0000 (12:04 +0200)]
mx2: Codingstyle: Let the compiler count arrays
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Tue, 23 Jun 2009 09:52:26 +0000 (11:52 +0200)]
mx2: remove mxc_irda platform device
Irda support is handled by the normal ims serial driver, so
we do not need this device.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 08:32:08 +0000 (10:32 +0200)]
MXC iomux-v3: Fix defines for PAD_CTL registers
The old defines leaked in from an old version of the patch.
Change the defines to match the register layout of the iomuxer.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 25 May 2009 15:36:19 +0000 (17:36 +0200)]
mxc: turn to soc specific init_irq functions
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 27 May 2009 16:33:58 +0000 (18:33 +0200)]
mxc: remove do not include directly
Everyone should be free to include the files he actually needs.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 27 May 2009 16:23:48 +0000 (18:23 +0200)]
i.MX serial: do not use #ifdef CONFIG_ARCH_*
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 11:45:37 +0000 (13:45 +0200)]
MXC: remove board specific setup of MXC_LL_UART_[PV]ADDR
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 11:29:57 +0000 (13:29 +0200)]
MXC uncompress macros: determine uart base by machine type
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 25 May 2009 15:22:18 +0000 (17:22 +0200)]
mxc: remove ARCH_NR_GPIOS
Use the default value of 256 which is enough for all i.MX SoCs.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 10:19:02 +0000 (12:19 +0200)]
system.c: runtime base address
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 25 May 2009 10:21:38 +0000 (12:21 +0200)]
MXC: pass base/irq to mxc_timer_init
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Russell King [Wed, 5 Aug 2009 21:10:52 +0000 (22:10 +0100)]
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable
Kevin Hilman [Mon, 20 Jul 2009 16:09:23 +0000 (09:09 -0700)]
OMAP3: Overo: add missing pen-down GPIO definition
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Thu, 4 Jun 2009 22:57:10 +0000 (15:57 -0700)]
OMAP: GPIO: clear/restore level/edge detect settings on mask/unmask
If IRQ triggering is enabled, it can trigger a pending interrupt
even for masked interrupts. Any pending GPIO interrupts can
prevent the powerdomain from hitting retention.
Problem found, reported and additional review and testing by Chunquiu
Wang.
Tested-by: Chunquiu Wang <cqwang@motorola.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Jouni Hogander [Wed, 29 Oct 2008 10:06:04 +0000 (12:06 +0200)]
OMAP3: PM: Fix wrong sequence in suspend.
Powerdomain previous state is checked after restoring new states in
suspend. This patch fixes this problem.
Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Eero Nurkkala [Tue, 23 Jun 2009 09:53:29 +0000 (12:53 +0300)]
OMAP: PM: CPUfreq: obey min/max settings of policy
Use the min/max settings from CPUfreq policy rather than
processor defined min/max settings.
Without this patch, it's possible to scale frequency outside
the current policy range.
Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Wed, 1 Jul 2009 04:02:45 +0000 (21:02 -0700)]
OMAP2/3/4: UART: allow in-order port traversal
Use list_add_tail() when adding discovered UART ports. This is so
traversal using list_for_each_entry() will traverse the list in the
order they were found.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Mon, 27 Apr 2009 19:27:36 +0000 (12:27 -0700)]
OMAP2/3/4: UART: Allow per-UART disabling wakeup for serial ports
This patch causes the OMAP uarts to honor the sysfs power/wakeup file
for IOPAD wakeups. Before the OMAP was always woken up from off mode
on a rs232 signal change. This patch also creates a different
platform device for each serial port so that the wakeup properties can
be control per port.
By default, IOPAD wakeups are enabled for each UART. To disable,
# echo disabled > /sys/devices/platform/serial8250.0/power/wakeup
Where serial8250.0 can be replaced by .1, or .2 to control the other
ports.
Original idea and original patch from Russ Dill <russ.dill@gmail.com>
Cc: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Tero Kristo [Thu, 5 Mar 2009 14:32:23 +0000 (16:32 +0200)]
OMAP3: Fixed crash bug with serial + suspend
It was possible for an unhandled interrupt to occur if there was incoming
serial traffic during wakeup from suspend. This was caused by the code
in arch-arm/mach-omap2/serial.c keeping interrupt enabled all the time,
but not acking its interrupts. Applies on top of PM branch.
Use the PM begin/end hooks to ensure that the "serial idle" interrupts
are disabled during the suspend path. Also, since begin/end hooks are
now used, use the suspend_state that is passed in the begin hook instead
of the enter hook as per the platform_suspend_ops docs.
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Wed, 24 Jun 2009 17:32:03 +0000 (10:32 -0700)]
OMAP4: UART: cleanup special case IRQ handling
Streamline the OMAP4 special IRQ assignments by putting inside
normal init loop instead of having a separate loop.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Wed, 24 Jun 2009 18:39:18 +0000 (11:39 -0700)]
OMAP3: PM: Do not build suspend code if SUSPEND is not enabled
Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Tue, 5 May 2009 23:34:25 +0000 (16:34 -0700)]
OMAP3: PM: prevent module wakeups from waking IVA2
By default, prevent functional wakeups from inside a module from
waking up the IVA2. Let DSP Bridge code handle this when loaded.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Mon, 27 Apr 2009 23:14:54 +0000 (16:14 -0700)]
OMAP3: PM: Clear pending PRCM reset flags on init
Any pending reset flags can prevent retention. Ensure they are all
cleared during boot.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Mon, 27 Apr 2009 14:50:23 +0000 (07:50 -0700)]
OMAP3: PM: Ensure PRCM interrupts are cleared at boot
Any pending PRCM interrupts can prevent retention. Ensure
they are cleared during boot.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Tue, 9 Jun 2009 18:45:30 +0000 (11:45 -0700)]
OMAP3: PM: CM_REGADDR macros using wrong name
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Wed, 10 Jun 2009 16:02:25 +0000 (09:02 -0700)]
OMAP2/3: PM: make PM __init calls static
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Russell King [Mon, 3 Aug 2009 15:41:55 +0000 (16:41 +0100)]
Merge branch 'omap4_upstream' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into devel-stable
Linus Torvalds [Sat, 1 Aug 2009 00:40:45 +0000 (17:40 -0700)]
Linux 2.6.31-rc5
Linus Torvalds [Fri, 31 Jul 2009 19:17:37 +0000 (12:17 -0700)]
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: bump up nr_to_write in xfs_vm_writepage
xfs: reduce bmv_count in xfs_vn_fiemap
Linus Torvalds [Fri, 31 Jul 2009 19:10:26 +0000 (12:10 -0700)]
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
io context: fix ref counting
block: make the end_io functions be non-GPL exports
block: fix improper kobject release in blk_integrity_unregister
block: always assign default lock to queues
mg_disk: Add missing ready status check on mg_write()
mg_disk: fix issue with data integrity on error in mg_write()
mg_disk: fix reading invalid status when use polling driver
mg_disk: remove prohibited sleep operation
Linus Torvalds [Fri, 31 Jul 2009 19:09:57 +0000 (12:09 -0700)]
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clocksource: Save mult_orig in clocksource_disable()
Linus Torvalds [Fri, 31 Jul 2009 19:09:22 +0000 (12:09 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: orphan subsystem
imxmmc: Remove unnecessary semicolons
cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG
sdhci: use SG_MITER_TO_SG/SG_MITER_FROM_SG
lib/scatterlist: add a flags to signalize mapping direction
Linus Torvalds [Fri, 31 Jul 2009 19:09:02 +0000 (12:09 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: sound/aoa: Add kmalloc NULL tests
ALSA: hda - Increase PCM stream name buf in patch_realtek.c
sound: mpu401.c: Buffer overflow
sound: aedsp16: Buffer overflow
ALSA: hda: fix out-of-bound hdmi_eld.sad[] write
ALSA: hda - Add quirk for Dell Studio 1555
Magnus Damm [Tue, 28 Jul 2009 21:09:55 +0000 (14:09 -0700)]
clocksource: Save mult_orig in clocksource_disable()
To fix the common case where ->enable() does not set up
mult, make sure mult_orig is saved in mult on disable.
Also add comments to explain why we do this.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Cc: johnstul@us.ibm.com
Cc: lethal@linux-sh.org
Cc: akpm@linux-foundation.org
LKML-Reference: <
20090618152432 .10136.9932.sendpatchset@rx1.opensource.se>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Pierre Ossman [Fri, 31 Jul 2009 10:27:28 +0000 (12:27 +0200)]
mmc: orphan subsystem
I do not have the time to take care of this, so remove myself as
maintainer.
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Joe Perches [Sun, 28 Jun 2009 16:26:31 +0000 (09:26 -0700)]
imxmmc: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Sebastian Andrzej Siewior [Mon, 22 Jun 2009 07:18:05 +0000 (09:18 +0200)]
cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG
the code allready uses flush_kernel_dcache_page(). This patch updates the
driver to the recent sg API changes which require that either SG_MITER_TO_SG
or SG_MITER_FROM_SG is set. SG_MITER_TO_SG calls flush_kernel_dcache_page()
in sg_mitter_stop()
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Sebastian Andrzej Siewior [Thu, 18 Jun 2009 07:33:32 +0000 (09:33 +0200)]
sdhci: use SG_MITER_TO_SG/SG_MITER_FROM_SG
so the page will be flushed on unmap on ARCH which need it.
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Sebastian Andrzej Siewior [Thu, 18 Jun 2009 08:19:12 +0000 (10:19 +0200)]
lib/scatterlist: add a flags to signalize mapping direction
sg_miter_start() is currently unaware of the direction of the copy
process (to or from the scatter list). It is important to know the
direction because the page has to be flushed in case the data written
is seen on a different mapping in user land on cache incoherent
architectures.
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Takashi Iwai [Fri, 31 Jul 2009 08:17:45 +0000 (10:17 +0200)]
Merge branch 'fix/oss' into for-linus
* fix/oss:
sound: mpu401.c: Buffer overflow
sound: aedsp16: Buffer overflow
Takashi Iwai [Fri, 31 Jul 2009 08:17:44 +0000 (10:17 +0200)]
Merge branch 'fix/misc' into for-linus
* fix/misc:
ALSA: sound/aoa: Add kmalloc NULL tests
Takashi Iwai [Fri, 31 Jul 2009 08:17:42 +0000 (10:17 +0200)]
Merge branch 'fix/hda' into for-linus
* fix/hda:
ALSA: hda - Increase PCM stream name buf in patch_realtek.c
ALSA: hda: fix out-of-bound hdmi_eld.sad[] write
ALSA: hda - Add quirk for Dell Studio 1555
Julia Lawall [Fri, 31 Jul 2009 06:32:03 +0000 (08:32 +0200)]
ALSA: sound/aoa: Add kmalloc NULL tests
Check that the result of kzalloc is not NULL before a dereference.
The semantic match that finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression *x;
identifier f;
constant char *C;
@@
x = \(kmalloc\|kcalloc\|kzalloc\)(...);
... when != x == NULL
when != x != NULL
when != (x || ...)
(
kfree(x)
|
f(...,C,...,x,...)
|
*f(...,x,...)
|
*x->f
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>