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

Commit 2a8d7bdd authored by Thomas Abraham's avatar Thomas Abraham Committed by Greg Kroah-Hartman
Browse files

ARM: SAMSUNG: Remove uart irq handling from plaform code 



With uart tx/rx/err interrupt handling moved into the driver for s3c64xx
and later SoC's, the uart interrupt handling in plaform code can be removed.
The uart device irq resources is reduced to one and the related unused
macros are removed.

Suggested-by: default avatarGrant Likely <grant.likely@secretlab.ca>
CC: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 88bb4ea1

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -722,7 +722,6 @@ config ARCH_S3C64XX 
	select ARCH_REQUIRE_GPIOLIB

	select SAMSUNG_CLKSRC

	select SAMSUNG_IRQ_VIC_TIMER

	select SAMSUNG_IRQ_UART

	select S3C_GPIO_TRACK

	select S3C_GPIO_PULL_UPDOWN

	select S3C_GPIO_CFG_S3C24XX

arch/arm/mach-s3c64xx/dev-uart.c

+8 −52
Original line number Diff line number Diff line
@@ -37,21 +37,10 @@ static struct resource s3c64xx_uart0_resource[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_S3CUART_RX0,

		.end	= IRQ_S3CUART_RX0,

		.start	= IRQ_UART0,

		.end	= IRQ_UART0,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= IRQ_S3CUART_TX0,

		.end	= IRQ_S3CUART_TX0,

		.flags	= IORESOURCE_IRQ,



	},

	[3] = {

		.start	= IRQ_S3CUART_ERR0,

		.end	= IRQ_S3CUART_ERR0,

		.flags	= IORESOURCE_IRQ,

	}

};



static struct resource s3c64xx_uart1_resource[] = {
@@ -61,19 +50,8 @@ static struct resource s3c64xx_uart1_resource[] = { 
		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_S3CUART_RX1,

		.end	= IRQ_S3CUART_RX1,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= IRQ_S3CUART_TX1,

		.end	= IRQ_S3CUART_TX1,

		.flags	= IORESOURCE_IRQ,



	},

	[3] = {

		.start	= IRQ_S3CUART_ERR1,

		.end	= IRQ_S3CUART_ERR1,

		.start	= IRQ_UART1,

		.end	= IRQ_UART1,

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -85,19 +63,8 @@ static struct resource s3c6xx_uart2_resource[] = { 
		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_S3CUART_RX2,

		.end	= IRQ_S3CUART_RX2,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= IRQ_S3CUART_TX2,

		.end	= IRQ_S3CUART_TX2,

		.flags	= IORESOURCE_IRQ,



	},

	[3] = {

		.start	= IRQ_S3CUART_ERR2,

		.end	= IRQ_S3CUART_ERR2,

		.start	= IRQ_UART2,

		.end	= IRQ_UART2,

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -109,19 +76,8 @@ static struct resource s3c64xx_uart3_resource[] = { 
		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_S3CUART_RX3,

		.end	= IRQ_S3CUART_RX3,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= IRQ_S3CUART_TX3,

		.end	= IRQ_S3CUART_TX3,

		.flags	= IORESOURCE_IRQ,



	},

	[3] = {

		.start	= IRQ_S3CUART_ERR3,

		.end	= IRQ_S3CUART_ERR3,

		.start	= IRQ_UART3,

		.end	= IRQ_UART3,

		.flags	= IORESOURCE_IRQ,

	},

};

arch/arm/mach-s3c64xx/include/mach/irqs.h

+0 −30
Original line number Diff line number Diff line
@@ -27,36 +27,6 @@ 
#define IRQ_VIC0_BASE	S3C_IRQ(0)

#define IRQ_VIC1_BASE	S3C_IRQ(32)



/* UART interrupts, each UART has 4 intterupts per channel so

 * use the space between the ISA and S3C main interrupts. Note, these

 * are not in the same order as the S3C24XX series! */



#define IRQ_S3CUART_BASE0	(16)

#define IRQ_S3CUART_BASE1	(20)

#define IRQ_S3CUART_BASE2	(24)

#define IRQ_S3CUART_BASE3	(28)



#define UART_IRQ_RXD		(0)

#define UART_IRQ_ERR		(1)

#define UART_IRQ_TXD		(2)

#define UART_IRQ_MODEM		(3)



#define IRQ_S3CUART_RX0		(IRQ_S3CUART_BASE0 + UART_IRQ_RXD)

#define IRQ_S3CUART_TX0		(IRQ_S3CUART_BASE0 + UART_IRQ_TXD)

#define IRQ_S3CUART_ERR0	(IRQ_S3CUART_BASE0 + UART_IRQ_ERR)



#define IRQ_S3CUART_RX1		(IRQ_S3CUART_BASE1 + UART_IRQ_RXD)

#define IRQ_S3CUART_TX1		(IRQ_S3CUART_BASE1 + UART_IRQ_TXD)

#define IRQ_S3CUART_ERR1	(IRQ_S3CUART_BASE1 + UART_IRQ_ERR)



#define IRQ_S3CUART_RX2		(IRQ_S3CUART_BASE2 + UART_IRQ_RXD)

#define IRQ_S3CUART_TX2		(IRQ_S3CUART_BASE2 + UART_IRQ_TXD)

#define IRQ_S3CUART_ERR2	(IRQ_S3CUART_BASE2 + UART_IRQ_ERR)



#define IRQ_S3CUART_RX3		(IRQ_S3CUART_BASE3 + UART_IRQ_RXD)

#define IRQ_S3CUART_TX3		(IRQ_S3CUART_BASE3 + UART_IRQ_TXD)

#define IRQ_S3CUART_ERR3	(IRQ_S3CUART_BASE3 + UART_IRQ_ERR)



/* VIC based IRQs */



#define S3C64XX_IRQ_VIC0(x)	(IRQ_VIC0_BASE + (x))

arch/arm/mach-s3c64xx/irq.c

+0 −25
Original line number Diff line number Diff line
@@ -25,29 +25,6 @@ 
#include <plat/irq-uart.h>

#include <plat/cpu.h>



static struct s3c_uart_irq uart_irqs[] = {

	[0] = {

		.regs		= S3C_VA_UART0,

		.base_irq	= IRQ_S3CUART_BASE0,

		.parent_irq	= IRQ_UART0,

	},

	[1] = {

		.regs		= S3C_VA_UART1,

		.base_irq	= IRQ_S3CUART_BASE1,

		.parent_irq	= IRQ_UART1,

	},

	[2] = {

		.regs		= S3C_VA_UART2,

		.base_irq	= IRQ_S3CUART_BASE2,

		.parent_irq	= IRQ_UART2,

	},

	[3] = {

		.regs		= S3C_VA_UART3,

		.base_irq	= IRQ_S3CUART_BASE3,

		.parent_irq	= IRQ_UART3,

	},

};



/* setup the sources the vic should advertise resume for, even though it

 * is not doing the wake (set_irq_wake needs to be valid) */

#define IRQ_VIC0_RESUME (1 << (IRQ_RTC_TIC - IRQ_VIC0_BASE))
@@ -67,6 +44,4 @@ void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid) 


	/* add the timer sub-irqs */

	s3c_init_vic_timer_irq(5, IRQ_TIMER0);



	s3c_init_uart_irqs(uart_irqs, ARRAY_SIZE(uart_irqs));

}

arch/arm/plat-s5p/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ config PLAT_S5P 
	select PLAT_SAMSUNG

	select SAMSUNG_CLKSRC

	select SAMSUNG_IRQ_VIC_TIMER

	select SAMSUNG_IRQ_UART

	help

	  Base platform code for Samsung's S5P series SoC.