Mark Brown [Wed, 17 Feb 2010 18:19:31 +0000 (18:19 +0000)]
ARM: SMDK6410: Add support for PMIC LED on WM1192-EV1 PMIC module
The PMIC LED on the SMDK6410 CPU board is driven by GPIO4 of the
WM8312 PMIC. Provide software control of this LED.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Mark Brown [Wed, 17 Feb 2010 18:19:29 +0000 (18:19 +0000)]
ARM: SMDK6410: Add initial support for WM1192-EV1 PMIC board
The Wolfson Microelectronics 1192-EV1 is a plug in module for the
SMDK6410 providing power using a WM8312 PMIC. This patch provides
initial hookup sufficient to initialise the board, though not all
features are fully described yet.
As part of this supplies for the system that are provided as a
single supply by one of the currently merged PMIC boards are
factored out so they can be reused between different regulators.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Jassi Brar [Fri, 12 Feb 2010 10:38:52 +0000 (10:38 +0000)]
ARM: S3C2443: GPIO: Correct AC97 pin defines
GPIO_E-[5,9] pin functionality was defined incorrectly.
The patch corrects and adds missing pins.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Jassi Brar [Fri, 12 Feb 2010 10:38:50 +0000 (10:38 +0000)]
ARM: SMDK2443: Enable AC97 device
Add AC97 controller to platform devices and initialize the AC97 gpios.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Wed, 24 Feb 2010 01:46:10 +0000 (01:46 +0000)]
ARM: SAMSUNG: Fix UART number for S5P6442
The recent changes in the UART code mean that we need to ensure that
the 4 UART case is only selected if S5PV210 is being compiled.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Fri, 29 Jan 2010 01:23:40 +0000 (10:23 +0900)]
ARM: S5P6442: Add serial port support
This patch adds UART serial port support for S5P6442.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Fri, 29 Jan 2010 01:22:47 +0000 (10:22 +0900)]
ARM: S5P6442: Add S5P6442 configuration file
This patch adds S5P6442 default configuration file.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Fri, 29 Jan 2010 01:21:16 +0000 (10:21 +0900)]
ARM: S5P6442: Add SMDK6442 board support file
This patch adds SMDK6442 board support file.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Fri, 29 Jan 2010 01:19:26 +0000 (10:19 +0900)]
ARM: S5P6442: Update Kconfig and Makefiles
Updates arch/arm Kconfig and Makefile for building the S5P6442 support.
Also modifies the plat-s5p Kconfig file to include the support for plat-s5p
for S5P6442.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Wed, 24 Feb 2010 01:43:27 +0000 (01:43 +0000)]
ARM: S5P6442: Add <mach/*.h> files missing from original commit
The removal of plat-s3c has left these missing from the initial commit,
so add copies from elsewhere.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Fri, 29 Jan 2010 01:17:20 +0000 (10:17 +0900)]
ARM: S5P6442: Add IRQ support
This patch adds IRQ support for S5P6442. This patch adds interrupt
register definitions, IRQ definitions for various interrupt sources
and new VIC base for VIC2 in plat-s5p common irq code.
Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Thu, 4 Feb 2010 00:42:13 +0000 (09:42 +0900)]
ARM: S5P6442: Add clock support for S5P6442
This patch adds clock support for S5P6442. This patch adds the clock
register definitions and the various system clocks in S5P6442.
Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Fri, 29 Jan 2010 01:12:14 +0000 (10:12 +0900)]
ARM: S5P6442: Add Samsung S5P6442 CPU support
This patch adds support for Samsung S5P6442 CPU. This patch also adds
an entry for S5P6442 cpu in plat-s5p cpu table.
Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Vasily Khoruzhick [Thu, 18 Feb 2010 16:32:29 +0000 (18:32 +0200)]
ARM: SAMSUNG: adc: disable/enable IRQ on suspend/resume
IRQ should be disabled on suspend and re-enabled on resume.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Vasily Khoruzhick [Thu, 18 Feb 2010 16:32:27 +0000 (18:32 +0200)]
ARM: SAMSUNG: Add resources description for s3c24xx ts driver
Without resources description driver fails during initialization.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 23 Feb 2010 00:18:36 +0000 (00:18 +0000)]
ARM: SAMSUNG: Eliminate plat-s3c
The plat-s3c directory is now clear, so remove the files in it and
expunge it from the build process.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 09:02:20 +0000 (09:02 +0000)]
ARM: SAMSUNG: Move include/mach files out of plat-s3c
Move the include/mach files out of plat-s3c and into the relevant
machine files. This does mean copying the files, but there is nowhere
else to put them.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 09:02:19 +0000 (09:02 +0000)]
ARM: SAMSUNG: Select NO_IOPORT for plat-samsung
All these platforms select NO_IOPORT, so move it to plat-samsung Kconfig
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 09:02:18 +0000 (09:02 +0000)]
ARM: S3C24XX: Move audio-simtec.h to plat-s3c24xx
Continue the clearout of plat-s3c by moving audio-simtec.h to plat-s3c24xx
as there are no current implementations outside of this platform.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 09:02:17 +0000 (09:02 +0000)]
ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx
Move the Kconfig entries from plat-s3c to plat-samsung and plat-s3c24xx
as necessary. The S3C_BOOT entries and the DMA configuration can go to
plat-samsung. The low-level UART configurations are currently S3C2XX
specific and can go to plat-s3c24xx.
Eliminating plat-s3c from the build process will be submitted seperately.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 09:02:16 +0000 (09:02 +0000)]
ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung
Move the init.c and time.c files to plat-samsung from plat-s3c, thus
clearing the last files that are being built in here.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 09:02:15 +0000 (09:02 +0000)]
ARM: SAMSUNG: Move DMA support to plat-samsung
Move the core of the DMA support to plat-samsung for everyone to use.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 09:02:14 +0000 (09:02 +0000)]
ARM: SAMSUNG: Move pm.c to plat-samsung
Move pm.c to plat-samsung, it should be usable by all Samsung systems
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 09:02:13 +0000 (09:02 +0000)]
ARM: SAMSUNG: Move map-base to plat-samsung
Move the map-base file to plat-samsung. To make the move easier, we do not
change the S3C_ prefix on many of the items as this would involve going
through altering all the dependencies.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 09:02:12 +0000 (09:02 +0000)]
ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung
Move common headers from plat-s3c's include/plat directory into plat-samsung.
No need to fix any files, these are still included via <plat/>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 22 Feb 2010 23:38:26 +0000 (23:38 +0000)]
ARM: Merge next-samsung-s3c64xx-platdeletion
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung
Conflicts:
arch/arm/mach-s3c64xx/Makefile (fixed)
Ben Dooks [Mon, 22 Feb 2010 23:26:47 +0000 (23:26 +0000)]
ARM: S3C64XX: Eliminate plat-s3c64xx
Now we've move the support out of plat-s3c64xx for everything, eliminate
the platform directory arch/arm/plat-s3c64xx and remove it from the ARM
build configuration.
Note, PLAT_S3C64XX is kept around for the moment until the drivers that
depend on it can be updated, so it is moved to the mach-s3c64xx Kconfig.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Sat, 20 Feb 2010 23:01:33 +0000 (23:01 +0000)]
ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed
dma-plat.h is the last file left in plat-s3c64xx, but to remove it we
must also change the use of dma-plat.h by the core code and the s3c24xx
implementation.
Rename the s3c24xx dma-plat.h in the common plat-samsung directory as it
may be used for other ports. Move the specific dma bits into the
mach-s3c64xx directory and update the build as needed.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 5 Feb 2010 12:52:53 +0000 (13:52 +0100)]
ARM: SAMSUNG: Move pm-core.h to machine directory
Move the pm-core.h to the machine include directory in the process of
eliminating the plat-s3c64xx.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 06:49:15 +0000 (15:49 +0900)]
ARM: S3C64XX: Remove plat-s3c64xx Kconfig and PLAT_S3C64XX
Remove the Kconfig and PLAT_S3C64XX defines for the previous S3C64XX
directory structure now that the code is moved into mach-s3c64xx.
Note, we cannot currently remove plat-s3c64xx directory as we have a
pair of include files used within plat-s3c and plat-samsung that need
to find a new home.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 06:10:38 +0000 (15:10 +0900)]
ARM: S3C64XX: Combine the clock init code
Turn the init sequence of
s3c24xx_register_baseclocks(xtal);
s3c64xx_register_clocks();
s3c6400_register_clocks(S3C6410_CLKDIV0_ARM_MASK);
into a single call as this is now contained within one file.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 05:53:19 +0000 (14:53 +0900)]
ARM: S3C64XX: Merge s3c6400-clock.c and clock.c into mach-s3c64xx
Merge plat-s3c64xx/s3c6400-clock.c mach-s3c64xx/clock.c placing all the
clock code into one place.
Note, no effort is made in this patch to squash the init functions
together.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 05:32:09 +0000 (14:32 +0900)]
ARM: S3C64XX: Merge s3c6400-init.c into cpu.c
Since this file is small, and is compiled for both systems in this
architecture merge it into the cpu support file and remove the original
instead of moving it.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 04:41:30 +0000 (13:41 +0900)]
ARM: S3C64XX: Move core support to mach-s3c64xx
Move the core S3C64XX support to mach-s3c64xx as it is unlikely to be used
outside of this directory. Also move the SoC header files in with it.
This includes the clock, cpu, cpufreq, dma, gpiolib and pll support.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 02:19:18 +0000 (11:19 +0900)]
ARM: S3C64XX: Move device and device setup into mach-s3c64xx
Move the S3C64XX specific device and setup files into mach-s3c64xx as
they are unlikely to be used outside of this code.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 02:07:23 +0000 (11:07 +0900)]
ARM: S3C64XX: Move IRQ support into mach-s3c64xx
Move IRQ support to mach-s3c64xx as it is unlikely to be re-used outside
this machine.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 01:45:40 +0000 (10:45 +0900)]
ARM: S3C64XX: Move headers into machine include directory
Move the register and GPIO definition files from plat-s3c64xx into the
machine include direcotry as they are unlikely to be reused outside
mach-s3c64xx.
This move includes removing the empty <mach/regs-clock.h> and replacing
it with the <plat/regs-clock.h> implementation.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Wed, 3 Feb 2010 01:56:07 +0000 (01:56 +0000)]
ARM: Merge next-samsung-s3c244x-merge
Merge branch 'next-samsung-s3c244x-merge' into next-samsung
Ben Dooks [Wed, 3 Feb 2010 01:55:39 +0000 (01:55 +0000)]
ARM: Merge next-samsung-devupdates2
Merge branch 'next-samsung-devupdates2' into next-samsung
Maurus Cuelenaere [Sat, 30 Jan 2010 17:01:48 +0000 (18:01 +0100)]
ARM: SAMSUNG: Add support for 12bit ADC
The S3C64XX SoC series support 12bit ADC data, enable this and
mask the data accordingly.
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 04:03:34 +0000 (13:03 +0900)]
ARM: S3C64XX: Make audio device code built unconditionally
Making the code depend on CONFIG_SND_S3C24XX_SOC means that if the ASoC
code is build modularily, the boards will fail to link due to the device
code also being built as a module.
As per Mark Brown's suggestions, just compile this always as it is expected
many machines will have audio.
Also move the obj-y line out of the device setup area into a new area just
for devices.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 01:53:35 +0000 (10:53 +0900)]
ARM: SAMSUNG: Use PLAT_SAMSUNG instead of PLAT_S3C
As part of the development process, it is hoped PLAT_S3C is either removed
from all of the PLAT_SAMSUNG derived platforms or removed entirely. It is
also better to use PLAT_SAMSUNG as this is the current base of all Samsung
devices.
Change the two places that use PLAT_S3C to use PLAT_SAMSUNG
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 29 Jan 2010 01:52:02 +0000 (10:52 +0900)]
ARM: SAMSUNG: Add SERIAL_SAMSUNG_UARTS_4 Kconfig option
Add SERIAL_SAMSUNG_UARTS_4 to mop up the number of cases currently using
four Samsung compatible UARTS.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Michel Pollet [Wed, 27 Jan 2010 16:38:08 +0000 (16:38 +0000)]
ARM: S3C2412: SoC has the fractional baud rate register
The S3C2412 has a fractional baud rate register, this patch adds the
corresponding flag to the UART definition to allow generation of more
precise baud rates for the various clock combinations.
Signed-off-by: Michel Pollet <buserror@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Jassi Brar [Thu, 28 Jan 2010 08:14:49 +0000 (17:14 +0900)]
ARM: S3C64XX: SPI: Make platform device compilation selectable
The SPI controller platform devices should be compiled in
independent of the driver support, otherwise we might end
up with dev-spi built as kernel module.
Change this to make every machine select if it has some SPI
device and wants to build device definitions.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Wed, 27 Jan 2010 09:13:59 +0000 (18:13 +0900)]
ARM: SAMSUNG: Add DMA masks to hsotg device
Add the required DMA masks to the hs-otg device definition to allow DMA
to work with it.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 07:54:21 +0000 (16:54 +0900)]
ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h
Merge these two headers into one, these two SoCs are so similar.
Note, correct fault in mach-smdk2443.h including the wrong header.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 07:47:41 +0000 (16:47 +0900)]
ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440
Remove the old common S3C2440 and S3C2442 SoC support from plat-s3c24xx
into mach-s3c2440 now this directory is serving both SoCs.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 07:37:50 +0000 (16:37 +0900)]
ARM: S3C24XX: Remove old mach-s3c2442
Remove the old mach-s3c2442 directory now all is merged into mach-s3c2440
and remove it from the arch/arm build process.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 07:31:32 +0000 (16:31 +0900)]
ARM: S3C244X: Move S3C2442 code into S3C2440
Move the remaining S3C2442 code into mach-s3c2440 as there is only one
file currently in there and these two SoCs are very similar.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 07:27:08 +0000 (16:27 +0900)]
ARM: S3C2440: Fix SMDK2440 SoC selection
Fix the entries for SMDK2440 should have allowed for S3C2440 or S3C2440
SoC selection but this depended on ARCH_S3C2440 which has not been around
for a while.
Remove the dependency to allow this to be selected.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 07:13:35 +0000 (16:13 +0900)]
ARM: S3C2442: Merge s3c2442.c and clock.c
Merge s3c2442.c and clock.c as the s3c242.c does not contain much and
the clock parts are always built for s3c2442 anyway.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 07:06:46 +0000 (16:06 +0900)]
ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440
Move the pair of machines in arch/arm/mach-s3c2442 into the mach-s3c2440
directory as the S3C2440 and S3C2442 are very close.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Atul Dahiya [Fri, 29 Jan 2010 00:08:28 +0000 (09:08 +0900)]
ARM: S5P: Change S5P_TIMER_IRQ based to 11 for SAMSUNG S5P series.
Currently, S5P_TIMER_IRQ is based at the end of VICs. This patch changes
the S5P_TIMER_IRQ base from end of VICs to 11 in ISA IRQ space.
No of VICs varies between SOCs. This causes an exception on S5P6442.
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Wed, 27 Jan 2010 07:57:07 +0000 (16:57 +0900)]
ARM: S5P6440: Move common memory map definitions for S5P
1. Moved common memory map definitions for S5P such as S5P_VA_XXX
into plat-s5p/include/mach/map-s5p.h from mach-s5p6440/include/mach.
2. Removed unnecessary definitions in the map.h and irq.c
3. Removed the unnecessary support for unaligned UART address
4. Renamed S5P_VA_VICx definitions as VA_VICx
5. Moved the definitons of VIC_BASE to plat-s5p/include/plat/irqs.h
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Mon, 25 Jan 2010 05:24:04 +0000 (14:24 +0900)]
ARM: S5P6440: Move CPU specific code in plat-s5p to machine directory
The s5p6440-clock.c and s5p6440-init.c code in the plat-s5p is specific to
s5p6440 SoC based systems. So these files are being moved to the machine
directory of s5p6440. And these files are renamed in the machine directory.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 09:21:40 +0000 (18:21 +0900)]
ARM: Merge next-smdk6410-defconfig
Merge branch 'next-smdk6410-defconfig' into next-samsung
Ben Dooks [Mon, 25 Jan 2010 01:46:51 +0000 (10:46 +0900)]
ARM: SAMSUNG: Add error printing to s3c24xx_register_clocks
Add an error print to s3c24xx_register_clocks to provide more useful
information when failing to register the clock.
I belive this was originally left out due to the possibility of a
problem with low-level debugging code. However, if the low-level
debug code is not functional by now there will be a whole other set of
problems being presented to the system.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 25 Jan 2010 01:44:10 +0000 (10:44 +0900)]
ARM: SAMSUNG: Add documentation to the clock registration calls.
Add some kerneldoc documentation to the s3c24xx_register_clock and the
s3c24xx_register_clocks() call.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 01:38:52 +0000 (10:38 +0900)]
ARM: S3C64XX: Squash SDHCI setup into one file
Squash the SDHCI setup for both the S3C6400 and S3C6410 into one file and
make the S3C6410 case use the S3C6400 code.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 01:18:14 +0000 (10:18 +0900)]
ARM: S3C64XX: Remove useless IO descriptor from S3C6410
The iotable in arch/arm/mach-s3c64xx/s3c6410.c is currently empty and
therefore can be removed from the build.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 26 Jan 2010 01:11:04 +0000 (10:11 +0900)]
ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410
As per discussions with Russell King on linux-arm-kernel, it appears that
both mach-s3c6400 and mach-s3c6410 are so close together that they should
simply be merged into mach-s3c64xx.
Note, this patch does not eliminate any of the bits that are still common,
it is simply a move of the two directories together, any further common
code will be eliminated or moved in further patches.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 25 Jan 2010 01:39:23 +0000 (10:39 +0900)]
ARM: SAMSUNG: Fix bad use of __initdata for s3c_register_clocks()
Functions should be marked __init, not __initdata.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Maurus Cuelenaere [Fri, 22 Jan 2010 22:29:16 +0000 (23:29 +0100)]
ARM: SAMSUNG: Fix null pointer dereference in ADC driver
ARM: SAMSUNG: Fix null pointer dereference in ADC driver
Use struct adc_device instead of relying on client (which could be
NULL) when checking for SoC type.
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Thomas Abraham [Fri, 22 Jan 2010 01:50:42 +0000 (10:50 +0900)]
ARM: S5PV210: Add serial port support
This patch adds UART serial port support for S5PV210.
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Wed, 20 Jan 2010 06:09:40 +0000 (15:09 +0900)]
ARM: S5P6440: Add HSMMC and OTG base addresses to map.h
Add the HSOTG and HSMMC block addresses to the map.h file.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 19 Jan 2010 04:16:50 +0000 (13:16 +0900)]
ARM: S3C64XX: Update s3c6400_defconfig for current kernel
Update the s3c6400_defconfig with one from the current kernel which has been
build and run tested on an SMDK6410.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 19 Jan 2010 02:34:58 +0000 (11:34 +0900)]
ARM: S3C6400: Update s3c6400_defconfig for bigger initrds for SMDK6410
The Samsung initrd for SMDK6410 is now bigger than the original initrds
that where used. Increase the command-line size and the size of the ramdisk
that it is unpacked into.
Also change the default init to /linuxrc to avoid problems with the current
SMDK ramdisk image failing to run /bin/bash.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Thu, 21 Jan 2010 04:31:38 +0000 (13:31 +0900)]
ARM: S3C64XX: Tidy up common code in s3c64xx_spi_set_info()
The s3c64xx_spi_set_info() sets one of two platform data structures depending
on which controller is being specified. Change to taking a pointer to the
relevant platform data structure and then having one set of code to place
the data into the area being pointed to.
Cc: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Maurus Cuelenaere [Thu, 21 Jan 2010 00:37:28 +0000 (01:37 +0100)]
ARM: S3C64XX: Fix typo in s3c-hsotg platform data
ARM: S3C64XX: Fix typo in s3c-hsotg platform data
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Mark Brown [Wed, 20 Jan 2010 13:06:05 +0000 (13:06 +0000)]
ARM: SAMSUNG: Staticise gpiolib implementation functions
They are not exported, they are referenced via vtables.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Mark Brown [Wed, 20 Jan 2010 13:06:04 +0000 (13:06 +0000)]
ARM: S3C64XX: Staticise audio platform data
It's not exported.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Mark Brown [Wed, 20 Jan 2010 12:05:55 +0000 (12:05 +0000)]
ARM: S3C64XX: Fix dev-audio build
As reported when the patch was posted commit
71269364 ("ARM: S3C64XX:
Add I2S resources in platform code") uses pin names for the IISv4
data output pins which are not present in mainline, causing dev-audio
to fail to build. Fix this by using the defines which are actually
present in the kernel source.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Mark Brown [Tue, 19 Jan 2010 15:26:56 +0000 (15:26 +0000)]
ARM: SMDK6410: Set up interrupt range for WM835x on 1190-EV1 PMIC board
The WM835x driver won't actually use this yet but it will in the
future when the changes converting it to genirq are merged.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Wed, 20 Jan 2010 03:29:25 +0000 (12:29 +0900)]
ARM: SAMSUNG: Move pm-check.c to plat-samsung
Move the pm-check.c file to plat-samsung for all Samsung SoC users, and
update Kconfig names to make them SAMSUNG_ instead of S3C2410_
Sed expresions used to make the change:
s/S3C2410_PM_DEBUG/SAMSUNG_PM_DEBUG/g
s/S3C2410_PM_CHECK/SAMSUNG_PM_CHECK/g
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Wed, 20 Jan 2010 03:22:24 +0000 (12:22 +0900)]
ARM: SAMSUNG: Move pmw.c to plat-samsung
Move the PWM driver support to plat-samsung, as these PWM blocks are
close enough across the current range to be supported by this driver.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Wed, 20 Jan 2010 02:09:28 +0000 (11:09 +0900)]
ARM: SAMSUNG: Move more support into plat-samsung
Move header files which are not likely to be touched in
any further support addition out of plat-s3c's include
directory into plat-samsung.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 19 Jan 2010 09:53:46 +0000 (18:53 +0900)]
ARM: Merge next-samsung-s5p6440-iodec
Merge branch 'next-samsung-s5p6440-iodec' into next-samsung-try10
Ben Dooks [Mon, 23 Nov 2009 23:32:31 +0000 (23:32 +0000)]
ARM: SAMSUNG: Add initial documentation directory and overview
Start Documentation/arm/Samsung and add an initial overview file
which whilst is not complete, is better than nothing.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Tue, 19 Jan 2010 02:21:39 +0000 (11:21 +0900)]
ARM: S5P6440: Add IO descriptor for ChipID block.
This patch adds the IO descriptor for ChipID block in S5P6440.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 19 Jan 2010 08:14:46 +0000 (17:14 +0900)]
ARM: SAMSUNG: Remove empty gpio-core.h and use central plat/gpio-core.h
Rename mach-s3c2410/include/mach/gpio-core.h to mach/gpio-track.h so that
it can be included by <plat/gpio-core.h> when needed.
Eliminate all other empty gpio-core.h files and just include the
<plat/gpio-core.h> as necessary.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 18 Jan 2010 09:00:55 +0000 (18:00 +0900)]
ARM: SAMSUNG: Move GPIO headers to plat-samsung
Move the GPIO and GPIO configuration headers into arch/arm/plat-samsung
as they are common to all the Samsung SoCs.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 18 Jan 2010 02:22:38 +0000 (11:22 +0900)]
ARM: SAMSUNG: Move gpiolib support in gpio.c to plat-samsung
Move the gpio.c code containing the core gpiolib and GPIO support to
plat-samsung from plat-s3c as it is used by all current Samsung SoCs.
Note, we didn't move this to gpiolib.c as it contains code that is not
strictly for gpiolib support and the 4bit code is already called gpiolib.c
so make the change easier by not renaming both files in one go.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 18 Jan 2010 01:47:45 +0000 (10:47 +0900)]
ARM: SAMSUNG: Move pm-gpio into plat-samsung
Move the pm-gpio code into plat-samsung.
Note, this should be changed later to properly compile the 4bit code if
the 4bit settings are enabled.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Tue, 19 Jan 2010 06:31:17 +0000 (15:31 +0900)]
ARM: S5P6440: Add S5P6440 GPIO support
This patch adds Samsung's S5P6440 GPIO support.
Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Kukjin Kim [Tue, 19 Jan 2010 06:30:54 +0000 (15:30 +0900)]
ARM: SAMSUNG: Move GPIO common functions to plat-samsung
This patch moves GPIO common functions (from plat-s3c64xx) into plat-samsung.
and adds the config option to build the plat-samsung/gpiolib for Samsung SoCs.
Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 19 Jan 2010 09:36:16 +0000 (18:36 +0900)]
ARM: Merge next-samsung-serial1
Merge branch 'next-samsung-serial1' into next-samsung-try7
Ben Dooks [Tue, 19 Jan 2010 09:36:12 +0000 (18:36 +0900)]
ARM: Merge next-samsung-clock2
Merge branch 'next-samsung-clock2' into next-samsung-try7
Ben Dooks [Tue, 19 Jan 2010 09:36:09 +0000 (18:36 +0900)]
ARM: Merge next-samsung-devupdates1
Merge branch 'next-samsung-devupdates1' into next-samsung-try7
Ben Dooks [Tue, 19 Jan 2010 09:36:04 +0000 (18:36 +0900)]
ARM: Merge next-jassi-spi
Merge branch 'next-jassi-spi' into next-samsung-try7
Thomas Abraham [Thu, 14 Jan 2010 06:05:38 +0000 (15:05 +0900)]
ARM: SAMSUNG: serial: Modify console initialization.
This patch modifies s3c24xx_serial_initconsole function to accept multiple
platform UART information structures. This is required on platforms that have
differences among the instances of UART ports. As an example, the FIFO sizes
could be different for each UART instance and hence multiple platform UART
information structures would be needed.
This patch also modifies the s3c24xx_console_init macro since it wraps the
call to the s3c24xx_serial_initconsole function.
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 19 Jan 2010 08:49:59 +0000 (17:49 +0900)]
ARM: Merge next-samsung-clock2
Merge branch 'next-samsung-clock2' into next-samsung-try5
Ben Dooks [Tue, 19 Jan 2010 08:48:35 +0000 (17:48 +0900)]
ARM: Merge next-samsung-devupdates1
Merge branch 'next-samsung-devupdates1' into next-samsung-try5
Ben Dooks [Tue, 19 Jan 2010 08:47:39 +0000 (17:47 +0900)]
ARM: Merge next-jassi-spi
Merge branch 'next-jassi-spi' into next-samsung-try5
Ben Dooks [Tue, 19 Jan 2010 08:42:25 +0000 (17:42 +0900)]
ARM: Merge next-s3c6410-andygreen
Merge branch 'next-s3c6410-andygreen' into next-samsung-try5
Ben Dooks [Tue, 19 Jan 2010 08:42:02 +0000 (17:42 +0900)]
ARM: Merge next-samsung-mc-adc
Merge branch 'next-samsung-mc-adc' into next-samsung-try5
Conflicts:
arch/arm/mach-s3c6400/include/mach/map.h
(fix ADC and RTC merge)
Ben Dooks [Mon, 18 Jan 2010 07:24:22 +0000 (16:24 +0900)]
ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata().
Add a s3c24xx_mci_set_platdata() call for all the machine files that have
platform data for the MCI driver. This brings the MCI device into line with
the other devices with __initdata and a specific call to ensure the right
structure type is being passed.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Fri, 15 Jan 2010 06:09:20 +0000 (15:09 +0900)]
ARM: MINI2440: Remove commented out devices from device array
There's no point in having these in until there is proper support for
them, so remove as they only confuse the device changing script.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Wed, 13 Jan 2010 05:59:46 +0000 (14:59 +0900)]
ARM: SAMSUNG: Add platform data registration for OHCI
Add a platform data helper for the OHCI device
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Tue, 12 Jan 2010 06:15:28 +0000 (15:15 +0900)]
ARM: SAMSUNG: Make UART device code common
Move s3c24xx_uart_devs, s3c24xx_uart_src and the platform devices to a
common entry in plat-samsung since they are the same in all the current
implementations.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>