Commit f725b5ee authored by Takashi YOSHII's avatar Takashi YOSHII Committed by Paul Mundt
Browse files

sh: shmin updates. 



This fixes up shmin (and SH7706/SH7708) IPR support for some of the
recent API changes.

Signed-off-by: default avatarTakashi YOSHII <takasi-y@ops.dti.ne.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 2c081e71

arch/sh/boards/shmin/setup.c

+11 −1
Original line number Diff line number Diff line
@@ -12,12 +12,22 @@ 
#include <asm/irq.h>

#include <asm/io.h>



#define PFC_PHCR	0xa400010e

#define PFC_PHCR	0xa400010eUL

#define INTC_ICR1	0xffd00000UL

#define INTC_IPRC	0xa4000016UL



static struct ipr_data shmin_ipr_map[] = {

	{ .irq=32, .addr=INTC_IPRC, .shift= 0, .priority=0 }, 

	{ .irq=33, .addr=INTC_IPRC, .shift= 4, .priority=0 }, 

	{ .irq=34, .addr=INTC_IPRC, .shift= 8, .priority=8 }, 

	{ .irq=35, .addr=INTC_IPRC, .shift=12, .priority=0 }, 

};



static void __init init_shmin_irq(void)

{

	ctrl_outw(0x2a00, PFC_PHCR);	// IRQ0-3=IRQ

	ctrl_outw(0x0aaa, INTC_ICR1);	// IRQ0-3=IRQ-mode,Low-active.

	make_ipr_irq(shmin_ipr_map, ARRAY_SIZE(shmin_ipr_map));

}



static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)

arch/sh/kernel/cpu/irq/ipr.c

+16 −3
Original line number Diff line number Diff line
@@ -43,16 +43,29 @@ static struct irq_chip ipr_irq_chip = { 
	.mask_ack	= disable_ipr_irq,

};



unsigned int map_ipridx_to_addr(int idx) __attribute__ ((weak));

unsigned int map_ipridx_to_addr(int idx)

{

	return 0;

}



void make_ipr_irq(struct ipr_data *table, unsigned int nr_irqs)

{

	int i;



	for (i = 0; i < nr_irqs; i++) {

		unsigned int irq = table[i].irq;

		table[i].addr = map_ipridx_to_addr(table[i].ipr_idx);



		if (!irq)

			irq = table[i].irq = i;



		/* could the IPR index be mapped, if not we ignore this */

		if (table[i].addr == 0)

		if (!table[i].addr) {

			table[i].addr = map_ipridx_to_addr(table[i].ipr_idx);

			if (!table[i].addr)

				continue;

		}



		disable_irq_nosync(irq);

		set_irq_chip_and_handler_name(irq, &ipr_irq_chip,

				      handle_level_irq, "level");

arch/sh/kernel/cpu/sh3/setup-sh7709.c

+21 −0
Original line number Diff line number Diff line
@@ -51,3 +51,24 @@ static int __init sh7709_devices_setup(void) 
				    ARRAY_SIZE(sh7709_devices));

}

__initcall(sh7709_devices_setup);



#define IPRx(A,N) .addr=A, .shift=0*N*-1

#define IPRA(N)	IPRx(0xfffffee2UL,N)

#define IPRB(N)	IPRx(0xfffffee4UL,N)

#define IPRE(N)	IPRx(0xa400001aUL,N)



static struct ipr_data sh7709_ipr_map[] = {

	[16]		= { IPRA(15-12), 2 }, /* TMU TUNI0 */

	[17]		= { IPRA(11-8),  4 }, /* TMU TUNI1 */

	[22]		= { IPRA(3-0),   2 }, /* RTC CUI */

	[23 ... 26]	= { IPRB(7-4),   3 }, /* SCI */

	[27]		= { IPRB(15-12), 2 }, /* WDT ITI */

	[48 ... 51]	= { IPRE(15-12), 7 }, /* DMA */

	[52 ... 55]	= { IPRE(11-8),  3 }, /* IRDA */

	[56 ... 59]	= { IPRE(7-4),   3 }, /* SCIF */

};



void __init init_IRQ_ipr()

{

	make_ipr_irq(sh7709_ipr_map, ARRAY_SIZE(sh7709_ipr_map));

}

arch/sh/mm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ config CPU_SUBTYPE_SH7705 
config CPU_SUBTYPE_SH7706

	bool "Support SH7706 processor"

	select CPU_SH3

	select CPU_HAS_IPR_IRQ

	help

	  Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
@@ -92,6 +93,7 @@ config CPU_SUBTYPE_SH7708 
config CPU_SUBTYPE_SH7709

	bool "Support SH7709 processor"

	select CPU_SH3

	select CPU_HAS_IPR_IRQ

	select CPU_HAS_PINT_IRQ

	help

	  Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.