Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-imx/mach-cpuimx27.c

AT91 conflict resolution:
Acked-by: NAnders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.

Pass the correct GPIO to gpio_free
Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Acked-by: NEric Bénard <eric@eukrea.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

without this patch we get :
arch/arm/mach-imx/built-in.o: In function `eukrea_cpuimx27_init':
eukrea_mbimx27-baseboard.c:(.init.text+0x44c): undefined reference to `mxc_ulpi_access_ops'
Signed-off-by: NEric Bénard <eric@eukrea.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

this patch fix the following errors :
arch/arm/mach-mx3/mach-pcm037_eet.c:62: error: implicit declaration of function 'MXC_SPI_CS'
arch/arm/mach-mx3/mach-pcm037_eet.c:185: error: implicit declaration of function 'imx35_add_spi_imx0'

from the Kconfig pcm037 is i.MX31 based and not i.MX35 so replace
imx35_add_spi_imx0 by imx31_add_spi_imx0
Signed-off-by: NEric Bénard <eric@eukrea.com>
[ukl: remove unneeded #include <mach/spi.h>]
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

This is only a partial revert of "ARM: mx3/mx31ads: fold board
header in its only user"
[commit ccfa7c26)]

As some of the the board defines are also used in the cs89x0
ethernet driver by the i.MX31 ADS.
Signed-off-by: NIan Lartey <ian@opensource.wolfsonmicro.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

add NAND, SDHC
Signed-off-by: NEric Bénard <eric@eukrea.com>

Signed-off-by: NEric Bénard <eric@eukrea.com>

this patch really configure the GPIO in GPIO mode.
Signed-off-by: NEric Bénard <eric@eukrea.com>

Tested on i.MX25 and i.MX35 and i.MX51
Signed-off-by: NEric Bénard <eric@eukrea.com>

the attached patch allows SD to work on i.MX51 with Wolfram's drivers
Tested on i.MX51.

Based on original patch from: Richard Zhu <r65037@freescale.com>
Signed-off-by: NEric Bénard <eric@eukrea.com>

Based on original patch from: Richard Zhu <r65037@freescale.com>
Signed-off-by: NEric Bénard <eric@eukrea.com>

Signed-off-by: NEric Bénard <eric@eukrea.com>

Signed-off-by: NEric Bénard <eric@eukrea.com>

Signed-off-by: NEric Bénard <eric@eukrea.com>

the PHY is UTMI so don't create an ULPI viewpoint.
Signed-off-by: NEric Bénard <eric@eukrea.com>

Without this exiting WFI can result in cache corruption.
Code taken from Freescale's 2.6.27 BSP and tested on i.MX35
Signed-off-by: NEric Bénard <eric@eukrea.com>

this patch fix the following errors :
arch/arm/plat-mxc/devices/platform-imx-dma.c:44:
    error: ‘MX25_SDMA_BASE_ADDR’ undeclared here (not in a function)
arch/arm/plat-mxc/devices/platform-imx-dma.c:44:
    error: ‘MX25_INT_SDMA’ undeclared here (not in a function)
Signed-off-by: NEric Bénard <eric@eukrea.com>
Acked-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

* get_rate_arm : when 400MHz clock is selected (cctl & 1<<14),
ARM clock is 400MHz (MPLL * 3 / 4) and not 800MHz
* get_rate_per : peripherals's clock is derived from AHB and not
from IPG (ref manual : figure 5-1)
* can2_clk : use the correct ID

* without this patch, peripherals getting their clock from PER
clocks work fine because of the 2 errors which fix themselves
(ARM clock x 2 and per clock actually based on IPG which is AHB/2)
but flexcan can't work as it gets its clock from IPG and thus
calculates its bitrate using a reference value which is twice
what it really is.
Signed-off-by: NEric Bénard <eric@eukrea.com>

During the reorganisation of the imx-i2c devices
(in 64de5ec1) the 3rd imx-i2c device
for the mx35 got lost. This patch adds the missing device.
Signed-off-by: NMarc Kleine-Budde <mkl@pengutronix.de>
Acked-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Add IRAM(Internal RAM) allocation functions using GENERIC_ALLOCATOR.
The allocation size is 4KB multiples to guarantee alignment. The
idea for these functions is for i.MX platforms to use them
to dynamically allocate IRAM usage.

Applies on 2.6.36-rc7
Signed-off-by: NDinh Nguyen <Dinh.Nguyen@freescale.com>
Reviewed-by: NAmit Kucheria <amit.kucheria@canonical.com>
Acked-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

This patch fixes build error about GPIO address due to
conflict of commit 4d914705 and 19a2c065.

- commit 4d914705: Fix on GPIO base addresses
- commit 19a2c065: Moves initial map for merging S5P64X0
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Conflicts:
	arch/arm/kernel/head-common.S

Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux' and 'unwind' into devel

Update Kconfig text accordingly.
Signed-off-by: Nsrinidhi kasagar <srinidhi.kasagar@stericsson.com>
Acked-by: NLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

This patch adds header <linux/sched.h> into the below files for build with
CONFIG_PREEMPT_NONE.

arch/arm/mach-s5p64x0/cpu.c
Signed-off-by: NSeung-Chull Suh <sc.suh@samsung.com>
[kgene.kim@samsung.com: edited title and message]
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

The patch removes s3c_gpio_lock/unlock to avoid acquiring the lock
recursively as lock is already acquired by calling function.
Signed-off-by: NAtul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: NSangbeom Kim <sbkim73@samsung.com>
[kgene.kim@samsung.com: removed useless variable due to this]
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

The s5p64x0_sysclass should be used in place of the obselete s5p6440_sysclass.
Signed-off-by: NAbhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: NSangbeom Kim <sbkim73@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Fix the touch screen device name from s3c64x0-adc to s3c64xx-adc.
Signed-off-by: NNaveen Krishna Ch <ch.naveen@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

This patch updates s5p64x0_defconfig and changes the name from
s5p6440_defconfig so that can support S5P6440 and S5P6450 with
one kernel.

Tested on SMDK6440(S5P6440) and SMDK6450(S5P6450).
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

This patch adds UART serial port support for S5P6450 SoC.
The S5P6450 has 6 UARTs, so adds resource of UART4 and UART5.
And to fix membase which is in serial/samsung.c is from Ben Dooks.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>

This patch moves smdk6440 board file from mach-s5p6440 into the new
mach-s5p64x0 directory and adds smdk6450 board file.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

This patch moves S5P6440 GPIO support files from mach-s5p6440
into the new mach-s5p64x0 for merge S5P6440 and S5P6450 SocS.
NOTE: Not supported S5P6450 GPIO yet. Will be supported soon.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

This patch adds S5P6450 I2C support in the ARCH_S5P64X0. And
moves S5P6440 I2C support files into the mach-s5p64x0 together.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

This patch moves DMA support files in the mach-s5p64x0
for S5P6440 and S5P6450 SoCs.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Cc: Jassi Brar <jassi.brar@samsung.com>

This patch updates Audio and SPI for S5P6440 and S5P6450 SoCs.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Cc: Jassi Brar <jassi.brar@samsung.com>

This patch updates timer support for S5P6440 and S5P6450 SoCs.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>