103 lines
3.1 KiB
Diff
103 lines
3.1 KiB
Diff
Hi!
|
|
This patch adds support for the OpenRD Ultimate machine(could be found at http://www.arm.linux.org.uk/developer/machines/list.php?id=2884)
|
|
|
|
Besides adding machine description this patch adds correction for PHY address for Ultimate version.
|
|
|
|
Differences from the previous attempt:
|
|
- Correctly filled instances of mv643xx_eth_platform_data in case of ultimate version.
|
|
- Do PCIE initialization for Ultimate version along with Base and Client
|
|
- Init ge01 if (!openrd-base) to make the code cleaner
|
|
|
|
Regards,
|
|
|
|
-- Dmytro Milinevskyy
|
|
|
|
Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
|
|
|
|
[tbm: adapted Kconfig]
|
|
|
|
---
|
|
|
|
arch/arm/mach-kirkwood/Kconfig | 7 +++++++
|
|
arch/arm/mach-kirkwood/openrd-setup.c | 27 ++++++++++++++++++++++++---
|
|
2 files changed, 31 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
|
|
index 29b2163..110a3b8 100644
|
|
--- a/arch/arm/mach-kirkwood/Kconfig
|
|
+++ b/arch/arm/mach-kirkwood/Kconfig
|
|
@@ -74,6 +74,13 @@
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell OpenRD Client Board.
|
|
|
|
+config MACH_OPENRD_ULTIMATE
|
|
+ bool "Marvell OpenRD Ultimate Board"
|
|
+ select MACH_OPENRD
|
|
+ help
|
|
+ Say 'Y' here if you want your kernel to support the
|
|
+ Marvell OpenRD Ultimate Board.
|
|
+
|
|
endmenu
|
|
|
|
endif
|
|
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
|
|
index ad3f1ec..284b00f 100644
|
|
--- a/arch/arm/mach-kirkwood/openrd-setup.c
|
|
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
|
|
@@ -1,7 +1,7 @@
|
|
/*
|
|
* arch/arm/mach-kirkwood/openrd-setup.c
|
|
*
|
|
- * Marvell OpenRD (Base|Client) Board Setup
|
|
+ * Marvell OpenRD (Base|Client|Ultimate) Board Setup
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
@@ -73,9 +73,15 @@ static void __init openrd_init(void)
|
|
|
|
kirkwood_ehci_init();
|
|
|
|
+ if (machine_is_openrd_ultimate()) {
|
|
+ openrd_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
|
|
+ openrd_ge01_data.phy_addr = MV643XX_ETH_PHY_ADDR(1);
|
|
+ }
|
|
+
|
|
kirkwood_ge00_init(&openrd_ge00_data);
|
|
- if (machine_is_openrd_client())
|
|
+ if (!machine_is_openrd_base())
|
|
kirkwood_ge01_init(&openrd_ge01_data);
|
|
+
|
|
kirkwood_sata_init(&openrd_sata_data);
|
|
kirkwood_sdio_init(&openrd_mvsdio_data);
|
|
|
|
@@ -84,7 +90,9 @@ static void __init openrd_init(void)
|
|
|
|
static int __init openrd_pci_init(void)
|
|
{
|
|
- if (machine_is_openrd_base() || machine_is_openrd_client())
|
|
+ if (machine_is_openrd_base() ||
|
|
+ machine_is_openrd_client() ||
|
|
+ machine_is_openrd_ultimate())
|
|
kirkwood_pcie_init();
|
|
|
|
return 0;
|
|
@@ -116,3 +124,16 @@ MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board")
|
|
.timer = &kirkwood_timer,
|
|
MACHINE_END
|
|
#endif
|
|
+
|
|
+#ifdef CONFIG_MACH_OPENRD_ULTIMATE
|
|
+MACHINE_START(OPENRD_ULTIMATE, "Marvell OpenRD Ultimate Board")
|
|
+ /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */
|
|
+ .phys_io = KIRKWOOD_REGS_PHYS_BASE,
|
|
+ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
|
|
+ .boot_params = 0x00000100,
|
|
+ .init_machine = openrd_init,
|
|
+ .map_io = kirkwood_map_io,
|
|
+ .init_irq = kirkwood_init_irq,
|
|
+ .timer = &kirkwood_timer,
|
|
+MACHINE_END
|
|
+#endif
|
|
--
|
|
1.7.1
|