[PATCH] ppc32: Added preliminary support for the MPC8548 CDS board

Adds support for using the MPC8548 processor on the CDS reference board.
Currently all the major busses (PCI, PCI-X, PCI-Express, sRIO) and eTSEC3
and eTSEC4 are not supported.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 49 insertions, 12 deletions

diff --git a/arch/ppc/platforms/85xx/Kconfig b/arch/ppc/platforms/85xx/Kconfig
index ff92e38e7da1..c5bc2821d991 100644
--- a/arch/ppc/platforms/85xx/Kconfig
+++ b/arch/ppc/platforms/85xx/Kconfig
@@ -21,6 +21,11 @@ config MPC8540_ADS
         help
           This option enables support for the MPC 8540 ADS evaluation board.
 
+config MPC8548_CDS
+        bool "Freescale MPC8548 CDS"
+        help
+          This option enablese support for the MPC8548 CDS evaluation board.
+
 config MPC8555_CDS
         bool "Freescale MPC8555 CDS"
         help
@@ -53,6 +58,11 @@ config MPC8540
         depends on MPC8540_ADS
         default y
 
+config MPC8548
+        bool
+        depends on MPC8548_CDS
+        default y
+
 config MPC8555
         bool
         depends on MPC8555_CDS
diff --git a/arch/ppc/platforms/85xx/Makefile b/arch/ppc/platforms/85xx/Makefile
index 854fbd298ba2..efdf813108f2 100644
--- a/arch/ppc/platforms/85xx/Makefile
+++ b/arch/ppc/platforms/85xx/Makefile
@@ -2,6 +2,7 @@
 # Makefile for the PowerPC 85xx linux kernel.
 #
 obj-$(CONFIG_MPC8540_ADS)       += mpc85xx_ads_common.o mpc8540_ads.o
+obj-$(CONFIG_MPC8548_CDS)       += mpc85xx_cds_common.o
 obj-$(CONFIG_MPC8555_CDS)       += mpc85xx_cds_common.o
 obj-$(CONFIG_MPC8560_ADS)       += mpc85xx_ads_common.o mpc8560_ads.o
 obj-$(CONFIG_SBC8560)           += sbc85xx.o sbc8560.o
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index e7cfa498568c..2d04bf599d2f 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -480,21 +480,47 @@ mpc85xx_cds_setup_arch(void)
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 0;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 0;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        }
 
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 1;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 1;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        }
+
+        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_eTSEC1);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 0;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        }
+
+        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_eTSEC2);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 1;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        }
 
+        ppc_sys_device_remove(MPC85xx_eTSEC3);
+        ppc_sys_device_remove(MPC85xx_eTSEC4);
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)