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

Commit 780172bf authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: check SIC defines rather than variant names 



Rather than having to maintain a hard coded list of Blackfin variants, use
the SIC defines themselves.  This fixes build problems on BF51x/BF538 under
some configurations as they were missing from one of the lists.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent ea8538a0

arch/blackfin/mach-common/ints-priority.c

+8 −9
Original line number Diff line number Diff line
@@ -1152,12 +1152,11 @@ void do_irq(int vec, struct pt_regs *fp) 
	} else {

		struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst;

		struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop;

#if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) \

	|| defined(BF538_FAMILY) || defined(CONFIG_BF51x)

#if defined(SIC_ISR0) || defined(SICA_ISR0)

		unsigned long sic_status[3];



		if (smp_processor_id()) {

#ifdef CONFIG_SMP

# ifdef SICB_ISR0

			/* This will be optimized out in UP mode. */

			sic_status[0] = bfin_read_SICB_ISR0() & bfin_read_SICB_IMASK0();

			sic_status[1] = bfin_read_SICB_ISR1() & bfin_read_SICB_IMASK1();
@@ -1166,7 +1165,7 @@ void do_irq(int vec, struct pt_regs *fp) 
			sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();

			sic_status[1] = bfin_read_SIC_ISR1() & bfin_read_SIC_IMASK1();

		}

#ifdef CONFIG_BF54x

# ifdef SIC_ISR2

		sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2();

# endif

		for (;; ivg++) {
@@ -1234,12 +1233,12 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs) 
		irq = IRQ_CORETMR;



	} else {

#if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561)

#if defined(SIC_ISR0) || defined(SICA_ISR0)

		unsigned long sic_status[3];



		sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();

		sic_status[1] = bfin_read_SIC_ISR1() & bfin_read_SIC_IMASK1();

#ifdef CONFIG_BF54x

# ifdef SIC_ISR2

		sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2();

# endif

		for (;; ivg++) {