[PATCH 3/9] s3c-fb: Add device name initialization.
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: 2010-06-16 09:34:46
Also in:
linux-arm-kernel, linux-samsung-soc
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
From: Pawel Osciak <redacted> Add framebuffer device name initialization calls for S3C2443, S3C64xx and S5P machines. Signed-off-by: Pawel Osciak <redacted> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- arch/arm/mach-s3c2443/s3c2443.c | 2 + arch/arm/mach-s3c64xx/s3c6400.c | 3 ++ arch/arm/mach-s3c64xx/s3c6410.c | 3 ++ arch/arm/mach-s5pc100/cpu.c | 3 ++ arch/arm/mach-s5pv210/cpu.c | 3 ++ arch/arm/plat-samsung/include/plat/fb-core.h | 29 ++++++++++++++++++++++++++ 6 files changed, 43 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-samsung/include/plat/fb-core.h
diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c
index ce2ec32..839b6b2 100644
--- a/arch/arm/mach-s3c2443/s3c2443.c
+++ b/arch/arm/mach-s3c2443/s3c2443.c@@ -35,6 +35,7 @@ #include <plat/s3c2443.h> #include <plat/devs.h> #include <plat/cpu.h> +#include <plat/fb-core.h> static struct map_desc s3c2443_iodesc[] __initdata = { IODESC_ENT(WATCHDOG),
@@ -62,6 +63,7 @@ int __init s3c2443_init(void) s3c24xx_reset_hook = s3c2443_hard_reset; s3c_device_nand.name = "s3c2412-nand"; + s3c_fb_setname("s3c2443-fb"); /* change WDT IRQ number */ s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;
diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c
index 5e93fe3..f4a9e07 100644
--- a/arch/arm/mach-s3c64xx/s3c6400.c
+++ b/arch/arm/mach-s3c64xx/s3c6400.c@@ -38,6 +38,7 @@ #include <plat/sdhci.h> #include <plat/iic-core.h> #include <plat/onenand-core.h> +#include <plat/fb-core.h> #include <mach/s3c6400.h> void __init s3c6400_map_io(void)
@@ -55,6 +56,8 @@ void __init s3c6400_map_io(void) s3c_onenand_setname("s3c6400-onenand"); s3c64xx_onenand1_setname("s3c6400-onenand"); + + s3c_fb_setname("s3c-fb"); } void __init s3c6400_init_clocks(int xtal)
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c
index 014401c..b2acb60 100644
--- a/arch/arm/mach-s3c64xx/s3c6410.c
+++ b/arch/arm/mach-s3c64xx/s3c6410.c@@ -40,6 +40,7 @@ #include <plat/iic-core.h> #include <plat/adc.h> #include <plat/onenand-core.h> +#include <plat/fb-core.h> #include <mach/s3c6400.h> #include <mach/s3c6410.h>
@@ -58,6 +59,8 @@ void __init s3c6410_map_io(void) s3c_device_nand.name = "s3c6400-nand"; s3c_onenand_setname("s3c6410-onenand"); s3c64xx_onenand1_setname("s3c6410-onenand"); + + s3c_fb_setname("s3c-fb"); } void __init s3c6410_init_clocks(int xtal)
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c
index 7b5bdbc..d10276a 100644
--- a/arch/arm/mach-s5pc100/cpu.c
+++ b/arch/arm/mach-s5pc100/cpu.c@@ -41,6 +41,7 @@ #include <plat/iic-core.h> #include <plat/sdhci.h> #include <plat/onenand-core.h> +#include <plat/fb-core.h> #include <plat/s5pc100.h>
@@ -92,6 +93,8 @@ void __init s5pc100_map_io(void) s3c_i2c1_setname("s3c2440-i2c"); s3c_onenand_setname("s5pc100-onenand"); + + s3c_fb_setname("s5pc100-fb"); } void __init s5pc100_init_clocks(int xtal)
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 411a4a9..4d3580a 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c@@ -34,6 +34,7 @@ #include <plat/s5pv210.h> #include <plat/iic-core.h> #include <plat/sdhci.h> +#include <plat/fb-core.h> /* Initial IO mappings */
@@ -91,6 +92,8 @@ void __init s5pv210_map_io(void) s3c_i2c0_setname("s3c2440-i2c"); s3c_i2c1_setname("s3c2440-i2c"); s3c_i2c2_setname("s3c2440-i2c"); + + s3c_fb_setname("s5pv210-fb"); } void __init s5pv210_init_clocks(int xtal)
diff --git a/arch/arm/plat-samsung/include/plat/fb-core.h b/arch/arm/plat-samsung/include/plat/fb-core.h
new file mode 100644
index 0000000..bca383e
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/fb-core.h@@ -0,0 +1,29 @@ +/* + * arch/arm/plat-samsung/include/plat/fb-core.h + * + * Copyright 2010 Samsung Electronics Co., Ltd. + * Pawel Osciak <p.osciak@samsung.com> + * + * Samsung framebuffer driver core functions + * + * 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 __ASM_PLAT_FB_CORE_H +#define __ASM_PLAT_FB_CORE_H __FILE__ + +/* + * These functions are only for use with the core support code, such as + * the CPU-specific initialization code. + */ + +/* Re-define device name depending on support. */ +static inline void s3c_fb_setname(char *name) +{ +#ifdef CONFIG_S3C_DEV_FB + s3c_device_fb.name = name; +#endif +} + +#endif /* __ASM_PLAT_FB_CORE_H */
--
1.7.1.240.g225c