Merge branch 'next-samsung-devupdates1' into next-samsung-try5

Merge branch 'next-jassi-spi' into next-samsung-try5

Merge branch 'next-s3c6410-andygreen' into next-samsung-try5

Merge branch 'next-samsung-mc-adc' into next-samsung-try5

Conflicts:
	arch/arm/mach-s3c6400/include/mach/map.h
	(fix ADC and RTC merge)

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: NBen Dooks <ben-linux@fluff.org>

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: NBen Dooks <ben-linux@fluff.org>

Add a platform data helper for the OHCI device
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

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: NBen Dooks <ben-linux@fluff.org>

Platform devices for SPI Controller of S3C64XX are defined and exported for
machines to include. Also, controller setup helper functions are defined for
machine code to set runtime configuration of the controller and the bus.
Signed-off-by: NJassi Brar <jassi.brar@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

We need a way to pass controller specific information to the SPI driver.
For that purpose new headers are made.

SPI Controller is assumed 'type-s3c64xx' and can be defined for newer SoCs.
 Hence, that part is placed under plat-samsung to be shared across newer SoCs.

SoC specific part - spi source clocks, will be placed
under plat-<soc>/include/plat/
Signed-off-by: NJassi Brar <jassi.brar@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Defined special 48MHz clock sources for SPI-0,1.
Signed-off-by: NJassi Brar <jassi.brar@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Added SPI controller register base.
Signed-off-by: NJassi Brar <jassi.brar@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

LAN9115 Ethernet only works on SMDK6410 if certain switches
are set in specific ways.  Document the requirement.
Signed-off-by: NAndy Green <andy@warmcat.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This adds the physical address of the SROM unit, and
applies a virtual mapping for it to the S3C_VA_MEM
slot.
Signed-off-by: NAndy Green <andy@warmcat.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Since the mach-smdk6410.c file claims it can start up the
smsc9115 ethernet device on the board, it should take care
about configuring the necessary chip select nCS1 so it can
see the chip.  The select defaults to 8-bit mode so without
config the Ethernet doesn't work.

This patch uses the new SROM definitions to set nCS1 to the
state found in the Samsung U-Boot port for 6410.  It may be
more conservative that it needs to be since those settings
were marked as for CS8900A also using this chip select.

But this change is enough to get the ethernet working when
booted with Qi.
Signed-off-by: NAndy Green <andy@warmcat.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This introduces a platform file for s3c64xx that defines
the SROM unit registers that control chip select
characteristics.
Signed-off-by: NAndy Green <andy@warmcat.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Merge branch 'next-s3c64xx' into next-samsung

Conflicts:
	arch/arm/mach-s3c6400/include/mach/map.h
	( ADC and RTC PA merge fixed)

Add S3C64XX support to the generic Samsung ADC driver
Signed-off-by: NMaurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Move S3C24XX ADC driver to plat-samsung
Signed-off-by: NMaurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Define resources needed by the I2S drivers in platform code.
Audio cfg_gpio callback and IORESOURCE_DMA are added.
Signed-off-by: NJassi Brar <jassi.brar@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add S3C64XX RTC platform driver
Signed-off-by: NMaurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

The SMDK2413 has a commented out device that does not have any setup
data for it, so remove it for now.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Prepare for the forthcoming device changes by renaming s3c_device_usb to
s3c_device_ohci as this is what the device represents.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds UART serial port support for S5P6440 CPU. Most of the
serial support of Samsung's 6400 CPU is reused for 6440 CPU.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds Samsung's S5P6440 default configuration file.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds Samsung's SMDK6440 board support file.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds the Kconfig and Makefile for the new S5P6440 machine
and platform directories. It also updates arch/arm Kconfig and Makefiles
to include the support for the new S5P6440 CPU.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds timer support for S5P6440 CPU.
Signed-off-by: NAtul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds IRQ support for S5P6440 CPU.
Signed-off-by: NAdityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds clock and pll support for S5P6440. This patch are based on
Harald Welte's patches and Ben's plat-samsung.
Signed-off-by: NThomas Abraham <thomas.ab@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds Samsung's S5P6440 CPU support.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Use the common UART IRQ handling code for the S5PC100 system.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Move to using the standard VIC/Timer IRQ handling code added previously
to avoid duplicating code.

Thanks to Marek Szyprowski for pointing out dual Kconfig change.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Remove the definitions we've deleted in the previous updates to the
clksrc_clk for arch/arm/plat-s5pc1xx/include/plat/regs-clock.h.

Added comments about the removal to the clock header since we only need
these defines in one place (and they've now been removed there) we get
rid of them from the header.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This script is used to change the old style clksrc_clk as originally
found in plat-s3c64xx to the new style. It is here for reference if needed
for future code merges.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Remove the individual 'struct clksrc_clks' and place them into an array
so that we can simply use s3c_register_clksrcs to register tham all in one
go.

Since the spdif clock relies on the audio clock, move the audio clocks
into their own arrary.

Thanks to  Marek Szyprowski for testing and pointing out the four clocks
what where missed from the clock list.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Move the clock definitions around ready to turn the clocks into an array
of clocks and register them in one go.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Remove the copy of the old s3c64xx struct clksrc_clk and use the new one
in plat-samsung. This eliminates a bug in the set_parent() call where it
failed to set the clk->parent after sucesfully updating the clock.

The script that was used to automate much of the process will be supplied
seperately.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch adds a configuration option for specifing the number
of additional GPIO pins to be used in addition to the GPIO pins
supported onchip.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add a common entry-macro-vic2.S for systems where there are two VICs
so that the machine or platform directories just need to setup the
correct information before including <asm/entry-macro-vic2.S> into
their own entry-macro.S file.

Since this code is from the S3C64XX project, we update the S3C64XX
machine entry code to use this new header.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>