115 lines
3.9 KiB
Diff
115 lines
3.9 KiB
Diff
From: Nicolas Pitre <nico@cam.org>
|
|
Date: Fri, 27 Feb 2009 03:55:59 +0000 (-0500)
|
|
Subject: [ARM] Kirkwood: register internal devices in a common place
|
|
X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=5b99d5348304a32dfca92238d27ac4de2b365175
|
|
|
|
[ARM] Kirkwood: register internal devices in a common place
|
|
|
|
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>
|
|
---
|
|
|
|
|
|
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c~ 2009-03-14 08:03:45.000000000 +0000
|
|
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c 2009-03-14 08:03:54.000000000 +0000
|
|
@@ -124,7 +124,6 @@
|
|
}
|
|
kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ);
|
|
|
|
- kirkwood_rtc_init();
|
|
kirkwood_sata_init(&rd88f6281_sata_data);
|
|
kirkwood_sdio_init(&rd88f6281_mvsdio_data);
|
|
kirkwood_uart0_init();
|
|
--- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c~ 2009-03-14 08:03:32.000000000 +0000
|
|
+++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 2009-03-14 08:03:54.000000000 +0000
|
|
@@ -55,7 +55,6 @@
|
|
|
|
kirkwood_ehci_init();
|
|
kirkwood_ge00_init(&db88f6281_ge00_data);
|
|
- kirkwood_rtc_init();
|
|
kirkwood_sata_init(&db88f6281_sata_data);
|
|
kirkwood_uart0_init();
|
|
kirkwood_sdio_init(&db88f6281_mvsdio_data);
|
|
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
|
|
index b1d1a87..913ea94 100644
|
|
--- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
|
|
+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
|
|
@@ -61,14 +61,11 @@ static void __init rd88f6192_init(void)
|
|
|
|
kirkwood_ehci_init();
|
|
kirkwood_ge00_init(&rd88f6192_ge00_data);
|
|
- kirkwood_rtc_init();
|
|
kirkwood_sata_init(&rd88f6192_sata_data);
|
|
spi_register_board_info(rd88F6192_spi_slave_info,
|
|
ARRAY_SIZE(rd88F6192_spi_slave_info));
|
|
kirkwood_spi_init();
|
|
kirkwood_uart0_init();
|
|
- kirkwood_xor0_init();
|
|
- kirkwood_xor1_init();
|
|
}
|
|
|
|
static int __init rd88f6192_pci_init(void)
|
|
|
|
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
|
|
index e5076aa..9f01255 100644
|
|
--- a/arch/arm/mach-kirkwood/common.c
|
|
+++ b/arch/arm/mach-kirkwood/common.c
|
|
@@ -255,7 +255,7 @@ static struct resource kirkwood_rtc_resource = {
|
|
.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);
|
|
}
|
|
@@ -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);
|
|
|
|
@@ -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);
|
|
|
|
@@ -753,4 +753,9 @@ void __init kirkwood_init(void)
|
|
#ifdef CONFIG_CACHE_FEROCEON_L2
|
|
kirkwood_l2_init();
|
|
#endif
|
|
+
|
|
+ /* internal devices that every board has */
|
|
+ kirkwood_rtc_init();
|
|
+ kirkwood_xor0_init();
|
|
+ kirkwood_xor1_init();
|
|
}
|
|
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
|
|
index 5827940..9e52826 100644
|
|
--- a/arch/arm/mach-kirkwood/common.h
|
|
+++ b/arch/arm/mach-kirkwood/common.h
|
|
@@ -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_ge00_switch_init(struct dsa_platform_data *d, int irq);
|
|
void kirkwood_pcie_init(void);
|
|
-void kirkwood_rtc_init(void);
|
|
void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);
|
|
void kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data);
|
|
void kirkwood_spi_init(void);
|
|
void kirkwood_uart0_init(void);
|
|
void kirkwood_uart1_init(void);
|
|
-void kirkwood_xor0_init(void);
|
|
-void kirkwood_xor1_init(void);
|
|
|
|
extern struct sys_timer kirkwood_timer;
|
|
|