r2729 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches

[Sven Luther]

Author: luther
Date: 2005-03-16 17:24:05 +0100 (Wed, 16 Mar 2005)
New Revision: 2729

Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch
Log:
Checkin for hch to look at, not yet tested, but hoefully final patching of the
marvell gigabit ethernet port on pegasos systems.


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch	2005-03-16 15:31:29 UTC (rev 2728)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch	2005-03-16 16:24:05 UTC (rev 2729)
@@ -8,10 +8,10 @@
 . $(dirname $0)/DPATCH
 
 @DPATCH@
-diff -urN linux-2.6.10-pegasos/arch/ppc/platforms/chrp_pci.c linux-2.6.10-pegasos-marvell/arch/ppc/platforms/chrp_pci.c
---- linux-2.6.10-pegasos/arch/ppc/platforms/chrp_pci.c	2005-03-16 10:52:31.499243024 +0100
-+++ linux-2.6.10-pegasos-marvell/arch/ppc/platforms/chrp_pci.c	2005-03-16 11:01:12.267074280 +0100
-@@ -153,19 +153,25 @@
+diff -urN linux-2.6.11/arch/ppc/platforms/chrp_pci.c linux-2.6.11-pegasos/arch/ppc/platforms/chrp_pci.c
+--- linux-2.6.11/arch/ppc/platforms/chrp_pci.c	2005-03-02 08:38:33.000000000 +0100
++++ linux-2.6.11-pegasos/arch/ppc/platforms/chrp_pci.c	2005-03-16 13:31:30.967266264 +0100
+@@ -155,19 +155,25 @@
  	return 1;
  }
  
@@ -44,32 +44,30 @@
  }
  
  #define PRG_CL_RESET_VALID 0x00010000
-@@ -303,8 +309,5 @@
- 		}
+@@ -304,6 +310,5 @@
  	}
- 	
--	if (is_pegasos)
--		ppc_md.pcibios_fixup = NULL;
--	else
+ 
+ 	/* Do not fixup interrupts from OF tree on pegasos */
+-	if (is_pegasos == 0)
 -		ppc_md.pcibios_fixup = chrp_pcibios_fixup;
 +	ppc_md.pcibios_fixup = chrp_pcibios_fixup;
  }
-diff -urN linux-2.6.10-pegasos/arch/ppc/platforms/Makefile linux-2.6.10-pegasos-marvell/arch/ppc/platforms/Makefile
---- linux-2.6.10-pegasos/arch/ppc/platforms/Makefile	2004-12-24 22:35:49.000000000 +0100
-+++ linux-2.6.10-pegasos-marvell/arch/ppc/platforms/Makefile	2005-03-16 10:53:30.681245992 +0100
+diff -urN linux-2.6.11/arch/ppc/platforms/Makefile linux-2.6.11-pegasos/arch/ppc/platforms/Makefile
+--- linux-2.6.11/arch/ppc/platforms/Makefile	2005-03-02 08:38:33.000000000 +0100
++++ linux-2.6.11-pegasos/arch/ppc/platforms/Makefile	2005-03-16 13:30:51.697236216 +0100
 @@ -12,7 +12,8 @@
  obj-$(CONFIG_PPC_PMAC)		+= pmac_pic.o pmac_setup.o pmac_time.o \
  					pmac_feature.o pmac_pci.o pmac_sleep.o \
- 					pmac_low_i2c.o
+ 					pmac_low_i2c.o pmac_cache.o
 -obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o
 +obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o \
 +					mv643xx_eth_pegasos.o
  obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o
  ifeq ($(CONFIG_PPC_PMAC),y)
  obj-$(CONFIG_NVRAM)		+= pmac_nvram.o
-diff -urN linux-2.6.10-pegasos/arch/ppc/platforms/mv643xx_eth_pegasos.c linux-2.6.10-pegasos-marvell/arch/ppc/platforms/mv643xx_eth_pegasos.c
---- linux-2.6.10-pegasos/arch/ppc/platforms/mv643xx_eth_pegasos.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.10-pegasos-marvell/arch/ppc/platforms/mv643xx_eth_pegasos.c	2005-03-16 10:46:45.000000000 +0100
+diff -urN linux-2.6.11/arch/ppc/platforms/mv643xx_eth_pegasos.c linux-2.6.11-pegasos/arch/ppc/platforms/mv643xx_eth_pegasos.c
+--- linux-2.6.11/arch/ppc/platforms/mv643xx_eth_pegasos.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.11-pegasos/arch/ppc/platforms/mv643xx_eth_pegasos.c	2005-03-16 13:30:22.458681152 +0100
 @@ -0,0 +1,103 @@
 +/*
 + *  arch/ppc/platforms/mv643xx_eth_pegasos.c