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

Commit 4c75aab6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'v3.3-samsung-fixes-4' of... 

Merge branch 'v3.3-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

* 'v3.3-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: fix touchscreen IRQ setup on Universal C210 board
  ARM: S3C24XX: DMA resume regression fix
  ARM: S3C24XX: Fix restart on S3C2442
  ARM: SAMSUNG: Fix memory size for hsotg
parents 1dbd02ec 63f32b38

arch/arm/mach-exynos/mach-universal_c210.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/i2c.h>

#include <linux/gpio_keys.h>

#include <linux/gpio.h>

#include <linux/interrupt.h>

#include <linux/fb.h>

#include <linux/mfd/max8998.h>

#include <linux/regulator/machine.h>
@@ -595,6 +596,7 @@ static struct mxt_platform_data qt602240_platform_data = { 
	.threshold	= 0x28,

	.voltage	= 2800000,		/* 2.8V */

	.orient		= MXT_DIAGONAL,

	.irqflags	= IRQF_TRIGGER_FALLING,

};



static struct i2c_board_info i2c3_devs[] __initdata = {

arch/arm/mach-s3c2440/common.h

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ 
#ifndef __ARCH_ARM_MACH_S3C2440_COMMON_H

#define __ARCH_ARM_MACH_S3C2440_COMMON_H



void s3c2440_restart(char mode, const char *cmd);

void s3c244x_restart(char mode, const char *cmd);



#endif /* __ARCH_ARM_MACH_S3C2440_COMMON_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -487,5 +487,5 @@ MACHINE_START(ANUBIS, "Simtec-Anubis") 
	.init_machine	= anubis_init,

	.init_irq	= s3c24xx_init_irq,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2440_restart,

	.restart	= s3c244x_restart,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -222,5 +222,5 @@ MACHINE_START(AT2440EVB, "AT2440EVB") 
	.init_machine	= at2440evb_init,

	.init_irq	= s3c24xx_init_irq,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2440_restart,

	.restart	= s3c244x_restart,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -601,5 +601,5 @@ MACHINE_START(NEO1973_GTA02, "GTA02") 
	.init_irq	= s3c24xx_init_irq,

	.init_machine	= gta02_machine_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2440_restart,

	.restart	= s3c244x_restart,

MACHINE_END