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

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

sh: mach-se evt2irq migration. 



Migrate Solution Engine boards to evt2irq backed hwirq lookups.

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

arch/sh/boards/mach-se/7722/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/input.h>

#include <linux/input/sh_keysc.h>

#include <linux/smc91x.h>

#include <linux/sh_intc.h>

#include <mach-se/mach/se7722.h>

#include <mach-se/mach/mrshpc.h>

#include <asm/machvec.h>
@@ -114,7 +115,7 @@ static struct resource sh_keysc_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 79,

		.start  = evt2irq(0xbe0),

		.flags  = IORESOURCE_IRQ,

	},

};

arch/sh/boards/mach-se/7724/setup.c

+16 −15
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/input/sh_keysc.h>

#include <linux/usb/r8a66597.h>

#include <linux/sh_eth.h>

#include <linux/sh_intc.h>

#include <linux/videodev2.h>

#include <video/sh_mobile_lcdc.h>

#include <media/sh_mobile_ceu.h>
@@ -197,7 +198,7 @@ static struct resource lcdc_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 106,

		.start	= evt2irq(0xf40),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -224,7 +225,7 @@ static struct resource ceu0_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start  = 52,

		.start  = evt2irq(0x880),

		.flags  = IORESOURCE_IRQ,

	},

	[2] = {
@@ -255,7 +256,7 @@ static struct resource ceu1_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start  = 63,

		.start  = evt2irq(0x9e0),

		.flags  = IORESOURCE_IRQ,

	},

	[2] = {
@@ -289,7 +290,7 @@ static struct resource fsi_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start  = 108,

		.start  = evt2irq(0xf80),

		.flags  = IORESOURCE_IRQ,

	},

};
@@ -343,7 +344,7 @@ static struct resource keysc_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 79,

		.start  = evt2irq(0xbe0),

		.flags  = IORESOURCE_IRQ,

	},

};
@@ -366,7 +367,7 @@ static struct resource sh_eth_resources[] = { 
		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = 91,

		.start = evt2irq(0xd60),

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

	},

};
@@ -397,8 +398,8 @@ static struct resource sh7724_usb0_host_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 65,

		.end	= 65,

		.start	= evt2irq(0xa20),

		.end	= evt2irq(0xa20),

		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_LOW,

	},

};
@@ -426,8 +427,8 @@ static struct resource sh7724_usb1_gadget_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 66,

		.end	= 66,

		.start	= evt2irq(0xa40),

		.end	= evt2irq(0xa40),

		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_LOW,

	},

};
@@ -452,7 +453,7 @@ static struct resource sdhi0_cn7_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 100,

		.start  = evt2irq(0xe80),

		.flags  = IORESOURCE_IRQ,

	},

};
@@ -481,7 +482,7 @@ static struct resource sdhi1_cn8_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 23,

		.start  = evt2irq(0x4e0),

		.flags  = IORESOURCE_IRQ,

	},

};
@@ -511,7 +512,7 @@ static struct resource irda_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 20,

		.start  = evt2irq(0x480),

		.flags  = IORESOURCE_IRQ,

	},

};
@@ -549,7 +550,7 @@ static struct resource sh_vou_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 55,

		.start  = evt2irq(0x8e0),

		.flags  = IORESOURCE_IRQ,

	},

};
@@ -595,6 +596,7 @@ static struct i2c_board_info i2c0_devices[] = { 
#define EEPROM_DATA 0xBA20600C

#define EEPROM_STAT 0xBA206010

#define EEPROM_STRT 0xBA206014



static int __init sh_eth_is_eeprom_ready(void)

{

	int t = 10000;
@@ -651,7 +653,6 @@ extern char ms7724se_sdram_enter_end; 
extern char ms7724se_sdram_leave_start;

extern char ms7724se_sdram_leave_end;





static int __init arch_setup(void)

{

	/* enable I2C device */

arch/sh/include/mach-se/mach/se.h

+10 −9
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 *

 * Hitachi SolutionEngine support

 */

#include <linux/sh_intc.h>



/* Box specific addresses.  */
@@ -82,16 +83,16 @@ 
#define INTC_IPRD       0xa4000018UL

#define INTC_IPRE       0xa400001aUL



#define IRQ0_IRQ        32

#define IRQ1_IRQ        33

#define IRQ0_IRQ        evt2irq(0x600)

#define IRQ1_IRQ        evt2irq(0x620)

#endif



#if defined(CONFIG_CPU_SUBTYPE_SH7705)

#define IRQ_STNIC	12

#define IRQ_CFCARD	14

#define IRQ_STNIC	evt2irq(0x380)

#define IRQ_CFCARD	evt2irq(0x3c0)

#else

#define IRQ_STNIC	10

#define IRQ_CFCARD	7

#define IRQ_STNIC	evt2irq(0x340)

#define IRQ_CFCARD	evt2irq(0x2e0)

#endif



/* SH Ether support (SH7710/SH7712) */
@@ -105,9 +106,9 @@ 
# define PHY_ID 0x01

#endif

/* Ether IRQ */

#define SH_ETH0_IRQ	80

#define SH_ETH1_IRQ	81

#define SH_TSU_IRQ	82

#define SH_ETH0_IRQ	evt2irq(0xc00)

#define SH_ETH1_IRQ	evt2irq(0xc20)

#define SH_TSU_IRQ	evt2irq(0xc40)



void init_se_IRQ(void);

arch/sh/include/mach-se/mach/se7343.h

+5 −4
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 *

 * SH-Mobile SolutionEngine 7343 support

 */

#include <linux/sh_intc.h>



/* Box specific addresses.  */
@@ -118,10 +119,10 @@ 
#define FPGA_IN		0xb1400000

#define FPGA_OUT	0xb1400002



#define IRQ0_IRQ        32

#define IRQ1_IRQ        33

#define IRQ4_IRQ        36

#define IRQ5_IRQ        37

#define IRQ0_IRQ        evt2irq(0x600)

#define IRQ1_IRQ        evt2irq(0x620)

#define IRQ4_IRQ        evt2irq(0x680)

#define IRQ5_IRQ        evt2irq(0x6a0)



#define SE7343_FPGA_IRQ_MRSHPC0	0

#define SE7343_FPGA_IRQ_MRSHPC1	1

arch/sh/include/mach-se/mach/se7721.h

+4 −2
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


#ifndef __ASM_SH_SE7721_H

#define __ASM_SH_SE7721_H



#include <linux/sh_intc.h>

#include <asm/addrspace.h>



/* Box specific addresses. */
@@ -51,7 +53,7 @@ 
#define PA_LED		0xB6800000	/* 8bit LED */

#define PA_FPGA		0xB7000000	/* FPGA base address */



#define MRSHPC_IRQ0	10

#define MRSHPC_IRQ0	evt2irq(0x340)



#define FPGA_ILSR1	(PA_FPGA + 0x02)

#define FPGA_ILSR2	(PA_FPGA + 0x03)