2 files changed, 6 insertions, 77 deletions

diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index 7051e6c5edc3..253ed5682a6d 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -330,75 +330,13 @@ static void mpc52xx_psc_spi_cleanup(struct spi_device *spi)
 
 static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
 {
-        struct mpc52xx_cdm __iomem *cdm;
-        struct mpc52xx_gpio __iomem *gpio;
         struct mpc52xx_psc __iomem *psc = mps->psc;
-        u32 ul;
         u32 mclken_div;
         int ret = 0;
 
-#if defined(CONFIG_PPC_MERGE)
-        cdm = mpc52xx_find_and_map("mpc5200-cdm");
-        gpio = mpc52xx_find_and_map("mpc5200-gpio");
-#else
-        cdm = ioremap(MPC52xx_PA(MPC52xx_CDM_OFFSET), MPC52xx_CDM_SIZE);
-        gpio = ioremap(MPC52xx_PA(MPC52xx_GPIO_OFFSET), MPC52xx_GPIO_SIZE);
-#endif
-        if (!cdm || !gpio) {
-                printk(KERN_ERR "Error mapping CDM/GPIO\n");
-                ret = -EFAULT;
-                goto unmap_regs;
-        }
-
         /* default sysclk is 512MHz */
-        mclken_div = 0x8000 |
-                (((mps->sysclk ? mps->sysclk : 512000000) / MCLK) & 0x1FF);
-
-        switch (psc_id) {
-        case 1:
-                ul = in_be32(&gpio->port_config);
-                ul &= 0xFFFFFFF8;
-                ul |= 0x00000006;
-                out_be32(&gpio->port_config, ul);
-                out_be16(&cdm->mclken_div_psc1, mclken_div);
-                ul = in_be32(&cdm->clk_enables);
-                ul |= 0x00000020;
-                out_be32(&cdm->clk_enables, ul);
-                break;
-        case 2:
-                ul = in_be32(&gpio->port_config);
-                ul &= 0xFFFFFF8F;
-                ul |= 0x00000060;
-                out_be32(&gpio->port_config, ul);
-                out_be16(&cdm->mclken_div_psc2, mclken_div);
-                ul = in_be32(&cdm->clk_enables);
-                ul |= 0x00000040;
-                out_be32(&cdm->clk_enables, ul);
-                break;
-        case 3:
-                ul = in_be32(&gpio->port_config);
-                ul &= 0xFFFFF0FF;
-                ul |= 0x00000600;
-                out_be32(&gpio->port_config, ul);
-                out_be16(&cdm->mclken_div_psc3, mclken_div);
-                ul = in_be32(&cdm->clk_enables);
-                ul |= 0x00000080;
-                out_be32(&cdm->clk_enables, ul);
-                break;
-        case 6:
-                ul = in_be32(&gpio->port_config);
-                ul &= 0xFF8FFFFF;
-                ul |= 0x00700000;
-                out_be32(&gpio->port_config, ul);
-                out_be16(&cdm->mclken_div_psc6, mclken_div);
-                ul = in_be32(&cdm->clk_enables);
-                ul |= 0x00000010;
-                out_be32(&cdm->clk_enables, ul);
-                break;
-        default:
-                ret = -EINVAL;
-                goto unmap_regs;
-        }
+        mclken_div = (mps->sysclk ? mps->sysclk : 512000000) / MCLK;
+        mpc52xx_set_psc_clkdiv(psc_id, mclken_div);
 
         /* Reset the PSC into a known state */
         out_8(&psc->command, MPC52xx_PSC_RST_RX);
@@ -422,12 +360,6 @@ static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
 
         mps->bits_per_word = 8;
 
-unmap_regs:
-        if (cdm)
-                iounmap(cdm);
-        if (gpio)
-                iounmap(gpio);
-
         return ret;
 }
 
@@ -623,8 +555,9 @@ static int __exit mpc52xx_psc_spi_of_remove(struct of_device *op)
 }
 
 static struct of_device_id mpc52xx_psc_spi_of_match[] = {
-        { .type = "spi", .compatible = "mpc5200-psc-spi", },
-        {},
+        { .compatible = "fsl,mpc5200-psc-spi", },
+        { .compatible = "mpc5200-psc-spi", }, /* old */
+        {}
 };
 
 MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 4580b9cf625d..04f7cd9fc261 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -436,11 +436,7 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
         mpc83xx_spi->qe_mode = pdata->qe_mode;
         mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8;
         mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8;
-
-        if (mpc83xx_spi->qe_mode)
-                mpc83xx_spi->spibrg = pdata->sysclk / 2;
-        else
-                mpc83xx_spi->spibrg = pdata->sysclk;
+        mpc83xx_spi->spibrg = pdata->sysclk;
 
         mpc83xx_spi->rx_shift = 0;
         mpc83xx_spi->tx_shift = 0;