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] Remove remaining reference to ite_gpio.h from Kbuild
  [MIPS] PNX8550 fixups

5 files changed, 12 insertions, 18 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index bfab055ad7cc..8a49884bd5ec 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -440,13 +440,11 @@ config MIPS_XXS1500
 
 config PNX8550_V2PCI
         bool "Philips PNX8550 based Viper2-PCI board"
-        depends on BROKEN
         select PNX8550
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_JBS
         bool "Philips PNX8550 based JBS board"
-        depends on BROKEN
         select PNX8550
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c
index 099679a9dfb9..3c93512be1ec 100644
--- a/arch/mips/philips/pnx8550/common/int.c
+++ b/arch/mips/philips/pnx8550/common/int.c
@@ -90,7 +90,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
         unsigned int pending = read_c0_status() & read_c0_cause();
 
         if (pending & STATUSF_IP2)
-                do_IRQ(2, regs);
+                hw0_irqdispatch(2, regs);
         else if (pending & STATUSF_IP7) {
                 if (read_c0_config7() & 0x01c0)
                         timer_irqdispatch(7, regs);
diff --git a/arch/mips/philips/pnx8550/common/platform.c b/arch/mips/philips/pnx8550/common/platform.c
index 5436b4b97455..d43f56e2cd78 100644
--- a/arch/mips/philips/pnx8550/common/platform.c
+++ b/arch/mips/philips/pnx8550/common/platform.c
@@ -17,15 +17,13 @@
 #include <linux/init.h>
 #include <linux/resource.h>
 #include <linux/serial.h>
-#include <linux/serial_ip3106.h>
+#include <linux/serial_pnx8xxx.h>
 #include <linux/platform_device.h>
 
 #include <int.h>
 #include <usb.h>
 #include <uart.h>
 
-extern struct uart_ops ip3106_pops;
-
 static struct resource pnx8550_usb_ohci_resources[] = {
         [0] = {
                 .start          = PNX8550_USB_OHCI_OP_BASE,
@@ -63,31 +61,29 @@ static struct resource pnx8550_uart_resources[] = {
         },
 };
 
-struct ip3106_port ip3106_ports[] = {
+struct pnx8xxx_port pnx8xxx_ports[] = {
         [0] = {
                 .port   = {
-                        .type           = PORT_IP3106,
+                        .type           = PORT_PNX8XXX,
                         .iotype         = UPIO_MEM,
                         .membase        = (void __iomem *)PNX8550_UART_PORT0,
                         .mapbase        = PNX8550_UART_PORT0,
                         .irq            = PNX8550_UART_INT(0),
                         .uartclk        = 3692300,
                         .fifosize       = 16,
-                        .ops            = &ip3106_pops,
                         .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
         },
         [1] = {
                 .port   = {
-                        .type           = PORT_IP3106,
+                        .type           = PORT_PNX8XXX,
                         .iotype         = UPIO_MEM,
                         .membase        = (void __iomem *)PNX8550_UART_PORT1,
                         .mapbase        = PNX8550_UART_PORT1,
                         .irq            = PNX8550_UART_INT(1),
                         .uartclk        = 3692300,
                         .fifosize       = 16,
-                        .ops            = &ip3106_pops,
                         .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
@@ -111,12 +107,12 @@ static struct platform_device pnx8550_usb_ohci_device = {
 };
 
 static struct platform_device pnx8550_uart_device = {
-        .name           = "ip3106-uart",
+        .name           = "pnx8xxx-uart",
         .id             = -1,
         .dev = {
                 .dma_mask               = &uart_dmamask,
                 .coherent_dma_mask      = 0xffffffff,
-                .platform_data = ip3106_ports,
+                .platform_data = pnx8xxx_ports,
         },
         .num_resources  = ARRAY_SIZE(pnx8550_uart_resources),
         .resource       = pnx8550_uart_resources,
diff --git a/arch/mips/philips/pnx8550/common/prom.c b/arch/mips/philips/pnx8550/common/prom.c
index 70aac9759412..f8952c1359cd 100644
--- a/arch/mips/philips/pnx8550/common/prom.c
+++ b/arch/mips/philips/pnx8550/common/prom.c
@@ -13,7 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/string.h>
-#include <linux/serial_ip3106.h>
+#include <linux/serial_pnx8xxx.h>
 
 #include <asm/bootinfo.h>
 #include <uart.h>
@@ -126,7 +126,7 @@ void prom_putchar(char c)
 {
         if (pnx8550_console_port != -1) {
                 /* Wait until FIFO not full */
-                while( ((ip3106_fifo(UART_BASE, pnx8550_console_port) & IP3106_UART_FIFO_TXFIFO) >> 16) >= 16)
+                while( ((ip3106_fifo(UART_BASE, pnx8550_console_port) & PNX8XXX_UART_FIFO_TXFIFO) >> 16) >= 16)
                         ;
                 /* Send one char */
                 ip3106_fifo(UART_BASE, pnx8550_console_port) = c;
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c
index 36b0c8bc6c06..e62123ca9b64 100644
--- a/arch/mips/philips/pnx8550/common/setup.c
+++ b/arch/mips/philips/pnx8550/common/setup.c
@@ -24,7 +24,7 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/serial_ip3106.h>
+#include <linux/serial_pnx8xxx.h>
 #include <linux/pm.h>
 
 #include <asm/cpu.h>
@@ -56,7 +56,7 @@ extern char *prom_getcmdline(void);
 
 struct resource standard_io_resources[] = {
         {
-                .start  = .0x00,
+                .start  = 0x00,
                 .end    = 0x1f,
                 .name   = "dma1",
                 .flags  = IORESOURCE_BUSY
@@ -144,7 +144,7 @@ void __init plat_mem_setup(void)
                 /* We must initialize the UART (console) before prom_printf */
                 /* Set LCR to 8-bit and BAUD to 38400 (no 5)                */
                 ip3106_lcr(UART_BASE, pnx8550_console_port) =
-                        IP3106_UART_LCR_8BIT;
+                        PNX8XXX_UART_LCR_8BIT;
                 ip3106_baud(UART_BASE, pnx8550_console_port) = 5;
         }