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

Commit bbfbd8b1 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Move the shared INTC code out to drivers/sh/ 



The INTC code will be re-used across different architectures, so move
this out to drivers/sh/ and include/linux/sh_intc.h respectively.

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

arch/sh/include/asm/hw_irq.h

+2 −90
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __ASM_SH_HW_IRQ_H



#include <linux/init.h>

#include <linux/sh_intc.h>

#include <asm/atomic.h>



extern atomic_t irq_err_count;
@@ -23,101 +24,12 @@ struct ipr_desc { 


void register_ipr_controller(struct ipr_desc *);



typedef unsigned char intc_enum;



struct intc_vect {

	intc_enum enum_id;

	unsigned short vect;

};



#define INTC_VECT(enum_id, vect) { enum_id, vect }

#define INTC_IRQ(enum_id, irq) INTC_VECT(enum_id, irq2evt(irq))



struct intc_group {

	intc_enum enum_id;

	intc_enum enum_ids[32];

};



#define INTC_GROUP(enum_id, ids...) { enum_id, { ids } }



struct intc_mask_reg {

	unsigned long set_reg, clr_reg, reg_width;

	intc_enum enum_ids[32];

#ifdef CONFIG_SMP

	unsigned long smp;

#endif

};



struct intc_prio_reg {

	unsigned long set_reg, clr_reg, reg_width, field_width;

	intc_enum enum_ids[16];

#ifdef CONFIG_SMP

	unsigned long smp;

#endif

};



struct intc_sense_reg {

	unsigned long reg, reg_width, field_width;

	intc_enum enum_ids[16];

};



#ifdef CONFIG_SMP

#define INTC_SMP(stride, nr) .smp = (stride) | ((nr) << 8)

#else

#define INTC_SMP(stride, nr)

#endif



struct intc_desc {

	struct intc_vect *vectors;

	unsigned int nr_vectors;

	struct intc_group *groups;

	unsigned int nr_groups;

	struct intc_mask_reg *mask_regs;

	unsigned int nr_mask_regs;

	struct intc_prio_reg *prio_regs;

	unsigned int nr_prio_regs;

	struct intc_sense_reg *sense_regs;

	unsigned int nr_sense_regs;

	char *name;

#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)

	struct intc_mask_reg *ack_regs;

	unsigned int nr_ack_regs;

#endif

};



#define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a)

#define DECLARE_INTC_DESC(symbol, chipname, vectors, groups,		\

	mask_regs, prio_regs, sense_regs)				\

struct intc_desc symbol __initdata = {					\

	_INTC_ARRAY(vectors), _INTC_ARRAY(groups),			\

	_INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs),			\

	_INTC_ARRAY(sense_regs),					\

	chipname,							\

}



#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)

#define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups,	\

	mask_regs, prio_regs, sense_regs, ack_regs)			\

struct intc_desc symbol __initdata = {					\

	_INTC_ARRAY(vectors), _INTC_ARRAY(groups),			\

	_INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs),			\

	_INTC_ARRAY(sense_regs),					\

	chipname,							\

	_INTC_ARRAY(ack_regs),						\

}

#endif



void __init register_intc_controller(struct intc_desc *desc);

int intc_set_priority(unsigned int irq, unsigned int prio);



void __init plat_irq_setup(void);

#ifdef CONFIG_CPU_SH3

void __init plat_irq_setup_sh3(void);

#endif

void __init plat_irq_setup_pins(int mode);



enum { IRQ_MODE_IRQ, IRQ_MODE_IRQ7654, IRQ_MODE_IRQ3210,

       IRQ_MODE_IRL7654_MASK, IRQ_MODE_IRL3210_MASK,

       IRQ_MODE_IRL7654, IRQ_MODE_IRL3210 };

void __init plat_irq_setup_pins(int mode);



#endif /* __ASM_SH_HW_IRQ_H */

arch/sh/kernel/cpu/irq/Makefile

+0 −2
Original line number Diff line number Diff line 
#

# Makefile for the Linux/SuperH CPU-specifc IRQ handlers.

#

obj-y	+= intc.o



obj-$(CONFIG_SUPERH32)			+= imask.o

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

obj-$(CONFIG_CPU_HAS_IPR_IRQ)		+= ipr.o

drivers/sh/Makefile

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

# Makefile for the SuperH specific drivers.

#



obj-$(CONFIG_SUPERHYWAY)	+= superhyway/

obj-$(CONFIG_MAPLE)		+= maple/

obj-y				+= intc.o

arch/sh/kernel/cpu/irq/intc.c→drivers/sh/intc.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/io.h>

#include <linux/interrupt.h>

#include <linux/bootmem.h>

#include <linux/sh_intc.h>



#define _INTC_MK(fn, mode, addr_e, addr_d, width, shift) \

	((shift) | ((width) << 5) | ((fn) << 9) | ((mode) << 13) | \

include/linux/sh_intc.h

0 → 100644
+91 −0
Original line number Diff line number Diff line 
#ifndef __SH_INTC_H

#define __SH_INTC_H



typedef unsigned char intc_enum;



struct intc_vect {

	intc_enum enum_id;

	unsigned short vect;

};



#define INTC_VECT(enum_id, vect) { enum_id, vect }

#define INTC_IRQ(enum_id, irq) INTC_VECT(enum_id, irq2evt(irq))



struct intc_group {

	intc_enum enum_id;

	intc_enum enum_ids[32];

};



#define INTC_GROUP(enum_id, ids...) { enum_id, { ids } }



struct intc_mask_reg {

	unsigned long set_reg, clr_reg, reg_width;

	intc_enum enum_ids[32];

#ifdef CONFIG_SMP

	unsigned long smp;

#endif

};



struct intc_prio_reg {

	unsigned long set_reg, clr_reg, reg_width, field_width;

	intc_enum enum_ids[16];

#ifdef CONFIG_SMP

	unsigned long smp;

#endif

};



struct intc_sense_reg {

	unsigned long reg, reg_width, field_width;

	intc_enum enum_ids[16];

};



#ifdef CONFIG_SMP

#define INTC_SMP(stride, nr) .smp = (stride) | ((nr) << 8)

#else

#define INTC_SMP(stride, nr)

#endif



struct intc_desc {

	struct intc_vect *vectors;

	unsigned int nr_vectors;

	struct intc_group *groups;

	unsigned int nr_groups;

	struct intc_mask_reg *mask_regs;

	unsigned int nr_mask_regs;

	struct intc_prio_reg *prio_regs;

	unsigned int nr_prio_regs;

	struct intc_sense_reg *sense_regs;

	unsigned int nr_sense_regs;

	char *name;

#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)

	struct intc_mask_reg *ack_regs;

	unsigned int nr_ack_regs;

#endif

};



#define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a)

#define DECLARE_INTC_DESC(symbol, chipname, vectors, groups,		\

	mask_regs, prio_regs, sense_regs)				\

struct intc_desc symbol __initdata = {					\

	_INTC_ARRAY(vectors), _INTC_ARRAY(groups),			\

	_INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs),			\

	_INTC_ARRAY(sense_regs),					\

	chipname,							\

}



#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)

#define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups,	\

	mask_regs, prio_regs, sense_regs, ack_regs)			\

struct intc_desc symbol __initdata = {					\

	_INTC_ARRAY(vectors), _INTC_ARRAY(groups),			\

	_INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs),			\

	_INTC_ARRAY(sense_regs),					\

	chipname,							\

	_INTC_ARRAY(ack_regs),						\

}

#endif



void __init register_intc_controller(struct intc_desc *desc);

int intc_set_priority(unsigned int irq, unsigned int prio);



#endif /* __SH_INTC_H */