10 files changed, 126 insertions, 72 deletions

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 6ebebde8454a..83584b6e1ba5 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -74,6 +74,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/ata_platform.h>
+#include <linux/mbus.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@@ -352,6 +353,9 @@ enum {
 #define IS_GEN_IIE(hpriv) ((hpriv)->hp_flags & MV_HP_GEN_IIE)
 #define HAS_PCI(host) (!((host)->ports[0]->flags & MV_FLAG_SOC))
 
+#define WINDOW_CTRL(i)          (0x20030 + ((i) << 4))
+#define WINDOW_BASE(i)          (0x20034 + ((i) << 4))
+
 enum {
         /* DMA boundary 0xffff is required by the s/g splitting
          * we need on /length/ in mv_fill-sg().
@@ -2897,6 +2901,27 @@ static int mv_create_dma_pools(struct mv_host_priv *hpriv, struct device *dev)
         return 0;
 }
 
+static void mv_conf_mbus_windows(struct mv_host_priv *hpriv,
+                                 struct mbus_dram_target_info *dram)
+{
+        int i;
+
+        for (i = 0; i < 4; i++) {
+                writel(0, hpriv->base + WINDOW_CTRL(i));
+                writel(0, hpriv->base + WINDOW_BASE(i));
+        }
+
+        for (i = 0; i < dram->num_cs; i++) {
+                struct mbus_dram_window *cs = dram->cs + i;
+
+                writel(((cs->size - 1) & 0xffff0000) |
+                        (cs->mbus_attr << 8) |
+                        (dram->mbus_dram_target_id << 4) | 1,
+                        hpriv->base + WINDOW_CTRL(i));
+                writel(cs->base, hpriv->base + WINDOW_BASE(i));
+        }
+}
+
 /**
  *      mv_platform_probe - handle a positive probe of an soc Marvell
  *      host
@@ -2951,6 +2976,12 @@ static int mv_platform_probe(struct platform_device *pdev)
                                    res->end - res->start + 1);
         hpriv->base -= MV_SATAHC0_REG_BASE;
 
+        /*
+         * (Re-)program MBUS remapping windows if we are asked to.
+         */
+        if (mv_platform_data->dram != NULL)
+                mv_conf_mbus_windows(hpriv, mv_platform_data->dram);
+
         rc = mv_create_dma_pools(hpriv, &pdev->dev);
         if (rc)
                 return rc;
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 5fa9c3c67e0c..b04c99580d0d 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -645,7 +645,7 @@ config I2C_PCA_ISA
 
 config I2C_MV64XXX
         tristate "Marvell mv64xxx I2C Controller"
-        depends on (MV64X60 || ARCH_ORION) && EXPERIMENTAL
+        depends on (MV64X60 || PLAT_ORION) && EXPERIMENTAL
         help
           If you say yes to this option, support will be included for the
           built-in I2C interface on the Marvell 64xxx line of host bridges.
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 4a3c6759492b..959fb86cda01 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -314,7 +314,7 @@ config MTD_ALAUDA
 
 config MTD_NAND_ORION
         tristate "NAND Flash support for Marvell Orion SoC"
-        depends on ARCH_ORION && MTD_NAND
+        depends on PLAT_ORION && MTD_NAND
         help
           This enables the NAND flash controller on Orion machines.
 
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 9162cca0182b..ec5ad28b237e 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -18,8 +18,8 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
-#include <asm/arch/platform.h>
 #include <asm/arch/hardware.h>
+#include <asm/plat-orion/orion_nand.h>
 
 #ifdef CONFIG_MTD_CMDLINE_PARTS
 static const char *part_probes[] = { "cmdlinepart", NULL };
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fe7b5ec09708..124d29f5fa0c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2415,7 +2415,7 @@ config UGETH_TX_ON_DEMAND
 
 config MV643XX_ETH
         tristate "Marvell Discovery (643XX) and Orion ethernet support"
-        depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || ARCH_ORION
+        depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
         select MII
         help
           This driver supports the gigabit ethernet MACs in the
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 0ae0d83e5d22..978e20a1791b 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -1043,7 +1043,9 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
         } else if (machine_is_csb337()) {
                 /* mix link activity status into LED2 link state */
                 write_phy(phy_address, MII_LEDCTRL_REG, 0x0d22);
-        }
+        } else if (machine_is_ecbat91())
+                write_phy(phy_address, MII_LEDCTRL_REG, 0x156A);
+
         disable_mdi();
         spin_unlock_irq(&lp->lock);
 
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 125e7b7f34ff..f7cb8e0758b4 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -486,12 +486,7 @@ void __ref pci_bus_size_bridges(struct pci_bus *bus)
                 break;
 
         case PCI_CLASS_BRIDGE_PCI:
-                /* don't size subtractive decoding (transparent)
-                 * PCI-to-PCI bridges */
-                if (bus->self->transparent)
-                        break;
                 pci_bridge_check_ranges(bus);
-                /* fall through */
         default:
                 pbus_size_io(bus);
                 /* If the bridge supports prefetchable range, size it
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 56af1f566a4c..cf29a2d0ba4c 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -166,15 +166,6 @@
 #define SERIAL_IMX_MAJOR        204
 #define MINOR_START             41
 
-#define NR_PORTS                2
-
-#define IMX_ISR_PASS_LIMIT      256
-
-/*
- * This is the size of our serial port register set.
- */
-#define UART_PORT_SIZE  0x100
-
 /*
  * This determines how often we check the modem status signals
  * for any change.  They generally aren't connected to an IRQ
@@ -358,66 +349,60 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
         struct tty_struct *tty = sport->port.info->tty;
         unsigned long flags, temp;
 
-        rx = readl(sport->port.membase + URXD0);
         spin_lock_irqsave(&sport->port.lock,flags);
 
-        do {
+        while (readl(sport->port.membase + USR2) & USR2_RDR) {
                 flg = TTY_NORMAL;
                 sport->port.icount.rx++;
 
+                rx = readl(sport->port.membase + URXD0);
+
                 temp = readl(sport->port.membase + USR2);
-                if( temp & USR2_BRCD ) {
+                if (temp & USR2_BRCD) {
                         writel(temp | USR2_BRCD, sport->port.membase + USR2);
-                        if(uart_handle_break(&sport->port))
-                                goto ignore_char;
+                        if (uart_handle_break(&sport->port))
+                                continue;
                 }
 
                 if (uart_handle_sysrq_char
                             (&sport->port, (unsigned char)rx))
-                        goto ignore_char;
+                        continue;
+
+                if (rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) ) {
+                        if (rx & URXD_PRERR)
+                                sport->port.icount.parity++;
+                        else if (rx & URXD_FRMERR)
+                                sport->port.icount.frame++;
+                        if (rx & URXD_OVRRUN)
+                                sport->port.icount.overrun++;
+
+                        if (rx & sport->port.ignore_status_mask) {
+                                if (++ignored > 100)
+                                        goto out;
+                                continue;
+                        }
+
+                        rx &= sport->port.read_status_mask;
+
+                        if (rx & URXD_PRERR)
+                                flg = TTY_PARITY;
+                        else if (rx & URXD_FRMERR)
+                                flg = TTY_FRAME;
+                        if (rx & URXD_OVRRUN)
+                                flg = TTY_OVERRUN;
 
-                if( rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) )
-                        goto handle_error;
+#ifdef SUPPORT_SYSRQ
+                        sport->port.sysrq = 0;
+#endif
+                }
 
-        error_return:
                 tty_insert_flip_char(tty, rx, flg);
-
-        ignore_char:
-                rx = readl(sport->port.membase + URXD0);
-        } while(rx & URXD_CHARRDY);
+        }
 
 out:
         spin_unlock_irqrestore(&sport->port.lock,flags);
         tty_flip_buffer_push(tty);
         return IRQ_HANDLED;
-
-handle_error:
-        if (rx & URXD_PRERR)
-                sport->port.icount.parity++;
-        else if (rx & URXD_FRMERR)
-                sport->port.icount.frame++;
-        if (rx & URXD_OVRRUN)
-                sport->port.icount.overrun++;
-
-        if (rx & sport->port.ignore_status_mask) {
-                if (++ignored > 100)
-                        goto out;
-                goto ignore_char;
-        }
-
-        rx &= sport->port.read_status_mask;
-
-        if (rx & URXD_PRERR)
-                flg = TTY_PARITY;
-        else if (rx & URXD_FRMERR)
-                flg = TTY_FRAME;
-        if (rx & URXD_OVRRUN)
-                flg = TTY_OVERRUN;
-
-#ifdef SUPPORT_SYSRQ
-        sport->port.sysrq = 0;
-#endif
-        goto error_return;
 }
 
 /*
@@ -546,7 +531,7 @@ static int imx_startup(struct uart_port *port)
         writel(USR1_RTSD, sport->port.membase + USR1);
 
         temp = readl(sport->port.membase + UCR1);
-        temp |= (UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN);
+        temp |= UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN;
         writel(temp, sport->port.membase + UCR1);
 
         temp = readl(sport->port.membase + UCR2);
@@ -731,9 +716,11 @@ static const char *imx_type(struct uart_port *port)
  */
 static void imx_release_port(struct uart_port *port)
 {
-        struct imx_port *sport = (struct imx_port *)port;
+        struct platform_device *pdev = to_platform_device(port->dev);
+        struct resource *mmres;
 
-        release_mem_region(sport->port.mapbase, UART_PORT_SIZE);
+        mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(mmres->start, mmres->end - mmres->start + 1);
 }
 
 /*
@@ -741,10 +728,18 @@ static void imx_release_port(struct uart_port *port)
  */
 static int imx_request_port(struct uart_port *port)
 {
-        struct imx_port *sport = (struct imx_port *)port;
+        struct platform_device *pdev = to_platform_device(port->dev);
+        struct resource *mmres;
+        void *ret;
+
+        mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!mmres)
+                return -ENODEV;
+
+        ret = request_mem_region(mmres->start, mmres->end - mmres->start + 1,
+                        "imx-uart");
 
-        return request_mem_region(sport->port.mapbase, UART_PORT_SIZE,
-                        "imx-uart") != NULL ? 0 : -EBUSY;
+        return  ret ? 0 : -EBUSY;
 }
 
 /*
@@ -815,7 +810,7 @@ static struct imx_port imx_ports[] = {
                 .type           = PORT_IMX,
                 .iotype         = UPIO_MEM,
                 .membase        = (void *)IMX_UART1_BASE,
-                .mapbase        = IMX_UART1_BASE, /* FIXME */
+                .mapbase        = 0x00206000,
                 .irq            = UART1_MINT_RX,
                 .uartclk        = 16000000,
                 .fifosize       = 32,
@@ -831,7 +826,7 @@ static struct imx_port imx_ports[] = {
                 .type           = PORT_IMX,
                 .iotype         = UPIO_MEM,
                 .membase        = (void *)IMX_UART2_BASE,
-                .mapbase        = IMX_UART2_BASE, /* FIXME */
+                .mapbase        = 0x00207000,
                 .irq            = UART2_MINT_RX,
                 .uartclk        = 16000000,
                 .fifosize       = 32,
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 46ee7f4c0912..85074cb36f38 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1033,7 +1033,7 @@ MODULE_LICENSE ("GPL");
 #define OF_PLATFORM_DRIVER      ehci_hcd_ppc_of_driver
 #endif
 
-#ifdef CONFIG_ARCH_ORION
+#ifdef CONFIG_PLAT_ORION
 #include "ehci-orion.c"
 #define PLATFORM_DRIVER         ehci_orion_driver
 #endif
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index e129981f139f..d187d0313742 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -11,15 +11,18 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <asm/arch/orion.h>
+#include <linux/mbus.h>
+#include <asm/plat-orion/ehci-orion.h>
 
 #define rdl(off)        __raw_readl(hcd->regs + (off))
 #define wrl(off, val)   __raw_writel((val), hcd->regs + (off))
 
-#define USB_CAUSE               0x310
-#define USB_MASK                0x314
 #define USB_CMD                 0x140
 #define USB_MODE                0x1a8
+#define USB_CAUSE               0x310
+#define USB_MASK                0x314
+#define USB_WINDOW_CTRL(i)      (0x320 + ((i) << 4))
+#define USB_WINDOW_BASE(i)      (0x324 + ((i) << 4))
 #define USB_IPG                 0x360
 #define USB_PHY_PWR_CTRL        0x400
 #define USB_PHY_TX_CTRL         0x420
@@ -162,8 +165,30 @@ static const struct hc_driver ehci_orion_hc_driver = {
         .bus_resume = ehci_bus_resume,
 };
 
+static void __init
+ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
+                                struct mbus_dram_target_info *dram)
+{
+        int i;
+
+        for (i = 0; i < 4; i++) {
+                wrl(USB_WINDOW_CTRL(i), 0);
+                wrl(USB_WINDOW_BASE(i), 0);
+        }
+
+        for (i = 0; i < dram->num_cs; i++) {
+                struct mbus_dram_window *cs = dram->cs + i;
+
+                wrl(USB_WINDOW_CTRL(i), ((cs->size - 1) & 0xffff0000) |
+                                        (cs->mbus_attr << 8) |
+                                        (dram->mbus_dram_target_id << 4) | 1);
+                wrl(USB_WINDOW_BASE(i), cs->base);
+        }
+}
+
 static int __init ehci_orion_drv_probe(struct platform_device *pdev)
 {
+        struct orion_ehci_data *pd = pdev->dev.platform_data;
         struct resource *res;
         struct usb_hcd *hcd;
         struct ehci_hcd *ehci;
@@ -227,6 +252,12 @@ static int __init ehci_orion_drv_probe(struct platform_device *pdev)
         ehci->sbrn = 0x20;
 
         /*
+         * (Re-)program MBUS remapping windows if we are asked to.
+         */
+        if (pd != NULL && pd->dram != NULL)
+                ehci_orion_conf_mbus_windows(hcd, pd->dram);
+
+        /*
          * setup Orion USB controller
          */
         orion_usb_setup(hcd);