Last minute fixes for 3.3
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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPWQktAAoJEIwa5zzehBx3OK4P/i3+nTB2WW8i8ll8pTHybSAj YuQGOtsvJDCkZQ6tIgMahNH/Pr2Q2gFe6cjP/akbWWCfUvOl36ZAl9NYY8eexoco ZGkMEXfhgtAsVepzEF1/64lwOgrh+AikzlL0q0tA2FmClcAejwFE7ht6zPcwFgJj 9lmR201/6OLc+qkmvrKRbmpO+eYZUVuQ4cOEMOxebXZN/tn5S/R2QWC3+PkUMbWz 7bngLHjO97legI0SGzfaKOx/02y/4hIDSybIPDOKDuXi1jUJlkrmnP09sQQLYdKN uxu56mn+vUPCIGNwmE1/ufSneM8pZEAHaRkUjFOrxtsdGKVsxFz1vyJ3OAQHd8FU WU+fKOew/Jf+jRpApydKWJ0yOdyTZIVqncvWpFs1RlmAVKPE96M8IL9oUZaV8rgJ c9XUCvDFF0OuZQyMoacSzbVfcAy9SE/f7fNXLUpI9rEriYfY5waCXcQrYGwjRtmD j2iY0pyaU72i7mtTbcsInPZ/bZ7gO+D1MmFl9WzduLWDJoGHJVcUyC1+YrJjoGF3 ggplns12qTtdgfiqTKV2I5qf2nHHbk8kmhII1fkYPZwdG2enKhV+r5Oth3zKPVXF oOD8YnjACuad05YdkpzQL2DSaiGtPVAXHP4xMN9ktNPSJHwx19HNDiTKex6oxcZf Dki+FinbRiFYUP/O91Xe =PLTM -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
9f8050c4f9
|
@ -343,6 +343,7 @@ static void __init omap3_check_revision(const char **cpu_rev)
|
||||||
case 0xb944:
|
case 0xb944:
|
||||||
omap_revision = AM335X_REV_ES1_0;
|
omap_revision = AM335X_REV_ES1_0;
|
||||||
*cpu_rev = "1.0";
|
*cpu_rev = "1.0";
|
||||||
|
break;
|
||||||
case 0xb8f2:
|
case 0xb8f2:
|
||||||
switch (rev) {
|
switch (rev) {
|
||||||
case 0:
|
case 0:
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "omap4-sar-layout.h"
|
#include "omap4-sar-layout.h"
|
||||||
|
#include <linux/export.h>
|
||||||
|
|
||||||
#ifdef CONFIG_CACHE_L2X0
|
#ifdef CONFIG_CACHE_L2X0
|
||||||
static void __iomem *l2cache_base;
|
static void __iomem *l2cache_base;
|
||||||
|
@ -55,6 +56,7 @@ void omap_bus_sync(void)
|
||||||
isb();
|
isb();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(omap_bus_sync);
|
||||||
|
|
||||||
/* Steal one page physical memory for barrier implementation */
|
/* Steal one page physical memory for barrier implementation */
|
||||||
int __init omap_barrier_reserve_memblock(void)
|
int __init omap_barrier_reserve_memblock(void)
|
||||||
|
|
|
@ -270,7 +270,6 @@ static struct regulator_init_data omap4_vusb_idata = {
|
||||||
.constraints = {
|
.constraints = {
|
||||||
.min_uV = 3300000,
|
.min_uV = 3300000,
|
||||||
.max_uV = 3300000,
|
.max_uV = 3300000,
|
||||||
.apply_uV = true,
|
|
||||||
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
||||||
| REGULATOR_MODE_STANDBY,
|
| REGULATOR_MODE_STANDBY,
|
||||||
.valid_ops_mask = REGULATOR_CHANGE_MODE
|
.valid_ops_mask = REGULATOR_CHANGE_MODE
|
||||||
|
|
|
@ -207,3 +207,4 @@ void s3c244x_restart(char mode, const char *cmd)
|
||||||
|
|
||||||
/* we'll take a jump through zero as a poor second */
|
/* we'll take a jump through zero as a poor second */
|
||||||
soft_restart(0);
|
soft_restart(0);
|
||||||
|
}
|
||||||
|
|
|
@ -428,8 +428,16 @@
|
||||||
#define OMAP_GPMC_NR_IRQS 8
|
#define OMAP_GPMC_NR_IRQS 8
|
||||||
#define OMAP_GPMC_IRQ_END (OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS)
|
#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))
|
#define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue