X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=target%2Flinux%2Focteon%2Fpatches-2.6.30%2F009-more_chip_specific_feature_tests.patch;fp=target%2Flinux%2Focteon%2Fpatches-2.6.30%2F009-more_chip_specific_feature_tests.patch;h=0000000000000000000000000000000000000000;hp=63dc4f13de2d88564eb9abe4f76b5e0757def8b9;hb=e7e264d2cc57b89d3bb66565f88f674cab1db383;hpb=171e13a4e8ea5d69986e3a7df260606b442b724d

diff --git a/target/linux/octeon/patches-2.6.30/009-more_chip_specific_feature_tests.patch b/target/linux/octeon/patches-2.6.30/009-more_chip_specific_feature_tests.patch
deleted file mode 100644
index 63dc4f13d..000000000
--- a/target/linux/octeon/patches-2.6.30/009-more_chip_specific_feature_tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-The octeon-ethernet driver needs to check for additional chip specific
-features, we add them to the octeon_has_feature() framework.
-
-Signed-off-by: David Daney <ddaney@caviumnetworks.com>
----
- arch/mips/include/asm/octeon/octeon-feature.h |   27 +++++++++++++++++++++++++
- 1 files changed, 27 insertions(+), 0 deletions(-)
-
---- a/arch/mips/include/asm/octeon/octeon-feature.h
-+++ b/arch/mips/include/asm/octeon/octeon-feature.h
-@@ -57,6 +57,13 @@ enum octeon_feature {
- 	OCTEON_FEATURE_RAID,
- 	/* Octeon has a builtin USB */
- 	OCTEON_FEATURE_USB,
-+	/* Octeon IPD can run without using work queue entries */
-+	OCTEON_FEATURE_NO_WPTR,
-+	/* Octeon has DFA state machines */
-+	OCTEON_FEATURE_DFA,
-+	/* Octeon MDIO block supports clause 45 transactions for 10
-+	 * Gig support */
-+	OCTEON_FEATURE_MDIO_CLAUSE_45,
- };
- 
- static inline int cvmx_fuse_read(int fuse);
-@@ -112,6 +119,26 @@ static inline int octeon_has_feature(enu
- 	case OCTEON_FEATURE_USB:
- 		return !(OCTEON_IS_MODEL(OCTEON_CN38XX)
- 			 || OCTEON_IS_MODEL(OCTEON_CN58XX));
-+	case OCTEON_FEATURE_NO_WPTR:
-+		return (OCTEON_IS_MODEL(OCTEON_CN56XX)
-+			 || OCTEON_IS_MODEL(OCTEON_CN52XX))
-+			&& !OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X)
-+			&& !OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X);
-+	case OCTEON_FEATURE_DFA:
-+		if (!OCTEON_IS_MODEL(OCTEON_CN38XX)
-+		    && !OCTEON_IS_MODEL(OCTEON_CN31XX)
-+		    && !OCTEON_IS_MODEL(OCTEON_CN58XX))
-+			return 0;
-+		else if (OCTEON_IS_MODEL(OCTEON_CN3020))
-+			return 0;
-+		else if (OCTEON_IS_MODEL(OCTEON_CN38XX_PASS1))
-+			return 1;
-+		else
-+			return !cvmx_fuse_read(120);
-+	case OCTEON_FEATURE_MDIO_CLAUSE_45:
-+		return !(OCTEON_IS_MODEL(OCTEON_CN3XXX)
-+			 || OCTEON_IS_MODEL(OCTEON_CN58XX)
-+			 || OCTEON_IS_MODEL(OCTEON_CN50XX));
- 	}
- 	return 0;
- }