[MIPS] TXx9: Make tx4938-specific code more independent
Make some TX4938 SoC specific code independent from board specific code. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
f6727fb889
commit
c49f91f51e
|
@ -220,6 +220,33 @@ void __init txx9_wdt_init(unsigned long base)
|
||||||
platform_device_register_simple("txx9wdt", -1, &res, 1);
|
platform_device_register_simple("txx9wdt", -1, &res, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* SPI support */
|
||||||
|
void __init txx9_spi_init(int busid, unsigned long base, int irq)
|
||||||
|
{
|
||||||
|
struct resource res[] = {
|
||||||
|
{
|
||||||
|
.start = base,
|
||||||
|
.end = base + 0x20 - 1,
|
||||||
|
.flags = IORESOURCE_MEM,
|
||||||
|
}, {
|
||||||
|
.start = irq,
|
||||||
|
.flags = IORESOURCE_IRQ,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
platform_device_register_simple("spi_txx9", busid,
|
||||||
|
res, ARRAY_SIZE(res));
|
||||||
|
}
|
||||||
|
|
||||||
|
void __init txx9_ethaddr_init(unsigned int id, unsigned char *ethaddr)
|
||||||
|
{
|
||||||
|
struct platform_device *pdev =
|
||||||
|
platform_device_alloc("tc35815-mac", id);
|
||||||
|
if (!pdev ||
|
||||||
|
platform_device_add_data(pdev, ethaddr, 6) ||
|
||||||
|
platform_device_add(pdev))
|
||||||
|
platform_device_put(pdev);
|
||||||
|
}
|
||||||
|
|
||||||
/* wrappers */
|
/* wrappers */
|
||||||
void __init plat_mem_setup(void)
|
void __init plat_mem_setup(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -262,3 +262,19 @@ void __init tx4938_setup_serial(void)
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SERIAL_TXX9 */
|
#endif /* CONFIG_SERIAL_TXX9 */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void __init tx4938_spi_init(int busid)
|
||||||
|
{
|
||||||
|
txx9_spi_init(busid, TX4938_SPI_REG & 0xfffffffffULL,
|
||||||
|
TXX9_IRQ_BASE + TX4938_IR_SPI);
|
||||||
|
}
|
||||||
|
|
||||||
|
void __init tx4938_ethaddr_init(unsigned char *addr0, unsigned char *addr1)
|
||||||
|
{
|
||||||
|
u64 pcfg = __raw_readq(&tx4938_ccfgptr->pcfg);
|
||||||
|
|
||||||
|
if (addr0 && (pcfg & TX4938_PCFG_ETH0_SEL))
|
||||||
|
txx9_ethaddr_init(TXX9_IRQ_BASE + TX4938_IR_ETH0, addr0);
|
||||||
|
if (addr1 && (pcfg & TX4938_PCFG_ETH1_SEL))
|
||||||
|
txx9_ethaddr_init(TXX9_IRQ_BASE + TX4938_IR_ETH1, addr1);
|
||||||
|
}
|
||||||
|
|
|
@ -132,19 +132,7 @@ static int __init rbtx4938_ethaddr_init(void)
|
||||||
if (sum)
|
if (sum)
|
||||||
printk(KERN_WARNING "seeprom: bad checksum.\n");
|
printk(KERN_WARNING "seeprom: bad checksum.\n");
|
||||||
}
|
}
|
||||||
for (i = 0; i < 2; i++) {
|
tx4938_ethaddr_init(&dat[4], &dat[4 + 6]);
|
||||||
unsigned int id =
|
|
||||||
TXX9_IRQ_BASE + (i ? TX4938_IR_ETH1 : TX4938_IR_ETH0);
|
|
||||||
struct platform_device *pdev;
|
|
||||||
if (!(__raw_readq(&tx4938_ccfgptr->pcfg) &
|
|
||||||
(i ? TX4938_PCFG_ETH1_SEL : TX4938_PCFG_ETH0_SEL)))
|
|
||||||
continue;
|
|
||||||
pdev = platform_device_alloc("tc35815-mac", id);
|
|
||||||
if (!pdev ||
|
|
||||||
platform_device_add_data(pdev, &dat[4 + 6 * i], 6) ||
|
|
||||||
platform_device_add(pdev))
|
|
||||||
platform_device_put(pdev);
|
|
||||||
}
|
|
||||||
#endif /* CONFIG_PCI */
|
#endif /* CONFIG_PCI */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -301,24 +289,6 @@ static struct gpio_chip rbtx4938_spi_gpio_chip = {
|
||||||
.ngpio = 3,
|
.ngpio = 3,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* SPI support */
|
|
||||||
|
|
||||||
static void __init txx9_spi_init(unsigned long base, int irq)
|
|
||||||
{
|
|
||||||
struct resource res[] = {
|
|
||||||
{
|
|
||||||
.start = base,
|
|
||||||
.end = base + 0x20 - 1,
|
|
||||||
.flags = IORESOURCE_MEM,
|
|
||||||
}, {
|
|
||||||
.start = irq,
|
|
||||||
.flags = IORESOURCE_IRQ,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
platform_device_register_simple("spi_txx9", 0,
|
|
||||||
res, ARRAY_SIZE(res));
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init rbtx4938_spi_init(void)
|
static int __init rbtx4938_spi_init(void)
|
||||||
{
|
{
|
||||||
struct spi_board_info srtc_info = {
|
struct spi_board_info srtc_info = {
|
||||||
|
@ -341,7 +311,7 @@ static int __init rbtx4938_spi_init(void)
|
||||||
gpio_direction_output(16 + SEEPROM2_CS, 1);
|
gpio_direction_output(16 + SEEPROM2_CS, 1);
|
||||||
gpio_request(16 + SEEPROM3_CS, "seeprom3");
|
gpio_request(16 + SEEPROM3_CS, "seeprom3");
|
||||||
gpio_direction_output(16 + SEEPROM3_CS, 1);
|
gpio_direction_output(16 + SEEPROM3_CS, 1);
|
||||||
txx9_spi_init(TX4938_SPI_REG & 0xfffffffffULL, RBTX4938_IRQ_IRC_SPI);
|
tx4938_spi_init(0);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,5 +45,7 @@ extern int (*txx9_irq_dispatch)(int pending);
|
||||||
void prom_init_cmdline(void);
|
void prom_init_cmdline(void);
|
||||||
char *prom_getcmdline(void);
|
char *prom_getcmdline(void);
|
||||||
void txx9_wdt_init(unsigned long base);
|
void txx9_wdt_init(unsigned long base);
|
||||||
|
void txx9_spi_init(int busid, unsigned long base, int irq);
|
||||||
|
void txx9_ethaddr_init(unsigned int id, unsigned char *ethaddr);
|
||||||
|
|
||||||
#endif /* __ASM_TXX9_GENERIC_H */
|
#endif /* __ASM_TXX9_GENERIC_H */
|
||||||
|
|
|
@ -280,6 +280,8 @@ void tx4938_wdt_init(void);
|
||||||
void tx4938_setup(void);
|
void tx4938_setup(void);
|
||||||
void tx4938_time_init(unsigned int tmrnr);
|
void tx4938_time_init(unsigned int tmrnr);
|
||||||
void tx4938_setup_serial(void);
|
void tx4938_setup_serial(void);
|
||||||
|
void tx4938_spi_init(int busid);
|
||||||
|
void tx4938_ethaddr_init(unsigned char *addr0, unsigned char *addr1);
|
||||||
int tx4938_report_pciclk(void);
|
int tx4938_report_pciclk(void);
|
||||||
void tx4938_report_pci1clk(void);
|
void tx4938_report_pci1clk(void);
|
||||||
int tx4938_pciclk66_setup(void);
|
int tx4938_pciclk66_setup(void);
|
||||||
|
|
Loading…
Reference in a new issue