Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c1d2470 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
  MN10300: Clear ASB2364 peripheral interrupt masks before enabling interrupts
  MN10300: Fix the ASB2364 gdbport UART register defs
  MN10300: Fix ASB2364 FPGA register defs
  MN10300: Select GENERIC_HARDIRQS_NO_DEPRECATED
  MN10300: Select HAVE_GENERIC_HARDIRQS rather than GENERIC_HARDIRQS
  MN10300: Convert ASB2364 FPGA irq_chip to new functions
  MN10300: Convert ipi irq_chip to new functions
  MN10300: Convert serial irq_chip to new functions
  MN10300: Convert cpu irq_chips to new functions
  MN10300: Remove unused mn10300_intc_* functions
  MN10300: Remove stale irq_chip.end - V2
  MN10300: Use clockevents_calc_mult_shift()
  MN10300: Use clocksource_register_hz()
  MN10300: Remove stale code
parents 664322a4 ddb7d1e9

arch/mn10300/Kconfig

+2 −16
Original line number Diff line number Diff line 
config MN10300

	def_bool y

	select HAVE_OPROFILE

	select GENERIC_HARDIRQS

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_HARDIRQS_NO_DEPRECATED



config AM33_2

	def_bool n
@@ -53,21 +54,6 @@ config GENERIC_TIME 
config GENERIC_CLOCKEVENTS

	def_bool y



config GENERIC_CLOCKEVENTS_BUILD

	def_bool y

	depends on GENERIC_CLOCKEVENTS



config GENERIC_CLOCKEVENTS_BROADCAST

	bool



config CEVT_MN10300

       def_bool y

       depends on GENERIC_CLOCKEVENTS



config CSRC_MN10300

       def_bool y

       depends on GENERIC_TIME



config GENERIC_BUG

	def_bool y

arch/mn10300/include/asm/intctl-regs.h

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ 


#ifndef __ASSEMBLY__

extern void set_intr_level(int irq, u16 level);

extern void mn10300_intc_set_level(unsigned int irq, unsigned int level);

extern void mn10300_intc_clear(unsigned int irq);

extern void mn10300_intc_set(unsigned int irq);

extern void mn10300_intc_enable(unsigned int irq);

extern void mn10300_intc_disable(unsigned int irq);

extern void mn10300_set_lateack_irq_type(int irq);

#endif

arch/mn10300/kernel/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ fpu-obj-$(CONFIG_FPU) := fpu.o fpu-low.o 


obj-y   := process.o signal.o entry.o traps.o irq.o \

	   ptrace.o setup.o time.o sys_mn10300.o io.o kthread.o \

	   switch_to.o mn10300_ksyms.o kernel_execve.o $(fpu-obj-y)

	   switch_to.o mn10300_ksyms.o kernel_execve.o $(fpu-obj-y) \

	   csrc-mn10300.o cevt-mn10300.o



obj-$(CONFIG_SMP) += smp.o smp-low.o
@@ -28,5 +29,3 @@ obj-$(CONFIG_MN10300_RTC) += rtc.o 
obj-$(CONFIG_PROFILE) += profile.o profile-low.o

obj-$(CONFIG_MODULES) += module.o

obj-$(CONFIG_KPROBES) += kprobes.o
 
obj-$(CONFIG_CSRC_MN10300) += csrc-mn10300.o

obj-$(CONFIG_CEVT_MN10300) += cevt-mn10300.o

arch/mn10300/kernel/cevt-mn10300.c

+6 −5
Original line number Diff line number Diff line
@@ -89,9 +89,10 @@ int __init init_clockevents(void) 
	cd->name		= "Timestamp";

	cd->features		= CLOCK_EVT_FEAT_ONESHOT;



	/* Calculate the min / max delta */

	clockevent_set_clock(cd, MN10300_JCCLK);

	/* Calculate shift/mult. We want to spawn at least 1 second */

	clockevents_calc_mult_shift(cd, MN10300_JCCLK, 1);



	/* Calculate the min / max delta */

	cd->max_delta_ns	= clockevent_delta2ns(TMJCBR_MAX, cd);

	cd->min_delta_ns	= clockevent_delta2ns(100, cd);
@@ -110,9 +111,9 @@ int __init init_clockevents(void) 
#if defined(CONFIG_SMP) && !defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)

	/* setup timer irq affinity so it only runs on this cpu */

	{

		struct irq_desc *desc;

		desc = irq_to_desc(cd->irq);

		cpumask_copy(desc->affinity, cpumask_of(cpu));

		struct irq_data *data;

		data = irq_get_irq_data(cd->irq);

		cpumask_copy(data->affinity, cpumask_of(cpu));

		iact->flags |= IRQF_NOBALANCING;

	}

#endif

arch/mn10300/kernel/csrc-mn10300.c

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ static struct clocksource clocksource_mn10300 = { 
int __init init_clocksource(void)

{

	startup_timestamp_counter();

	clocksource_set_clock(&clocksource_mn10300, MN10300_TSCCLK);

	clocksource_register(&clocksource_mn10300);

	clocksource_register_hz(&clocksource_mn10300, MN10300_TSCCLK);

	return 0;

}