Date: Mon, 13 Aug 2012 02:16:37 +0000 (UTC) From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r239227 - projects/armv6/sys/arm/mv Message-ID: <201208130216.q7D2GbZ7073003@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208130216.q7D2GbZ7073003>