platform/kernel/linux-rpi.git
15 years agoMerge branch 'nomadik' into devel-stable
Russell King [Sat, 12 Sep 2009 10:50:52 +0000 (11:50 +0100)]
Merge branch 'nomadik' into devel-stable

15 years agoMerge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Russell King [Tue, 8 Sep 2009 20:21:15 +0000 (21:21 +0100)]
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

15 years ago[ARM] orion5x: Add LaCie NAS 2Big Network support
Simon Guinot [Tue, 23 Jun 2009 11:54:35 +0000 (13:54 +0200)]
[ARM] orion5x: Add LaCie NAS 2Big Network support

This patch add support for the 2Big Network LaCie boards.

Signed-off-by: Simon Guinot <sguinot@lacie.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
15 years agoMerge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Russell King [Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)]
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable

15 years agoARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
Ben Dooks [Mon, 3 Aug 2009 14:11:29 +0000 (15:11 +0100)]
ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ

The show_fiq_list() call in arch/arm/kernel/irq.c currently depends on
CONFIG_ARCH_ACORN, but this is not the only architecture that supports
the usage of FIQ. Change to calling this if CONFIG_FIQ is set (which
is what arch/arm/kernel/fiq.c is built by).

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S3C: Add S3C_DEV_NAND Kconfig entry
Ben Dooks [Sun, 16 Aug 2009 22:54:58 +0000 (23:54 +0100)]
ARM: S3C: Add S3C_DEV_NAND Kconfig entry

Currently the S5PC100 does not define S3C_PA_NAND, leaving the NAND device
definitions in arch/arm/plat-s3c/dev-nand.c unbuildable. Add a KConfig
entry to select whether this is built.

As backwards compatibility, both the S3C24XX and S3C64XX define the new
configuration in their main Kconfig files until better support for basing
this selection on a per-machine basis can be sorted out.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S5PC100: Board and configuration file
Byungho Min [Tue, 23 Jun 2009 12:40:28 +0000 (21:40 +0900)]
ARM: S5PC100: Board and configuration file

SMDKC100 board support.
The board can be obtained from meritech (http://www.meritech.co.kr)

Signed-off-by: Byungho Min <bhmin@samsung.com>
[ben-linux@fluff.org: fixup subject and description]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S5PC100: Kconfigs and Makefiles
Byungho Min [Tue, 23 Jun 2009 12:39:42 +0000 (21:39 +0900)]
ARM: S5PC100: Kconfigs and Makefiles

S5PC100 is a new SoC with ARM coretex-A8 and numerous peripherals. This SoC is
successor of S3C64XX. S5PC100 has peripherals which are still similar to S3C
families so some drivers in "arch/arm/plat-s3c" can be shared. S5PC100 specific
drivers will be added in "arch/arm/plat-s5pcxx" or "arch/arm/mach-s5pc100"

Signed-off-by: Byungho Min <bhmin@samsung.com>
[ben-linux@fluff.org: tidy and edit description]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S5PC100: Clock and PLL support
Byungho Min [Tue, 23 Jun 2009 12:39:56 +0000 (21:39 +0900)]
ARM: S5PC100: Clock and PLL support

S5PC100 has 4 PLLs (APLL,MPLL,EPLL,HPLL) and 3 clock domains. Clock scheme is
implemented here.

Signed-off-by: Byungho Min <bhmin@samsung.com>
[ben-linux@fluff.org: edited title]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S5PC100: IRQ and timer
Byungho Min [Tue, 23 Jun 2009 12:40:03 +0000 (21:40 +0900)]
ARM: S5PC100: IRQ and timer

S5PC100 has 3 VICs(Vectored Interrupt Controller). The VICs come from S3C64xx
series, so the driver source code can be shared with S3C families. The S5PC100
has 3 VICs while S3C64xx has only 2.

Signed-off-by: Byungho Min <bhmin@samsung.com>
[ben-linux@fluff.org: subject fixup]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S5PC100: GPIO and I2C
Byungho Min [Tue, 23 Jun 2009 12:40:22 +0000 (21:40 +0900)]
ARM: S5PC100: GPIO and I2C

S5PC100 has more GPIO group then previous one. It has 34 groups of GPIO, while
S3C6410 has 17 groups. For now, only header files are written.

Signed-off-by: Byungho Min <bhmin@samsung.com>
[ben-linux@fluff.org: subject fixup]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S5PC100: CPU initialization
Byungho Min [Tue, 23 Jun 2009 12:40:15 +0000 (21:40 +0900)]
ARM: S5PC100: CPU initialization

Signed-off-by: Byungho Min <bhmin@samsung.com>
[ben-linux@fluff.org: subject fixup]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S5PC100: UART and Serial
Byungho Min [Tue, 23 Jun 2009 12:40:09 +0000 (21:40 +0900)]
ARM: S5PC100: UART and Serial

Serial driver of S5PC100 is the same as S3C6400, so S5PC100 shares the serial
driver with S3C6400. Uart driver is copied from plat-s3c64xx to plat-s5pc1xx,
as I do not use plat-s3c64xx directory.

Signed-off-by: Byungho Min <bhmin@samsung.com>
[ben-linux@fluff.org: title fixup]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S5PC100: Memory map
Byungho Min [Tue, 23 Jun 2009 12:39:49 +0000 (21:39 +0900)]
ARM: S5PC100: Memory map

S5PC100's the physical IO space starts at 0xe000"0000. To maximize space for
vmalloc, the virtual IO space starts at 0xf400"0000 as same as other samsung
CPUs(s3c24xx and s3c64xx) do.

Signed-off-by: Byungho Min <bhmin@samsung.com>
[ben-linux@fluff.org: subject and description fixup]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoMerge branch 'for-rmk-2.6.32' of git://git.pengutronix.de/git/ukl/linux-2.6 into...
Russell King [Sat, 15 Aug 2009 15:51:48 +0000 (16:51 +0100)]
Merge branch 'for-rmk-2.6.32' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable

15 years agoMerge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
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

15 years agoMerge branch 'next-s3c64xx-moves' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:24:06 +0000 (15:24 +0100)]
Merge branch 'next-s3c64xx-moves' into next-s3c

15 years agoMerge branch 'next-s3c64xx' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:24:01 +0000 (15:24 +0100)]
Merge branch 'next-s3c64xx' into next-s3c

15 years agoMerge branch 'next-s3c24xx-cpufreq' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:23:45 +0000 (15:23 +0100)]
Merge branch 'next-s3c24xx-cpufreq' into next-s3c

15 years agoMerge branch 'next-s3c24xx' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:23:34 +0000 (15:23 +0100)]
Merge branch 'next-s3c24xx' into next-s3c

15 years agoMerge branch 'next-s3c-machines' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:23:22 +0000 (15:23 +0100)]
Merge branch 'next-s3c-machines' into next-s3c

15 years agoMerge branch 'next-s3c-hwmon' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:23:15 +0000 (15:23 +0100)]
Merge branch 'next-s3c-hwmon' into next-s3c

15 years agomx21ads: Fix framebuffer platform data
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>
15 years agoMX21: Compilation fix for devices.c
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>
15 years agomx31moboard: two GPIOS are used to reset other microcontrolers on the robot
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>
15 years agomx31moboard: initialize 4 input gpios for mx31moboard
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>
15 years agomx31moboard: support for the 4 leds used on mx31moboard
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>
15 years agomx31: define various GPIOs used on mx31moboard
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>
15 years agopcm037: mux configuration for predefined gpio line
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>
15 years agopcm043: mux configuration for predefined gpio line
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>
15 years agopcm038: mux configuration for predefined gpio line
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>
15 years agoMX31 Fix spi clock names
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>
15 years agomx3x: Fixup USB base addresses
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>
15 years agomx27: add support for phytec pca100 (phyCARD-s) board
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>
15 years agoi.MX35 clock support: Add USB clocks
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>
15 years agoMX31: add spi controller devices/resources
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>
15 years agoMX2: Add SPI devices/resources
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>
15 years agomx31moboard: move usb otg support back to moboard common file
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>
15 years agomx31moboard: added usb xcvr reset for mx31moboard
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>
15 years agomx31: added one more pin definition
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>
15 years agoMXC: add iomux pins configuration support for MXC91231
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>
15 years agoMXC: add basic MXC91231 support
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>
15 years agoi.MX25 iomux definitions (corrected version)
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>
15 years agofix mx35 wrong clock
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>
15 years agoFreescale i.MX25 PDK (3ds) board support
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>
15 years agoAdd i.MX25 support
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>
15 years agomxc pwm: add mx25 support
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>
15 years agoiomux-v3: Allow for a runtime base address
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>
15 years agoMXC: i.MX25 timer support
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>
15 years agoMXC: use variable for irq controller base in entry-macro.S
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>
15 years agoARM: MX3: add ckil clock
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>
15 years agoARM: mxc: Fix i2c_board_info definitions
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>
15 years agoARM: S3C24XX: Add SPI bus 1 on GPD8 through GPD10
Ben Dooks [Mon, 3 Aug 2009 16:26:50 +0000 (17:26 +0100)]
ARM: S3C24XX: Add SPI bus 1 on GPD8 through GPD10

Add configuration callback for SPI bus 1 on GPD[8..10] and ensure the
correct GPIO configuration register definitions in regs-gpio.h

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S3C24XX: Add platform device for AC97 controller
Mark Brown [Wed, 5 Aug 2009 17:29:57 +0000 (18:29 +0100)]
ARM: S3C24XX: Add platform device for AC97 controller

Move the definition of the "generic" IRQ in the process.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S3C24XX: Add FIQ IRQ routing support
Ben Dooks [Mon, 3 Aug 2009 16:26:57 +0000 (17:26 +0100)]
ARM: S3C24XX: Add FIQ IRQ routing support

Add support for routing an IRQ from the normal ARM IRQ mechanism to the
FIQ input of the processor.

Note, also fix a bug where the init_FIQ() function has not been called
when CONFIG_FIQ is enabled.

Signed-off-by; Ben Dooks <ben@simtec.co.uk>

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S3C: Move S3C64xx audio devices into S3C64xx directory
Mark Brown [Wed, 5 Aug 2009 17:21:57 +0000 (18:21 +0100)]
ARM: S3C: Move S3C64xx audio devices into S3C64xx directory

Allowing us to make the Kconfig a little bit saner.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S3C64XX: Add address mapping for AC97 controller
Mark Brown [Wed, 5 Aug 2009 17:21:59 +0000 (18:21 +0100)]
ARM: S3C64XX: Add address mapping for AC97 controller

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S3C64XX: Add mapping for IISv4 port
Mark Brown [Tue, 4 Aug 2009 15:25:12 +0000 (16:25 +0100)]
ARM: S3C64XX: Add mapping for IISv4 port

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: S3C64XX: Add UART2,UART3 support for SMDK6410 (resend)
Matt Hsu [Mon, 29 Jun 2009 11:03:41 +0000 (19:03 +0800)]
ARM: S3C64XX: Add UART2,UART3 support for SMDK6410 (resend)

Add proper uartcfg for UART port 2,3 and tidy it up on SMDK6410.

Signed-off-by: Matt Hsu <matt@0xlab.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years agoARM: NCP: make ncp_iodesc static and move it to initdata section
Marek Szyprowski [Wed, 24 Jun 2009 06:05:43 +0000 (08:05 +0200)]
ARM: NCP: make ncp_iodesc static and move it to initdata section

Make ncp_iodesc struct static to clean a public namespace a bit and move
it to __initdata section to save memory a bit.

Reviewed-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
15 years ago[ARM] let arch/arm/Kconfig source drivers/Kconfig
Uwe Kleine-König [Thu, 13 Aug 2009 19:09:21 +0000 (21:09 +0200)]
[ARM] let arch/arm/Kconfig source drivers/Kconfig

The changes introduced by this change are:
  - drivers/mtd/Kconfig doesn't depend on ALIGNMENT_TRAP ||
    !CPU_CP15_MMU any more
  - the following files are sourced additionally:
    + drivers/macintosh/Kconfig
      completely depends on PPC || MAC || X86
    + drivers/telephony/Kconfig
      new
    + drivers/pps/Kconfig
      new
    + drivers/infiniband/Kconfig
      new
    + drivers/edac/Kconfig
      depends on X86 || PPC
    + drivers/vlynq/Kconfig
      depends on AR7 && EXPERIMENTAL (that is ARCH_MIPS)
    + drivers/xen/Kconfig
      everything depends on XEN
    + drivers/platform/Kconfig
      depends on X86
  - drivers/regulator/Kconfig is sourced later as is
    drivers/accessibility/Kconfig

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
15 years agoUse kernel/Kconfig.preempt for ARM
Uwe Kleine-König [Thu, 13 Aug 2009 18:38:17 +0000 (20:38 +0200)]
Use kernel/Kconfig.preempt for ARM

before this patch ARM had it's own definition of CONFIG_PREEMPT.
Instead of that use the general definition provided in
kernel/Kconfig.preempt.

This patch changes the available options in *config.  Namely PREEMPT
isn't a stand alone bool anymore, but part of a 'choice' the
following Kconfig symbols are added:

PREEMPT_NONE
PREEMPT_VOLUNTARY

Selecting PREEMPT_NONE now produces exactly the code as not selecting
PREEMPT before (apart from a comment in
/sys/kernel/debug/tracing/(per_cpu/cpuX/)?trace).  The only difference
PREEMPT_VOLUNTARY does is that might_resched might reschedule.  Both
should't introduce regressions.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
15 years agoComplete irq tracing support for ARM
Uwe Kleine-König [Thu, 13 Aug 2009 18:38:17 +0000 (20:38 +0200)]
Complete irq tracing support for ARM

Before this patch enabling and disabling irqs in assembler code and by
the hardware wasn't tracked completly.

I had to transpose two instructions in arch/arm/lib/bitops.h because
restore_irqs doesn't preserve the flags with CONFIG_TRACE_IRQFLAGS=y

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
15 years ago[ARM] support tracing when using newer compilers
Uwe Kleine-König [Thu, 13 Aug 2009 18:38:16 +0000 (20:38 +0200)]
[ARM] support tracing when using newer compilers

Since gcc 4.4 the name and calling convention for function profiling
on ARM changed.  With this patch both types are supported.

See http://sourceware.org/ml/libc-ports/2008-04/msg00009.html for some
details.

Lightly-Tested-by: Anand Gadiyar <gadiyar@ti.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
15 years agonetx: Use get_irqnr_preamble to initialize base register
Uwe Kleine-König [Thu, 13 Aug 2009 18:38:16 +0000 (20:38 +0200)]
netx: Use get_irqnr_preamble to initialize base register

This patch optimizes the irq handling a bit.  Now the base register is
only computed once per irq exception instead of at least twice.
Moreover the mov+add sequence is simplified to an ldr (which might save
some cycles depending on memory timing).

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
15 years agoMerge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
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

15 years ago[ARM] add MAINTAINERS entry for Orion/Kirkwood/etc.
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>
15 years ago[ARM] Kirkwood: Initialise SATA for OpenRD-Base
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>
15 years ago[ARM] Kirkwood: Marvell OpenRD-Base board support
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>
15 years ago¶ARM] Orion5x: fix cpu window mapping for 88f6183
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>
15 years ago[ARM] Kirkwood: Add support for 6281-A1
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>
15 years ago[ARM] orion5x: Add LaCie NAS d2Network support
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>
15 years agoAdd support for Eukrea's MBIMX27
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>
15 years agoAdd support for Eukrea's CPUIMX27
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>
15 years agoMX27: Add USB platform devices and resources
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>
15 years agoMX3: add additional USB pins to iomux
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>
15 years agoehci mxc: Fix clocks
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>
15 years agoMX3: Add USB platform devices and resources
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>
15 years ago[ARM] MXC: remove the now unused #ifndef CONFIG_COMMON_CLKDEV
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>
15 years ago[ARM] MXC: Switch MX1 to clkdev support
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>
15 years agoMXC PLL decoding: calculate mfn value with less magic
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>
15 years agoMXC: pwm driver fixes
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>
15 years agoMXC gpio interrupt support: move register definitions to .c file
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>
15 years agomxc gpio: CONFIG_ARCH_* -> cpu_is_*()
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>
15 years agopcm038: Add support for SJA1000 on baseboard
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>
15 years agopcm037: Add support for SJA1000 on baseboard
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>
15 years agoimxfb: Add support for multiple displays
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>
15 years agoimxfb: use resource_size() macro
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>
15 years agoimxfb: calculate bpix value from bits_per_pixel
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>
15 years agomx1: Codingstyle: Let the compiler count arrays
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>
15 years agomx3: Codingstyle: Let the compiler count arrays
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>
15 years agomx2: Codingstyle: Let the compiler count arrays
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>
15 years agomx2: remove mxc_irda platform device
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>
15 years agoMXC iomux-v3: Fix defines for PAD_CTL registers
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>
15 years agomxc: turn to soc specific init_irq functions
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>
15 years agomxc: remove do not include directly
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>
15 years agoi.MX serial: do not use #ifdef CONFIG_ARCH_*
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>
15 years agoMXC: remove board specific setup of MXC_LL_UART_[PV]ADDR
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>
15 years agoMXC uncompress macros: determine uart base by machine type
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>
15 years agomxc: remove ARCH_NR_GPIOS
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>