X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4784f4c2bf048b55011c8dd82357d0d4b272597f..401bc38762bc0f72ebef9844389593bb2a904a71:/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch b/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
index 79e5e356a..45589a862 100644
--- a/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
@@ -11,7 +11,7 @@
  CONFIG_MACH_IXDP465=y
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -65,6 +65,24 @@
+@@ -65,6 +65,22 @@
  	  WG302 v2 or WAG302 v2 Access Points. For more information
  	  on this platform, see http://openwrt.org
  
@@ -29,9 +29,7 @@
 +# CF slot connected to the expansion bus, so we just enable them together.
 +#
 +config MACH_PRONGHORNMETRO
-+	bool 
-+	depends on MACH_PRONGHORN
-+	default y
++	def_bool MACH_PRONGHORN
 +
  config ARCH_IXDP425
  	bool "IXDP425"
@@ -322,7 +320,7 @@
 +	ixp4xx_sys_init();
 +
 +	pronghorn_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-+	pronghorn_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_16M - 1;
++	pronghorn_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
 +
 +	*IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
 +	*IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
@@ -330,15 +328,6 @@
 +	platform_add_devices(pronghorn_devices, ARRAY_SIZE(pronghorn_devices));
 +
 +	if (machine_is_pronghorn()) {
-+		pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(3);
-+		pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(3);
-+
-+		pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(4);
-+		pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(4);
-+
-+		pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS3;
-+		pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS4;
-+	} else {
 +		pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(2);
 +		pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(2);
 +
@@ -347,6 +336,15 @@
 +
 +		pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS2;
 +		pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS3;
++	} else {
++		pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(3);
++		pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(3);
++
++		pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(4);
++		pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(4);
++
++		pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS3;
++		pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS4;
 +
 +		platform_device_register(&pronghorn_i2c_gpio);
 +	}