Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9f8050c4f99789d03ca96d4e625bd6637241828f

Authored by Linus Torvalds
2 parents 9a0cee7114 c66fcfa938
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Merge tag 'fixes-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull last minute fixes from Olof Johansson:
 "One samsung build fix due to a mis-applied patch, and a small set of
  OMAP fixes.  This should be the last from arm-soc for 3.3, hopefully."

* tag 'fixes-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: S3C2440: Fixed build error for s3c244x
  ARM: OMAP2+: Fix module build errors with CONFIG_OMAP4_ERRATA_I688
  ARM: OMAP: id: Add missing break statement in omap3xxx_check_revision
  ARM: OMAP2+: Remove apply_uV constraints for fixed regulator
  ARM: OMAP: irqs: Fix NR_IRQS value to handle PRCM interrupts

Showing 5 changed files Side-by-side Diff

arch/arm/mach-omap2/id.c
Diff comments   View file @ 9f8050c
... ... @@ -343,6 +343,7 @@
343 343 case 0xb944:
344 344 omap_revision = AM335X_REV_ES1_0;
345 345 *cpu_rev = "1.0";
  346 + break;
346 347 case 0xb8f2:
347 348 switch (rev) {
348 349 case 0:
arch/arm/mach-omap2/omap4-common.c
Diff comments   View file @ 9f8050c
... ... @@ -31,6 +31,7 @@
31 31  
32 32 #include "common.h"
33 33 #include "omap4-sar-layout.h"
  34 +#include <linux/export.h>
34 35  
35 36 #ifdef CONFIG_CACHE_L2X0
36 37 static void __iomem *l2cache_base;
... ... @@ -55,6 +56,7 @@
55 56 isb();
56 57 }
57 58 }
  59 +EXPORT_SYMBOL(omap_bus_sync);
58 60  
59 61 /* Steal one page physical memory for barrier implementation */
60 62 int __init omap_barrier_reserve_memblock(void)
arch/arm/mach-omap2/twl-common.c
Diff comments   View file @ 9f8050c
... ... @@ -270,7 +270,6 @@
270 270 .constraints = {
271 271 .min_uV = 3300000,
272 272 .max_uV = 3300000,
273   - .apply_uV = true,
274 273 .valid_modes_mask = REGULATOR_MODE_NORMAL
275 274 | REGULATOR_MODE_STANDBY,
276 275 .valid_ops_mask = REGULATOR_CHANGE_MODE
arch/arm/mach-s3c2440/s3c244x.c
Diff comments   View file @ 9f8050c
... ... @@ -207,4 +207,5 @@
207 207  
208 208 /* we'll take a jump through zero as a poor second */
209 209 soft_restart(0);
  210 +}
arch/arm/plat-omap/include/plat/irqs.h
Diff comments   View file @ 9f8050c
... ... @@ -428,8 +428,16 @@
428 428 #define OMAP_GPMC_NR_IRQS 8
429 429 #define OMAP_GPMC_IRQ_END (OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS)
430 430  
  431 +/* PRCM IRQ handler */
  432 +#ifdef CONFIG_ARCH_OMAP2PLUS
  433 +#define OMAP_PRCM_IRQ_BASE (OMAP_GPMC_IRQ_END)
  434 +#define OMAP_PRCM_NR_IRQS 64
  435 +#define OMAP_PRCM_IRQ_END (OMAP_PRCM_IRQ_BASE + OMAP_PRCM_NR_IRQS)
  436 +#else
  437 +#define OMAP_PRCM_IRQ_END OMAP_GPMC_IRQ_END
  438 +#endif
431 439  
432   -#define NR_IRQS OMAP_GPMC_IRQ_END
  440 +#define NR_IRQS OMAP_PRCM_IRQ_END
433 441  
434 442 #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32))
435 443