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
170170 {
171171 printk("S3C2410: Initialising architecture\n");
172172
173+#ifdef CONFIG_PM
173174 register_syscore_ops(&s3c2410_pm_syscore_ops);
175+#endif
174176 register_syscore_ops(&s3c24xx_irq_syscore_ops);
175177
176178 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
245245 {
246246 printk("S3C2412: Initialising architecture\n");
247247
248+#ifdef CONFIG_PM
248249 register_syscore_ops(&s3c2412_pm_syscore_ops);
250+#endif
249251 register_syscore_ops(&s3c24xx_irq_syscore_ops);
250252
251253 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
9797
9898 s3c_fb_setname("s3c2443-fb");
9999
100+#ifdef CONFIG_PM
100101 register_syscore_ops(&s3c2416_pm_syscore_ops);
102+#endif
101103 register_syscore_ops(&s3c24xx_irq_syscore_ops);
102104
103105 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
5555
5656 /* register suspend/resume handlers */
5757
58+#ifdef CONFIG_PM
5859 register_syscore_ops(&s3c2410_pm_syscore_ops);
60+#endif
5961 register_syscore_ops(&s3c244x_pm_syscore_ops);
6062 register_syscore_ops(&s3c24xx_irq_syscore_ops);
6163
arch/arm/mach-s3c2440/s3c2442.c+2−0
@@ -169,7 +169,9 @@ int __init s3c2442_init(void) · 168 unmodified lines
169169 {
170170 printk("S3C2442: Initialising architecture\n");
171171
172+#ifdef CONFIG_PM
172173 register_syscore_ops(&s3c2410_pm_syscore_ops);
174+#endif
173175 register_syscore_ops(&s3c244x_pm_syscore_ops);
174176 register_syscore_ops(&s3c24xx_irq_syscore_ops);
175177
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
163163 ct->chip.irq_mask = irq_gc_mask_set_bit;
164164 ct->chip.irq_unmask = irq_gc_mask_clr_bit;
165165 ct->chip.irq_set_type = s5p_gpioint_set_type,
166− ct->regs.ack = PEND_OFFSET + REG_OFFSET(chip->group);
167− ct->regs.mask = MASK_OFFSET + REG_OFFSET(chip->group);
168− ct->regs.type = CON_OFFSET + REG_OFFSET(chip->group);
166+ ct->regs.ack = PEND_OFFSET + REG_OFFSET(group - bank->start);
167+ ct->regs.mask = MASK_OFFSET + REG_OFFSET(group - bank->start);
168+ ct->regs.type = CON_OFFSET + REG_OFFSET(group - bank->start);
169169 irq_setup_generic_chip(gc, IRQ_MSK(chip->chip.ngpio),
170170 IRQ_GC_INIT_MASK_CACHE,
171171 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