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

Commit 74fac66e authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents ef449e6d 1264fa6f

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

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct s3c_fb_platdata smdk6410_lcd_pdata __initdata = { 
	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,

};



struct map_desc smdk6410_iodesc[] = {};

static struct map_desc smdk6410_iodesc[] = {};



static struct platform_device *smdk6410_devices[] __initdata = {

#ifdef CONFIG_SMDK6410_SD_CH0
@@ -146,7 +146,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { 


static struct i2c_board_info i2c_devs0[] __initdata = {

	{ I2C_BOARD_INFO("24c08", 0x50), },

	{ I2C_BOARD_INFO("WM8580", 0X1b), },

	{ I2C_BOARD_INFO("wm8580", 0x1b), },

};



static struct i2c_board_info i2c_devs1[] __initdata = {

arch/arm/plat-s3c64xx/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static struct clk *clks[] __initdata = { 
	&clk_48m,

};



void s3c64xx_register_clocks(void)

void __init s3c64xx_register_clocks(void)

{

	struct clk *clkp;

	int ret;

arch/arm/plat-s3c64xx/gpiolib.c

+1 −1
Original line number Diff line number Diff line
@@ -417,4 +417,4 @@ static __init int s3c64xx_gpiolib_init(void) 
	return 0;

}



arch_initcall(s3c64xx_gpiolib_init);
 
core_initcall(s3c64xx_gpiolib_init);

arch/arm/plat-s3c64xx/include/plat/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
#define IRQ_ONENAND1		S3C64XX_IRQ_VIC1(12)

#define IRQ_NFC			S3C64XX_IRQ_VIC1(13)

#define IRQ_CFCON		S3C64XX_IRQ_VIC1(14)

#define IRQ_UHOST		S3C64XX_IRQ_VIC1(15)

#define IRQ_USBH		S3C64XX_IRQ_VIC1(15)

#define IRQ_SPI0		S3C64XX_IRQ_VIC1(16)

#define IRQ_SPI1		S3C64XX_IRQ_VIC1(17)

#define IRQ_IIC			S3C64XX_IRQ_VIC1(18)

arch/arm/plat-s3c64xx/irq-eint.c

+14 −1
Original line number Diff line number Diff line
@@ -14,12 +14,15 @@ 


#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/gpio.h>

#include <linux/irq.h>

#include <linux/io.h>



#include <asm/hardware/vic.h>



#include <plat/regs-irqtype.h>

#include <plat/regs-gpio.h>

#include <plat/gpio-cfg.h>



#include <mach/map.h>

#include <plat/cpu.h>
@@ -74,6 +77,7 @@ static void s3c_irq_eint_maskack(unsigned int irq) 
static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type)

{

	int offs = eint_offset(irq);

	int pin;

	int shift;

	u32 ctrl, mask;

	u32 newvalue = 0;
@@ -125,6 +129,15 @@ static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type) 
	ctrl |= newvalue << shift;

	__raw_writel(ctrl, reg);



	/* set the GPIO pin appropriately */



	if (offs < 23)

		pin = S3C64XX_GPN(offs);

	else

		pin = S3C64XX_GPM(offs - 23);



	s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(2));



	return 0;

}
@@ -181,7 +194,7 @@ static void s3c_irq_demux_eint20_27(unsigned int irq, struct irq_desc *desc) 
	s3c_irq_demux_eint(20, 27);

}



int __init s3c64xx_init_irq_eint(void)

static int __init s3c64xx_init_irq_eint(void)

{

	int irq;