Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb42b044 authored by Pawel Osciak's avatar Pawel Osciak Committed by Linus Torvalds
Browse files

s3c-fb: add device name initialization 



Add framebuffer device name initialization calls for S3C2443, S3C64xx and
S5P machines.

Signed-off-by: default avatarPawel Osciak <p.osciak@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Cc: InKi Dae <inki.dae@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4e591ac6

arch/arm/mach-s3c2416/s3c2416.c

+2 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include <plat/cpu.h>



#include <plat/iic-core.h>

#include <plat/fb-core.h>



static struct map_desc s3c2416_iodesc[] __initdata = {

	IODESC_ENT(WATCHDOG),
@@ -90,7 +91,7 @@ int __init s3c2416_init(void) 
	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");



	s3c_device_fb.name = "s3c2443-fb";

	s3c_fb_setname("s3c2443-fb");



	return sysdev_register(&s3c2416_sysdev);

}

arch/arm/mach-s3c2443/s3c2443.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-s5pc100/cpu.c

+2 −0
Original line number Diff line number Diff line
@@ -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,7 @@ 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)

arch/arm/mach-s5pv210/cpu.c

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/clock.h>

#include <plat/fb-core.h>

#include <plat/s5pv210.h>

#include <plat/iic-core.h>

#include <plat/sdhci.h>
@@ -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)

arch/arm/plat-samsung/include/plat/fb-core.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * 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 */