lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MIPS] TXx9: Miscellaneous build fixes

Browse Source 
* 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>
This commit is contained in:
Atsushi Nemoto
2008-07-18 00:43:48 +09:00
committed by Ralf Baechle
parent 73b4390fb2
commit 8d795f2a5c
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/txx9/Kconfig
View File

@@ -7,6 +7,8 @@ config TOSHIBA_RBTX4927
bool "Toshiba RBTX49[23]7 board" bool "Toshiba RBTX49[23]7 board"
depends on MACH_TX49XX depends on MACH_TX49XX
select SOC_TX4927 select SOC_TX4927
# TX4937 is subset of TX4938
select SOC_TX4938
help help
This Toshiba board is based on the TX4927 processor. Say Y here to This Toshiba board is based on the TX4927 processor. Say Y here to
support this machine type support this machine type

20
arch/mips/txx9/generic/setup.c
View File

@@ -94,6 +94,22 @@ void clk_put(struct clk *clk)
} }
EXPORT_SYMBOL(clk_put); EXPORT_SYMBOL(clk_put);
/* GPIO support */
#ifdef CONFIG_GENERIC_GPIO
int gpio_to_irq(unsigned gpio)
{
return -EINVAL;
}
EXPORT_SYMBOL(gpio_to_irq);
int irq_to_gpio(unsigned irq)
{
return -EINVAL;
}
EXPORT_SYMBOL(irq_to_gpio);
#endif
extern struct txx9_board_vec jmr3927_vec; extern struct txx9_board_vec jmr3927_vec;
extern struct txx9_board_vec rbtx4927_vec; extern struct txx9_board_vec rbtx4927_vec;
extern struct txx9_board_vec rbtx4937_vec; extern struct txx9_board_vec rbtx4937_vec;
@@ -126,15 +142,19 @@ void __init prom_init(void)
#endif #endif
#ifdef CONFIG_CPU_TX49XX #ifdef CONFIG_CPU_TX49XX
switch (TX4938_REV_PCODE()) { switch (TX4938_REV_PCODE()) {
#ifdef CONFIG_TOSHIBA_RBTX4927
case 0x4927: case 0x4927:
txx9_board_vec = &rbtx4927_vec; txx9_board_vec = &rbtx4927_vec;
break; break;
case 0x4937: case 0x4937:
txx9_board_vec = &rbtx4937_vec; txx9_board_vec = &rbtx4937_vec;
break; break;
#endif
#ifdef CONFIG_TOSHIBA_RBTX4938
case 0x4938: case 0x4938:
txx9_board_vec = &rbtx4938_vec; txx9_board_vec = &rbtx4938_vec;
break; break;
#endif
} }
#endif #endif

14
arch/mips/txx9/rbtx4938/setup.c
View File

@@ -457,7 +457,7 @@ static void __init rbtx4938_mem_setup(void)
rbtx4938_fpga_resource.start = CPHYSADDR(RBTX4938_FPGA_REG_ADDR); rbtx4938_fpga_resource.start = CPHYSADDR(RBTX4938_FPGA_REG_ADDR);
rbtx4938_fpga_resource.end = CPHYSADDR(RBTX4938_FPGA_REG_ADDR) + 0xffff; rbtx4938_fpga_resource.end = CPHYSADDR(RBTX4938_FPGA_REG_ADDR) + 0xffff;
rbtx4938_fpga_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY; rbtx4938_fpga_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
if (request_resource(&iomem_resource, &rbtx4938_fpga_resource)) if (request_resource(&txx9_ce_res[2], &rbtx4938_fpga_resource))
printk("request resource for fpga failed\n"); printk("request resource for fpga failed\n");
_machine_restart = rbtx4938_machine_restart; _machine_restart = rbtx4938_machine_restart;
@@ -488,18 +488,6 @@ static int __init rbtx4938_ne_init(void)
return IS_ERR(dev) ? PTR_ERR(dev) : 0; return IS_ERR(dev) ? PTR_ERR(dev) : 0;
} }
/* GPIO support */
int gpio_to_irq(unsigned gpio)
{
return -EINVAL;
}
int irq_to_gpio(unsigned irq)
{
return -EINVAL;
}
static DEFINE_SPINLOCK(rbtx4938_spi_gpio_lock); static DEFINE_SPINLOCK(rbtx4938_spi_gpio_lock);
static void rbtx4938_spi_gpio_set(struct gpio_chip *chip, unsigned int offset, static void rbtx4938_spi_gpio_set(struct gpio_chip *chip, unsigned int offset,