5 files changed, 36 insertions, 5 deletions
diff --git a/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h b/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h
index efeb025affc7..33d421d78bad 100644
--- a/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h
+++ b/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h
@@ -1,6 +1,6 @@
 /* arch/arm/plat-s3c/include/plat/cpu-freq.h
 *
- * Copyright (c) 2006,2007,2009 Simtec Electronics
+ * Copyright (c) 2006-2009 Simtec Electronics
 *      http://armlinux.simtec.co.uk/
 *      Ben Dooks <ben@simtec.co.uk>
 *
@@ -222,7 +222,9 @@ extern struct clk *s3c_cpufreq_clk_get(struct device *, const char *);
 /* S3C2410 and compatible exported functions */
 extern void s3c2410_cpufreq_setrefresh(struct s3c_cpufreq_config *cfg);
+extern void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg);
+#ifdef CONFIG_S3C2410_IOTIMING
 extern int s3c2410_iotiming_calc(struct s3c_cpufreq_config *cfg,
                                 struct s3c_iotimings *iot);
@@ -231,8 +233,11 @@ extern int s3c2410_iotiming_get(struct s3c_cpufreq_config *cfg,
 extern void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg,
                                 struct s3c_iotimings *iot);
+#else
-extern void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg);
+#define s3c2410_iotiming_calc NULL
+#define s3c2410_iotiming_get NULL
+#define s3c2410_iotiming_set NULL
+#endif /* CONFIG_S3C2410_IOTIMING */
 /* S3C2412 compatible routines */
diff --git a/arch/arm/plat-s3c24xx/include/plat/map.h b/arch/arm/plat-s3c24xx/include/plat/map.h
index c4d133436fc7..bd534d32b993 100644
--- a/arch/arm/plat-s3c24xx/include/plat/map.h
+++ b/arch/arm/plat-s3c24xx/include/plat/map.h
@@ -64,7 +64,7 @@
 /* the calculation for the VA of this must ensure that
 * it is the same distance apart from the UART in the
 * phsyical address space, as the initial mapping for the IO
- * is done as a 1:1 maping. This puts it (currently) at
+ * is done as a 1:1 mapping. This puts it (currently) at
 * 0xFA800000, which is not in the way of any current mapping
 * by the base system.
 */
diff --git a/arch/arm/plat-s3c24xx/include/plat/mci.h b/arch/arm/plat-s3c24xx/include/plat/mci.h
index c2cef6139683..36aaa10fad06 100644
--- a/arch/arm/plat-s3c24xx/include/plat/mci.h
+++ b/arch/arm/plat-s3c24xx/include/plat/mci.h
@@ -1,6 +1,31 @@
 #ifndef _ARCH_MCI_H
 #define _ARCH_MCI_H
+/**
+ * struct s3c24xx_mci_pdata - sd/mmc controller platform data
+ * @no_wprotect: Set this to indicate there is no write-protect switch.
+ * @no_detect: Set this if there is no detect switch.
+ * @wprotect_invert: Invert the default sense of the write protect switch.
+ * @detect_invert: Invert the default sense of the write protect switch.
+ * @use_dma: Set to allow the use of DMA.
+ * @gpio_detect: GPIO number for the card detect line.
+ * @gpio_wprotect: GPIO number for the write protect line.
+ * @ocr_avail: The mask of the available power states, non-zero to use.
+ * @set_power: Callback to control the power mode.
+ *
+ * The @gpio_detect is used for card detection when @no_wprotect is unset,
+ * and the default sense is that 0 returned from gpio_get_value() means
+ * that a card is inserted. If @detect_invert is set, then the value from
+ * gpio_get_value() is inverted, which makes 1 mean card inserted.
+ *
+ * The driver will use @gpio_wprotect to signal whether the card is write
+ * protected if @no_wprotect is not set. A 0 returned from gpio_get_value()
+ * means the card is read/write, and 1 means read-only. The @wprotect_invert
+ * will invert the value returned from gpio_get_value().
+ *
+ * Card power is set by @ocr_availa, using MCC_VDD_ constants if it is set
+ * to a non-zero value, otherwise the default of 3.2-3.4V is used.
+ */
 struct s3c24xx_mci_pdata {
        unsigned int    no_wprotect : 1;
        unsigned int    no_detect : 1;
diff --git a/arch/arm/plat-s3c24xx/include/plat/regs-dma.h b/arch/arm/plat-s3c24xx/include/plat/regs-dma.h
index 3bc0a216df97..1b0f4c36d384 100644
--- a/arch/arm/plat-s3c24xx/include/plat/regs-dma.h
+++ b/arch/arm/plat-s3c24xx/include/plat/regs-dma.h
@@ -1,6 +1,6 @@
 /* arch/arm/mach-s3c2410/include/mach/dma.h
 *
- * Copyright (C) 2003,2004,2006 Simtec Electronics
+ * Copyright (C) 2003-2006 Simtec Electronics
 *      Ben Dooks <ben@simtec.co.uk>
 *
 * Samsung S3C24XX DMA support
diff --git a/arch/arm/plat-s3c24xx/include/plat/s3c2410.h b/arch/arm/plat-s3c24xx/include/plat/s3c2410.h
index b6deeef8f663..82ab4aad1bbe 100644
--- a/arch/arm/plat-s3c24xx/include/plat/s3c2410.h
+++ b/arch/arm/plat-s3c24xx/include/plat/s3c2410.h
@@ -27,6 +27,7 @@ extern void s3c2410_init_clocks(int xtal);
 #define s3c2410_init_uarts NULL
 #define s3c2410_map_io NULL
 #define s3c2410_init NULL
+#define s3c2410a_init NULL
 #endif
 extern int s3c2410_baseclk_add(void);

diff --git a/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h b/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h index efeb025affc7..33d421d78bad 100644 --- a/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h +++ b/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h
@@ -1,6 +1,6 @@
1	/* arch/arm/plat-s3c/include/plat/cpu-freq.h	1	/* arch/arm/plat-s3c/include/plat/cpu-freq.h
2	*	2	*
3	* Copyright (c) 2006,2007,2009 Simtec Electronics	3	* Copyright (c) 2006-2009 Simtec Electronics
4	* http://armlinux.simtec.co.uk/	4	* http://armlinux.simtec.co.uk/
5	* Ben Dooks <ben@simtec.co.uk>	5	* Ben Dooks <ben@simtec.co.uk>
6	*	6	*
@@ -222,7 +222,9 @@ extern struct clk s3c_cpufreq_clk_get(struct device , const char *);
222	/* S3C2410 and compatible exported functions */	222	/* S3C2410 and compatible exported functions */
223		223
224	extern void s3c2410_cpufreq_setrefresh(struct s3c_cpufreq_config *cfg);	224	extern void s3c2410_cpufreq_setrefresh(struct s3c_cpufreq_config *cfg);
		225	extern void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg);
225		226
		227	#ifdef CONFIG_S3C2410_IOTIMING
226	extern int s3c2410_iotiming_calc(struct s3c_cpufreq_config *cfg,	228	extern int s3c2410_iotiming_calc(struct s3c_cpufreq_config *cfg,
227	struct s3c_iotimings *iot);	229	struct s3c_iotimings *iot);
228		230
@@ -231,8 +233,11 @@ extern int s3c2410_iotiming_get(struct s3c_cpufreq_config *cfg,
231		233
232	extern void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg,	234	extern void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg,
233	struct s3c_iotimings *iot);	235	struct s3c_iotimings *iot);
234		236	#else
235	extern void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg);	237	#define s3c2410_iotiming_calc NULL
		238	#define s3c2410_iotiming_get NULL
		239	#define s3c2410_iotiming_set NULL
		240	#endif /* CONFIG_S3C2410_IOTIMING */
236		241
237	/* S3C2412 compatible routines */	242	/* S3C2412 compatible routines */
238		243


diff --git a/arch/arm/plat-s3c24xx/include/plat/map.h b/arch/arm/plat-s3c24xx/include/plat/map.h index c4d133436fc7..bd534d32b993 100644 --- a/arch/arm/plat-s3c24xx/include/plat/map.h +++ b/arch/arm/plat-s3c24xx/include/plat/map.h
@@ -64,7 +64,7 @@
64	/* the calculation for the VA of this must ensure that	64	/* the calculation for the VA of this must ensure that
65	* it is the same distance apart from the UART in the	65	* it is the same distance apart from the UART in the
66	* phsyical address space, as the initial mapping for the IO	66	* phsyical address space, as the initial mapping for the IO
67	* is done as a 1:1 maping. This puts it (currently) at	67	* is done as a 1:1 mapping. This puts it (currently) at
68	* 0xFA800000, which is not in the way of any current mapping	68	* 0xFA800000, which is not in the way of any current mapping
69	* by the base system.	69	* by the base system.
70	*/	70	*/


diff --git a/arch/arm/plat-s3c24xx/include/plat/mci.h b/arch/arm/plat-s3c24xx/include/plat/mci.h index c2cef6139683..36aaa10fad06 100644 --- a/arch/arm/plat-s3c24xx/include/plat/mci.h +++ b/arch/arm/plat-s3c24xx/include/plat/mci.h
@@ -1,6 +1,31 @@
1	#ifndef _ARCH_MCI_H	1	#ifndef _ARCH_MCI_H
2	#define _ARCH_MCI_H	2	#define _ARCH_MCI_H
3		3
		4	/**
		5	* struct s3c24xx_mci_pdata - sd/mmc controller platform data
		6	* @no_wprotect: Set this to indicate there is no write-protect switch.
		7	* @no_detect: Set this if there is no detect switch.
		8	* @wprotect_invert: Invert the default sense of the write protect switch.
		9	* @detect_invert: Invert the default sense of the write protect switch.
		10	* @use_dma: Set to allow the use of DMA.
		11	* @gpio_detect: GPIO number for the card detect line.
		12	* @gpio_wprotect: GPIO number for the write protect line.
		13	* @ocr_avail: The mask of the available power states, non-zero to use.
		14	* @set_power: Callback to control the power mode.
		15	*
		16	* The @gpio_detect is used for card detection when @no_wprotect is unset,
		17	* and the default sense is that 0 returned from gpio_get_value() means
		18	* that a card is inserted. If @detect_invert is set, then the value from
		19	* gpio_get_value() is inverted, which makes 1 mean card inserted.
		20	*
		21	* The driver will use @gpio_wprotect to signal whether the card is write
		22	* protected if @no_wprotect is not set. A 0 returned from gpio_get_value()
		23	* means the card is read/write, and 1 means read-only. The @wprotect_invert
		24	* will invert the value returned from gpio_get_value().
		25	*
		26	* Card power is set by @ocr_availa, using MCC_VDD_ constants if it is set
		27	* to a non-zero value, otherwise the default of 3.2-3.4V is used.
		28	*/
4	struct s3c24xx_mci_pdata {	29	struct s3c24xx_mci_pdata {
5	unsigned int no_wprotect : 1;	30	unsigned int no_wprotect : 1;
6	unsigned int no_detect : 1;	31	unsigned int no_detect : 1;


diff --git a/arch/arm/plat-s3c24xx/include/plat/regs-dma.h b/arch/arm/plat-s3c24xx/include/plat/regs-dma.h index 3bc0a216df97..1b0f4c36d384 100644 --- a/arch/arm/plat-s3c24xx/include/plat/regs-dma.h +++ b/arch/arm/plat-s3c24xx/include/plat/regs-dma.h
@@ -1,6 +1,6 @@
1	/* arch/arm/mach-s3c2410/include/mach/dma.h	1	/* arch/arm/mach-s3c2410/include/mach/dma.h
2	*	2	*
3	* Copyright (C) 2003,2004,2006 Simtec Electronics	3	* Copyright (C) 2003-2006 Simtec Electronics
4	* Ben Dooks <ben@simtec.co.uk>	4	* Ben Dooks <ben@simtec.co.uk>
5	*	5	*
6	* Samsung S3C24XX DMA support	6	* Samsung S3C24XX DMA support


diff --git a/arch/arm/plat-s3c24xx/include/plat/s3c2410.h b/arch/arm/plat-s3c24xx/include/plat/s3c2410.h index b6deeef8f663..82ab4aad1bbe 100644 --- a/arch/arm/plat-s3c24xx/include/plat/s3c2410.h +++ b/arch/arm/plat-s3c24xx/include/plat/s3c2410.h
@@ -27,6 +27,7 @@ extern void s3c2410_init_clocks(int xtal);
27	#define s3c2410_init_uarts NULL	27	#define s3c2410_init_uarts NULL
28	#define s3c2410_map_io NULL	28	#define s3c2410_map_io NULL
29	#define s3c2410_init NULL	29	#define s3c2410_init NULL
		30	#define s3c2410a_init NULL
30	#endif	31	#endif
31		32
32	extern int s3c2410_baseclk_add(void);	33	extern int s3c2410_baseclk_add(void);