From owner-svn-src-projects@FreeBSD.ORG Mon Aug 13 02:16:38 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A6D7106564A; Mon, 13 Aug 2012 02:16:38 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D0E4E8FC0A; Mon, 13 Aug 2012 02:16:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7D2Gb2Z073006; Mon, 13 Aug 2012 02:16:37 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7D2GbZ7073003; Mon, 13 Aug 2012 02:16:37 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201208130216.q7D2GbZ7073003@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Mon, 13 Aug 2012 02:16:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239227 - projects/armv6/sys/arm/mv X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 02:16:38 -0000 Author: gonzo Date: Mon Aug 13 02:16:37 2012 New Revision: 239227 URL: http://svn.freebsd.org/changeset/base/239227 Log: Merge Ian's patch and fix some usage of PCI/PCIE defines in Orion/Kirkwood code Submitted by: Ian Lepore Modified: projects/armv6/sys/arm/mv/mv_pci.c projects/armv6/sys/arm/mv/mvwin.h Modified: projects/armv6/sys/arm/mv/mv_pci.c ============================================================================== --- projects/armv6/sys/arm/mv/mv_pci.c Mon Aug 13 01:33:56 2012 (r239226) +++ projects/armv6/sys/arm/mv/mv_pci.c Mon Aug 13 02:16:37 2012 (r239227) @@ -240,16 +240,16 @@ mv_pcib_attach(device_t self) parnode = OF_parent(node); if (fdt_is_compatible(node, "mrvl,pcie")) { sc->sc_type = MV_TYPE_PCIE; - sc->sc_mem_win_target = MV_WIN_PCIE_MEM_TARGET; - sc->sc_mem_win_attr = MV_WIN_PCIE_MEM_ATTR; - sc->sc_io_win_target = MV_WIN_PCIE_IO_TARGET; - sc->sc_io_win_attr = MV_WIN_PCIE_IO_ATTR; + sc->sc_mem_win_target = MV_WIN_PCIE_TARGET(0); + sc->sc_mem_win_attr = MV_WIN_PCIE_MEM_ATTR(0); + sc->sc_io_win_target = MV_WIN_PCIE_TARGET(0); + sc->sc_io_win_attr = MV_WIN_PCIE_IO_ATTR(0); #ifdef SOC_MV_ORION } else if (fdt_is_compatible(node, "mrvl,pci")) { sc->sc_type = MV_TYPE_PCI; - sc->sc_mem_win_target = MV_WIN_PCI_MEM_TARGET; + sc->sc_mem_win_target = MV_WIN_PCI_TARGET; sc->sc_mem_win_attr = MV_WIN_PCI_MEM_ATTR; - sc->sc_io_win_target = MV_WIN_PCI_IO_TARGET; + sc->sc_io_win_target = MV_WIN_PCI_TARGET; sc->sc_io_win_attr = MV_WIN_PCI_IO_ATTR; #endif } else Modified: projects/armv6/sys/arm/mv/mvwin.h ============================================================================== --- projects/armv6/sys/arm/mv/mvwin.h Mon Aug 13 01:33:56 2012 (r239226) +++ projects/armv6/sys/arm/mv/mvwin.h Mon Aug 13 02:16:37 2012 (r239227) @@ -63,13 +63,6 @@ * External devices: 0x80000000, 1 GB (VA == PA) * Includes Device Bus, PCI and PCIE. */ -#define MV_PCIE_IO_PHYS_BASE (MV_PHYS_BASE + MV_SIZE) -#define MV_PCIE_IO_BASE MV_PCIE_IO_PHYS_BASE -#define MV_PCIE_IO_SIZE (1024 * 1024) -#define MV_PCI_IO_PHYS_BASE (MV_PCIE_IO_PHYS_BASE + MV_PCIE_IO_SIZE) -#define MV_PCI_IO_BASE MV_PCI_IO_PHYS_BASE -#define MV_PCI_IO_SIZE (1024 * 1024) - #if defined(SOC_MV_ORION) #define MV_PCI_PORTS 2 /* 1x PCI + 1x PCIE */ #elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_FREY) @@ -225,8 +218,8 @@ #define MV_WIN_CESA_ATTR 0 #endif -#define MV_WIN_USB_CTRL(n) (0x320 * (n) + 0x0) -#define MV_WIN_USB_BASE(n) (0x320 * (n) + 0x4) +#define MV_WIN_USB_CTRL(n) (0x10 * (n) + 0x320) +#define MV_WIN_USB_BASE(n) (0x10 * (n) + 0x324) #define MV_WIN_USB_MAX 4 #define MV_WIN_ETH_BASE(n) (0x8 * (n) + 0x200)