diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 17:02:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 17:02:29 -0700 |
commit | c52ecdab06ff3b4d0f8914951eb74dc8b049f51c (patch) | |
tree | 291a55adb3be3fec45dcc6affa72d9d1244ba42a /arch/arm/mach-at91/clock.c | |
parent | dc315011312f04433e0fdd34b6a3dde4bfde1e48 (diff) | |
parent | c0f85a82484c25d23b44a87a35daddb2b276b4aa (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: fix pxa27x keyboard driver
[ARM] Fix 4417/1: Serial: Fix AMBA drivers locking
[ARM] 4421/1: AT91: Value of _KEY fields.
[ARM] Solve buggy smp_processor_id() usage
[ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA)
[ARM] 4419/1: AT91: SAM9 USB clocks check for suspending
[ARM] 4418/1: AT91: Number of programmable clocks differs
[ARM] 4392/2: Do not corrupt the SP register in compressed/head.S
Diffstat (limited to 'arch/arm/mach-at91/clock.c')
-rw-r--r-- | arch/arm/mach-at91/clock.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 06c9a0507d0..848efb2a4eb 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -364,19 +364,14 @@ static int at91_clk_show(struct seq_file *s, void *unused) { u32 scsr, pcsr, sr; struct clk *clk; - unsigned i; seq_printf(s, "SCSR = %8x\n", scsr = at91_sys_read(AT91_PMC_SCSR)); seq_printf(s, "PCSR = %8x\n", pcsr = at91_sys_read(AT91_PMC_PCSR)); - seq_printf(s, "MOR = %8x\n", at91_sys_read(AT91_CKGR_MOR)); seq_printf(s, "MCFR = %8x\n", at91_sys_read(AT91_CKGR_MCFR)); seq_printf(s, "PLLA = %8x\n", at91_sys_read(AT91_CKGR_PLLAR)); seq_printf(s, "PLLB = %8x\n", at91_sys_read(AT91_CKGR_PLLBR)); - seq_printf(s, "MCKR = %8x\n", at91_sys_read(AT91_PMC_MCKR)); - for (i = 0; i < 4; i++) - seq_printf(s, "PCK%d = %8x\n", i, at91_sys_read(AT91_PMC_PCKR(i))); seq_printf(s, "SR = %8x\n", sr = at91_sys_read(AT91_PMC_SR)); seq_printf(s, "\n"); |