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

Commit f64bea43 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: SMDK2416: Add support for framebuffer device and ensure correct setup 



Add support for the LCD display on the SMDJK2416, and correctly name the
framebuffer device.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent f077f3fc

arch/arm/mach-s3c2416/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ menu "S3C2416 Machines" 
config MACH_SMDK2416

	bool "SMDK2416"

	select CPU_S3C2416

	select S3C_DEV_FB

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	help

arch/arm/mach-s3c2416/mach-smdk2416.c

+59 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/io.h>

#include <linux/mtd/partitions.h>

#include <linux/gpio.h>

#include <linux/fb.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -36,16 +37,19 @@ 
#include <mach/regs-lcd.h>



#include <mach/idle.h>

#include <mach/fb.h>

#include <mach/leds-gpio.h>

#include <plat/iic.h>



#include <plat/s3c2416.h>

#include <plat/gpio-cfg.h>

#include <plat/clock.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/nand.h>



#include <plat/regs-fb-v4.h>

#include <plat/fb.h>



#include <plat/common-smdk.h>



static struct map_desc smdk2416_iodesc[] __initdata = {
@@ -109,7 +113,54 @@ static struct s3c2410_uartcfg smdk2416_uartcfgs[] __initdata = { 
	}

};



struct s3c_fb_pd_win smdk2416_fb_win[] = {

	[0] = {

		/* think this is the same as the smdk6410 */

		.win_mode	= {

			.pixclock	= 41094,

			.left_margin	= 8,

			.right_margin	= 13,

			.upper_margin	= 7,

			.lower_margin	= 5,

			.hsync_len	= 3,

			.vsync_len	= 1,

			.xres           = 800,

			.yres           = 480,

		},

		.default_bpp	= 16,

		.max_bpp	= 32,

	},

};



static void s3c2416_fb_gpio_setup_24bpp(void)

{

	unsigned int gpio;



	for (gpio = S3C2410_GPC(1); gpio <= S3C2410_GPC(4); gpio++) {

		s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));

		s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);

	}



	for (gpio = S3C2410_GPC(8); gpio <= S3C2410_GPC(15); gpio++) {

		s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));

		s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);

	}



	for (gpio = S3C2410_GPD(0); gpio <= S3C2410_GPD(15); gpio++) {

		s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));

		s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);

	}

}



static struct s3c_fb_platdata smdk2416_fb_platdata = {

	.win[0]		= &smdk2416_fb_win[0],

	.setup_gpio	= s3c2416_fb_gpio_setup_24bpp,

	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,

	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,

};



static struct platform_device *smdk2416_devices[] __initdata = {

	&s3c_device_fb,

	&s3c_device_wdt,

	&s3c_device_ohci,

	&s3c_device_i2c0,
@@ -119,20 +170,25 @@ static struct platform_device *smdk2416_devices[] __initdata = { 


static void __init smdk2416_map_io(void)

{



	s3c24xx_init_io(smdk2416_iodesc, ARRAY_SIZE(smdk2416_iodesc));

	s3c24xx_init_clocks(12000000);

	s3c24xx_init_uarts(smdk2416_uartcfgs, ARRAY_SIZE(smdk2416_uartcfgs));



}



static void __init smdk2416_machine_init(void)

{

	s3c_i2c0_set_platdata(NULL);

	s3c_fb_set_platdata(&smdk2416_fb_platdata);



	gpio_request(S3C2410_GPB(4), "USBHost Power");

	gpio_direction_output(S3C2410_GPB(4), 1);



	gpio_request(S3C2410_GPB(3), "Display Power");

	gpio_direction_output(S3C2410_GPB(3), 1);



	gpio_request(S3C2410_GPB(1), "Display Reset");

	gpio_direction_output(S3C2410_GPB(1), 1);



	platform_add_devices(smdk2416_devices, ARRAY_SIZE(smdk2416_devices));

	smdk_machine_init();

}

arch/arm/mach-s3c2416/s3c2416.c

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ int __init s3c2416_init(void) 
	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");



	s3c_device_fb.name = "s3c2443-fb";



	return sysdev_register(&s3c2416_sysdev);

}