mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 14:14:37 +00:00
Code Issues Releases Wiki Activity

[ARM] Kirkwood: register internal devices in a common place

Browse source 
The RTC and the two XOR engines are internal to the chip, and therefore
always available since they don't depend on a particular board layout.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
This commit is contained in:
Nicolas Pitre 2009-02-26 22:55:59 -05:00
parent 249cbfa3f5
commit 5b99d53483
5 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/mach-kirkwood/common.c
View file

@ -255,7 +255,7 @@ static struct resource kirkwood_rtc_resource = {
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}; };
void __init kirkwood_rtc_init(void) static void __init kirkwood_rtc_init(void)
{ {
platform_device_register_simple("rtc-mv", -1, &kirkwood_rtc_resource, 1); platform_device_register_simple("rtc-mv", -1, &kirkwood_rtc_resource, 1);
} }
@ -547,7 +547,7 @@ static struct platform_device kirkwood_xor01_channel = {
}, },
}; };
void __init kirkwood_xor0_init(void) static void __init kirkwood_xor0_init(void)
{ {
platform_device_register(&kirkwood_xor0_shared); platform_device_register(&kirkwood_xor0_shared);
@ -645,7 +645,7 @@ static struct platform_device kirkwood_xor11_channel = {
}, },
}; };
void __init kirkwood_xor1_init(void) static void __init kirkwood_xor1_init(void)
{ {
platform_device_register(&kirkwood_xor1_shared); platform_device_register(&kirkwood_xor1_shared);
@ -753,4 +753,9 @@ void __init kirkwood_init(void)
#ifdef CONFIG_CACHE_FEROCEON_L2 #ifdef CONFIG_CACHE_FEROCEON_L2
kirkwood_l2_init(); kirkwood_l2_init();
#endif #endif
/* internal devices that every board has */
kirkwood_rtc_init();
kirkwood_xor0_init();
kirkwood_xor1_init();
} }

3
arch/arm/mach-kirkwood/common.h
View file

@ -34,14 +34,11 @@ void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data);
void kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data); void kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data);
void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq); void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq);
void kirkwood_pcie_init(void); void kirkwood_pcie_init(void);
void kirkwood_rtc_init(void);
void kirkwood_sata_init(struct mv_sata_platform_data *sata_data); void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);
void kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data); void kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data);
void kirkwood_spi_init(void); void kirkwood_spi_init(void);
void kirkwood_uart0_init(void); void kirkwood_uart0_init(void);
void kirkwood_uart1_init(void); void kirkwood_uart1_init(void);
void kirkwood_xor0_init(void);
void kirkwood_xor1_init(void);
extern struct sys_timer kirkwood_timer; extern struct sys_timer kirkwood_timer;

1
arch/arm/mach-kirkwood/db88f6281-bp-setup.c
View file

@ -94,7 +94,6 @@ static void __init db88f6281_init(void)
kirkwood_ehci_init(); kirkwood_ehci_init();
kirkwood_ge00_init(&db88f6281_ge00_data); kirkwood_ge00_init(&db88f6281_ge00_data);
kirkwood_rtc_init();
kirkwood_sata_init(&db88f6281_sata_data); kirkwood_sata_init(&db88f6281_sata_data);
kirkwood_uart0_init(); kirkwood_uart0_init();
kirkwood_sdio_init(&db88f6281_mvsdio_data); kirkwood_sdio_init(&db88f6281_mvsdio_data);

3
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
View file

@ -57,14 +57,11 @@ static void __init rd88f6192_init(void)
kirkwood_ehci_init(); kirkwood_ehci_init();
kirkwood_ge00_init(&rd88f6192_ge00_data); kirkwood_ge00_init(&rd88f6192_ge00_data);
kirkwood_rtc_init();
kirkwood_sata_init(&rd88f6192_sata_data); kirkwood_sata_init(&rd88f6192_sata_data);
spi_register_board_info(rd88F6192_spi_slave_info, spi_register_board_info(rd88F6192_spi_slave_info,
ARRAY_SIZE(rd88F6192_spi_slave_info)); ARRAY_SIZE(rd88F6192_spi_slave_info));
kirkwood_spi_init(); kirkwood_spi_init();
kirkwood_uart0_init(); kirkwood_uart0_init();
kirkwood_xor0_init();
kirkwood_xor1_init();
} }
static int __init rd88f6192_pci_init(void) static int __init rd88f6192_pci_init(void)

3
arch/arm/mach-kirkwood/rd88f6281-setup.c
View file

@ -121,12 +121,9 @@ static void __init rd88f6281_init(void)
} }
kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ); kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ);
kirkwood_rtc_init();
kirkwood_sata_init(&rd88f6281_sata_data); kirkwood_sata_init(&rd88f6281_sata_data);
kirkwood_sdio_init(&rd88f6281_mvsdio_data); kirkwood_sdio_init(&rd88f6281_mvsdio_data);
kirkwood_uart0_init(); kirkwood_uart0_init();
kirkwood_xor0_init();
kirkwood_xor1_init();
platform_device_register(&rd88f6281_nand_flash); platform_device_register(&rd88f6281_nand_flash);
} }