Commit 18bc8131 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Get the mach-cayman IRQ support building. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent caead5ef

arch/sh/kernel/cpu/irq/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ 
obj-y	+= intc.o



obj-$(CONFIG_SUPERH32)			+= imask.o

obj-$(CONFIG_CPU_SH5)			+= intc-sh5.o

obj-$(CONFIG_CPU_HAS_IPR_IRQ)		+= ipr.o

obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)	+= maskreg.o

arch/sh64/kernel/irq_intc.c→arch/sh/kernel/cpu/irq/intc-sh5.c

+4 −19
Original line number Diff line number Diff line
@@ -14,21 +14,14 @@ 
 * controller.

 *

 */



#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/stddef.h>

#include <linux/bitops.h>       /* this includes also <asm/registers.h */

                                /* which is required to remap register */

                                /* names used into __asm__ blocks...   */



#include <asm/hardware.h>

#include <asm/platform.h>

#include <linux/bitops.h>

#include <asm/cpu/irq.h>

#include <asm/page.h>

#include <asm/io.h>

#include <asm/irq.h>



/*

 * Maybe the generic Peripheral block could move to a more
@@ -192,7 +185,7 @@ int intc_irq_describe(char* p, int irq) 
}

#endif



void __init init_IRQ(void)

void __init plat_irq_setup(void)

{

        unsigned long long __dummy0, __dummy1=~0x00000000100000f0;

	unsigned long reg;
@@ -251,14 +244,6 @@ void __init init_IRQ(void) 
		}

	}



#ifdef CONFIG_SH_CAYMAN

	{

		extern void init_cayman_irq(void);



		init_cayman_irq();

	}

#endif



	/*

	 * And now let interrupts come in.

	 * sti() is not enough, we need to

arch/sh/kernel/cpu/sh5/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -5,7 +5,3 @@ obj-y := entry.o probe.o switchto.o 


obj-$(CONFIG_SH_FPU)		+= fpu.o

obj-$(CONFIG_KALLSYMS)		+= unwind.o
 


# CPU subtype setup

obj-$(CONFIG_CPU_SUBTYPE_SH5_101)	+= setup-sh5-101.o

obj-$(CONFIG_CPU_SUBTYPE_SH5_103)	+= setup-sh5-101.o

arch/sh/kernel/cpu/sh5/setup-sh5-101.c

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/*

 * SH5-101 Setup

 *

 *  Copyright (C) 2007  Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <linux/init.h>



void __init plat_irq_setup(void)

{

	/* do nothing - all IRL interrupts are handled by the board code */

}

arch/sh/mach-cayman/Makefile

+1 −7
Original line number Diff line number Diff line 
#

# Makefile for the Hitachi Cayman specific parts of the kernel

#

# Note! Dependencies are done automagically by 'make dep', which also

# removes any old dependencies. DON'T put your own dependencies here

# unless it's something special (ie not a .c file).

#



obj-y := setup.o irq.o iomap.o

obj-y := setup.o irq.o

obj-$(CONFIG_HEARTBEAT)	+= led.o