summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKyoungil Kim <ki0351.kim@samsung.com>2012-05-13 09:00:47 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-05-14 18:22:39 +0900
commita024fa1313d57264ad88a7a4f2f96f9472986712 (patch)
treebd8ba45b2e3a53f4a3b1d10b092ca5cd29402a51 /arch
parent20ef9e08d27b3f5e09c32d4d371fa97f610a3069 (diff)
downloadlinux-stable-a024fa1313d57264ad88a7a4f2f96f9472986712.tar.gz
linux-stable-a024fa1313d57264ad88a7a4f2f96f9472986712.tar.bz2
linux-stable-a024fa1313d57264ad88a7a4f2f96f9472986712.zip
ARM: EXYNOS: To use common config for EXYNOS4 and EXYNOS5 SPI
The naming EXYNOS4 is changed to EXYNOS for using shared SPI config of EXYNOS4 and EXYNOS5. And S3C64XX_DEV_SPIn configs are added to MACH_SMDK5250 config to use SPI on the EYXNOS5250. Signed-off-by: Kyoungil Kim <ki0351.kim@samsung.com> [kgene.kim@samsung.com: updated because of non-existing config] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-exynos/Kconfig2
-rw-r--r--arch/arm/mach-exynos/Makefile2
-rw-r--r--arch/arm/mach-exynos/include/mach/spi-clocks.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 4bb2f9464e23..ff3e47d7c89f 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -167,7 +167,7 @@ config EXYNOS4_SETUP_USB_PHY
help
Common setup code for USB PHY controller
-config EXYNOS4_SETUP_SPI
+config EXYNOS_SETUP_SPI
bool
help
Common setup code for SPI GPIO configurations.
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index 84c06ae53ee8..440a637c76f1 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -69,4 +69,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C7) += setup-i2c7.o
obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o
obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY) += setup-usb-phy.o
-obj-$(CONFIG_EXYNOS4_SETUP_SPI) += setup-spi.o
+obj-$(CONFIG_EXYNOS_SETUP_SPI) += setup-spi.o
diff --git a/arch/arm/mach-exynos/include/mach/spi-clocks.h b/arch/arm/mach-exynos/include/mach/spi-clocks.h
index 576efdf6d091..c71a5fba6a84 100644
--- a/arch/arm/mach-exynos/include/mach/spi-clocks.h
+++ b/arch/arm/mach-exynos/include/mach/spi-clocks.h
@@ -11,6 +11,6 @@
#define __ASM_ARCH_SPI_CLKS_H __FILE__
/* Must source from SCLK_SPI */
-#define EXYNOS4_SPI_SRCCLK_SCLK 0
+#define EXYNOS_SPI_SRCCLK_SCLK 0
#endif /* __ASM_ARCH_SPI_CLKS_H */