Olof Johansson
e3a66aa33a
Merge branch 'multiplatform/platform-data' into next/multiplatform
...
* multiplatform/platform-data:
ARM: spear: move platform_data definitions
ARM: samsung: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: nomadik: move platform_data definitions
ARM: w90x900: move platform_data definitions
ARM: vt8500: move platform_data definitions
ARM: tegra: move sdhci platform_data definition
ARM: sa1100: move platform_data definitions
ARM: pxa: move platform_data definitions
ARM: netx: move platform_data definitions
ARM: msm: move platform_data definitions
ARM: imx: move platform_data definitions
ARM: ep93xx: move platform_data definitions
ARM: davinci: move platform_data definitions
ARM: at91: move platform_data definitions
Conflicts due to removed files:
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-trimslice.c
Conflicts due to code removal:
arch/arm/mach-tegra/board-paz00.c
Context conflicts in:
drivers/mmc/host/sdhci-tegra.c
drivers/net/irda/pxaficp_ir.c
Signed-off-by: Olof Johansson <olof@lixom.net >
2012-09-22 01:07:21 -07:00
Arnd Bergmann
436d42c61c
ARM: samsung: move platform_data definitions
...
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This moves such data out of the samsung include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Acked-by: Nicolas Pitre <nico@linaro.org >
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com >
Cc: Kukjin Kim <kgene.kim@samsung.com >
Cc: Kyungmin Park <kyungmin.park@samsung.com >
Cc: Ben Dooks <ben-linux@fluff.org >
Cc: Jeff Garzik <jgarzik@pobox.com >
Cc: Guenter Roeck <linux@roeck-us.net >
Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de >
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com >
Cc: Bryan Wu <bryan.wu@canonical.com >
Cc: Richard Purdie <rpurdie@rpsys.net >
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com >
Cc: Chris Ball <cjb@laptop.org >
Cc: David Woodhouse <dwmw2@infradead.org >
Cc: Grant Likely <grant.likely@secretlab.ca >
Cc: Felipe Balbi <balbi@ti.com >
Cc: Alan Stern <stern@rowland.harvard.edu >
Cc: Sangbeom Kim <sbkim73@samsung.com >
Cc: Liam Girdwood <lrg@ti.com >
Cc: linux-samsung-soc@vger.kernel.org
2012-09-19 17:42:18 +02:00
Sylwester Nawrocki
42aa322c37
ARM: S3C24XX: Convert users of s3c2410_gpio_setpin to gpiolib API
...
This is a prerequisite for removal of deprecated s3c2410_gpio* API
from the Samsung gpiolib driver.
Cc: Ben Dooks <ben-linux@fluff.org >
Cc: Guillaume Gourat <guillaume.gourat@nexvision.tv >
Cc: Michel Pollet <buserror@gmail.com >
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com >
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com >
2012-08-28 09:06:49 -07:00
Tushar Behera
5ff2714ae0
ARM: S3C24XX: Use common macro to define resources on mach-osiris.c
...
Cc: Ben Dooks <ben-linux@fluff.org >
Signed-off-by: Tushar Behera <tushar.behera@linaro.org >
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com >
2012-05-13 06:47:07 +09:00
Arnd Bergmann
f4e2467bad
Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup
...
* 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6:
ep93xx: Remove unnecessary includes of ep93xx-regs.h
ep93xx: Move EP93XX_SYSCON defines to SoC private header
ep93xx: Move crunch code to mach-ep93xx directory
ep93xx: Make syscon access functions private to SoC
ep93xx: Configure GPIO ports in core code
ep93xx: Move peripheral defines to local SoC header
ep93xx: Convert the watchdog driver into a platform device.
ep93xx: Use ioremap for backlight driver
ep93xx: Move GPIO defines to gpio-ep93xx.h
ep93xx: Don't use system controller defines in audio drivers
ep93xx: Move PHYS_BASE defines to local SoC header file
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-s3c2440/common.h
2012-03-15 15:20:07 +00:00
Kukjin Kim
dd6f01b5cc
ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/
...
This patch moves S3C2440 stuff into mach-s3c24xx/ directory
so that we can merge the s3c24 series' directories to the
just one mach-s3c24xx/ directory.
And this patch is including following.
- re-ordered alphabetically by option text at Kconfig and Makefile
Cc: Ben Dooks <ben-linux@fluff.org >
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com >
2012-03-03 08:55:17 +09:00