From owner-p4-projects@FreeBSD.ORG Thu Apr 10 03:47:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54D1D1065670; Thu, 10 Apr 2008 03:47:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17573106566B for ; Thu, 10 Apr 2008 03:47:11 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 065A48FC1B for ; Thu, 10 Apr 2008 03:47:11 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3A3lAMv083730 for ; Thu, 10 Apr 2008 03:47:10 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3A3lA1E083719 for perforce@freebsd.org; Thu, 10 Apr 2008 03:47:10 GMT (envelope-from kevlo@freebsd.org) Date: Thu, 10 Apr 2008 03:47:10 GMT Message-Id: <200804100347.m3A3lA1E083719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 139705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 03:47:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=139705 Change 139705 by kevlo@kevlo_wsl on 2008/04/10 03:46:19 Add Marvell 88F5181 support Reviewed by: raj Affected files ... .. //depot/projects/arm/src/sys/arm/orion/5x/5x.c#2 edit .. //depot/projects/arm/src/sys/arm/orion/orionreg.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/orion/5x/5x.c#2 (text+ko) ==== @@ -133,8 +133,8 @@ * System dentifiers are available in the registers range * of PCIE controller. */ - *dev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 0); - *rev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 8); + *dev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 0) >> 16; + *rev = bus_space_read_4(obio_tag, ORION_PCIE_BASE, 8) & 0xff; } void @@ -148,30 +148,24 @@ printf("SOC: "); if (bootverbose) - printf("(0x%8x:0x%08x) ", d, r); + printf("(0x%4x:0x%04x) ", d, r); - if ((d & 0xffff) == ORION_ID_MV) - printf("Marvell 88F"); - else { - printf("Unknown vendor\n"); - return; - } - - d >>= 16; - r &= 0xff; - if (d == ORION_ID_88F5182) { - dev = "5182"; + if (d == ORION_ID_88F5181) { + dev = "Marvell 88F5181"; + rev = (r == 3) ? "B1" : ""; + } else if (d == ORION_ID_88F5182) { + dev = "Marvell 88F5182"; rev = (r == 2) ? "A2" : ""; - } else if (d == ORION_ID_88F5281) { - dev = "5281"; + dev = "Marvell 88F5281"; if (r == 4) rev = "D0"; else if (r == 5) rev = "D1"; + else if (r == 6) + rev = "D2"; else rev = ""; - } else { dev = "UNKNOWN"; rev = ""; @@ -264,8 +258,9 @@ { /* Depending on the SoC windows 0-1, or 0-3 have remap capability */ - if (((dev >> 16) == ORION_ID_88F5182 && i < 2) || - ((dev >> 16) == ORION_ID_88F5281 && i < 4)) + if ((dev == ORION_ID_88F5181 && i < 2) || + (dev == ORION_ID_88F5182 && i < 2) || + (dev == ORION_ID_88F5281 && i < 4)) return (1); return (0); ==== //depot/projects/arm/src/sys/arm/orion/orionreg.h#4 (text+ko) ==== @@ -216,6 +216,7 @@ * Chip ID */ #define ORION_ID_MV 0x11ab +#define ORION_ID_88F5181 0x5181 #define ORION_ID_88F5182 0x5182 #define ORION_ID_88F5281 0x5281