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

Commit 97055a91 authored Jul 03, 2008 by Linus Torvalds

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] cevt-txx9: Reset timer counter on initialization
  [MIPS] IP22: Fix crashes due to wrong L1_CACHE_BYTES
  [MIPS] IP32: Fix unexpected irq 71

parents ee3ece83 8986d2f5

arch/mips/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1006,7 +1006,7 @@ config BOOT_ELF32
	config MIPS_L1_CACHE_SHIFT		config MIPS_L1_CACHE_SHIFT
	int		int
	default "4" if MACH_DECSTATION		default "4" if MACH_DECSTATION
	default "7" if SGI_IP27 \|\| SGI_IP28 \|\| SNI_RM		default "7" if SGI_IP22 \|\| SGI_IP27 \|\| SGI_IP28 \|\| SNI_RM
	default "4" if PMC_MSP4200_EVAL		default "4" if PMC_MSP4200_EVAL
	default "5"		default "5"

arch/mips/kernel/cevt-txx9.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -161,6 +161,9 @@ void __init txx9_tmr_init(unsigned long baseaddr)
	struct txx9_tmr_reg __iomem *tmrptr;		struct txx9_tmr_reg __iomem *tmrptr;

	tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg));		tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg));
			/* Start once to make CounterResetEnable effective */
			__raw_writel(TXx9_TMTCR_CRE \| TXx9_TMTCR_TCE, &tmrptr->tcr);
			/* Stop and reset the counter */
	__raw_writel(TXx9_TMTCR_CRE, &tmrptr->tcr);		__raw_writel(TXx9_TMTCR_CRE, &tmrptr->tcr);
	__raw_writel(0, &tmrptr->tisr);		__raw_writel(0, &tmrptr->tisr);
	__raw_writel(0xffffffff, &tmrptr->cpra);		__raw_writel(0xffffffff, &tmrptr->cpra);

arch/mips/sgi-ip32/ip32-irq.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -425,6 +425,11 @@ static void ip32_irq0(void)
	BUILD_BUG_ON(MACEISA_SERIAL2_RDMAOR_IRQ - MACEISA_AUDIO_SW_IRQ != 31);		BUILD_BUG_ON(MACEISA_SERIAL2_RDMAOR_IRQ - MACEISA_AUDIO_SW_IRQ != 31);

	crime_int = crime->istat & crime_mask;		crime_int = crime->istat & crime_mask;

			/* crime sometime delivers spurious interrupts, ignore them */
			if (unlikely(crime_int == 0))
			return;

	irq = MACE_VID_IN1_IRQ + __ffs(crime_int);		irq = MACE_VID_IN1_IRQ + __ffs(crime_int);

	if (crime_int & CRIME_MACEISA_INT_MASK) {		if (crime_int & CRIME_MACEISA_INT_MASK) {