diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-07-17 11:43:48 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-20 09:38:19 -0400 |
commit | 8d795f2a5cf73338a467ac82bdeb73225e987c45 (patch) | |
tree | 050293df491ce1623d4c7dc5f5c21a0e4f7fcf84 /arch/mips/txx9/rbtx4938/setup.c | |
parent | 73b4390fb23456964201abda79f1210fe337d01a (diff) |
[MIPS] TXx9: Miscellaneous build fixes
* Fix build if only RBTX4927 or RBTX4938 was selected.
* Move gpio helpers to generic part.
* Select SOC_TX4938 for RBTX4927/37 board.
* Fix parent of rbtx4938_fpga_resource.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/txx9/rbtx4938/setup.c')
-rw-r--r-- | arch/mips/txx9/rbtx4938/setup.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c index aaa987ae0f83..c2da92396b7a 100644 --- a/arch/mips/txx9/rbtx4938/setup.c +++ b/arch/mips/txx9/rbtx4938/setup.c | |||
@@ -457,7 +457,7 @@ static void __init rbtx4938_mem_setup(void) | |||
457 | rbtx4938_fpga_resource.start = CPHYSADDR(RBTX4938_FPGA_REG_ADDR); | 457 | rbtx4938_fpga_resource.start = CPHYSADDR(RBTX4938_FPGA_REG_ADDR); |
458 | rbtx4938_fpga_resource.end = CPHYSADDR(RBTX4938_FPGA_REG_ADDR) + 0xffff; | 458 | rbtx4938_fpga_resource.end = CPHYSADDR(RBTX4938_FPGA_REG_ADDR) + 0xffff; |
459 | rbtx4938_fpga_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY; | 459 | rbtx4938_fpga_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY; |
460 | if (request_resource(&iomem_resource, &rbtx4938_fpga_resource)) | 460 | if (request_resource(&txx9_ce_res[2], &rbtx4938_fpga_resource)) |
461 | printk("request resource for fpga failed\n"); | 461 | printk("request resource for fpga failed\n"); |
462 | 462 | ||
463 | _machine_restart = rbtx4938_machine_restart; | 463 | _machine_restart = rbtx4938_machine_restart; |
@@ -488,18 +488,6 @@ static int __init rbtx4938_ne_init(void) | |||
488 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; | 488 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; |
489 | } | 489 | } |
490 | 490 | ||
491 | /* GPIO support */ | ||
492 | |||
493 | int gpio_to_irq(unsigned gpio) | ||
494 | { | ||
495 | return -EINVAL; | ||
496 | } | ||
497 | |||
498 | int irq_to_gpio(unsigned irq) | ||
499 | { | ||
500 | return -EINVAL; | ||
501 | } | ||
502 | |||
503 | static DEFINE_SPINLOCK(rbtx4938_spi_gpio_lock); | 491 | static DEFINE_SPINLOCK(rbtx4938_spi_gpio_lock); |
504 | 492 | ||
505 | static void rbtx4938_spi_gpio_set(struct gpio_chip *chip, unsigned int offset, | 493 | static void rbtx4938_spi_gpio_set(struct gpio_chip *chip, unsigned int offset, |