---

yaml
---
r: 73101
b: refs/heads/master
c: 5d1a536
h: refs/heads/master
i:
  73099: 282589b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 160acc2e899f26356bde92bc257253b7ca78f0c3
+refs/heads/master: 5d1a536621403b442eef60ddd35e6b7a46fb04b7

trunk/MAINTAINERS

@@ -398,12 +398,6 @@ P:	Arnaldo Carvalho de Melo
 M:	acme@ghostprotocols.net
 S:	Maintained
 
-APPLETOUCH TOUCHPAD DRIVER
-P:	Johannes Berg
-M:	johannes@sipsolutions.net
-L:	linux-input@vger.kernel.org
-S:	Maintained
-
 ARC FRAMEBUFFER DRIVER
 P:	Jaya Kumar
 M:	jayalk@intworks.biz
@@ -1707,7 +1701,7 @@ S:	Maintained
 HID CORE LAYER
 P:	Jiri Kosina
 M:	jkosina@suse.cz
-L:	linux-input@vger.kernel.org
+L:	linux-input@atrey.karlin.mff.cuni.cz
 T:	git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git
 S:	Maintained
 
@@ -1933,7 +1927,8 @@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
 P:	Dmitry Torokhov
 M:	dmitry.torokhov@gmail.com
 M:	dtor@mail.ru
-L:	linux-input@vger.kernel.org
+L:	linux-input@atrey.karlin.mff.cuni.cz
+L:	linux-joystick@atrey.karlin.mff.cuni.cz
 T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
 S:	Maintained
 

trunk/Makefile

@@ -168,8 +168,7 @@ export srctree objtree VPATH TOPDIR
 SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
 				  -e s/arm.*/arm/ -e s/sa110/arm/ \
 				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
-				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-				  -e s/sh[234].*/sh/ )
+				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
 
 # Cross compiling and selecting different set of gcc/bin-utils
 # ---------------------------------------------------------------------------

trunk/arch/mips/Kconfig

@@ -546,7 +546,6 @@ config SIBYTE_BIGSUR
 	select SWAP_IO_SPACE
 	select SYS_HAS_CPU_SB1
 	select SYS_SUPPORTS_BIG_ENDIAN
-	select SYS_SUPPORTS_HIGHMEM
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SNI_RM
@@ -734,27 +733,15 @@ config ARCH_MAY_HAVE_PC_FDC
 config BOOT_RAW
 	bool
 
-config CEVT_BCM1480
-	bool
-
 config CEVT_GT641XX
 	bool
 
 config CEVT_R4K
 	bool
 
-config CEVT_SB1250
-	bool
-
 config CEVT_TXX9
 	bool
 
-config CSRC_BCM1480
-	bool
-
-config CSRC_SB1250
-	bool
-
 config CFE
 	bool
 

trunk/arch/mips/au1000/mtx-1/Makefile

@@ -9,5 +9,3 @@
 
 lib-y := init.o board_setup.o irqmap.o
 obj-y := platform.o
-
-EXTRA_CFLAGS += -Werror

trunk/arch/mips/au1000/mtx-1/platform.c

@@ -34,6 +34,15 @@ static struct resource mtx1_wdt_res[] = {
 	}
 };
 
+static struct resource mtx1_sys_btn[] = {
+	[0] = {
+		.start	= 7,
+		.end	= 7,
+		.name	= "mtx1-sys-btn-gpio",
+		.flags	= IORESOURCE_IRQ,
+	}
+};
+
 static struct platform_device mtx1_wdt = {
 	.name = "mtx1-wdt",
 	.id = 0,

trunk/arch/mips/au1000/pb1200/Makefile

@@ -3,5 +3,3 @@
 #
 
 lib-y := init.o board_setup.o irqmap.o
-
-EXTRA_CFLAGS += -Werror

trunk/arch/mips/au1000/pb1200/board_setup.c

@@ -68,11 +68,9 @@ void board_reset(void)
 void __init board_setup(void)
 {
 	char *argptr = NULL;
-
-#if 0
-	{
 	u32 pin_func;
 
+#if 0
 	/* Enable PSC1 SYNC for AC97.  Normaly done in audio driver,
 	 * but it is board specific code, so put it here.
 	 */
@@ -83,13 +81,11 @@ void __init board_setup(void)
 
 	au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
 	au_sync();
-	}
 #endif
 
 #if defined(CONFIG_I2C_AU1550)
 	{
 	u32 freq0, clksrc;
-	u32 pin_func;
 
 	/* Select SMBUS in CPLD */
 	bcsr->resets &= ~(BCSR_RESETS_PCS0MUX);

trunk/arch/mips/au1000/pb1200/irqmap.c

@@ -94,41 +94,51 @@ inline void pb1200_disable_irq(unsigned int irq_nr)
 	bcsr->intclr = 1<<(irq_nr - PB1200_INT_BEGIN);
 }
 
-static unsigned int pb1200_setup_cascade(void)
+static unsigned int pb1200_startup_irq( unsigned int irq_nr )
 {
-	int err;
-
-	err = request_irq(AU1000_GPIO_7, &pb1200_cascade_handler,
-			  0, "Pb1200 Cascade", &pb1200_cascade_handler);
-	if (err)
-		return err;
-
-	return 0;
-}
-
-static unsigned int pb1200_startup_irq(unsigned int irq)
-{
-	if (++pb1200_cascade_en == 1) {
-		int res;
-
-		res = pb1200_setup_cascade();
-		if (res)
-			return res;
+	if (++pb1200_cascade_en == 1)
+	{
+		request_irq(AU1000_GPIO_7, &pb1200_cascade_handler,
+			0, "Pb1200 Cascade", (void *)&pb1200_cascade_handler );
+#ifdef CONFIG_MIPS_PB1200
+    /* We have a problem with CPLD rev3. Enable a workaround */
+	if( ((bcsr->whoami & BCSR_WHOAMI_CPLD)>>4) <= 3)
+	{
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		printk("Pb1200 must be at CPLD rev4. Please have Pb1200\n");
+		printk("updated to latest revision. This software will not\n");
+		printk("work on anything less than CPLD rev4\n");
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		printk("\nWARNING!!!\n");
+		while(1);
 	}
-
-	pb1200_enable_irq(irq);
-
+#endif
+	}
+	pb1200_enable_irq(irq_nr);
 	return 0;
 }
 
-static void pb1200_shutdown_irq(unsigned int irq)
+static void pb1200_shutdown_irq( unsigned int irq_nr )
 {
-	pb1200_disable_irq(irq);
+	pb1200_disable_irq(irq_nr);
 	if (--pb1200_cascade_en == 0)
-		free_irq(AU1000_GPIO_7, &pb1200_cascade_handler);
+	{
+		free_irq(AU1000_GPIO_7, &pb1200_cascade_handler );
+	}
+	return;
 }
 
-static struct irq_chip external_irq_type = {
+static struct irq_chip external_irq_type =
+{
 #ifdef CONFIG_MIPS_PB1200
 	.name = "Pb1200 Ext",
 #endif
@@ -145,38 +155,16 @@ static struct irq_chip external_irq_type = {
 
 void _board_init_irq(void)
 {
-	unsigned int irq;
-
-#ifdef CONFIG_MIPS_PB1200
-	/* We have a problem with CPLD rev3. Enable a workaround */
-	if (((bcsr->whoami & BCSR_WHOAMI_CPLD) >> 4) <= 3) {
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		printk("Pb1200 must be at CPLD rev4. Please have Pb1200\n");
-		printk("updated to latest revision. This software will not\n");
-		printk("work on anything less than CPLD rev4\n");
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		printk("\nWARNING!!!\n");
-		panic("Game over.  Your score is 0.");
-	}
-#endif
+	int irq_nr;
 
-	for (irq = PB1200_INT_BEGIN; irq <= PB1200_INT_END; irq++) {
-		set_irq_chip_and_handler(irq, &external_irq_type,
+	for (irq_nr = PB1200_INT_BEGIN; irq_nr <= PB1200_INT_END; irq_nr++)
+	{
+		set_irq_chip_and_handler(irq_nr, &external_irq_type,
 					 handle_level_irq);
-		pb1200_disable_irq(irq);
+		pb1200_disable_irq(irq_nr);
 	}
 
-	/*
-	 * GPIO_7 can not be hooked here, so it is hooked upon first
-	 * request of any source attached to the cascade
-	 */
+	/* GPIO_7 can not be hooked here, so it is hooked upon first
+	request of any source attached to the cascade */
 }
+

trunk/arch/mips/basler/excite/excite_setup.c

@@ -77,7 +77,7 @@ int titan_irqflags;
 void __init plat_time_init(void)
 {
 	const u32 modebit5 = ocd_readl(0x00e4);
-	unsigned int mult = ((modebit5 >> 11) & 0x1f) + 2;
+	unsigned int mult = ((modebit5 >> 11) & 0x1f) + 2,
 	unsigned int div = ((modebit5 >> 16) & 0x1f) + 2;
 
 	if (div == 33)

trunk/arch/mips/jazz/irq.c

@@ -97,10 +97,9 @@ asmlinkage void plat_irq_dispatch(void)
 	if (pending & IE_IRQ4) {
 		r4030_read_reg32(JAZZ_TIMER_REGISTER);
 		do_IRQ(JAZZ_TIMER_IRQ);
-	} else if (pending & IE_IRQ2) {
-		irq = *(volatile u8 *)JAZZ_EISA_IRQ_ACK;
-		do_IRQ(irq);
-	} else if (pending & IE_IRQ1) {
+	} else if (pending & IE_IRQ2)
+		do_IRQ(r4030_read_reg32(JAZZ_EISA_IRQ_ACK));
+	else if (pending & IE_IRQ1) {
 		irq = *(volatile u8 *)JAZZ_IO_IRQ_SOURCE >> 2;
 		if (likely(irq > 0))
 			do_IRQ(irq + JAZZ_IRQ_START - 1);
@@ -118,45 +117,41 @@ static void r4030_set_mode(enum clock_event_mode mode,
 struct clock_event_device r4030_clockevent = {
 	.name		= "r4030",
 	.features	= CLOCK_EVT_FEAT_PERIODIC,
-	.rating		= 300,
+	.rating		= 100,
 	.irq		= JAZZ_TIMER_IRQ,
+	.cpumask	= CPU_MASK_CPU0,
 	.set_mode	= r4030_set_mode,
 };
 
 static irqreturn_t r4030_timer_interrupt(int irq, void *dev_id)
 {
-	struct clock_event_device *cd = dev_id;
+	r4030_clockevent.event_handler(&r4030_clockevent);
 
-	cd->event_handler(cd);
 	return IRQ_HANDLED;
 }
 
 static struct irqaction r4030_timer_irqaction = {
 	.handler	= r4030_timer_interrupt,
 	.flags		= IRQF_DISABLED,
 	.mask		= CPU_MASK_CPU0,
-	.name		= "R4030 timer",
+	.name		= "timer",
 };
 
 void __init plat_time_init(void)
 {
-	struct clock_event_device *cd = &r4030_clockevent;
-	struct irqaction *action = &r4030_timer_irqaction;
-	unsigned int cpu = smp_processor_id();
+	struct irqaction *irq = &r4030_timer_irqaction;
 
 	BUG_ON(HZ != 100);
 
-	cd->cpumask             = cpumask_of_cpu(cpu);
-	clockevents_register_device(cd);
-	action->dev_id = cd;
-	setup_irq(JAZZ_TIMER_IRQ, action);
-
 	/*
 	 * Set clock to 100Hz.
 	 *
 	 * The R4030 timer receives an input clock of 1kHz which is divieded by
 	 * a programmable 4-bit divider.  This makes it fairly inflexible.
 	 */
 	r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9);
+	setup_irq(JAZZ_TIMER_IRQ, irq);
+
+	clockevents_register_device(&r4030_clockevent);
 	setup_pit_timer();
 }

trunk/arch/mips/kernel/Makefile

@@ -8,13 +8,9 @@ obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \
 		   ptrace.o reset.o semaphore.o setup.o signal.o syscall.o \
 		   time.o topology.o traps.o unaligned.o
 
-obj-$(CONFIG_CEVT_BCM1480)	+= cevt-bcm1480.o
 obj-$(CONFIG_CEVT_R4K)		+= cevt-r4k.o
 obj-$(CONFIG_CEVT_GT641XX)	+= cevt-gt641xx.o
-obj-$(CONFIG_CEVT_SB1250)	+= cevt-sb1250.o
 obj-$(CONFIG_CEVT_TXX9)		+= cevt-txx9.o
-obj-$(CONFIG_CSRC_BCM1480)	+= csrc-bcm1480.o
-obj-$(CONFIG_CSRC_SB1250)	+= csrc-sb1250.o
 
 binfmt_irix-objs	:= irixelf.o irixinv.o irixioctl.o irixsig.o	\
 			   irix5sys.o sysirix.o