8 files changed, 99 insertions, 220 deletions

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index cf815b22b9f..7748a3a426d 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -12,6 +12,7 @@ config MPC8540_ADS
 config MPC8560_ADS
         bool "Freescale MPC8560 ADS"
         select DEFAULT_UIMAGE
+        select PPC_CPM_NEW_BINDING
         help
           This option enables support for the MPC 8560 ADS board
 
diff --git a/arch/powerpc/platforms/85xx/mpc8540_ads.h b/arch/powerpc/platforms/85xx/mpc8540_ads.h
deleted file mode 100644
index da82f4c0fda..00000000000
--- a/arch/powerpc/platforms/85xx/mpc8540_ads.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/powerpc/platforms/85xx/mpc8540_ads.h
- *
- * MPC8540ADS board definitions
- *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
- *
- * Copyright 2004 Freescale Semiconductor Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC8540ADS_H__
-#define __MACH_MPC8540ADS_H__
-
-#include <linux/initrd.h>
-
-#define BOARD_CCSRBAR           ((uint)0xe0000000)
-#define BCSR_ADDR               ((uint)0xf8000000)
-#define BCSR_SIZE               ((uint)(32 * 1024))
-
-/* PCI interrupt controller */
-#define PIRQA           MPC85xx_IRQ_EXT1
-#define PIRQB           MPC85xx_IRQ_EXT2
-#define PIRQC           MPC85xx_IRQ_EXT3
-#define PIRQD           MPC85xx_IRQ_EXT4
-
-/* Offset of CPM register space */
-#define CPM_MAP_ADDR    (CCSRBAR + MPC85xx_CPM_OFFSET)
-
-#endif                          /* __MACH_MPC8540ADS_H__ */
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 378a244b3ba..bccdc25f83a 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -17,13 +17,12 @@
 #include <linux/kdev_t.h>
 #include <linux/delay.h>
 #include <linux/seq_file.h>
+#include <linux/of_platform.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc85xx.h>
-#include <asm/prom.h>
 #include <asm/mpic.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
@@ -32,10 +31,8 @@
 #include <sysdev/fsl_pci.h>
 
 #ifdef CONFIG_CPM2
-#include <linux/fs_enet_pd.h>
 #include <asm/cpm2.h>
 #include <sysdev/cpm2_pic.h>
-#include <asm/fs_pd.h>
 #endif
 
 #ifdef CONFIG_PCI
@@ -95,10 +92,10 @@ static void __init mpc85xx_ads_pic_init(void)
 
 #ifdef CONFIG_CPM2
         /* Setup CPM2 PIC */
-        np = of_find_node_by_type(NULL, "cpm-pic");
+        np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
         if (np == NULL) {
-                printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
-                return;
+                printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
+                return;
         }
         irq = irq_of_parse_and_map(np, 0);
 
@@ -111,81 +108,75 @@ static void __init mpc85xx_ads_pic_init(void)
  * Setup the architecture
  */
 #ifdef CONFIG_CPM2
-void init_fcc_ioports(struct fs_platform_info *fpi)
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static struct cpm_pin mpc8560_ads_pins[] = {
+        /* SCC1 */
+        {3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* SCC2 */
+        {3, 26, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* FCC2 */
+        {1, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 20, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 22, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 25, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 26, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 27, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {1, 30, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {2, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK14 */
+        {2, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK13 */
+
+        /* FCC3 */
+        {1, 4, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 6, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 7, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 10, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 11, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 12, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 13, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 14, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 15, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 16, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK16 */
+        {2, 17, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK15 */
+};
+
+static void __init init_ioports(void)
 {
-        struct io_port *io = cpm2_map(im_ioport);
-        int fcc_no = fs_get_fcc_index(fpi->fs_no);
-        int target;
-        u32 tempval;
-
-        switch(fcc_no) {
-        case 1:
-                tempval = in_be32(&io->iop_pdirb);
-                tempval &= ~PB2_DIRB0;
-                tempval |= PB2_DIRB1;
-                out_be32(&io->iop_pdirb, tempval);
-
-                tempval = in_be32(&io->iop_psorb);
-                tempval &= ~PB2_PSORB0;
-                tempval |= PB2_PSORB1;
-                out_be32(&io->iop_psorb, tempval);
-
-                tempval = in_be32(&io->iop_pparb);
-                tempval |= (PB2_DIRB0 | PB2_DIRB1);
-                out_be32(&io->iop_pparb, tempval);
-
-                target = CPM_CLK_FCC2;
-                break;
-        case 2:
-                tempval = in_be32(&io->iop_pdirb);
-                tempval &= ~PB3_DIRB0;
-                tempval |= PB3_DIRB1;
-                out_be32(&io->iop_pdirb, tempval);
-
-                tempval = in_be32(&io->iop_psorb);
-                tempval &= ~PB3_PSORB0;
-                tempval |= PB3_PSORB1;
-                out_be32(&io->iop_psorb, tempval);
-
-                tempval = in_be32(&io->iop_pparb);
-                tempval |= (PB3_DIRB0 | PB3_DIRB1);
-                out_be32(&io->iop_pparb, tempval);
-
-                tempval = in_be32(&io->iop_pdirc);
-                tempval |= PC3_DIRC1;
-                out_be32(&io->iop_pdirc, tempval);
-
-                tempval = in_be32(&io->iop_pparc);
-                tempval |= PC3_DIRC1;
-                out_be32(&io->iop_pparc, tempval);
-
-                target = CPM_CLK_FCC3;
-                break;
-        default:
-                printk(KERN_ERR "init_fcc_ioports: invalid FCC number\n");
-                return;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(mpc8560_ads_pins); i++) {
+                struct cpm_pin *pin = &mpc8560_ads_pins[i];
+                cpm2_set_pin(pin->port, pin->pin, pin->flags);
         }
 
-        /* Port C has clocks......  */
-        tempval = in_be32(&io->iop_psorc);
-        tempval &= ~(PC_CLK(fpi->clk_rx - 8) | PC_CLK(fpi->clk_tx - 8));
-        out_be32(&io->iop_psorc, tempval);
-
-        tempval = in_be32(&io->iop_pdirc);
-        tempval &= ~(PC_CLK(fpi->clk_rx - 8) | PC_CLK(fpi->clk_tx - 8));
-        out_be32(&io->iop_pdirc, tempval);
-        tempval = in_be32(&io->iop_pparc);
-        tempval |= (PC_CLK(fpi->clk_rx - 8) | PC_CLK(fpi->clk_tx - 8));
-        out_be32(&io->iop_pparc, tempval);
-
-        cpm2_unmap(io);
-
-        /* Configure Serial Interface clock routing.
-         * First,  clear FCC bits to zero,
-         * then set the ones we want.
-         */
-        cpm2_clk_setup(target, fpi->clk_rx, CPM_CLK_RX);
-        cpm2_clk_setup(target, fpi->clk_tx, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK13, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK14, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK15, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK16, CPM_CLK_TX);
 }
 #endif
 
@@ -200,6 +191,7 @@ static void __init mpc85xx_ads_setup_arch(void)
 
 #ifdef CONFIG_CPM2
         cpm2_reset();
+        init_ioports();
 #endif
 
 #ifdef CONFIG_PCI
@@ -231,6 +223,24 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
         seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .name = "soc", },
+        { .type = "soc", },
+        { .name = "cpm", },
+        { .name = "localbus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        if (!machine_is(mpc85xx_ads))
+                return 0;
+
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        return 0;
+}
+device_initcall(declare_of_platform_devices);
+
 /*
  * Called very early, device-tree isn't unflattened
  */
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.h b/arch/powerpc/platforms/85xx/mpc85xx_ads.h
deleted file mode 100644
index 46c3532992a..00000000000
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * MPC85xx ADS board definitions
- *
- * Maintainer: Kumar Gala <galak@kernel.crashing.org>
- *
- * Copyright 2004 Freescale Semiconductor Inc.
- *
- * 2006 (c) MontaVista Software, Inc.
- * Vitaly Bordug <vbordug@ru.mvista.com>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC85XXADS_H
-#define __MACH_MPC85XXADS_H
-
-#include <linux/initrd.h>
-#include <sysdev/fsl_soc.h>
-
-#define BCSR_ADDR               ((uint)0xf8000000)
-#define BCSR_SIZE               ((uint)(32 * 1024))
-
-#ifdef CONFIG_CPM2
-
-#define MPC85xx_CPM_OFFSET      (0x80000)
-
-#define CPM_MAP_ADDR            (get_immrbase() + MPC85xx_CPM_OFFSET)
-#define CPM_IRQ_OFFSET          60
-
-#define SIU_INT_SMC1            ((uint)0x04+CPM_IRQ_OFFSET)
-#define SIU_INT_SMC2            ((uint)0x05+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC1            ((uint)0x28+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC2            ((uint)0x29+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC3            ((uint)0x2a+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC4            ((uint)0x2b+CPM_IRQ_OFFSET)
-
-/* FCC1 Clock Source Configuration.  These can be
- * redefined in the board specific file.
- *    Can only choose from CLK9-12 */
-#define F1_RXCLK       12
-#define F1_TXCLK       11
-
-/* FCC2 Clock Source Configuration.  These can be
- * redefined in the board specific file.
- *    Can only choose from CLK13-16 */
-#define F2_RXCLK       13
-#define F2_TXCLK       14
-
-/* FCC3 Clock Source Configuration.  These can be
- * redefined in the board specific file.
- *    Can only choose from CLK13-16 */
-#define F3_RXCLK       15
-#define F3_TXCLK       16
-
-#endif  /* CONFIG_CPM2 */
-#endif  /* __MACH_MPC85XXADS_H */
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index afe5868cd97..4d063eec621 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -36,7 +36,6 @@
 #include <asm/machdep.h>
 #include <asm/ipic.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc85xx.h>
 #include <asm/irq.h>
 #include <mm/mmu_decl.h>
 #include <asm/prom.h>
@@ -47,6 +46,15 @@
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
 
+/* CADMUS info */
+/* xxx - galak, move into device tree */
+#define CADMUS_BASE (0xf8004000)
+#define CADMUS_SIZE (256)
+#define CM_VER  (0)
+#define CM_CSR  (1)
+#define CM_RST  (2)
+
+
 static int cds_pci_slot = 2;
 static volatile u8 *cadmus;
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.h b/arch/powerpc/platforms/85xx/mpc85xx_cds.h
deleted file mode 100644
index b251c9feb3d..00000000000
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * arch/powerpc/platforms/85xx/mpc85xx_cds.h
- *
- * MPC85xx CDS board definitions
- *
- * Maintainer: Kumar Gala <galak@kernel.crashing.org>
- *
- * Copyright 2004 Freescale Semiconductor, Inc
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC85XX_CDS_H__
-#define __MACH_MPC85XX_CDS_H__
-
-/* CADMUS info */
-#define CADMUS_BASE (0xf8004000)
-#define CADMUS_SIZE (256)
-#define CM_VER  (0)
-#define CM_CSR  (1)
-#define CM_RST  (2)
-
-/* CDS NVRAM/RTC */
-#define CDS_RTC_ADDR    (0xf8000000)
-#define CDS_RTC_SIZE    (8 * 1024)
-
-/* PCI interrupt controller */
-#define PIRQ0A                  MPC85xx_IRQ_EXT0
-#define PIRQ0B                  MPC85xx_IRQ_EXT1
-#define PIRQ0C                  MPC85xx_IRQ_EXT2
-#define PIRQ0D                  MPC85xx_IRQ_EXT3
-#define PIRQ1A                  MPC85xx_IRQ_EXT11
-
-#define NR_8259_INTS            16
-#define CPM_IRQ_OFFSET          NR_8259_INTS
-
-#define MPC85xx_OPENPIC_IRQ_OFFSET      80
-
-#endif /* __MACH_MPC85XX_CDS_H__ */
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index 772e8de9310..59c121a97ac 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -24,7 +24,6 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc85xx.h>
 #include <mm/mmu_decl.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 6913e99c127..61b3eedf41b 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -39,7 +39,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc85xx.h>
 #include <asm/irq.h>
 #include <mm/mmu_decl.h>
 #include <asm/prom.h>