mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 04:11:49 +00:00
30b842889e
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 commitfd454997d6("gpio: samsung: refactor gpiolib init for exynos4/5"), and then commitf10590c983("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 ...
103 lines
3.0 KiB
Makefile
103 lines
3.0 KiB
Makefile
# arch/arm/mach-s3c24xx/Makefile
|
|
#
|
|
# Copyright (c) 2012 Samsung Electronics Co., Ltd.
|
|
# http://www.samsung.com/
|
|
#
|
|
# Copyright 2007 Simtec Electronics
|
|
#
|
|
# Licensed under GPLv2
|
|
|
|
obj-y :=
|
|
obj-m :=
|
|
obj-n :=
|
|
obj- :=
|
|
|
|
# core
|
|
|
|
obj-y += common.o
|
|
|
|
obj-$(CONFIG_CPU_S3C2410) += s3c2410.o
|
|
obj-$(CONFIG_S3C2410_DMA) += dma-s3c2410.o
|
|
obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o
|
|
|
|
obj-$(CONFIG_CPU_S3C2412) += s3c2412.o irq-s3c2412.o clock-s3c2412.o
|
|
obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o
|
|
obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o
|
|
obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o
|
|
|
|
obj-$(CONFIG_CPU_S3C2416) += s3c2416.o irq-s3c2416.o clock-s3c2416.o
|
|
obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o
|
|
|
|
obj-$(CONFIG_CPU_S3C2440) += s3c2440.o irq-s3c2440.o clock-s3c2440.o
|
|
obj-$(CONFIG_CPU_S3C2442) += s3c2442.o
|
|
obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o
|
|
obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o
|
|
|
|
obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o
|
|
|
|
# PM
|
|
|
|
obj-$(CONFIG_PM) += pm.o irq-pm.o sleep.o
|
|
|
|
# common code
|
|
|
|
obj-$(CONFIG_S3C2443_COMMON) += common-s3c2443.o
|
|
obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o
|
|
|
|
#
|
|
# machine support
|
|
# following is ordered alphabetically by option text.
|
|
#
|
|
|
|
obj-$(CONFIG_MACH_AML_M5900) += mach-amlm5900.o
|
|
obj-$(CONFIG_ARCH_BAST) += mach-bast.o
|
|
obj-$(CONFIG_BAST_PC104_IRQ) += bast-irq.o
|
|
obj-$(CONFIG_ARCH_H1940) += mach-h1940.o
|
|
obj-$(CONFIG_H1940BT) += h1940-bluetooth.o
|
|
obj-$(CONFIG_PM_H1940) += pm-h1940.o
|
|
obj-$(CONFIG_MACH_N30) += mach-n30.o
|
|
obj-$(CONFIG_MACH_OTOM) += mach-otom.o
|
|
obj-$(CONFIG_MACH_QT2410) += mach-qt2410.o
|
|
obj-$(CONFIG_ARCH_SMDK2410) += mach-smdk2410.o
|
|
obj-$(CONFIG_MACH_TCT_HAMMER) += mach-tct_hammer.o
|
|
obj-$(CONFIG_MACH_VR1000) += mach-vr1000.o
|
|
|
|
obj-$(CONFIG_MACH_JIVE) += mach-jive.o
|
|
obj-$(CONFIG_MACH_SMDK2413) += mach-smdk2413.o
|
|
obj-$(CONFIG_MACH_VSTMS) += mach-vstms.o
|
|
|
|
obj-$(CONFIG_MACH_SMDK2416) += mach-smdk2416.o
|
|
|
|
obj-$(CONFIG_MACH_ANUBIS) += mach-anubis.o
|
|
obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o
|
|
obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o
|
|
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
|
|
obj-$(CONFIG_MACH_OSIRIS) += mach-osiris.o
|
|
obj-$(CONFIG_MACH_RX3715) += mach-rx3715.o
|
|
obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
|
|
|
|
obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
|
|
obj-$(CONFIG_MACH_RX1950) += mach-rx1950.o
|
|
|
|
obj-$(CONFIG_MACH_SMDK2443) += mach-smdk2443.o
|
|
|
|
# common bits of machine support
|
|
|
|
obj-$(CONFIG_S3C24XX_SMDK) += common-smdk.o
|
|
obj-$(CONFIG_S3C24XX_SIMTEC_AUDIO) += simtec-audio.o
|
|
obj-$(CONFIG_S3C24XX_SIMTEC_NOR) += simtec-nor.o
|
|
obj-$(CONFIG_S3C24XX_SIMTEC_PM) += simtec-pm.o
|
|
obj-$(CONFIG_S3C24XX_SIMTEC_USB) += simtec-usb.o
|
|
|
|
# machine additions
|
|
|
|
obj-$(CONFIG_MACH_BAST_IDE) += bast-ide.o
|
|
obj-$(CONFIG_MACH_OSIRIS_DVS) += mach-osiris-dvs.o
|
|
|
|
# device setup
|
|
|
|
obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
|
|
obj-$(CONFIG_S3C2443_SETUP_SPI) += setup-spi.o
|
|
obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o
|
|
obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o
|