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
This commit is contained in:
commit
4c75aab698
|
@ -13,6 +13,7 @@
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
#include <linux/gpio_keys.h>
|
#include <linux/gpio_keys.h>
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
|
#include <linux/interrupt.h>
|
||||||
#include <linux/fb.h>
|
#include <linux/fb.h>
|
||||||
#include <linux/mfd/max8998.h>
|
#include <linux/mfd/max8998.h>
|
||||||
#include <linux/regulator/machine.h>
|
#include <linux/regulator/machine.h>
|
||||||
|
@ -595,6 +596,7 @@ static struct mxt_platform_data qt602240_platform_data = {
|
||||||
.threshold = 0x28,
|
.threshold = 0x28,
|
||||||
.voltage = 2800000, /* 2.8V */
|
.voltage = 2800000, /* 2.8V */
|
||||||
.orient = MXT_DIAGONAL,
|
.orient = MXT_DIAGONAL,
|
||||||
|
.irqflags = IRQF_TRIGGER_FALLING,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct i2c_board_info i2c3_devs[] __initdata = {
|
static struct i2c_board_info i2c3_devs[] __initdata = {
|
||||||
|
|
|
@ -12,6 +12,6 @@
|
||||||
#ifndef __ARCH_ARM_MACH_S3C2440_COMMON_H
|
#ifndef __ARCH_ARM_MACH_S3C2440_COMMON_H
|
||||||
#define __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 */
|
#endif /* __ARCH_ARM_MACH_S3C2440_COMMON_H */
|
||||||
|
|
|
@ -487,5 +487,5 @@ MACHINE_START(ANUBIS, "Simtec-Anubis")
|
||||||
.init_machine = anubis_init,
|
.init_machine = anubis_init,
|
||||||
.init_irq = s3c24xx_init_irq,
|
.init_irq = s3c24xx_init_irq,
|
||||||
.timer = &s3c24xx_timer,
|
.timer = &s3c24xx_timer,
|
||||||
.restart = s3c2440_restart,
|
.restart = s3c244x_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -222,5 +222,5 @@ MACHINE_START(AT2440EVB, "AT2440EVB")
|
||||||
.init_machine = at2440evb_init,
|
.init_machine = at2440evb_init,
|
||||||
.init_irq = s3c24xx_init_irq,
|
.init_irq = s3c24xx_init_irq,
|
||||||
.timer = &s3c24xx_timer,
|
.timer = &s3c24xx_timer,
|
||||||
.restart = s3c2440_restart,
|
.restart = s3c244x_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -601,5 +601,5 @@ MACHINE_START(NEO1973_GTA02, "GTA02")
|
||||||
.init_irq = s3c24xx_init_irq,
|
.init_irq = s3c24xx_init_irq,
|
||||||
.init_machine = gta02_machine_init,
|
.init_machine = gta02_machine_init,
|
||||||
.timer = &s3c24xx_timer,
|
.timer = &s3c24xx_timer,
|
||||||
.restart = s3c2440_restart,
|
.restart = s3c244x_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -701,5 +701,5 @@ MACHINE_START(MINI2440, "MINI2440")
|
||||||
.init_machine = mini2440_init,
|
.init_machine = mini2440_init,
|
||||||
.init_irq = s3c24xx_init_irq,
|
.init_irq = s3c24xx_init_irq,
|
||||||
.timer = &s3c24xx_timer,
|
.timer = &s3c24xx_timer,
|
||||||
.restart = s3c2440_restart,
|
.restart = s3c244x_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -158,5 +158,5 @@ MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
|
||||||
.init_machine = nexcoder_init,
|
.init_machine = nexcoder_init,
|
||||||
.init_irq = s3c24xx_init_irq,
|
.init_irq = s3c24xx_init_irq,
|
||||||
.timer = &s3c24xx_timer,
|
.timer = &s3c24xx_timer,
|
||||||
.restart = s3c2440_restart,
|
.restart = s3c244x_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -436,5 +436,5 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS")
|
||||||
.init_irq = s3c24xx_init_irq,
|
.init_irq = s3c24xx_init_irq,
|
||||||
.init_machine = osiris_init,
|
.init_machine = osiris_init,
|
||||||
.timer = &s3c24xx_timer,
|
.timer = &s3c24xx_timer,
|
||||||
.restart = s3c2440_restart,
|
.restart = s3c244x_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -822,5 +822,5 @@ MACHINE_START(RX1950, "HP iPAQ RX1950")
|
||||||
.init_irq = s3c24xx_init_irq,
|
.init_irq = s3c24xx_init_irq,
|
||||||
.init_machine = rx1950_init_machine,
|
.init_machine = rx1950_init_machine,
|
||||||
.timer = &s3c24xx_timer,
|
.timer = &s3c24xx_timer,
|
||||||
.restart = s3c2440_restart,
|
.restart = s3c244x_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -213,5 +213,5 @@ MACHINE_START(RX3715, "IPAQ-RX3715")
|
||||||
.init_irq = rx3715_init_irq,
|
.init_irq = rx3715_init_irq,
|
||||||
.init_machine = rx3715_init_machine,
|
.init_machine = rx3715_init_machine,
|
||||||
.timer = &s3c24xx_timer,
|
.timer = &s3c24xx_timer,
|
||||||
.restart = s3c2440_restart,
|
.restart = s3c244x_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -183,5 +183,5 @@ MACHINE_START(S3C2440, "SMDK2440")
|
||||||
.map_io = smdk2440_map_io,
|
.map_io = smdk2440_map_io,
|
||||||
.init_machine = smdk2440_machine_init,
|
.init_machine = smdk2440_machine_init,
|
||||||
.timer = &s3c24xx_timer,
|
.timer = &s3c24xx_timer,
|
||||||
.restart = s3c2440_restart,
|
.restart = s3c244x_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
#include <plat/cpu.h>
|
#include <plat/cpu.h>
|
||||||
#include <plat/s3c244x.h>
|
#include <plat/s3c244x.h>
|
||||||
#include <plat/pm.h>
|
#include <plat/pm.h>
|
||||||
#include <plat/watchdog-reset.h>
|
|
||||||
|
|
||||||
#include <plat/gpio-core.h>
|
#include <plat/gpio-core.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
@ -74,15 +73,3 @@ void __init s3c2440_map_io(void)
|
||||||
s3c24xx_gpiocfg_default.set_pull = s3c24xx_gpio_setpull_1up;
|
s3c24xx_gpiocfg_default.set_pull = s3c24xx_gpio_setpull_1up;
|
||||||
s3c24xx_gpiocfg_default.get_pull = s3c24xx_gpio_getpull_1up;
|
s3c24xx_gpiocfg_default.get_pull = s3c24xx_gpio_getpull_1up;
|
||||||
}
|
}
|
||||||
|
|
||||||
void s3c2440_restart(char mode, const char *cmd)
|
|
||||||
{
|
|
||||||
if (mode == 's') {
|
|
||||||
soft_restart(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
arch_wdt_reset();
|
|
||||||
|
|
||||||
/* we'll take a jump through zero as a poor second */
|
|
||||||
soft_restart(0);
|
|
||||||
}
|
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
#include <plat/pm.h>
|
#include <plat/pm.h>
|
||||||
#include <plat/pll.h>
|
#include <plat/pll.h>
|
||||||
#include <plat/nand-core.h>
|
#include <plat/nand-core.h>
|
||||||
|
#include <plat/watchdog-reset.h>
|
||||||
|
|
||||||
static struct map_desc s3c244x_iodesc[] __initdata = {
|
static struct map_desc s3c244x_iodesc[] __initdata = {
|
||||||
IODESC_ENT(CLKPWR),
|
IODESC_ENT(CLKPWR),
|
||||||
|
@ -196,3 +197,13 @@ struct syscore_ops s3c244x_pm_syscore_ops = {
|
||||||
.suspend = s3c244x_suspend,
|
.suspend = s3c244x_suspend,
|
||||||
.resume = s3c244x_resume,
|
.resume = s3c244x_resume,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void s3c244x_restart(char mode, const char *cmd)
|
||||||
|
{
|
||||||
|
if (mode == 's')
|
||||||
|
soft_restart(0);
|
||||||
|
|
||||||
|
arch_wdt_reset();
|
||||||
|
|
||||||
|
/* we'll take a jump through zero as a poor second */
|
||||||
|
soft_restart(0);
|
||||||
|
|
|
@ -1249,7 +1249,7 @@ static void s3c2410_dma_resume(void)
|
||||||
struct s3c2410_dma_chan *cp = s3c2410_chans + dma_channels - 1;
|
struct s3c2410_dma_chan *cp = s3c2410_chans + dma_channels - 1;
|
||||||
int channel;
|
int channel;
|
||||||
|
|
||||||
for (channel = dma_channels - 1; channel >= 0; cp++, channel--)
|
for (channel = dma_channels - 1; channel >= 0; cp--, channel--)
|
||||||
s3c2410_dma_resume_chan(cp);
|
s3c2410_dma_resume_chan(cp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1409,7 +1409,7 @@ void __init s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd)
|
||||||
|
|
||||||
#ifdef CONFIG_S3C_DEV_USB_HSOTG
|
#ifdef CONFIG_S3C_DEV_USB_HSOTG
|
||||||
static struct resource s3c_usb_hsotg_resources[] = {
|
static struct resource s3c_usb_hsotg_resources[] = {
|
||||||
[0] = DEFINE_RES_MEM(S3C_PA_USB_HSOTG, SZ_16K),
|
[0] = DEFINE_RES_MEM(S3C_PA_USB_HSOTG, SZ_128K),
|
||||||
[1] = DEFINE_RES_IRQ(IRQ_OTG),
|
[1] = DEFINE_RES_IRQ(IRQ_OTG),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue