summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: da70a2b)
raw | patch | inline | side by side (parent: da70a2b)
author | Minkyu Kang <mk7.kang@samsung.com> | |
Mon, 23 Aug 2010 10:52:03 +0000 (19:52 +0900) | ||
committer | Minkyu Kang <mk7.kang@samsung.com> | |
Thu, 26 Aug 2010 08:33:23 +0000 (17:33 +0900) |
Use the same configuration around S5P SoCs.
(s5pc100, s5pc110, s5pc210 and so on)
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
(s5pc100, s5pc110, s5pc210 and so on)
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
diff --git a/common/serial.c b/common/serial.c
index fceabfa1e7e341a3d540ca42f0abcacfd978dfb1..9e5759ecf5424b41a84ab9bb7b3772d1b0fd412b 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
#else
#error "CONFIG_SERIAL? missing."
#endif
-#elif defined(CONFIG_S5PC1XX)
+#elif defined(CONFIG_S5P)
#if defined(CONFIG_SERIAL0)
return &s5p_serial0_device;
#elif defined(CONFIG_SERIAL1)
serial_register(&s3c24xx_serial1_device);
serial_register(&s3c24xx_serial2_device);
#endif
-#if defined(CONFIG_S5PC1XX)
+#if defined(CONFIG_S5P)
serial_register(&s5p_serial0_device);
serial_register(&s5p_serial1_device);
serial_register(&s5p_serial2_device);
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 528ca2e99af78d87e3a80ed074e5818582455e46..07d395d898f58636fe8eb702994ffda401c59d0b 100644 (file)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
COBJS-$(CONFIG_KIRKWOOD_GPIO) += kw_gpio.o
COBJS-$(CONFIG_MX31_GPIO) += mx31_gpio.o
COBJS-$(CONFIG_PCA953X) += pca953x.o
-COBJS-$(CONFIG_S5PC1XX) += s5p_gpio.o
+COBJS-$(CONFIG_S5P) += s5p_gpio.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
index f2be687639bdd7d576c723157704ec337c5dfd9e..20b49124d5a4cdca3d19d3be3485ac83ec77ce5a 100644 (file)
#define MAP_01 (0x1 << 24)
#define MAP_10 (0x2 << 24)
#define MAP_11 (0x3 << 24)
-#elif defined(CONFIG_S5PC1XX)
+#elif defined(CONFIG_S5P)
#define MAP_00 (0x0 << 26)
#define MAP_01 (0x1 << 26)
#define MAP_10 (0x2 << 26)
{
return (fba << 12) | (fpa << 6) | (fsa << 4);
}
-#elif defined(CONFIG_S5PC1XX)
+#elif defined(CONFIG_S5P)
static unsigned int s3c_mem_addr(int fba, int fpa, int fsa)
{
return (fba << 13) | (fpa << 7) | (fsa << 5);
#if defined(CONFIG_S3C64XX)
onenand->base = (void *)0x70100000;
onenand->ahb_addr = (void *)0x20000000;
-#elif defined(CONFIG_S5PC1XX)
+#elif defined(CONFIG_S5P)
onenand->base = (void *)0xE7100000;
onenand->ahb_addr = (void *)0xB0000000;
#endif
index c731bfb594f1cbd04e0f6dfabf3c6d21a447698e..6d45a8ef5540591f94ce45fb61d7ea417889bec4 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
COBJS-$(CONFIG_SYS_NS16550) += ns16550.o
COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
-COBJS-$(CONFIG_S5PC1XX) += serial_s5p.o
+COBJS-$(CONFIG_S5P) += serial_s5p.o
COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o
COBJS-$(CONFIG_CLPS7111_SERIAL) += serial_clps7111.o
COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o
index c8ea8fda82b694077fcb3ddab2dee0f9d5d853e0..dc01ceb7b26a653075b92f4f00a9907953f36e2f 100644 (file)
/* High Level Configuration Options */
#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */
#define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
-#define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */
+#define CONFIG_S5P 1 /* which is in a S5P Family */
#define CONFIG_S5PC110 1 /* which is in a S5PC110 */
#define CONFIG_MACH_GONI 1 /* working with Goni */
index 76a47c4456f3dac7e9ad730ce2637dff71f1fc83..595d17400134174ca24fc372678eef482908c54b 100644 (file)
*/
#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */
#define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
-#define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */
+#define CONFIG_S5P 1 /* which is in a S5P Family */
#define CONFIG_S5PC100 1 /* which is in a S5PC100 */
#define CONFIG_SMDKC100 1 /* working with SMDKC100 */
diff --git a/include/serial.h b/include/serial.h
index 6513d8eeef95f4a965c52a8bebdd4fd77410b2d7..9e4a22607f32c11ec81b1dec313f46be09ac3b2c 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
extern struct serial_device s3c24xx_serial2_device;
#endif
-#if defined(CONFIG_S5PC1XX)
+#if defined(CONFIG_S5P)
extern struct serial_device s5p_serial0_device;
extern struct serial_device s5p_serial1_device;
extern struct serial_device s5p_serial2_device;