set up the NPEs and microcode loading on the Pronghorn Metro

SVN-Revision: 6861

2 files changed, 119 insertions, 0 deletions

diff --git a/target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch b/target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch
new file mode 100644
index 0000000000..17b6b3642a
--- /dev/null
+++ b/target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch
@@ -0,0 +1,63 @@
+diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+--- linux-2.6.19.2/arch/arm/mach-ixp4xx/pronghornmetro-setup.c	2007-04-02 21:30:12.000000000 +0200
++++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c	2007-04-02 21:57:11.000000000 +0200
+@@ -87,10 +87,58 @@
+ 	.resource	= &pronghornmetro_uart_resource,
+ };
+ 
++static struct resource res_mac0 = {
++	.start		= IXP4XX_EthB_BASE_PHYS,
++	.end		= IXP4XX_EthB_BASE_PHYS + 0x1ff,
++	.flags		= IORESOURCE_MEM,
++};
++
++static struct resource res_mac1 = {
++	.start		= IXP4XX_EthC_BASE_PHYS,
++	.end		= IXP4XX_EthC_BASE_PHYS + 0x1ff,
++	.flags		= IORESOURCE_MEM,
++};
++
++static struct mac_plat_info plat_mac0 = {
++	.npe_id		= 1,
++	.phy_id		= 0,
++	.eth_id		= 0,
++	.rxq_id		= 27,
++	.txq_id		= 24,
++	.rxdoneq_id	= 4,
++};
++
++static struct mac_plat_info plat_mac1 = {
++	.npe_id		= 2,
++	.phy_id		= 1,
++	.eth_id		= 1,
++	.rxq_id		= 28,
++	.txq_id		= 25,
++	.rxdoneq_id	= 5,
++};
++
++static struct platform_device mac0 = {
++	.name		= "ixp4xx_mac",
++	.id		= 0,
++	.dev.platform_data = &plat_mac0,
++	.num_resources	= 1,
++	.resource	= &res_mac0,
++};
++
++static struct platform_device mac1 = {
++	.name		= "ixp4xx_mac",
++	.id		= 1,
++	.dev.platform_data = &plat_mac1,
++	.num_resources	= 1,
++	.resource	= &res_mac1,
++};
++
+ static struct platform_device *pronghornmetro_devices[] __initdata = {
+ 	&pronghornmetro_i2c_controller,
+ 	&pronghornmetro_flash,
+-	&pronghornmetro_uart
++	&pronghornmetro_uart,
++	&mac0,
++	&mac1,
+ };
+ 
+ static void __init pronghornmetro_init(void)
diff --git a/target/linux/ixp4xx-2.6/patches/420-pronghorn_metro_mtd_microcode.patch b/target/linux/ixp4xx-2.6/patches/420-pronghorn_metro_mtd_microcode.patch
new file mode 100644
index 0000000000..f3fed26b1a
--- /dev/null
+++ b/target/linux/ixp4xx-2.6/patches/420-pronghorn_metro_mtd_microcode.patch
@@ -0,0 +1,56 @@
+diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+--- linux-2.6.19.2/arch/arm/mach-ixp4xx/pronghornmetro-setup.c	2007-04-04 11:48:14.000000000 +0200
++++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c	2007-04-04 11:52:09.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include <linux/serial.h>
+ #include <linux/tty.h>
+ #include <linux/serial_8250.h>
++#include <linux/mtd/mtd.h>
+ #include <linux/slab.h>
+ 
+ #include <asm/types.h>
+@@ -133,12 +134,35 @@
+ 	.resource	= &res_mac1,
+ };
+ 
++struct npe_ucode_platform_data pronghornmetro_npe_ucode_data = {
++	.mtd_partition	= "RedBoot",
++};
++
++static struct platform_device pronghornmetro_npe_ucode = {
++	.name			= "ixp4xx_npe_ucode",
++	.id			= 0,
++	.dev.platform_data	= &pronghornmetro_npe_ucode_data,
++};
++
+ static struct platform_device *pronghornmetro_devices[] __initdata = {
+ 	&pronghornmetro_i2c_controller,
+ 	&pronghornmetro_flash,
+ 	&pronghornmetro_uart,
+ 	&mac0,
+ 	&mac1,
++	&pronghornmetro_npe_ucode,
++};
++
++static void pronghornmetro_flash_add(struct mtd_info *mtd)
++{
++}
++
++static void pronghornmetro_flash_remove(struct mtd_info *mtd) {
++}
++
++static struct mtd_notifier pronghornmetro_flash_notifier = {
++	.add = pronghornmetro_flash_add,
++	.remove = pronghornmetro_flash_remove,
+ };
+ 
+ static void __init pronghornmetro_init(void)
+@@ -152,6 +176,8 @@
+ 	*IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
+ 
+ 	platform_add_devices(pronghornmetro_devices, ARRAY_SIZE(pronghornmetro_devices));
++
++	register_mtd_user(&pronghornmetro_flash_notifier);
+ }
+ 
+ #ifdef CONFIG_MACH_PRONGHORNMETRO