[U-Boot] [PATCH 14/19] powerpc: mpc85xx: remove MPC8555CDS support

Tue Sep 1 15:28:53 CEST 2015

This has not been converted to Generic Board, so should be removed.
(See doc/README.generic-board for details.)

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
Cc: Kumar Gala <kumar.gala at freescale.com>
---

 arch/powerpc/cpu/mpc85xx/Kconfig        |   4 -
 arch/powerpc/cpu/mpc85xx/pci.c          |  23 --
 arch/powerpc/include/asm/immap_85xx.h   |   5 +-
 board/freescale/mpc8555cds/Kconfig      |  12 -
 board/freescale/mpc8555cds/MAINTAINERS  |   7 -
 board/freescale/mpc8555cds/Makefile     |  12 -
 board/freescale/mpc8555cds/ddr.c        |  56 ----
 board/freescale/mpc8555cds/law.c        |  42 ---
 board/freescale/mpc8555cds/mpc8555cds.c | 428 -----------------------------
 board/freescale/mpc8555cds/tlb.c        |  96 -------
 configs/MPC8555CDS_defconfig            |   3 -
 configs/MPC8555CDS_legacy_defconfig     |   4 -
 doc/README.scrapyard                    |   1 +
 drivers/ddr/fsl/ctrl_regs.c             |   4 -
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c      |   3 -
 drivers/input/keyboard.c                |   6 +-
 include/configs/MPC8555CDS.h            | 461 --------------------------------
 17 files changed, 5 insertions(+), 1162 deletions(-)
 delete mode 100644 board/freescale/mpc8555cds/Kconfig
 delete mode 100644 board/freescale/mpc8555cds/MAINTAINERS
 delete mode 100644 board/freescale/mpc8555cds/Makefile
 delete mode 100644 board/freescale/mpc8555cds/ddr.c
 delete mode 100644 board/freescale/mpc8555cds/law.c
 delete mode 100644 board/freescale/mpc8555cds/mpc8555cds.c
 delete mode 100644 board/freescale/mpc8555cds/tlb.c
 delete mode 100644 configs/MPC8555CDS_defconfig
 delete mode 100644 configs/MPC8555CDS_legacy_defconfig
 delete mode 100644 include/configs/MPC8555CDS.h

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 6a9cc13..e0f0459 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -46,9 +46,6 @@ config TARGET_P5040DS
 config TARGET_MPC8536DS
 	bool "Support MPC8536DS"
 
-config TARGET_MPC8555CDS
-	bool "Support MPC8555CDS"
-
 config TARGET_MPC8560ADS
 	bool "Support MPC8560ADS"
 
@@ -145,7 +142,6 @@ source "board/freescale/bsc9132qds/Kconfig"
 source "board/freescale/c29xpcie/Kconfig"
 source "board/freescale/corenet_ds/Kconfig"
 source "board/freescale/mpc8536ds/Kconfig"
-source "board/freescale/mpc8555cds/Kconfig"
 source "board/freescale/mpc8560ads/Kconfig"
 source "board/freescale/mpc8568mds/Kconfig"
 source "board/freescale/mpc8569mds/Kconfig"
diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index c6d2fda..2192cc4 100644
--- a/arch/powerpc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
@@ -120,29 +120,6 @@ pci_mpc85xx_init(struct pci_controller *board_hose)
 
 	pci_register_hose(hose);
 
-#if defined(CONFIG_MPC8555CDS) || defined(CONFIG_MPC8541CDS)
-	/*
-	 * This is a SW workaround for an apparent HW problem
-	 * in the PCI controller on the MPC85555/41 CDS boards.
-	 * The first config cycle must be to a valid, known
-	 * device on the PCI bus in order to trick the PCI
-	 * controller state machine into a known valid state.
-	 * Without this, the first config cycle has the chance
-	 * of hanging the controller permanently, just leaving
-	 * it in a semi-working state, or leaving it working.
-	 *
-	 * Pick on the Tundra, Device 17, to get it right.
-	 */
-	{
-		u8 header_type;
-
-		pci_hose_read_config_byte(hose,
-					  PCI_BDF(0,BRIDGE_ID,0),
-					  PCI_HEADER_TYPE,
-					  &header_type);
-	}
-#endif
-
 	hose->last_busno = pci_hose_scan(hose);
 
 #ifdef CONFIG_MPC85XX_PCI2
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 0c9d85e..828acf6 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -124,10 +124,7 @@ typedef struct ccsr_i2c {
 	u8	res[4096 - 1 * sizeof(struct fsl_i2c)];
 } ccsr_i2c_t;
 
-#if defined(CONFIG_MPC8540) \
-	|| defined(CONFIG_MPC8541) \
-	|| defined(CONFIG_MPC8548) \
-	|| defined(CONFIG_MPC8555)
+#if defined(CONFIG_MPC8548)
 /* DUART Registers */
 typedef struct ccsr_duart {
 	u8	res1[1280];
diff --git a/board/freescale/mpc8555cds/Kconfig b/board/freescale/mpc8555cds/Kconfig
deleted file mode 100644
index 04bd572..0000000
diff --git a/board/freescale/mpc8555cds/MAINTAINERS b/board/freescale/mpc8555cds/MAINTAINERS
deleted file mode 100644
index 1ef6690..0000000
diff --git a/board/freescale/mpc8555cds/Makefile b/board/freescale/mpc8555cds/Makefile
deleted file mode 100644
index d32d005..0000000
diff --git a/board/freescale/mpc8555cds/ddr.c b/board/freescale/mpc8555cds/ddr.c
deleted file mode 100644
index d2ac6c4..0000000
diff --git a/board/freescale/mpc8555cds/law.c b/board/freescale/mpc8555cds/law.c
deleted file mode 100644
index 39df3f1..0000000
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
deleted file mode 100644
index de5f566..0000000
diff --git a/board/freescale/mpc8555cds/tlb.c b/board/freescale/mpc8555cds/tlb.c
deleted file mode 100644
index fff3b4a..0000000
diff --git a/configs/MPC8555CDS_defconfig b/configs/MPC8555CDS_defconfig
deleted file mode 100644
index 3bdbb0c..0000000
diff --git a/configs/MPC8555CDS_legacy_defconfig b/configs/MPC8555CDS_legacy_defconfig
deleted file mode 100644
index 8e53ee0..0000000
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index fe2ae27..f400913 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -12,6 +12,7 @@ The list should be sorted in reverse chronological order.
 
 Board            Arch        CPU            Commit      Removed     Last known maintainer/contact
 =================================================================================================
+MPC8555CDS       powerpc     mpc85xx        -           -           Kumar Gala <kumar.gala at freescale.com>
 MPC8548CDS       powerpc     mpc85xx        -           -
 MPC8544DS        powerpc     mpc85xx        -           -
 MPC8541CDS       powerpc     mpc85xx        -           -           Kumar Gala <kumar.gala at freescale.com>
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index 8367c95..fc10cea 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -1768,10 +1768,6 @@ static void set_ddr_sdram_clk_cntl(fsl_ddr_cfg_regs_t *ddr,
 	unsigned int clk_adjust;	/* Clock adjust */
 	unsigned int ss_en = 0;		/* Source synchronous enable */
 
-#if defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
-	/* Per FSL Application Note: AN2805 */
-	ss_en = 1;
-#endif
 	clk_adjust = popts->clk_adjust;
 	ddr->ddr_sdram_clk_cntl = (0
 				   | ((ss_en & 0x1) << 31)
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 8dd4a91..670642f 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -49,9 +49,6 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
 	out_be32(&ddr->timing_cfg_2, regs->timing_cfg_2);
 	out_be32(&ddr->sdram_mode, regs->ddr_sdram_mode);
 	out_be32(&ddr->sdram_interval, regs->ddr_sdram_interval);
-#if defined(CONFIG_MPC8555) || defined(CONFIG_MPC8541)
-	out_be32(&ddr->sdram_clk_cntl, regs->ddr_sdram_clk_cntl);
-#endif
 
 	/*
 	 * 200 painful micro-seconds must elapse between
diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c
index be0f333..e24bf66 100644
--- a/drivers/input/keyboard.c
+++ b/drivers/input/keyboard.c
@@ -30,7 +30,7 @@
 
 #define	KBD_BUFFER_LEN		0x20  /* size of the keyboardbuffer */
 
-#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
+#if defined(CONFIG_MPC5xxx)
 int ps2ser_check(void);
 #endif
 
@@ -72,7 +72,7 @@ static void kbd_put_queue(char data)
 /* test if a character is in the queue */
 static int kbd_testc(struct stdio_dev *dev)
 {
-#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
+#if defined(CONFIG_MPC5xxx)
 	/* no ISR is used, so received chars must be polled */
 	ps2ser_check();
 #endif
@@ -87,7 +87,7 @@ static int kbd_getc(struct stdio_dev *dev)
 {
 	char c;
 	while(in_pointer==out_pointer) {
-#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
+#if defined(CONFIG_MPC5xxx)
 	/* no ISR is used, so received chars must be polled */
 	ps2ser_check();
 #endif
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
deleted file mode 100644
index 675ca87..0000000
-- 
1.9.1

