Russell King [Thu, 10 Jul 2008 15:38:50 +0000 (16:38 +0100)]
Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel
Dmitry Baryshkov [Thu, 10 Jul 2008 13:44:23 +0000 (14:44 +0100)]
[ARM] 5171/1: ep93xx: fix compilation of modules using clocks
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
sedji gaouaou [Thu, 10 Jul 2008 09:12:14 +0000 (10:12 +0100)]
[ARM] 5133/2: at91sam9g20 defconfig file
at91sam9g20 defconfig file
Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
sedji gaouaou [Thu, 10 Jul 2008 09:15:35 +0000 (10:15 +0100)]
[ARM] 5130/4: Support for the at91sam9g20
Support for the at91sam9g20 : Atmel 400Mhz ARM 926ej-s SOC.
AT91sam9g20 is an evolution of the at91sam9260 with a faster clock
speed.
We created a new board for this device but based the chip support
directly on 9260 files with little updates.
Here is the chip page on Atmel wabsite:
http://atmel.com/dyn/products/product_card.asp?part_id=4337
Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Arnaud Patard [Tue, 8 Jul 2008 22:07:48 +0000 (23:07 +0100)]
[ARM] 5160/1: IOP3XX: gpio/gpiolib support
This patch brings support for gpio/gpiolib framework to Intel IOP3xx
platforms.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Patrice Vilchez [Wed, 9 Jul 2008 21:16:00 +0000 (22:16 +0100)]
[ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
New timings are based on application note
"NAND Flash Support on AT91SAM9 Microcontrollers" available at
http://atmel.com/dyn/resources/prod_documents/doc6255.pdf).
Signed-off-by: Patrice Vilchez <patrice.vilchez@atmel.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Saeed Bishara [Wed, 2 Jul 2008 17:06:32 +0000 (06:06 -1100)]
[ARM] Feroceon: don't disable BPU on boot
On Feroceon platforms that have a branch prediction unit, bit 11 of the
cp15 control register controls the BPU. This patch keeps the old value
of this bit instead of always clearing it.
Signed-off-by: Saeed Bishara <saeed@marvell.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Martin Michlmayr [Mon, 7 Jul 2008 18:23:09 +0000 (21:23 +0300)]
[ARM] Orion: LED support for HP mv2120
The HP mv2120 has several LEDs that are controlled through gpio.
Export the health LED, the red SATA LEDs as well as two gpios
that control the brightness of _all_ LEDs to userland. The
Ethernet and power LEDs can't be controlled through gpio and the
blue SATA LEDs are handled via the SATA driver.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Nicolas Pitre [Fri, 27 Jun 2008 22:56:22 +0000 (18:56 -0400)]
[ARM] Orion: add RD88F5181L-FXO support
This patch adds support for the Marvell Orion-VoIP RD-88F5181L-FXO
Reference Design, and enables use of the ethernet, USB, Cardbus and
mini-PCIe ports.
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Lennert Buytenhek [Mon, 30 Jun 2008 18:25:24 +0000 (14:25 -0400)]
[ARM] Orion: add RD88F5181L-GE support
This patch adds support for the Marvell Orion-VoIP RD2-88F5181L-GE
Reference Design, and enables use of the ethernet, USB, Cardbus and
mini-PCIe ports.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Imre Kaloz [Wed, 25 Jun 2008 23:30:41 +0000 (01:30 +0200)]
[ARM] Orion: add Netgear WNR854T support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Russell King [Mon, 7 Jul 2008 21:21:34 +0000 (22:21 +0100)]
Merge branch 'machtypes' into orion
Ben Dooks [Mon, 7 Jul 2008 17:12:49 +0000 (18:12 +0100)]
[ARM] s3c2410_defconfig: update for current build
Update the s3c2410_defconfig for the current set of
added patches.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 7 Jul 2008 17:12:48 +0000 (18:12 +0100)]
[ARM] Acer n30: Minor style and indentation fixes.
Minor style fixes.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Christer Weinigel [Mon, 7 Jul 2008 17:12:47 +0000 (18:12 +0100)]
[ARM] Acer n30: Hardware initialisation.
Initialise the hardware register settings on boot, to allow the
device to function correctly.
Signed-off-by: Christer Weinigel <christer@weinigel.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Christer Weinigel [Mon, 7 Jul 2008 17:12:46 +0000 (18:12 +0100)]
[ARM] Acer n30: LCD support.
This patch adds the configuration needed for the LCD display on the n30.
Signed-off-by: Christer Weinigel <christer@weinigel.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Christer Weinigel [Mon, 7 Jul 2008 17:12:45 +0000 (18:12 +0100)]
[ARM] Acer n30: Add support for n35 and related devices.
Add support for the Acer N35 and related devices.
Signed-off-by: Christer Weinigel <christer@weinigel.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Christer Weinigel [Mon, 7 Jul 2008 17:12:44 +0000 (18:12 +0100)]
[ARM] Acer n30: LED support.
Add support for the LEDs on the Acer N30.
Signed-off-by: Christer Weinigel <christer@weinigel.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Christer Weinigel [Mon, 7 Jul 2008 17:12:43 +0000 (18:12 +0100)]
[ARM] Acer n30: GPIO buttons support
Add support for the GPIO buttons on the Acer N30.
Signed-off-by: Christer Weinigel <christer@weinigel.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Christer Weinigel [Mon, 7 Jul 2008 17:12:42 +0000 (18:12 +0100)]
[ARM] Acer n30: USB bus pull-up support.
Add support for the USB D+ pull up on the Acer N30. This is needed
for the USB gadget to work properly.
Signed-off-by: Christer Weinigel <christer@weinigel.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Christer Weinigel [Mon, 7 Jul 2008 17:12:41 +0000 (18:12 +0100)]
[ARM] Acer n30: Source file cleanups.
Clean up some junk from the official kernel.
The compile-command is something that's only useful for me personally
and doesn't belong in the mainstream kernel.
Signed-off-by: Christer Weinigel <christer@weinigel.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 7 Jul 2008 17:12:40 +0000 (18:12 +0100)]
[ARM] S3C2443: Add prediv clk and fix setting of h and p clocks
Update the S3C2443 clock support to add the prediv clock
that is sourced via a divider from msysclk. Also fix the
setting of p and h clocks from this prediv clock.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 7 Jul 2008 17:12:39 +0000 (18:12 +0100)]
[ARM] S3C2443: Add armdiv and arm clocks
Add the armdiv and arm clocks to the S3C2443 clock
framework and ensure they are correctly setup.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 7 Jul 2008 17:12:38 +0000 (18:12 +0100)]
[ARM] S3C2443: Fix s3c2443_clkcon_enable_p() using wrong register.
s3c2443_clkcon_enable_p() was reading from the correct register
S3C2443_PCLKCON, but then writing the value back to the wrong
register S3C2443_HCLKCON.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ramax Lo [Mon, 7 Jul 2008 17:12:37 +0000 (18:12 +0100)]
[ARM] AT2440EVB: Add DM9000A network controller support.
Add DM9000AEP network controller support for AT2440EVB.
Signed-off-by: Ramax Lo <ramaxlo@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ramax Lo [Mon, 7 Jul 2008 17:12:36 +0000 (18:12 +0100)]
[ARM] S3C2440: Add AT2440EVB board support
Add basic support for AT2440EVB board based on Samsung S3C2440 SoC.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Ramax Lo <ramaxlo@gmail.com>
Russell King [Mon, 7 Jul 2008 15:26:41 +0000 (16:26 +0100)]
Merge branches 'ns9x' and 'machtypes' into devel
Russell King [Thu, 3 Jul 2008 15:11:06 +0000 (16:11 +0100)]
[ARM] mach-types update
Update mach-types. Remove invalid or incorrect entries.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ben Dooks [Thu, 3 Jul 2008 11:32:51 +0000 (12:32 +0100)]
[ARM] S3C24XX: Split serial driver into core and per-cpu drivers
The S3C2410 serial driver in drivers/serial/s3c2410.c has been
growing bigger with the addition of more variants of this hardware
with the growing Samsung SoCs range. As such, it would be
easier to split this code up into a core and per-cpu drivers to
make driver addition easier, and the core smaller.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 1 Jul 2008 12:17:24 +0000 (13:17 +0100)]
[ARM] S3C24XX: PWM API support.
Add support for PWM in the S3C24XX series of SoC via the
PWM API.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Matthieu Castet [Thu, 3 Jul 2008 10:24:45 +0000 (11:24 +0100)]
[ARM] S3C2412: Correct parents for EREFCLK and UREFCLK
For s3c2412, set parent for clk_erefclk and clk_urefclk.
This allow for example to use xtal or extclk for i2s clock.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Matthieu Castet <matthieu.castet@parrot.com>
Ben Dooks [Thu, 3 Jul 2008 10:24:44 +0000 (11:24 +0100)]
[ARM] VR1000: Add tmp101 to list of I2C devices on the board
Add tmp101 support via the new style I2C driver registration
on the VR1000.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:43 +0000 (11:24 +0100)]
[ARM] ANUBIS: Add i2c device list to Simtec Anubis
Add i2c board info initialiser to setup the list of
I2C devices present on an Simtec Anubis.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:42 +0000 (11:24 +0100)]
[ARM] VR1000: Add i2c device list to Thorcom VR1000
Add i2c board intialisers to specify the I2C devices
attached on the Thorcom VR1000.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:41 +0000 (11:24 +0100)]
[ARM] BAST: Add i2c device list on Simtec Bast
Add i2c boardinfo for the connected i2c devices on the
Simtec Bast.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:40 +0000 (11:24 +0100)]
[ARM] OSIRIS: Add i2c device list to Simtec Osiris
Add an i2c board information initialisers to the board
to define which devices are present.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:39 +0000 (11:24 +0100)]
[ARM] S3C24XX: Add physmap device for all Simtec NOR equiped boards.
Move to using the physmap platform device code to attached NOR
flash on Simtec boards so that the old bast-flash driver can be
safely removed.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:38 +0000 (11:24 +0100)]
[ARM] ANUBIS: Move to using ata_platform driver (libata)
Change the (as yet unused) IDE bus on the Simtec Anubis board
to use pata_platform and thus libata to provide IDE support.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:37 +0000 (11:24 +0100)]
[ARM] BAST/VR1000: Move to using ata_platform (libata)
Use the pata_platform driver to provide the IDE port
drivers on the Simntec BAST and Thorcom VR1000 machines
as a precursor to removing drivers/ide/arm/bast-ide.c
This will mean that the system will need SCSI and SCSI disc
support as a minimum, and any references to hdX will be
changed to sdX.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:36 +0000 (11:24 +0100)]
[ARM] JIVE: Add power off on shutdown support
Add pm_power_off hook to allow the Logitech Jive to shutdown
when asked to halt.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:35 +0000 (11:24 +0100)]
[ARM] JIVE: Add i2c device info for LIS302DL sensor
Add i2c bus definition for the LIS302DL sensor driver
which is connected on the i2c bus.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:34 +0000 (11:24 +0100)]
[ARM] JIVE: Add board definitions for audio
Add board definitions for the audio device connected
on the Logitech Jive.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:33 +0000 (11:24 +0100)]
[ARM] JIVE: Add LCD display setup information
Add the setup information for the LCD display
connected to the device.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:32 +0000 (11:24 +0100)]
[ARM] JIVE: Add SPI bus definitions for LCD controller
Add the definitions for the VGG2432A4 intelligent
LCD display conneected via an GPIO-based SPI bus
on the Logitech Jive.
Signed-of-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:31 +0000 (11:24 +0100)]
[ARM] JIVE: Add setup information for the S3C2412 LCD controller
Setup the video controller information for the Jive.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:30 +0000 (11:24 +0100)]
[ARM] JIVE: Initialise the sleep configuration registers
Ensure that the S3C2412 sleep configuration registers
are approriately setup so that the device can safely
go to sleep.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:29 +0000 (11:24 +0100)]
[ARM] JIVE: Initial machine support for Logitech Jive
This is the base machine support for the Logitech Jive
machine.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:27 +0000 (11:24 +0100)]
[ARM] S3C24XX: Support for PWM timer clocks via clk_* API
Add support for the PWM timer clock routing via the
standard clk_ API.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:26 +0000 (11:24 +0100)]
[ARM] S3C24XX: Add PWM timer MUX defines
Add timer defines for the MUX settings for
each of the PWM timers to add to the per-timer
defines already in the file.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:25 +0000 (11:24 +0100)]
[ARM] S3C24XX: Add gpiolib support
Add support for gpilib on all S3C24XX platforms.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:32:28 +0000 (11:32 +0100)]
[ARM] S3C24XX: s3c2410_defconfig: enable USB subset of drivers
Enable a subset of USB drivers which are useful for
using on these devices.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:32:27 +0000 (11:32 +0100)]
[ARM] S3C24XX: s3c2410_defconfig: add SCSI support
Enable SCSI support, mainly to help with adding
USB storage support later and for the imminent
changes for libata.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:32:26 +0000 (11:32 +0100)]
[ARM] S3C24XX: s3c2410_defconfig: update networking options
Add the following to the networking confgiuration:
1) Packet socket support (useful for userland dhcp)
2) Add bluetooth and USB bluetooth drivers as modules
3) Add basic IPv6 support as modules.
4) Add the wireless core as modules.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:32:25 +0000 (11:32 +0100)]
[ARM] S3C24XX: s3c2410_defconfig: update miscellaneous options
Add some basic config filesystem, ensure errors are verbose
by default.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:32:24 +0000 (11:32 +0100)]
[ARM] S3C24XX: s3c2410_defconfig: update filesystem options
Enable new filesystem options, such as:
- JFFS2 summary nodes
- Ext2/3 externed options
- Standard CDROM filesystems
Also add NTFS as a module.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:32:23 +0000 (11:32 +0100)]
[ARM] S3C24XX: s3c2410_defconfig: enable useful NLS options
Enable some useful NLS codepages to be built into
the kernel, and build the rest as modules.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:32:22 +0000 (11:32 +0100)]
[ARM] S3C24XX: s3c2410_defconfig: update list of used drivers
Update the drivers built, such as the SM501 and
parallel port.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:32:21 +0000 (11:32 +0100)]
[ARM] S3C24XX: s3c2410_defconfig: update to rc8
Update the s3c2410_defconfig to rc8
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 3 Jul 2008 10:24:23 +0000 (11:24 +0100)]
[ARM] S3C2410: Add sysfs attribute for serial driver clock source
Add attribute to show the current clock source for the serial
driver and remove old and annoying debug output.
Note, this only currently shows the current source with a
"* " prefix to indicate that it is the current source. Future
code will list all the clock sources, with the non-selected
one with " " prefix.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
PATCH FOLLOWS
KernelVersion: 2.6.26-rc3
Ben Dooks [Thu, 3 Jul 2008 10:24:22 +0000 (11:24 +0100)]
[ARM] S3C2410: Fix flags on DM9000 resources on BAST and VR1000
Fix the flags entries for the DM9000 IRQ entries on both the
Simtec BAST and Thorcom VR1000 board. The current entries use
the IRQF_ flags, but we should be using the IORESOURCE_IRQ_
definitions.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
PATCH FOLLOWS
KernelVersion: 2.6.26-rc5
Paulius Zaleckas [Wed, 25 Jun 2008 12:25:13 +0000 (13:25 +0100)]
[ARM] 5122/1: imx_dma_request_by_prio simpilfication
imx_dma_request_by_prio can return channel number by itself.
No need to supply variable address through parameters.
Also converted all drivers using this function.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Paulius Zaleckas [Wed, 25 Jun 2008 12:33:14 +0000 (13:33 +0100)]
[ARM] 5123/1: Select GENERIC_HARDIRQS_NO__DO_IRQ for ARM arch
ARM architecture is not using __do_IRQ
Acked-By: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Catalin Marinas [Fri, 13 Jun 2008 09:28:36 +0000 (10:28 +0100)]
[ARM] 5092/1: Fix the I-cache invalidation on ARMv6 and later CPUs
This patch adds the I-cache invalidation in update_mmu_cache if the
corresponding vma is marked as executable. It also invalidates the
I-cache if a thread migrates to a CPU it never ran on.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Catalin Marinas [Mon, 23 Jun 2008 15:32:14 +0000 (16:32 +0100)]
[ARM] 5121/1: Annotate platform_secondary_init with trace_hardirqs_off
This patch annotates the platform_secondary_init function in
arch/arm/mach-realview/platsmp.c with trace_hardirqs_off to avoid a
warning when LOCKDEP and TRACE_IRQFLAGS are enabled.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Matthias Kaehlcke [Mon, 9 Jun 2008 23:24:08 +0000 (16:24 -0700)]
[ARM] OMAP1: N770: Convert audio_pwr_sem in a mutex
ARM: OMAP1: N770: The semaphore audio_pwr_sem is used as a
mutex. Convert it to the mutex API
[akpm@linux-foundation.org: include mutex.h]
Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Vegard Nossum [Mon, 9 Jun 2008 23:24:10 +0000 (16:24 -0700)]
[ARM] fix header guards
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Adrian Bunk [Mon, 9 Jun 2008 23:24:09 +0000 (16:24 -0700)]
[ARM] remove drivers/acorn/char/defkeymap-l7200.c
The config option for building drivers/acorn/char/defkeymap-l7200.c is
not present since at least kernel 2.6.0.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ben Dooks [Fri, 23 May 2008 10:48:00 +0000 (11:48 +0100)]
[ARM] 5054/1: S3C2410: Add GPLv2 license to the s3c2410 serial driver
The original driver had an MODULE_LICENSE statement for GPL,
but no explict license in the header of the file. To make
this more explicit, and since I am the original authour,
we will add a GPLv2 header.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ben Dooks [Thu, 22 May 2008 15:36:45 +0000 (16:36 +0100)]
[ARM] 5050/1: S3C2410: Cleanup header on S3C2410 serial driver
Remove the changelog which should really be found
in the version control system.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Thu, 3 Jul 2008 15:13:28 +0000 (16:13 +0100)]
Merge branch 'fb' into devel
Conflicts:
arch/arm/Kconfig
Ben Dooks [Tue, 1 Jul 2008 13:16:49 +0000 (14:16 +0100)]
[ARM] 5140/1: RPC: Use HAVE_PATA_PLATFORM to select pata platform driver
Use HAVE_PATA_PLATFORM for ARCH_RPC
Cc: Linux ARM Kernel <linux-arm-kernel@lists.arm.linux.org.uk>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Sat, 19 Apr 2008 15:01:38 +0000 (16:01 +0100)]
[ARM] rpc: ecard: remove deprecated ecard_address() and relatives
ecard_address() is obsolete, and has been marked deprecated since
at least 2.6.12-rc2. All in-tree users have been updated to use
the new approach, so it's time to remove this.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Sat, 19 Apr 2008 14:56:08 +0000 (15:56 +0100)]
[ARM] rpc: deprecate __ioaddr() and __ioaddrc() helpers
Now everything is converted to use MMIO accessors, these helpers
are no longer required.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Sat, 19 Apr 2008 14:42:57 +0000 (15:42 +0100)]
[ARM] rpc: acornscsi: update to new style ecard driver
Update acornscsi as per all the other ecard drivers to use MMIO
accessors rather than the obsolete 'pc io' style inb/outb accessors.
Use ecard_request_resources()/ecard_release_resources() for easier
resource handling, rather than requesting 5 separate regions
individually.
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Sat, 19 Apr 2008 14:37:44 +0000 (15:37 +0100)]
[ARM] rpc: acornscsi: stop using private __stringify()
The kernel has its own, so let's use that instead.
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Sat, 19 Apr 2008 13:26:18 +0000 (14:26 +0100)]
[ARM] rpc: acornscsi: convert hardware accessors to take 'AS_Host *'
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Sat, 19 Apr 2008 14:13:45 +0000 (15:13 +0100)]
[ARM] rpc: acornscsi: fixup abort/reset methods, fix build errors
Revive the AcornSCSI driver, update it for the replacement command
abort and host reset methods, and fix the build errors in
acornscsi-io.S.
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Sat, 19 Apr 2008 14:20:23 +0000 (15:20 +0100)]
[ARM] rpc: acornscsi: remove unused 'ADDR' macro
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Sat, 19 Apr 2008 14:12:23 +0000 (15:12 +0100)]
[ARM] rpc: etherh: fix unused variable warning
Fix:
drivers/net/arm/etherh.c:650: warning: unused variable `i'
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Paul Walmsley [Thu, 3 Jul 2008 09:24:46 +0000 (12:24 +0300)]
ARM: OMAP2: Clock: New OMAP2/3 DPLL rate rounding algorithm
This patch adds a new rate rounding algorithm for DPLL clocks on the
OMAP2/3 architecture.
For a desired DPLL target rate, there may be several
multiplier/divider (M, N) values which will generate a sufficiently
close rate. Lower N values result in greater power economy. However,
lower N values can cause the difference between the rounded rate and
the target rate ("rate error") to be larger than it would be with a
higher N. This can cause downstream devices to run more slowly than
they otherwise would.
This DPLL rate rounding algorithm:
- attempts to find the lowest possible N (DPLL divider) to reach the
target_rate (since, according to Richard Woodruff <r-woodruff@ti.com>,
lower N values save more power than higher N values).
- allows developers to set an upper bound on the error between the
rounded rate and the desired target rate ("rate tolerance"), so an
appropriate balance between rate fidelity and power savings can be
set. This maximum rate error tolerance is set via
omap2_set_dpll_rate_tolerance().
- never returns a rounded rate higher than the target rate.
The rate rounding algorithm caches the last rounded M, N, and rate
computation to avoid rounding the rate twice for each clk_set_rate()
call. (This patch does not yet implement set_rate for DPLLs; that
follows in a future patch.)
The algorithm trades execution speed for rate accuracy. It will find
the (M, N) set that results in the least rate error, within a
specified rate tolerance. It does this by evaluating each divider
setting - on OMAP3, this involves 128 steps. Another approach to DPLL
rate rounding would be to bail out as soon as a valid rate is found
within the rate tolerance, which would trade rate accuracy for
execution speed. Alternate implementations welcome.
This code is not yet used by the OMAP24XX DPLL clock, since it
is currently defined as a composite clock, fusing the DPLL M,N and the
M2 output divider. This patch also renames the existing OMAP24xx DPLL
programming functions to highlight that they program both the DPLL and
the DPLL's output multiplier.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 3 Jul 2008 09:24:45 +0000 (12:24 +0300)]
ARM: OMAP2: Clock: Add OMAP3 DPLL autoidle functions
This patch adds support for DPLL autoidle control to the OMAP3 clock
framework. These functions will be used by the noncore DPLL enable
and disable code - this is because, according to the CDP code, the
DPLL autoidle status must be saved and restored across DPLL
lock/bypass/off transitions.
N.B.: the CORE DPLL (DPLL3) has three autoidle mode options, rather
than just two. This code currently does not support the third option,
low-power bypass autoidle.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 3 Jul 2008 09:24:45 +0000 (12:24 +0300)]
ARM: OMAP: Add OMAP chip type structure; clean up mach-omap2/id.c
Add a new OMAP chip identification interface, omap_chip_id.
omap_chip_id is a structure which contains one bit for each OMAP2/3
CPU type, and on 3430, ES level. For example, the CHIP_IS_OMAP2420
bit is set in omap_chip at boot on an OMAP2420. On OMAP3430ES2, both
CHIP_IS_OMAP3430 and CHIP_IS_OMAP3430ES2 bits are set.
omap_chip is set in mach-omap2/id.c by _set_omap_chip(). Other
code should use the omap_chip_is() function to test against omap_chip.
Also, clean up id.c by splitting some code out of
omap_check_revision() into its own function, _set_system_rev(); and
converting some debug printk()s into pr_debug().
Second revision.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:44 +0000 (12:24 +0300)]
ARM: OMAP: Turn CM and PRM access into functions
Otherwise compiling in omap2 and omap3 will not work.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:44 +0000 (12:24 +0300)]
ARM: OMAP: Introduce omap_globals and prcm access functions for multi-omap
New struct omap_globals contains the omap processor specific
module bases. Use omap_globals to set the various base addresses
to make detecting omap chip type simpler.
Also introduce OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS for future multi-omap
patches.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:43 +0000 (12:24 +0300)]
ARM: OMAP: Remove __REG access for multi-omap
This does not play nicely with multi-omap as it cannot be replaced
by a function in io.c for omaps with different IO bases.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:43 +0000 (12:24 +0300)]
ARM: OMAP: USB: Change omap USB code to use omap_read/write instead of __REG
Change omap USB code to use omap_read/write instead of __REG for multi-omap
Cc: David Brownell <david-b@pacbell.net>
Cc: linux-usb@vger.kernel.org
Cc: i2c@lm-sensors.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:41 +0000 (12:24 +0300)]
ARM: OMAP: Change omap_cf.c and omap_nor.c to use omap_readw/writew instead of __REG
Change omap_cf.c and omap_nor.c to use omap_readw/writew instead of __REG.
This is needed for multi-omap in the future.
Cc: David Brownell <david-b@pacbell.net>
Cc: linux-pcmcia@lists.infradead.org
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Tony Lindren <tony@atomide.com>
Hiroshi DOYU [Thu, 3 Jul 2008 09:24:41 +0000 (12:24 +0300)]
ARM: OMAP: CLKFW: Initial debugfs support for omap clock framework
debugfs can provide the infrastructure to trace the dependencies of
clock tree hierarchy quite visibly. This patch enables to keep track
of clock tree hierarchy and expose their attributes under each clock
directry as below:
omap:~# tree -d -L 2 /debug/clock/omap_32k_fck/
/debug/clock/omap_32k_fck/
|-- gpt10_fck
|-- gpt11_fck
|-- gpt1_fck
|-- per_32k_alwon_fck
| |-- gpio2_fck
| |-- gpio3_fck
| |-- gpio4_fck
| |-- gpio5_fck
| |-- gpio6_fck
| `-- wdt3_fck
|-- ts_fck
`-- wkup_32k_fck
|-- gpio1_fck
`-- wdt2_fck
14 directories
omap:~# tree /debug/clock/omap_32k_fck/gpt10_fck/
/debug/clock/omap_32k_fck/gpt10_fck/
|-- flags
|-- rate
`-- usecount
0 directories, 3 files
Although, compared with David Brownell's small patch, this may look
bit overkilling, I expect that this debugfs can deal with other PRCM
complexities at the same time. For example, powerdomain dependencies
can be expressed by using symbolic links of these clocks if
powerdomain supports dubgfs as well.
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:41 +0000 (12:24 +0300)]
ARM: OMAP: Clean up interrupt lines to fix warnings for multi-omap
If boards with different NR_IRQS are compiled together, tons of
compiler warnings are emitted about redefining NR_IRQS.
This patch fixes the problem by adding up NR_IRQS in a common place.
Patch also removes quite a bit of now unnecessary code.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Eduardo Valentin [Thu, 3 Jul 2008 09:24:40 +0000 (12:24 +0300)]
ARM: OMAP: McBSP: Add support for mcbsp on mach-omap2
This patch adds support for mach-omap2 based on current
mcbsp platform driver.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Eduardo Valentin [Thu, 3 Jul 2008 09:24:40 +0000 (12:24 +0300)]
ARM: OMAP: McBSP: Add support for mcbsp on mach-omap1
This patch adds support for mach-omap1 based on current
mcbsp platform driver.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Eduardo Valentin [Thu, 3 Jul 2008 09:24:39 +0000 (12:24 +0300)]
ARM: OMAP: McBSP: Prepare for splitting into omap1 and omap2 code
This patch transform mcbsp code to use platform data
from arch/arm/plat-omap/devices.c
It also gets ride of ifdefs on mcbsp.c code.
To do it, a platform data structure was defined.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Eduardo Valentin [Thu, 3 Jul 2008 09:24:39 +0000 (12:24 +0300)]
ARM: OMAP: McBSP: Coding style cleanup on arch/arm/plat-omap/mcbsp.c
This patch fix lots of warnings and errors reported by
scripts/checkpatch.pl on arch/arm/plat-omap/mcbsp.c.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:38 +0000 (12:24 +0300)]
ARM: OMAP: SRAM: Split sram24xx.S into sram242x.S and sram243x.S
Split sram24xx.S into sram242x.S and sram243x.S
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:38 +0000 (12:24 +0300)]
ARM: OMAP: SRAM: Move omap2 sram-fn.S to sram242x.S
This file will get split between sram242x.S and sram243x.S
in following patch.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:38 +0000 (12:24 +0300)]
ARM: OMAP: SRAM: Move sram-fn.S from plat-omap to mach-omap1
This file is omap1 specific.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:37 +0000 (12:24 +0300)]
ARM: OMAP: DMA: Clean-up code
DMA clean-up, mostly checkpatch.pl fixes.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:36 +0000 (12:24 +0300)]
ARM: OMAP: DMA: Remove __REG access
Remove __REG access in DMA code, use dma_read/write instead:
- dynamically set the omap_dma_base based on the omap type
- omap_read/write becomes dma_read/write
- dma channel registers are read with dma_ch_read/write
Cc: David Brownell <david-b@pacbell.net>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 3 Jul 2008 09:24:31 +0000 (12:24 +0300)]
ARM: OMAP: DMA: Make channels dynamic for multi-boot
Make DMA channels dynamic for multi-boot
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 3 Jul 2008 09:24:31 +0000 (12:24 +0300)]
ARM: OMAP: Add OMAP3430 base defines
Add symbolic constants for OMAP3430 base addresses; include that file
in hardware.h.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>