|
|
@@ -6,264 +6,134 @@
|
|
|
*
|
|
|
* Copyright 2005 MontaVista Software Inc.
|
|
|
*
|
|
|
+ * Heavily modified by Scott Wood <scottwood@freescale.com>
|
|
|
+ * Copyright 2007 Freescale Semiconductor, Inc.
|
|
|
+ *
|
|
|
* This file is licensed under the terms of the GNU General Public License
|
|
|
* version 2. This program is licensed "as is" without any warranty of any
|
|
|
* kind, whether express or implied.
|
|
|
*/
|
|
|
|
|
|
#include <linux/init.h>
|
|
|
-#include <linux/module.h>
|
|
|
-#include <linux/param.h>
|
|
|
-#include <linux/string.h>
|
|
|
-#include <linux/ioport.h>
|
|
|
-#include <linux/device.h>
|
|
|
-#include <linux/delay.h>
|
|
|
-#include <linux/root_dev.h>
|
|
|
-
|
|
|
-#include <linux/fs_enet_pd.h>
|
|
|
-#include <linux/fs_uart_pd.h>
|
|
|
-#include <linux/mii.h>
|
|
|
+#include <linux/of_platform.h>
|
|
|
|
|
|
-#include <asm/delay.h>
|
|
|
#include <asm/io.h>
|
|
|
#include <asm/machdep.h>
|
|
|
-#include <asm/page.h>
|
|
|
-#include <asm/processor.h>
|
|
|
#include <asm/system.h>
|
|
|
#include <asm/time.h>
|
|
|
#include <asm/mpc8xx.h>
|
|
|
#include <asm/8xx_immap.h>
|
|
|
#include <asm/commproc.h>
|
|
|
#include <asm/fs_pd.h>
|
|
|
-#include <asm/prom.h>
|
|
|
+#include <asm/udbg.h>
|
|
|
|
|
|
#include <sysdev/commproc.h>
|
|
|
|
|
|
-static void init_smc1_uart_ioports(struct fs_uart_platform_info* fpi);
|
|
|
-static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi);
|
|
|
-static void init_scc1_ioports(struct fs_platform_info* ptr);
|
|
|
-
|
|
|
-void __init mpc86xads_board_setup(void)
|
|
|
-{
|
|
|
- cpm8xx_t *cp;
|
|
|
- unsigned int *bcsr_io;
|
|
|
- u8 tmpval8;
|
|
|
-
|
|
|
- bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
|
|
|
- cp = (cpm8xx_t *)immr_map(im_cpm);
|
|
|
-
|
|
|
- if (bcsr_io == NULL) {
|
|
|
- printk(KERN_CRIT "Could not remap BCSR\n");
|
|
|
- return;
|
|
|
- }
|
|
|
-#ifdef CONFIG_SERIAL_CPM_SMC1
|
|
|
- clrbits32(bcsr_io, BCSR1_RS232EN_1);
|
|
|
- clrbits32(&cp->cp_simode, 0xe0000000 >> 17); /* brg1 */
|
|
|
- tmpval8 = in_8(&(cp->cp_smc[0].smc_smcm)) | (SMCM_RX | SMCM_TX);
|
|
|
- out_8(&(cp->cp_smc[0].smc_smcm), tmpval8);
|
|
|
- clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN);
|
|
|
-#else
|
|
|
- setbits32(bcsr_io,BCSR1_RS232EN_1);
|
|
|
- out_be16(&cp->cp_smc[0].smc_smcmr, 0);
|
|
|
- out_8(&cp->cp_smc[0].smc_smce, 0);
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifdef CONFIG_SERIAL_CPM_SMC2
|
|
|
- clrbits32(bcsr_io,BCSR1_RS232EN_2);
|
|
|
- clrbits32(&cp->cp_simode, 0xe0000000 >> 1);
|
|
|
- setbits32(&cp->cp_simode, 0x20000000 >> 1); /* brg2 */
|
|
|
- tmpval8 = in_8(&(cp->cp_smc[1].smc_smcm)) | (SMCM_RX | SMCM_TX);
|
|
|
- out_8(&(cp->cp_smc[1].smc_smcm), tmpval8);
|
|
|
- clrbits16(&cp->cp_smc[1].smc_smcmr, SMCMR_REN | SMCMR_TEN);
|
|
|
+#include "mpc86xads.h"
|
|
|
|
|
|
- init_smc2_uart_ioports(0);
|
|
|
-#else
|
|
|
- setbits32(bcsr_io,BCSR1_RS232EN_2);
|
|
|
- out_be16(&cp->cp_smc[1].smc_smcmr, 0);
|
|
|
- out_8(&cp->cp_smc[1].smc_smce, 0);
|
|
|
-#endif
|
|
|
- immr_unmap(cp);
|
|
|
- iounmap(bcsr_io);
|
|
|
-}
|
|
|
+struct cpm_pin {
|
|
|
+ int port, pin, flags;
|
|
|
+};
|
|
|
|
|
|
+static struct cpm_pin mpc866ads_pins[] = {
|
|
|
+ /* SMC1 */
|
|
|
+ {CPM_PORTB, 24, CPM_PIN_INPUT}, /* RX */
|
|
|
+ {CPM_PORTB, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
|
|
|
+
|
|
|
+ /* SMC2 */
|
|
|
+ {CPM_PORTB, 21, CPM_PIN_INPUT}, /* RX */
|
|
|
+ {CPM_PORTB, 20, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
|
|
|
+
|
|
|
+ /* SCC1 */
|
|
|
+ {CPM_PORTA, 6, CPM_PIN_INPUT}, /* CLK1 */
|
|
|
+ {CPM_PORTA, 7, CPM_PIN_INPUT}, /* CLK2 */
|
|
|
+ {CPM_PORTA, 14, CPM_PIN_INPUT}, /* TX */
|
|
|
+ {CPM_PORTA, 15, CPM_PIN_INPUT}, /* RX */
|
|
|
+ {CPM_PORTB, 19, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TENA */
|
|
|
+ {CPM_PORTC, 10, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /* RENA */
|
|
|
+ {CPM_PORTC, 11, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /* CLSN */
|
|
|
+
|
|
|
+ /* MII */
|
|
|
+ {CPM_PORTD, 3, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 4, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 5, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 6, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 7, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 8, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 9, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 10, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 11, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 12, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 13, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 14, CPM_PIN_OUTPUT},
|
|
|
+ {CPM_PORTD, 15, CPM_PIN_OUTPUT},
|
|
|
+};
|
|
|
|
|
|
-static void init_fec1_ioports(struct fs_platform_info* ptr)
|
|
|
+static void __init init_ioports(void)
|
|
|
{
|
|
|
- iop8xx_t *io_port = (iop8xx_t *)immr_map(im_ioport);
|
|
|
+ int i;
|
|
|
|
|
|
- /* configure FEC1 pins */
|
|
|
+ for (i = 0; i < ARRAY_SIZE(mpc866ads_pins); i++) {
|
|
|
+ struct cpm_pin *pin = &mpc866ads_pins[i];
|
|
|
+ cpm1_set_pin(pin->port, pin->pin, pin->flags);
|
|
|
+ }
|
|
|
|
|
|
- setbits16(&io_port->iop_pdpar, 0x1fff);
|
|
|
- setbits16(&io_port->iop_pddir, 0x1fff);
|
|
|
+ cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);
|
|
|
+ cpm1_clk_setup(CPM_CLK_SMC2, CPM_BRG2, CPM_CLK_RTX);
|
|
|
+ cpm1_clk_setup(CPM_CLK_SCC1, CPM_CLK1, CPM_CLK_TX);
|
|
|
+ cpm1_clk_setup(CPM_CLK_SCC1, CPM_CLK2, CPM_CLK_RX);
|
|
|
|
|
|
- immr_unmap(io_port);
|
|
|
+ /* Set FEC1 and FEC2 to MII mode */
|
|
|
+ clrbits32(&mpc8xx_immr->im_cpm.cp_cptr, 0x00000180);
|
|
|
}
|
|
|
|
|
|
-void init_fec_ioports(struct fs_platform_info *fpi)
|
|
|
+static void __init mpc86xads_setup_arch(void)
|
|
|
{
|
|
|
- int fec_no = fs_get_fec_index(fpi->fs_no);
|
|
|
+ struct device_node *np;
|
|
|
+ u32 __iomem *bcsr_io;
|
|
|
+
|
|
|
+ cpm_reset();
|
|
|
+ init_ioports();
|
|
|
|
|
|
- switch (fec_no) {
|
|
|
- case 0:
|
|
|
- init_fec1_ioports(fpi);
|
|
|
- break;
|
|
|
- default:
|
|
|
- printk(KERN_ERR "init_fec_ioports: invalid FEC number\n");
|
|
|
+ np = of_find_compatible_node(NULL, NULL, "fsl,mpc866ads-bcsr");
|
|
|
+ if (!np) {
|
|
|
+ printk(KERN_CRIT "Could not find fsl,mpc866ads-bcsr node\n");
|
|
|
return;
|
|
|
}
|
|
|
-}
|
|
|
|
|
|
-static void init_scc1_ioports(struct fs_platform_info* fpi)
|
|
|
-{
|
|
|
- unsigned *bcsr_io;
|
|
|
- iop8xx_t *io_port;
|
|
|
- cpm8xx_t *cp;
|
|
|
-
|
|
|
- bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE);
|
|
|
- io_port = (iop8xx_t *)immr_map(im_ioport);
|
|
|
- cp = (cpm8xx_t *)immr_map(im_cpm);
|
|
|
+ bcsr_io = of_iomap(np, 0);
|
|
|
+ of_node_put(np);
|
|
|
|
|
|
if (bcsr_io == NULL) {
|
|
|
printk(KERN_CRIT "Could not remap BCSR\n");
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- /* Configure port A pins for Txd and Rxd.
|
|
|
- */
|
|
|
- setbits16(&io_port->iop_papar, PA_ENET_RXD | PA_ENET_TXD);
|
|
|
- clrbits16(&io_port->iop_padir, PA_ENET_RXD | PA_ENET_TXD);
|
|
|
- clrbits16(&io_port->iop_paodr, PA_ENET_TXD);
|
|
|
-
|
|
|
- /* Configure port C pins to enable CLSN and RENA.
|
|
|
- */
|
|
|
- clrbits16(&io_port->iop_pcpar, PC_ENET_CLSN | PC_ENET_RENA);
|
|
|
- clrbits16(&io_port->iop_pcdir, PC_ENET_CLSN | PC_ENET_RENA);
|
|
|
- setbits16(&io_port->iop_pcso, PC_ENET_CLSN | PC_ENET_RENA);
|
|
|
-
|
|
|
- /* Configure port A for TCLK and RCLK.
|
|
|
- */
|
|
|
- setbits16(&io_port->iop_papar, PA_ENET_TCLK | PA_ENET_RCLK);
|
|
|
- clrbits16(&io_port->iop_padir, PA_ENET_TCLK | PA_ENET_RCLK);
|
|
|
- clrbits32(&cp->cp_pbpar, PB_ENET_TENA);
|
|
|
- clrbits32(&cp->cp_pbdir, PB_ENET_TENA);
|
|
|
-
|
|
|
- /* Configure Serial Interface clock routing.
|
|
|
- * First, clear all SCC bits to zero, then set the ones we want.
|
|
|
- */
|
|
|
- clrbits32(&cp->cp_sicr, SICR_ENET_MASK);
|
|
|
- setbits32(&cp->cp_sicr, SICR_ENET_CLKRT);
|
|
|
-
|
|
|
- /* In the original SCC enet driver the following code is placed at
|
|
|
- the end of the initialization */
|
|
|
- setbits32(&cp->cp_pbpar, PB_ENET_TENA);
|
|
|
- setbits32(&cp->cp_pbdir, PB_ENET_TENA);
|
|
|
-
|
|
|
- clrbits32(bcsr_io+1, BCSR1_ETHEN);
|
|
|
+ clrbits32(bcsr_io, BCSR1_RS232EN_1 | BCSR1_RS232EN_2 | BCSR1_ETHEN);
|
|
|
iounmap(bcsr_io);
|
|
|
- immr_unmap(cp);
|
|
|
- immr_unmap(io_port);
|
|
|
-}
|
|
|
-
|
|
|
-void init_scc_ioports(struct fs_platform_info *fpi)
|
|
|
-{
|
|
|
- int scc_no = fs_get_scc_index(fpi->fs_no);
|
|
|
-
|
|
|
- switch (scc_no) {
|
|
|
- case 0:
|
|
|
- init_scc1_ioports(fpi);
|
|
|
- break;
|
|
|
- default:
|
|
|
- printk(KERN_ERR "init_scc_ioports: invalid SCC number\n");
|
|
|
- return;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-static void init_smc1_uart_ioports(struct fs_uart_platform_info* ptr)
|
|
|
+static int __init mpc86xads_probe(void)
|
|
|
{
|
|
|
- unsigned *bcsr_io;
|
|
|
- cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm);
|
|
|
-
|
|
|
- setbits32(&cp->cp_pbpar, 0x000000c0);
|
|
|
- clrbits32(&cp->cp_pbdir, 0x000000c0);
|
|
|
- clrbits16(&cp->cp_pbodr, 0x00c0);
|
|
|
- immr_unmap(cp);
|
|
|
-
|
|
|
- bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
|
|
|
-
|
|
|
- if (bcsr_io == NULL) {
|
|
|
- printk(KERN_CRIT "Could not remap BCSR1\n");
|
|
|
- return;
|
|
|
- }
|
|
|
- clrbits32(bcsr_io,BCSR1_RS232EN_1);
|
|
|
- iounmap(bcsr_io);
|
|
|
+ unsigned long root = of_get_flat_dt_root();
|
|
|
+ return of_flat_dt_is_compatible(root, "fsl,mpc866ads");
|
|
|
}
|
|
|
|
|
|
-static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi)
|
|
|
-{
|
|
|
- unsigned *bcsr_io;
|
|
|
- cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm);
|
|
|
-
|
|
|
- setbits32(&cp->cp_pbpar, 0x00000c00);
|
|
|
- clrbits32(&cp->cp_pbdir, 0x00000c00);
|
|
|
- clrbits16(&cp->cp_pbodr, 0x0c00);
|
|
|
- immr_unmap(cp);
|
|
|
-
|
|
|
- bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
|
|
|
-
|
|
|
- if (bcsr_io == NULL) {
|
|
|
- printk(KERN_CRIT "Could not remap BCSR1\n");
|
|
|
- return;
|
|
|
- }
|
|
|
- clrbits32(bcsr_io,BCSR1_RS232EN_2);
|
|
|
- iounmap(bcsr_io);
|
|
|
-}
|
|
|
+static struct of_device_id __initdata of_bus_ids[] = {
|
|
|
+ { .name = "soc", },
|
|
|
+ { .name = "cpm", },
|
|
|
+ { .name = "localbus", },
|
|
|
+ {},
|
|
|
+};
|
|
|
|
|
|
-void init_smc_ioports(struct fs_uart_platform_info *data)
|
|
|
+static int __init declare_of_platform_devices(void)
|
|
|
{
|
|
|
- int smc_no = fs_uart_id_fsid2smc(data->fs_no);
|
|
|
+ if (machine_is(mpc86x_ads))
|
|
|
+ of_platform_bus_probe(NULL, of_bus_ids, NULL);
|
|
|
|
|
|
- switch (smc_no) {
|
|
|
- case 0:
|
|
|
- init_smc1_uart_ioports(data);
|
|
|
- data->brg = data->clk_rx;
|
|
|
- break;
|
|
|
- case 1:
|
|
|
- init_smc2_uart_ioports(data);
|
|
|
- data->brg = data->clk_rx;
|
|
|
- break;
|
|
|
- default:
|
|
|
- printk(KERN_ERR "init_scc_ioports: invalid SCC number\n");
|
|
|
- return;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-int platform_device_skip(const char *model, int id)
|
|
|
-{
|
|
|
return 0;
|
|
|
}
|
|
|
-
|
|
|
-static void __init mpc86xads_setup_arch(void)
|
|
|
-{
|
|
|
- cpm_reset();
|
|
|
-
|
|
|
- mpc86xads_board_setup();
|
|
|
-
|
|
|
- ROOT_DEV = Root_NFS;
|
|
|
-}
|
|
|
-
|
|
|
-static int __init mpc86xads_probe(void)
|
|
|
-{
|
|
|
- char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
|
|
|
- "model", NULL);
|
|
|
- if (model == NULL)
|
|
|
- return 0;
|
|
|
- if (strcmp(model, "MPC866ADS"))
|
|
|
- return 0;
|
|
|
-
|
|
|
- return 1;
|
|
|
-}
|
|
|
+device_initcall(declare_of_platform_devices);
|
|
|
|
|
|
define_machine(mpc86x_ads) {
|
|
|
.name = "MPC86x ADS",
|
|
|
@@ -275,4 +145,5 @@ define_machine(mpc86x_ads) {
|
|
|
.calibrate_decr = mpc8xx_calibrate_decr,
|
|
|
.set_rtc_time = mpc8xx_set_rtc_time,
|
|
|
.get_rtc_time = mpc8xx_get_rtc_time,
|
|
|
+ .progress = udbg_progress,
|
|
|
};
|
Scott Wood