History

Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung

* 'samsung-fixes-4' of git://github.com/kgene/linux-samsung: ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM ARM: S5P: fix offset calculation on gpio-interrupt

Linus Torvalds committed 15 years ago

Commit 1bf1aac2 parents 5117cc2 fb630b96 files · +13 −3Browse files

Unified · Split

6 files
  1. arch/arm/mach-s3c2410/s3c2410.c +2 −0
  2. arch/arm/mach-s3c2412/s3c2412.c +2 −0
  3. arch/arm/mach-s3c2416/s3c2416.c +2 −0
  4. arch/arm/mach-s3c2440/s3c2440.c +2 −0
  5. arch/arm/mach-s3c2440/s3c2442.c +2 −0
  6. arch/arm/plat-s5p/irq-gpioint.c +3 −3
arch/arm/mach-s3c2410/s3c2410.c+2−0
@@ -170,7 +170,9 @@ int __init s3c2410_init(void) · 169 unmodified lines
170{170{
171 printk("S3C2410: Initialising architecture\n");171 printk("S3C2410: Initialising architecture\n");
172 172
173#ifdef CONFIG_PM
173 register_syscore_ops(&s3c2410_pm_syscore_ops);174 register_syscore_ops(&s3c2410_pm_syscore_ops);
175#endif
174 register_syscore_ops(&s3c24xx_irq_syscore_ops);176 register_syscore_ops(&s3c24xx_irq_syscore_ops);
175 177
176 return sysdev_register(&s3c2410_sysdev);178 return sysdev_register(&s3c2410_sysdev);
arch/arm/mach-s3c2412/s3c2412.c+2−0
@@ -245,7 +245,9 @@ int __init s3c2412_init(void) · 244 unmodified lines
245{245{
246 printk("S3C2412: Initialising architecture\n");246 printk("S3C2412: Initialising architecture\n");
247 247
248#ifdef CONFIG_PM
248 register_syscore_ops(&s3c2412_pm_syscore_ops);249 register_syscore_ops(&s3c2412_pm_syscore_ops);
250#endif
249 register_syscore_ops(&s3c24xx_irq_syscore_ops);251 register_syscore_ops(&s3c24xx_irq_syscore_ops);
250 252
251 return sysdev_register(&s3c2412_sysdev);253 return sysdev_register(&s3c2412_sysdev);
arch/arm/mach-s3c2416/s3c2416.c+2−0
@@ -97,7 +97,9 @@ int __init s3c2416_init(void) · 96 unmodified lines
97 97
98 s3c_fb_setname("s3c2443-fb");98 s3c_fb_setname("s3c2443-fb");
99 99
100#ifdef CONFIG_PM
100 register_syscore_ops(&s3c2416_pm_syscore_ops);101 register_syscore_ops(&s3c2416_pm_syscore_ops);
102#endif
101 register_syscore_ops(&s3c24xx_irq_syscore_ops);103 register_syscore_ops(&s3c24xx_irq_syscore_ops);
102 104
103 return sysdev_register(&s3c2416_sysdev);105 return sysdev_register(&s3c2416_sysdev);
arch/arm/mach-s3c2440/s3c2440.c+2−0
@@ -55,7 +55,9 @@ int __init s3c2440_init(void) · 54 unmodified lines
55 55
56 /* register suspend/resume handlers */56 /* register suspend/resume handlers */
57 57
58#ifdef CONFIG_PM
58 register_syscore_ops(&s3c2410_pm_syscore_ops);59 register_syscore_ops(&s3c2410_pm_syscore_ops);
60#endif
59 register_syscore_ops(&s3c244x_pm_syscore_ops);61 register_syscore_ops(&s3c244x_pm_syscore_ops);
60 register_syscore_ops(&s3c24xx_irq_syscore_ops);62 register_syscore_ops(&s3c24xx_irq_syscore_ops);
61 63
arch/arm/mach-s3c2440/s3c2442.c+2−0
@@ -169,7 +169,9 @@ int __init s3c2442_init(void) · 168 unmodified lines
169{169{
170 printk("S3C2442: Initialising architecture\n");170 printk("S3C2442: Initialising architecture\n");
171 171
172#ifdef CONFIG_PM
172 register_syscore_ops(&s3c2410_pm_syscore_ops);173 register_syscore_ops(&s3c2410_pm_syscore_ops);
174#endif
173 register_syscore_ops(&s3c244x_pm_syscore_ops);175 register_syscore_ops(&s3c244x_pm_syscore_ops);
174 register_syscore_ops(&s3c24xx_irq_syscore_ops);176 register_syscore_ops(&s3c24xx_irq_syscore_ops);
175 177
arch/arm/plat-s5p/irq-gpioint.c+3−3
@@ -163,9 +163,9 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip) · 162 unmodified lines
163 ct->chip.irq_mask = irq_gc_mask_set_bit;163 ct->chip.irq_mask = irq_gc_mask_set_bit;
164 ct->chip.irq_unmask = irq_gc_mask_clr_bit;164 ct->chip.irq_unmask = irq_gc_mask_clr_bit;
165 ct->chip.irq_set_type = s5p_gpioint_set_type,165 ct->chip.irq_set_type = s5p_gpioint_set_type,
166 ct->regs.ack = PEND_OFFSET + REG_OFFSET(chip->group);166 ct->regs.ack = PEND_OFFSET + REG_OFFSET(group - bank->start);
167 ct->regs.mask = MASK_OFFSET + REG_OFFSET(chip->group);167 ct->regs.mask = MASK_OFFSET + REG_OFFSET(group - bank->start);
168 ct->regs.type = CON_OFFSET + REG_OFFSET(chip->group);168 ct->regs.type = CON_OFFSET + REG_OFFSET(group - bank->start);
169 irq_setup_generic_chip(gc, IRQ_MSK(chip->chip.ngpio),169 irq_setup_generic_chip(gc, IRQ_MSK(chip->chip.ngpio),
170 IRQ_GC_INIT_MASK_CACHE,170 IRQ_GC_INIT_MASK_CACHE,
171 IRQ_NOREQUEST | IRQ_NOPROBE, 0);171 IRQ_NOREQUEST | IRQ_NOPROBE, 0);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t