提交 3cd4e067 编写于 作者: F Florian Fainelli 提交者: Ralf Baechle

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: NFlorian Fainelli <florian@openwrt.org>
Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
上级 02163528
...@@ -34,21 +34,11 @@ ...@@ -34,21 +34,11 @@
#include <asm/mach-rc32434/rb.h> #include <asm/mach-rc32434/rb.h>
#include <asm/mach-rc32434/integ.h> #include <asm/mach-rc32434/integ.h>
#include <asm/mach-rc32434/gpio.h> #include <asm/mach-rc32434/gpio.h>
#include <asm/mach-rc32434/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)
#define ETH0_RX_DMA_ADDR (DMA0_BASE_ADDR + 0 * DMA_CHAN_OFFSET) #define ETH0_RX_DMA_ADDR (DMA0_BASE_ADDR + 0 * DMA_CHAN_OFFSET)
#define ETH0_TX_DMA_ADDR (DMA0_BASE_ADDR + 1 * 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[] = { static struct resource korina_dev0_res[] = {
{ {
.name = "korina_regs", .name = "korina_regs",
...@@ -101,8 +91,6 @@ static struct platform_device korina_dev0 = { ...@@ -101,8 +91,6 @@ static struct platform_device korina_dev0 = {
.num_resources = ARRAY_SIZE(korina_dev0_res), .num_resources = ARRAY_SIZE(korina_dev0_res),
}; };
#define CF_GPIO_NUM 13
static struct resource cf_slot0_res[] = { static struct resource cf_slot0_res[] = {
{ {
.name = "cf_membase", .name = "cf_membase",
...@@ -116,7 +104,7 @@ static struct resource cf_slot0_res[] = { ...@@ -116,7 +104,7 @@ static struct resource cf_slot0_res[] = {
}; };
static struct cf_device cf_slot0_data = { static struct cf_device cf_slot0_data = {
.gpio_pin = 13 .gpio_pin = CF_GPIO_NUM
}; };
static struct platform_device cf_slot0 = { static struct platform_device cf_slot0 = {
......
...@@ -61,6 +61,15 @@ struct rb532_gpio_reg { ...@@ -61,6 +61,15 @@ struct rb532_gpio_reg {
/* PCI messaging unit */ /* PCI messaging unit */
#define RC32434_PCI_MSU_GPIO (1 << 13) #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 void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val);
extern unsigned get_434_reg(unsigned reg_offs); extern unsigned get_434_reg(unsigned reg_offs);
......
...@@ -5,4 +5,9 @@ ...@@ -5,4 +5,9 @@
#include <asm/mach-generic/irq.h> #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 */ #endif /* __ASM_RC32434_IRQ_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册