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

Commit 462fb38f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.13/fixes-not-urgent-part2' of... 

Merge tag 'omap-for-v3.13/fixes-not-urgent-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes-non-critical

From Tony Lindgren:
Few more omap fixes that are not regressions or oopses and can
wait for the merge window.

* tag 'omap-for-v3.13/fixes-not-urgent-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: irq, AM33XX add missing register check
  ARM: OMAP2+: wakeupgen: AM43x adaptation

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ffd076ee 0bebda68

arch/arm/mach-omap2/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs 
			goto out;



		irqnr = readl_relaxed(base_addr + 0xd8);

#ifdef CONFIG_SOC_TI81XX

#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX)

		if (irqnr)

			goto out;

		irqnr = readl_relaxed(base_addr + 0xf8);

arch/arm/mach-omap2/omap-wakeupgen.c

+13 −5
Original line number Diff line number Diff line
@@ -33,8 +33,12 @@ 
#include "omap4-sar-layout.h"

#include "common.h"



#define MAX_NR_REG_BANKS	5

#define MAX_IRQS		160

#define AM43XX_NR_REG_BANKS	7

#define AM43XX_IRQS		224

#define MAX_NR_REG_BANKS	AM43XX_NR_REG_BANKS

#define MAX_IRQS		AM43XX_IRQS

#define DEFAULT_NR_REG_BANKS	5

#define DEFAULT_IRQS		160

#define WKG_MASK_ALL		0x00000000

#define WKG_UNMASK_ALL		0xffffffff

#define CPU_ENA_OFFSET		0x400
@@ -47,8 +51,8 @@ static void __iomem *wakeupgen_base; 
static void __iomem *sar_base;

static DEFINE_RAW_SPINLOCK(wakeupgen_lock);

static unsigned int irq_target_cpu[MAX_IRQS];

static unsigned int irq_banks = MAX_NR_REG_BANKS;

static unsigned int max_irqs = MAX_IRQS;

static unsigned int irq_banks = DEFAULT_NR_REG_BANKS;

static unsigned int max_irqs = DEFAULT_IRQS;

static unsigned int omap_secure_apis;



/*
@@ -418,11 +422,15 @@ int __init omap_wakeupgen_init(void) 
		irq_banks = OMAP4_NR_BANKS;

		max_irqs = OMAP4_NR_IRQS;

		omap_secure_apis = 1;

	} else if (soc_is_am43xx()) {

		irq_banks = AM43XX_NR_REG_BANKS;

		max_irqs = AM43XX_IRQS;

	}



	/* Clear all IRQ bitmasks at wakeupGen level */

	for (i = 0; i < irq_banks; i++) {

		wakeupgen_writel(0, i, CPU0_ID);

		if (!soc_is_am43xx())

			wakeupgen_writel(0, i, CPU1_ID);

	}