Commit 3cd4e067 authored by Florian Fainelli's avatar Florian Fainelli Committed by Ralf Baechle
Browse files

MIPS: RB532: Cleanup and group definitions to their right places 



This patch moves GPIO related definitions to gpio.h and IRQ
related to irq.h

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 02163528

arch/mips/rb532/devices.c

+2 −14
Original line number Diff line number Diff line
@@ -34,21 +34,11 @@ 
#include <asm/mach-rc32434/rb.h>

#include <asm/mach-rc32434/integ.h>

#include <asm/mach-rc32434/gpio.h>



#define ETH0_DMA_RX_IRQ   	(GROUP1_IRQ_BASE + 0)

#define ETH0_DMA_TX_IRQ   	(GROUP1_IRQ_BASE + 1)

#define ETH0_RX_OVR_IRQ   	(GROUP3_IRQ_BASE + 9)

#define ETH0_TX_UND_IRQ   	(GROUP3_IRQ_BASE + 10)

#include <asm/mach-rc32434/irq.h>



#define ETH0_RX_DMA_ADDR  (DMA0_BASE_ADDR + 0 * DMA_CHAN_OFFSET)

#define ETH0_TX_DMA_ADDR  (DMA0_BASE_ADDR + 1 * DMA_CHAN_OFFSET)



/* NAND definitions */

#define GPIO_RDY (1 << 0x08)

#define GPIO_WPX (1 << 0x09)

#define GPIO_ALE (1 << 0x0a)

#define GPIO_CLE (1 << 0x0b)



static struct resource korina_dev0_res[] = {

	{

		.name = "korina_regs",
@@ -101,8 +91,6 @@ static struct platform_device korina_dev0 = { 
	.num_resources = ARRAY_SIZE(korina_dev0_res),

};



#define CF_GPIO_NUM 13



static struct resource cf_slot0_res[] = {

	{

		.name = "cf_membase",
@@ -116,7 +104,7 @@ static struct resource cf_slot0_res[] = { 
};



static struct cf_device cf_slot0_data = {

	.gpio_pin = 13

	.gpio_pin = CF_GPIO_NUM

};



static struct platform_device cf_slot0 = {

include/asm-mips/mach-rc32434/gpio.h

+9 −0
Original line number Diff line number Diff line
@@ -61,6 +61,15 @@ struct rb532_gpio_reg { 
/* PCI messaging unit */

#define RC32434_PCI_MSU_GPIO	(1 << 13)



/* NAND GPIO signals */

#define GPIO_RDY		(1 << 0x08)

#define GPIO_WPX		(1 << 0x09)

#define GPIO_ALE		(1 << 0x0a)

#define GPIO_CLE		(1 << 0x0b)



/* Compact Flash GPIO pin */

#define CF_GPIO_NUM		13





extern void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val);

extern unsigned get_434_reg(unsigned reg_offs);

include/asm-mips/mach-rc32434/irq.h

+5 −0
Original line number Diff line number Diff line
@@ -5,4 +5,9 @@ 


#include <asm/mach-generic/irq.h>



#define ETH0_DMA_RX_IRQ   	(GROUP1_IRQ_BASE + 0)

#define ETH0_DMA_TX_IRQ   	(GROUP1_IRQ_BASE + 1)

#define ETH0_RX_OVR_IRQ   	(GROUP3_IRQ_BASE + 9)

#define ETH0_TX_UND_IRQ   	(GROUP3_IRQ_BASE + 10)



#endif  /* __ASM_RC32434_IRQ_H */