forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Browse source 
Pull m68k/colfire fixes from Greg Ungerer:
 "Only a couple of patches this time.  One migrating the clock driver
  code to the new set-state interface.  The other cleaning up to use the
  PFN_DOWN macro"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k/coldfire: use PFN_DOWN macro
  m68k/coldfire/pit: Migrate to new 'set-state' interface
This commit is contained in:
Linus Torvalds 2015-09-08 11:31:33 -07:00
commit 1c8cc72d57
2 changed files with 33 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
arch/m68k/coldfire/m54xx.c
View file

@ -25,6 +25,7 @@
#include <asm/m54xxgpt.h> #include <asm/m54xxgpt.h>
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <linux/pfn.h>
#endif #endif
/***************************************************************************/ /***************************************************************************/
@ -91,13 +92,13 @@ static void __init mcf54xx_bootmem_alloc(void)
m68k_memory[0].size = _ramend - _rambase; m68k_memory[0].size = _ramend - _rambase;
/* compute total pages in system */ /* compute total pages in system */
num_pages = (_ramend - _rambase) >> PAGE_SHIFT; num_pages = PFN_DOWN(_ramend - _rambase);
/* page numbers */ /* page numbers */
memstart = PAGE_ALIGN(_ramstart); memstart = PAGE_ALIGN(_ramstart);
min_low_pfn = _rambase >> PAGE_SHIFT; min_low_pfn = PFN_DOWN(_rambase);
start_pfn = memstart >> PAGE_SHIFT; start_pfn = PFN_DOWN(memstart);
max_low_pfn = _ramend >> PAGE_SHIFT; max_low_pfn = PFN_DOWN(_ramend);
high_memory = (void *)_ramend; high_memory = (void *)_ramend;
m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6; m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;

62
arch/m68k/coldfire/pit.c
View file

@ -42,37 +42,28 @@ static u32 pit_cnt;
* This is also called after resume to bring the PIT into operation again. * This is also called after resume to bring the PIT into operation again.
*/ */
static void init_cf_pit_timer(enum clock_event_mode mode, static int cf_pit_set_periodic(struct clock_event_device *evt)
struct clock_event_device *evt)
{ {
switch (mode) { __raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
case CLOCK_EVT_MODE_PERIODIC: __raw_writew(PIT_CYCLES_PER_JIFFY, TA(MCFPIT_PMR));
__raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE |
MCFPIT_PCSR_OVW | MCFPIT_PCSR_RLD |
MCFPIT_PCSR_CLK64, TA(MCFPIT_PCSR));
return 0;
}
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR)); static int cf_pit_set_oneshot(struct clock_event_device *evt)
__raw_writew(PIT_CYCLES_PER_JIFFY, TA(MCFPIT_PMR)); {
__raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE | \ __raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
MCFPIT_PCSR_OVW | MCFPIT_PCSR_RLD | \ __raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE |
MCFPIT_PCSR_CLK64, TA(MCFPIT_PCSR)); MCFPIT_PCSR_OVW | MCFPIT_PCSR_CLK64, TA(MCFPIT_PCSR));
break; return 0;
}
case CLOCK_EVT_MODE_SHUTDOWN: static int cf_pit_shutdown(struct clock_event_device *evt)
case CLOCK_EVT_MODE_UNUSED: {
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR)); return 0;
break;
case CLOCK_EVT_MODE_ONESHOT:
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
__raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE | \
MCFPIT_PCSR_OVW | MCFPIT_PCSR_CLK64, \
TA(MCFPIT_PCSR));
break;
case CLOCK_EVT_MODE_RESUME:
/* Nothing to do here */
break;
}
} }
/* /*
@ -88,12 +79,15 @@ static int cf_pit_next_event(unsigned long delta,
} }
struct clock_event_device cf_pit_clockevent = { struct clock_event_device cf_pit_clockevent = {
.name = "pit", .name = "pit",
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, .features = CLOCK_EVT_FEAT_PERIODIC |
.set_mode = init_cf_pit_timer, CLOCK_EVT_FEAT_ONESHOT,
.set_next_event = cf_pit_next_event, .set_state_shutdown = cf_pit_shutdown,
.shift = 32, .set_state_periodic = cf_pit_set_periodic,
.irq = MCF_IRQ_PIT1, .set_state_oneshot = cf_pit_set_oneshot,
.set_next_event = cf_pit_next_event,
.shift = 32,
.irq = MCF_IRQ_PIT1,
}; };