diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:02:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:02:08 +0200 |
| commit | 683460969159406d65c4f11d2d3e857188242e16 (patch) | |
| tree | b6fa8d5fcd5b66b99ce354b7190fc1baf50f25e3 /drivers | |
| parent | 34392fc0419ed63d9609dd41a2e1b2f21f146181 (diff) | |
| download | barebox-683460969159406d65c4f11d2d3e857188242e16.tar.gz barebox-683460969159406d65c4f11d2d3e857188242e16.tar.xz | |
svn_rev_593
intrduce get_clock_* functions
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/fec_mpc5200.c | 7 | ||||
| -rw-r--r-- | drivers/serial/serial_mpc5xxx.c | 15 |
2 files changed, 10 insertions, 12 deletions
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c index a1c100e802..72cdcafefa 100644 --- a/drivers/net/fec_mpc5200.c +++ b/drivers/net/fec_mpc5200.c @@ -15,11 +15,10 @@ #include <driver.h> #include <asm/arch/sdma.h> #include <asm/arch/fec.h> +#include <asm/arch/clocks.h> #include <miiphy.h> #include "fec_mpc5200.h" -DECLARE_GLOBAL_DATA_PTR; - #define CONFIG_PHY_ADDR 1 /* FIXME */ /* #define DEBUG 0x28 */ @@ -263,7 +262,9 @@ static int mpc5xxx_fec_init(struct eth_device *dev) * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock * and do not drop the Preamble. */ - fec->eth->mii_speed = (((gd->ipb_clk >> 20) / 5) << 1); /* No MII for 7-wire mode */ + printf("%s: miispeed\n", __FUNCTION__); + fec->eth->mii_speed = (((get_ipb_clock() >> 20) / 5) << 1); /* No MII for 7-wire mode */ + printf("done: %d\n", get_ipb_clock()); } /* diff --git a/drivers/serial/serial_mpc5xxx.c b/drivers/serial/serial_mpc5xxx.c index 84ca77dafb..8a7ef8d4f4 100644 --- a/drivers/serial/serial_mpc5xxx.c +++ b/drivers/serial/serial_mpc5xxx.c @@ -39,8 +39,7 @@ #include <init.h> #include <console.h> #include <xfuncs.h> - -DECLARE_GLOBAL_DATA_PTR; +#include <asm/arch/clocks.h> static void mpc5xxx_serial_setbrg(struct console_device *cdev) { @@ -48,13 +47,14 @@ static void mpc5xxx_serial_setbrg(struct console_device *cdev) volatile struct mpc5xxx_psc *psc = (struct mpc5xxx_psc *)dev->map_base; unsigned long baseclk; int div; - +return; + printf("%s: ipb\n", __FUNCTION__); #if defined(CONFIG_MGT5100) baseclk = (CFG_MPC5XXX_CLKIN + 16) / 32; #elif defined(CONFIG_MPC5200) - baseclk = (gd->ipb_clk + 16) / 32; + baseclk = (get_ipb_clock() + 16) / 32; #endif - + printf("done: %d\n", get_ipb_clock()); /* set up UART divisor */ #if 0 div = (baseclk + (gd->baudrate/2)) / gd->baudrate; @@ -70,18 +70,15 @@ static int mpc5xxx_serial_init(struct console_device *cdev) { struct device_d *dev = cdev->dev; volatile struct mpc5xxx_psc *psc = (struct mpc5xxx_psc *)dev->map_base; - unsigned long baseclk; - +return 0; /* reset PSC */ psc->command = PSC_SEL_MODE_REG_1; /* select clock sources */ #if defined(CONFIG_MGT5100) psc->psc_clock_select = 0xdd00; - baseclk = (CFG_MPC5XXX_CLKIN + 16) / 32; #elif defined(CONFIG_MPC5200) psc->psc_clock_select = 0; - baseclk = (gd->ipb_clk + 16) / 32; #endif /* switch to UART mode */ |