Linus Torvalds 30b842889e arm-soc: soc specific changes, part 2 ... This adds support for the spear13xx platform, which has first been under review a long time ago and finally been completed after generic spear work has gone into the clock, dt and pinctrl branches. Also a number of updates for the samsung socs are part of this branch. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPuezDAAoJEIwa5zzehBx3mooP/iTHd1wRjr2MzKNx4+LpLWgl aAXH002xe9Lvu7m75BRvEYWWdRLkyEy9ARM4s2wJCnxU41KmbF65ED1erxK8xaSe Ako34vzH+HiUCM2DLzIP6FXyJMM7OcfrdGaY/GxOv+U+MzGUHeu3Q+8b0B/yfBnm M3HdDrpyZHKZP9UM3wVQ4/ilDck6vEjYSV2jC11IaHiDMRD2nSpfRKh8H3+gv65S gtj9EZpWM8CZg/fCe5lsm3PZnBnqHHW3WVafVnDQfGWeJYqZxMB5QKLU6qf/ntpx LU2WjXoGaMmGBVZWynrwNEY6GVp3fZrDV30/q8Htf0/fBpEjUncrLHXtw0DxkpnK UuyoRgn7zxOc3kDzohFNIexp1K3q+PNzXklR9hg7OSVji+9bPd2LIOEnpBeghBGj WzZIebz5dIdddHlnOl4fRdmxZva2UTuI4bFAJ0izi10Mup7A9lrENnFHG/iVA0rQ QlqJZoyeDCvbXQqZCgHirYRPhIxXdQj4G5IivfRxQ7Jgjy76Kt9uDp1egwezF/3a 2jVtcK42XokVv3Dhsvq9UNFn9GWdVImZ7eh70XLv+q834zAVxSzjWLtlS8I1Q5WO 7BGIJaICtugNwgYr44Dif6nsoVUmMnSwU5hVw1pApKZspN6EhMhMdp2hw8JPHFUs mrZdHi1NAWuYSbObc3UB =W2Ri -----END PGP SIGNATURE----- Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull arm-soc: soc specific changes (part 2) from Olof Johansson: "This adds support for the spear13xx platform, which has first been under review a long time ago and finally been completed after generic spear work has gone into the clock, dt and pinctrl branches. Also a number of updates for the samsung socs are part of this branch." Fix up trivial conflicts in drivers/gpio/gpio-samsung.c that look much worse than they are: the exonys5 init code was refactored in commit fd454997d6 ("gpio: samsung: refactor gpiolib init for exynos4/5"), and then commit f10590c983 ("ARM: EXYNOS: add GPC4 bank instance") added a new gpio chip define and did tiny updates to the init code. So the conflict diff looks like hell, but it's actually a fairly simple change. * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits) ARM: exynos: fix building with CONFIG_OF disabled ARM: EXYNOS: Add AUXDATA for i2c controllers ARM: dts: Update device tree source files for EXYNOS5250 ARM: EXYNOS: Add device tree support for interrupt combiner ARM: EXYNOS: Add irq_domain support for interrupt combiner ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5 ARM: EXYNOS: update irqs for EXYNOS5250 SoC ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll ARM: EXYNOS: add GPC4 bank instance ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition ARM: EXYNOS: Modify the GIC physical address for static io-mapping ARM: EXYNOS: Add watchdog timer clock instance pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res SPEAr: Update MAINTAINERS and Documentation SPEAr13xx: Add defconfig SPEAr13xx: Add compilation support SPEAr13xx: Add dts and dtsi files pinctrl: Add SPEAr13xx pinctrl drivers pinctrl: SPEAr: Create macro for declaring GPIO PINS SPEAr13xx: Add common clock framework support ...		2012-05-26 13:05:55 -07:00
..
include/mach	ARM: S3C24XX: Add map entries needed by the s3c64xx-spi devices	2012-04-24 18:06:58 -07:00
bast-ide.c	ARM: S3C24XX: Use common macro to define resources on bast-ide.c	2012-05-12 16:12:20 +09:00
bast-irq.c
clock-s3c244x.c
clock-s3c2412.c
clock-s3c2416.c	ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi	2012-04-24 18:07:03 -07:00
clock-s3c2440.c
clock-s3c2443.c	ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi	2012-04-24 18:07:03 -07:00
common-s3c2443.c	ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi	2012-04-24 18:07:03 -07:00
common-smdk.c
common.c	ARM: S3C24XX: Use common macro to define resources on dev-uart.c	2012-05-12 16:24:59 +09:00
common.h	ARM: S3C24XX: fix missing common.h in mach-s3c24xx/	2012-04-02 06:43:23 +09:00
dma-s3c2410.c
dma-s3c2412.c
dma-s3c2440.c
dma-s3c2443.c	ARM: S3C24XX: claim spi channels for hsspi in dma-s3c2443	2012-04-24 18:06:53 -07:00
h1940-bluetooth.c
irq-pm.c	ARM: S3C24XX: move common power-management code to mach-s3c24xx	2012-05-12 16:22:18 +09:00
irq-s3c244x.c
irq-s3c2412.c
irq-s3c2416.c
irq-s3c2440.c
irq-s3c2443.c
Kconfig	Merge branch 'next/devel-s3c24xx-hsspi' into next/devel-samsung	2012-05-14 18:22:46 +09:00
mach-amlm5900.c	ARM: S3C24XX: Use common macro to define resources on mach-amlm5900.c	2012-05-12 16:12:20 +09:00
mach-anubis.c	ARM: S3C24XX: Use common macro to define resources on mach-anubis.c	2012-05-12 16:12:21 +09:00
mach-at2440evb.c	ARM: S3C24XX: Use common macro to define resources on mach-at2440evb.c	2012-05-12 16:12:21 +09:00
mach-bast.c	ARM: S3C24XX: Use common macro to define resources on mach-bast.c	2012-05-12 16:12:21 +09:00
mach-gta02.c	ARM: S3C24XX: Use common macro to define resources on mach-gta02.c	2012-05-12 16:12:23 +09:00
mach-h1940.c	ARM: S3C24XX: Use common macro to define resources on mach-h1940.c	2012-05-12 16:12:24 +09:00
mach-jive.c
mach-mini2440.c	ARM: S3C24XX: Use common macro to define resources on mach-mini2440.c	2012-05-12 16:12:24 +09:00
mach-n30.c
mach-nexcoder.c	ARM: S3C24XX: Use common macro to define resources on mach-nexcoder.c	2012-05-12 16:12:24 +09:00
mach-osiris-dvs.c
mach-osiris.c	ARM: S3C24XX: Use common macro to define resources on mach-osiris.c	2012-05-13 06:47:07 +09:00
mach-otom.c	ARM: S3C24XX: Use common macro to define resources on mach-otom.c	2012-05-12 16:12:24 +09:00
mach-qt2410.c	ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c	2012-05-13 06:47:18 +09:00
mach-rx1950.c	ARM: S3C24XX: Use common macro to define resources on mach-rx1950.c	2012-05-12 16:12:25 +09:00
mach-rx3715.c
mach-smdk2410.c
mach-smdk2413.c
mach-smdk2416.c
mach-smdk2440.c
mach-smdk2443.c
mach-tct_hammer.c	ARM: S3C24XX: Use common macro to define resources on mach-tct_hammer.c	2012-05-12 16:12:25 +09:00
mach-vr1000.c	ARM: S3C24XX: Use common macro to define resources on mach-vr1000.c	2012-05-12 16:12:25 +09:00
mach-vstms.c
Makefile	arm-soc: soc specific changes, part 2	2012-05-26 13:05:55 -07:00
Makefile.boot
pm-h1940.S
pm-s3c2410.c
pm-s3c2412.c
pm-s3c2416.c
pm.c	ARM: S3C24XX: move common power-management code to mach-s3c24xx	2012-05-12 16:22:18 +09:00
s3c244x.c
s3c2410.c
s3c2412.c
s3c2416.c
s3c2440.c
s3c2442.c
s3c2443.c
setup-i2c.c
setup-sdhci-gpio.c
setup-spi.c	ARM: S3C24XX: Add HSSPI setup callback for s3c64xx-spi driver	2012-04-24 18:07:10 -07:00
setup-ts.c
simtec-audio.c
simtec-nor.c	ARM: S3C24XX: Use common macro to define resources on simtec-nor.c	2012-05-12 16:12:25 +09:00
simtec-pm.c
simtec-usb.c
simtec.h
sleep-s3c2410.S
sleep-s3c2412.S
sleep.S	ARM: S3C24XX: move common power-management code to mach-s3c24xx	2012-05-12 16:22:18 +09:00