1 files changed, 0 insertions, 168 deletions

diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
index bec0c974cf54..0f0aff06c596 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -51,7 +51,6 @@
 
 /**************************************************************/
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
 void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
 {
         cpm_command(port->command, cmd);
@@ -68,75 +67,6 @@ void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram)
         iounmap(pram);
 }
 
-#else
-void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
-{
-        ushort val;
-        int line = port - cpm_uart_ports;
-        volatile cpm8xx_t *cp = cpmp;
-
-        switch (line) {
-        case UART_SMC1:
-                val = mk_cr_cmd(CPM_CR_CH_SMC1, cmd) | CPM_CR_FLG;
-                break;
-        case UART_SMC2:
-                val = mk_cr_cmd(CPM_CR_CH_SMC2, cmd) | CPM_CR_FLG;
-                break;
-        case UART_SCC1:
-                val = mk_cr_cmd(CPM_CR_CH_SCC1, cmd) | CPM_CR_FLG;
-                break;
-        case UART_SCC2:
-                val = mk_cr_cmd(CPM_CR_CH_SCC2, cmd) | CPM_CR_FLG;
-                break;
-        case UART_SCC3:
-                val = mk_cr_cmd(CPM_CR_CH_SCC3, cmd) | CPM_CR_FLG;
-                break;
-        case UART_SCC4:
-                val = mk_cr_cmd(CPM_CR_CH_SCC4, cmd) | CPM_CR_FLG;
-                break;
-        default:
-                return;
-
-        }
-        cp->cp_cpcr = val;
-        while (cp->cp_cpcr & CPM_CR_FLG) ;
-}
-
-void smc1_lineif(struct uart_cpm_port *pinfo)
-{
-        pinfo->brg = 1;
-}
-
-void smc2_lineif(struct uart_cpm_port *pinfo)
-{
-        pinfo->brg = 2;
-}
-
-void scc1_lineif(struct uart_cpm_port *pinfo)
-{
-        /* XXX SCC1: insert port configuration here */
-        pinfo->brg = 1;
-}
-
-void scc2_lineif(struct uart_cpm_port *pinfo)
-{
-        /* XXX SCC2: insert port configuration here */
-        pinfo->brg = 2;
-}
-
-void scc3_lineif(struct uart_cpm_port *pinfo)
-{
-        /* XXX SCC3: insert port configuration here */
-        pinfo->brg = 3;
-}
-
-void scc4_lineif(struct uart_cpm_port *pinfo)
-{
-        /* XXX SCC4: insert port configuration here */
-        pinfo->brg = 4;
-}
-#endif
-
 /*
  * Allocate DP-Ram and memory buffers. We need to allocate a transmit and
  * receive buffer descriptors from dual port ram, and a character
@@ -205,101 +135,3 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 
         cpm_dpfree(pinfo->dp_addr);
 }
-
-#ifndef CONFIG_PPC_CPM_NEW_BINDING
-/* Setup any dynamic params in the uart desc */
-int cpm_uart_init_portdesc(void)
-{
-        pr_debug("CPM uart[-]:init portdesc\n");
-
-        cpm_uart_nr = 0;
-#ifdef CONFIG_SERIAL_CPM_SMC1
-        cpm_uart_ports[UART_SMC1].smcp = &cpmp->cp_smc[0];
-/*
- *  Is SMC1 being relocated?
- */
-# ifdef CONFIG_I2C_SPI_SMC1_UCODE_PATCH
-        cpm_uart_ports[UART_SMC1].smcup =
-            (smc_uart_t *) & cpmp->cp_dparam[0x3C0];
-# else
-        cpm_uart_ports[UART_SMC1].smcup =
-            (smc_uart_t *) & cpmp->cp_dparam[PROFF_SMC1];
-# endif
-        cpm_uart_ports[UART_SMC1].port.mapbase =
-            (unsigned long)&cpmp->cp_smc[0];
-        cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
-        cpm_uart_ports[UART_SMC1].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-        cpm_uart_ports[UART_SMC1].port.uartclk = uart_clock();
-        cpm_uart_port_map[cpm_uart_nr++] = UART_SMC1;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SMC2
-        cpm_uart_ports[UART_SMC2].smcp = &cpmp->cp_smc[1];
-        cpm_uart_ports[UART_SMC2].smcup =
-            (smc_uart_t *) & cpmp->cp_dparam[PROFF_SMC2];
-        cpm_uart_ports[UART_SMC2].port.mapbase =
-            (unsigned long)&cpmp->cp_smc[1];
-        cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
-        cpm_uart_ports[UART_SMC2].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-        cpm_uart_ports[UART_SMC2].port.uartclk = uart_clock();
-        cpm_uart_port_map[cpm_uart_nr++] = UART_SMC2;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC1
-        cpm_uart_ports[UART_SCC1].sccp = &cpmp->cp_scc[0];
-        cpm_uart_ports[UART_SCC1].sccup =
-            (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC1];
-        cpm_uart_ports[UART_SCC1].port.mapbase =
-            (unsigned long)&cpmp->cp_scc[0];
-        cpm_uart_ports[UART_SCC1].sccp->scc_sccm &=
-            ~(UART_SCCM_TX | UART_SCCM_RX);
-        cpm_uart_ports[UART_SCC1].sccp->scc_gsmrl &=
-            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC1].port.uartclk = uart_clock();
-        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC1;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC2
-        cpm_uart_ports[UART_SCC2].sccp = &cpmp->cp_scc[1];
-        cpm_uart_ports[UART_SCC2].sccup =
-            (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC2];
-        cpm_uart_ports[UART_SCC2].port.mapbase =
-            (unsigned long)&cpmp->cp_scc[1];
-        cpm_uart_ports[UART_SCC2].sccp->scc_sccm &=
-            ~(UART_SCCM_TX | UART_SCCM_RX);
-        cpm_uart_ports[UART_SCC2].sccp->scc_gsmrl &=
-            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC2].port.uartclk = uart_clock();
-        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC2;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC3
-        cpm_uart_ports[UART_SCC3].sccp = &cpmp->cp_scc[2];
-        cpm_uart_ports[UART_SCC3].sccup =
-            (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC3];
-        cpm_uart_ports[UART_SCC3].port.mapbase =
-            (unsigned long)&cpmp->cp_scc[2];
-        cpm_uart_ports[UART_SCC3].sccp->scc_sccm &=
-            ~(UART_SCCM_TX | UART_SCCM_RX);
-        cpm_uart_ports[UART_SCC3].sccp->scc_gsmrl &=
-            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC3].port.uartclk = uart_clock();
-        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC3;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC4
-        cpm_uart_ports[UART_SCC4].sccp = &cpmp->cp_scc[3];
-        cpm_uart_ports[UART_SCC4].sccup =
-            (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC4];
-        cpm_uart_ports[UART_SCC4].port.mapbase =
-            (unsigned long)&cpmp->cp_scc[3];
-        cpm_uart_ports[UART_SCC4].sccp->scc_sccm &=
-            ~(UART_SCCM_TX | UART_SCCM_RX);
-        cpm_uart_ports[UART_SCC4].sccp->scc_gsmrl &=
-            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC4].port.uartclk = uart_clock();
-        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC4;
-#endif
-        return 0;
-}
-#endif