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

[Sven Luther]

Author: luther
Date: 2005-03-17 00:36:13 +0100 (Thu, 17 Mar 2005)
New Revision: 2732

Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch
Log:
powerpc gigabit ethernet driver now uses device_initcall to initialize itself.


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 22:19:43 UTC (rev 2731)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch	2005-03-16 23:36:13 UTC (rev 2732)
@@ -16,58 +16,15 @@
  					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
++					chrp_pegasos_eth.o
  obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o
  ifeq ($(CONFIG_PPC_PMAC),y)
  obj-$(CONFIG_NVRAM)		+= pmac_nvram.o
---- 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 19:50:13.983842672 +0100
-@@ -21,6 +21,7 @@
- #include <asm/sections.h>
- #include <asm/pci-bridge.h>
- #include <asm/open_pic.h>
-+#include <asm/mv64x60.h>
- 
- /* LongTrail */
- void __iomem *gg2_pci_config_base;
-@@ -161,13 +162,18 @@
- 	struct pci_dev *dev = NULL;
- 	struct device_node *np;
- 
--	/* PCI interrupts are controlled by the OpenPIC */
--	for_each_pci_dev(dev) {
--		np = pci_device_to_OF_node(dev);
--		if ((np != 0) && (np->n_intrs > 0) && (np->intrs[0].line != 0))
--			dev->irq = np->intrs[0].line;
--		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-+	if (_chrp_type != _CHRP_Pegasos) {
-+		/* PCI interrupts are controlled by the OpenPIC */
-+		for_each_pci_dev(dev) {
-+			np = pci_device_to_OF_node(dev);
-+			if ((np != 0) && (np->n_intrs > 0) && (np->intrs[0].line != 0))
-+				dev->irq = np->intrs[0].line;
-+			pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-+		}
- 	}
-+	
-+	/* Let's search for marvel 643xx northbridges and do presetup if found */
-+	mv643xx_eth_add_pds();
- }
- 
- #define PRG_CL_RESET_VALID 0x00010000
-@@ -304,6 +310,5 @@
- 	}
- 
- 	/* 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;
- }
---- 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 19:43:34.375592360 +0100
-@@ -0,0 +1,100 @@
+--- linux-2.6.11/arch/ppc/platforms/chrp_pegasos_eth.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.11-pegasos/arch/ppc/platforms/chrp_pegasos_eth.c	2005-03-16 19:43:34.375592360 +0100
+@@ -0,0 +1,101 @@
 +/*
-+ *  arch/ppc/platforms/mv643xx_eth_pegasos.c
++ *  arch/ppc/platforms/chrp_pegasos_eth.c
 + *
 + *  Copyright (C) 2005 Sven Luther <sl@bplan-gmbh.de> 
 + *  Thanks to :
@@ -166,13 +123,4 @@
 +	}
 +	return ret;
 +}
---- linux-2.6.11/include/asm-ppc/mv64x60.h	2005-03-02 08:38:17.000000000 +0100
-+++ linux-2.6.11-pegasos/include/asm-ppc/mv64x60.h	2005-03-16 19:48:44.646424024 +0100
-@@ -342,4 +342,7 @@
- extern struct mv64x60_64bit_window
- 	mv64360_64bit_windows[MV64x60_64BIT_WIN_COUNT];
- 
-+/* chrp/pegasos probe and initialization function */
-+extern int mv643xx_eth_add_pds(void);
-+
- #endif /* __ASMPPC_MV64x60_H */
++device_initcall(mv643xx_eth_add_pds);