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)

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>

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>

Move the handling for the UART interrupts out of the s3c64xx specific
code and into plat-samsung so that it can be used by all implementations
that need it.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Move the VIC based timer interrupt handling out of plat-s3c64xx and
into plat-samsung to be re-used for other systems. This also reduces
the code size as we now have a common init routine and use the irq_desc
to store the interrupt number of the timer.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

The arch/arm/plat-s3c/gpio-config.c file is common to pretty much all the Samsung
SoCs, so move it to arch/arm/plat-samsung
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Move all the platform device definitions from plat-s3c into plat-samsung
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Move the code for the pwm-clock into plat-samsung, as it is common to
all Samsung SoCs.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This patch makes clk_default_setrate and clk_ops_def_setrate available
to code outside plat-samsung clock code.
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>

If there is no source register defined, do not register a clksrc
clock with a valid .set_parent in the ops.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Add s3c_register_clocks() to register an array of clocks, printing
an error message if there is a problem. Replace all points in the code
where this could be used.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

If the reg_div field is not set, then do not register clk_ops with the
get/set/round rate calls as these will fail to work.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

This is the core implementation of the clock code for all Samsung based
SoCs, so move it to arch/arm/plat-samsung (the clock.h file has already
been moved).

Since the file is built for every Samsung SoC, no changes are needed to the
Kconfig system.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

The new code calls the clock setup code on registration which
can be before the clock system has been fully initialised. The
following code re-does this setup at the end of the clock
registration and thus we get two printings.

Update the calls to only print on the last pass or when doing
the necessary resume work.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>

Change these two fields to have named initialisers as per the
review comments from Kyungmin Park.

sed used:

s@\.reg_src\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_src\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g
s@\.reg_div\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_div\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g
Signed-off-by: NBen Dooks <ben-linux@fluff.org>