tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 9f8050c4 9a0cee71

+13 -2
+1
arch/arm/mach-omap2/id.c
··· 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:
+2
arch/arm/mach-omap2/omap4-common.c
··· 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; ··· 56 55 isb(); 57 56 } 58 57 } 58 + EXPORT_SYMBOL(omap_bus_sync); 59 59 60 60 /* Steal one page physical memory for barrier implementation */ 61 61 int __init omap_barrier_reserve_memblock(void)
-1
arch/arm/mach-omap2/twl-common.c
··· 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
+1
arch/arm/mach-s3c2440/s3c244x.c
··· 207 207 208 208 /* we'll take a jump through zero as a poor second */ 209 209 soft_restart(0); 210 + }
+9 -1
arch/arm/plat-omap/include/plat/irqs.h
··· 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