Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f8050c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9a0cee71 c66fcfa9

arch/arm/mach-omap2/id.c

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ static void __init omap3_check_revision(const char **cpu_rev) 
	case 0xb944:

		omap_revision = AM335X_REV_ES1_0;

		*cpu_rev = "1.0";

		break;

	case 0xb8f2:

		switch (rev) {

		case 0:

arch/arm/mach-omap2/omap4-common.c

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#include "common.h"

#include "omap4-sar-layout.h"

#include <linux/export.h>



#ifdef CONFIG_CACHE_L2X0

static void __iomem *l2cache_base;
@@ -55,6 +56,7 @@ void omap_bus_sync(void) 
		isb();

	}

}

EXPORT_SYMBOL(omap_bus_sync);



/* Steal one page physical memory for barrier implementation */

int __init omap_barrier_reserve_memblock(void)

arch/arm/mach-omap2/twl-common.c

+0 −1
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ static struct regulator_init_data omap4_vusb_idata = { 
	.constraints = {

		.min_uV			= 3300000,

		.max_uV			= 3300000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

arch/arm/mach-s3c2440/s3c244x.c

+1 −0
Original line number Diff line number Diff line
@@ -207,3 +207,4 @@ void s3c244x_restart(char mode, const char *cmd) 


	/* we'll take a jump through zero as a poor second */

	soft_restart(0);

}

arch/arm/plat-omap/include/plat/irqs.h

+9 −1
Original line number Diff line number Diff line
@@ -428,8 +428,16 @@ 
#define OMAP_GPMC_NR_IRQS	8

#define OMAP_GPMC_IRQ_END	(OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS)



/* PRCM IRQ handler */

#ifdef CONFIG_ARCH_OMAP2PLUS

#define OMAP_PRCM_IRQ_BASE	(OMAP_GPMC_IRQ_END)

#define OMAP_PRCM_NR_IRQS	64

#define OMAP_PRCM_IRQ_END	(OMAP_PRCM_IRQ_BASE + OMAP_PRCM_NR_IRQS)

#else

#define OMAP_PRCM_IRQ_END	OMAP_GPMC_IRQ_END

#endif



#define NR_IRQS			OMAP_GPMC_IRQ_END

#define NR_IRQS			OMAP_PRCM_IRQ_END



#define OMAP_IRQ_BIT(irq)	(1 << ((irq) % 32))