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

Commit c917c1d0 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'v2630-rc2-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

parents 77f4025b 0c3ee078

arch/arm/mach-s3c2412/mach-jive.c

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

#include <plat/pm.h>

#include <plat/udc.h>

#include <plat/iic.h>



static struct map_desc jive_iodesc[] __initdata = {

};
@@ -278,7 +277,7 @@ __setup("mtdset=", jive_mtdset); 
#define LCD_HTOT (LCD_HSYNC + LCD_LEFT_MARGIN + LCD_XRES + LCD_RIGHT_MARGIN)

#define LCD_VTOT (LCD_VSYNC + LCD_LOWER_MARGIN + LCD_YRES + LCD_UPPER_MARGIN)



struct s3c2410fb_display jive_vgg2432a4_display[] = {

static struct s3c2410fb_display jive_vgg2432a4_display[] = {

	[0] = {

		.width		= LCD_XRES,

		.height		= LCD_YRES,
@@ -311,7 +310,7 @@ struct s3c2410fb_display jive_vgg2432a4_display[] = { 
#define S3C2410_GPCCON_MASK(x)	(3 << ((x) * 2))

#define S3C2410_GPDCON_MASK(x)	(3 << ((x) * 2))



struct s3c2410fb_mach_info jive_lcd_config = {

static struct s3c2410fb_mach_info jive_lcd_config = {

	.displays	 = jive_vgg2432a4_display,

	.num_displays	 = ARRAY_SIZE(jive_vgg2432a4_display),

	.default_display = 0,

arch/arm/mach-s3c2440/mach-anubis.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static struct s3c2410_platform_nand anubis_nand_info = { 


/* IDE channels */



struct pata_platform_info anubis_ide_platdata = {

static struct pata_platform_info anubis_ide_platdata = {

	.ioport_shift	= 5,

};

arch/arm/mach-s3c2440/mach-osiris.c

+0 −1
Original line number Diff line number Diff line
@@ -413,7 +413,6 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS") 
	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,

	.map_io		= osiris_map_io,

	.init_machine	= osiris_init,

	.init_irq	= s3c24xx_init_irq,

	.init_machine	= osiris_init,

	.timer		= &s3c24xx_timer,

arch/arm/mach-s3c6410/mach-smdk6410.c

+4 −0
Original line number Diff line number Diff line
@@ -166,6 +166,10 @@ static void __init smdk6410_machine_init(void) 
	s3c_i2c1_set_platdata(NULL);

	s3c_fb_set_platdata(&smdk6410_lcd_pdata);



	gpio_request(S3C64XX_GPN(5), "LCD power");

	gpio_request(S3C64XX_GPF(13), "LCD power");

	gpio_request(S3C64XX_GPF(15), "LCD power");



	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));

	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));

arch/arm/plat-s3c/gpio-config.c

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
*/



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/gpio.h>

#include <linux/io.h>
@@ -38,6 +39,7 @@ int s3c_gpio_cfgpin(unsigned int pin, unsigned int config) 


	return ret;

}

EXPORT_SYMBOL(s3c_gpio_cfgpin);



int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull)

{
@@ -56,6 +58,7 @@ int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull) 


	return ret;

}

EXPORT_SYMBOL(s3c_gpio_setpull);



#ifdef CONFIG_S3C_GPIO_CFG_S3C24XX

int s3c_gpio_setcfg_s3c24xx_banka(struct s3c_gpio_chip *chip,