ARM: Merge for-2635-4/spi-devs

Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s5pc100/include/mach/map.h
	arch/arm/mach-s5pv210/Makefile

2 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index fb5d05e91e44..6fb7bfdd232a 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -25,6 +25,10 @@
 #define S5PV210_PA_GPIO         (0xE0200000)
 #define S5P_PA_GPIO             S5PV210_PA_GPIO
 
+/* SPI */
+#define S5PV210_PA_SPI0         0xE1300000
+#define S5PV210_PA_SPI1         0xE1400000
+
 #define S5PV210_PA_IIC0         (0xE1800000)
 #define S5PV210_PA_IIC1         (0xFAB00000)
 #define S5PV210_PA_IIC2         (0xE1A00000)
diff --git a/arch/arm/mach-s5pv210/include/mach/spi-clocks.h b/arch/arm/mach-s5pv210/include/mach/spi-clocks.h
new file mode 100644
index 000000000000..02acded5f73d
--- /dev/null
+++ b/arch/arm/mach-s5pv210/include/mach/spi-clocks.h
@@ -0,0 +1,17 @@
+/* linux/arch/arm/mach-s5pv210/include/mach/spi-clocks.h
+ *
+ * Copyright (C) 2010 Samsung Electronics Co. Ltd.
+ *      Jaswinder Singh <jassi.brar@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __S5PV210_PLAT_SPI_CLKS_H
+#define __S5PV210_PLAT_SPI_CLKS_H __FILE__
+
+#define S5PV210_SPI_SRCCLK_PCLK         0
+#define S5PV210_SPI_SRCCLK_SCLK         1
+
+#endif /* __S5PV210_PLAT_SPI_CLKS_H */