diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:53 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-04 09:05:43 -0500 |
| commit | b28774966c933780e891998b472528ba0724b8e0 (patch) | |
| tree | d76b6cc026872c19add8d85f555e22fa414be2b9 /board/inka4x0/inkadiag.c | |
| parent | 7c80c6c51ab39b4509b4ca79035490eabab0af86 (diff) | |
| download | olio-uboot-2014.01-b28774966c933780e891998b472528ba0724b8e0.tar.xz olio-uboot-2014.01-b28774966c933780e891998b472528ba0724b8e0.zip | |
ppc: Move mpc5xxx clocks to arch_global_data
Move ipb_clk and pci_clk into arch_global_data and tidy up.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/inka4x0/inkadiag.c')
| -rw-r--r-- | board/inka4x0/inkadiag.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/inka4x0/inkadiag.c b/board/inka4x0/inkadiag.c index cf82f61ef..1c01bb45b 100644 --- a/board/inka4x0/inkadiag.c +++ b/board/inka4x0/inkadiag.c @@ -187,7 +187,7 @@ static int ser_init(volatile struct mpc5xxx_psc *psc, int baudrate) /* select clock sources */ out_be16(&psc->psc_clock_select, 0); - baseclk = (gd->ipb_clk + 16) / 32; + baseclk = (gd->arch.ipb_clk + 16) / 32; /* switch to UART mode */ out_be32(&psc->sicr, 0); @@ -369,7 +369,7 @@ static void buzzer_turn_on(unsigned int freq) { volatile struct mpc5xxx_gpt *gpt = (struct mpc5xxx_gpt *)(BUZZER_GPT); - const u32 prescale = gd->ipb_clk / freq / 128; + const u32 prescale = gd->arch.ipb_clk / freq / 128; const u32 count = 128; const u32 width = 64; @@ -405,9 +405,9 @@ static int do_inkadiag_buzzer(cmd_tbl_t *cmdtp, int flag, int argc, freq = simple_strtol(argv[0], NULL, 0); /* avoid zero prescale in buzzer_turn_on() */ - if (freq > gd->ipb_clk / 128) { + if (freq > gd->arch.ipb_clk / 128) { printf("%dHz exceeds maximum (%ldHz)\n", freq, - gd->ipb_clk / 128); + gd->arch.ipb_clk / 128); } else if (!freq) printf("Zero frequency is senseless\n"); else |