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

Commit fd633cf1 authored by Gabor Juhos's avatar Gabor Juhos Committed by John Crispin
Browse files

ath79: remove ATH79_MISC_IRQ_* defines 



Use the ATH79_MISC_IRQ() macro instead.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/4930/


Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
parent 7e69c10a

arch/mips/ath79/dev-common.c

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static struct resource ath79_uart_resources[] = { 
static struct plat_serial8250_port ath79_uart_data[] = {

	{

		.mapbase	= AR71XX_UART_BASE,

		.irq		= ATH79_MISC_IRQ_UART,

		.irq		= ATH79_MISC_IRQ(3),

		.flags		= AR71XX_UART_FLAGS,

		.iotype		= UPIO_MEM32,

		.regshift	= 2,
@@ -62,8 +62,8 @@ static struct resource ar933x_uart_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= ATH79_MISC_IRQ_UART,

		.end	= ATH79_MISC_IRQ_UART,

		.start	= ATH79_MISC_IRQ(3),

		.end	= ATH79_MISC_IRQ(3),

		.flags	= IORESOURCE_IRQ,

	},

};

arch/mips/ath79/dev-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static void __init ath79_usb_setup(void) 
	mdelay(900);



	ath79_usb_init_resource(ath79_ohci_resources, AR71XX_OHCI_BASE,

				AR71XX_OHCI_SIZE, ATH79_MISC_IRQ_OHCI);

				AR71XX_OHCI_SIZE, ATH79_MISC_IRQ(6));

	platform_device_register(&ath79_ohci_device);



	ath79_usb_init_resource(ath79_ehci_resources, AR71XX_EHCI_BASE,

arch/mips/ath79/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ void __init arch_init_irq(void) 
		BUG();

	}



	cp0_perfcount_irq = ATH79_MISC_IRQ_PERFC;

	cp0_perfcount_irq = ATH79_MISC_IRQ(5);

	mips_cpu_irq_init();

	ath79_misc_irq_init();

arch/mips/include/asm/mach-ath79/irq.h

+0 −13
Original line number Diff line number Diff line
@@ -26,19 +26,6 @@ 
#define ATH79_IP2_IRQ_COUNT	2

#define ATH79_IP2_IRQ(_x)	(ATH79_IP2_IRQ_BASE + (_x))



#define ATH79_MISC_IRQ_TIMER	(ATH79_MISC_IRQ_BASE + 0)

#define ATH79_MISC_IRQ_ERROR	(ATH79_MISC_IRQ_BASE + 1)

#define ATH79_MISC_IRQ_GPIO	(ATH79_MISC_IRQ_BASE + 2)

#define ATH79_MISC_IRQ_UART	(ATH79_MISC_IRQ_BASE + 3)

#define ATH79_MISC_IRQ_WDOG	(ATH79_MISC_IRQ_BASE + 4)

#define ATH79_MISC_IRQ_PERFC	(ATH79_MISC_IRQ_BASE + 5)

#define ATH79_MISC_IRQ_OHCI	(ATH79_MISC_IRQ_BASE + 6)

#define ATH79_MISC_IRQ_DMA	(ATH79_MISC_IRQ_BASE + 7)

#define ATH79_MISC_IRQ_TIMER2	(ATH79_MISC_IRQ_BASE + 8)

#define ATH79_MISC_IRQ_TIMER3	(ATH79_MISC_IRQ_BASE + 9)

#define ATH79_MISC_IRQ_TIMER4	(ATH79_MISC_IRQ_BASE + 10)

#define ATH79_MISC_IRQ_ETHSW	(ATH79_MISC_IRQ_BASE + 12)



#include_next <irq.h>



#endif /* __ASM_MACH_ATH79_IRQ_H */