| ic.c (218427) | ic.c (238873) |
|---|---|
| 1/*- 2 * Copyright (c) 2006 Benno Rice. 3 * Copyright (C) 2007-2008 MARVELL INTERNATIONAL LTD. 4 * All rights reserved. 5 * 6 * Adapted and extended to Marvell SoCs by Semihalf. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 15 unchanged lines hidden (view full) --- 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * 28 * from: FreeBSD: //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_icu.c, rev 1 29 */ 30 31#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2006 Benno Rice. 3 * Copyright (C) 2007-2008 MARVELL INTERNATIONAL LTD. 4 * All rights reserved. 5 * 6 * Adapted and extended to Marvell SoCs by Semihalf. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 15 unchanged lines hidden (view full) --- 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * 28 * from: FreeBSD: //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_icu.c, rev 1 29 */ 30 31#include <sys/cdefs.h> |
| 32__FBSDID("$FreeBSD: head/sys/arm/mv/ic.c 218427 2011-02-08 01:49:30Z marcel $"); | 32__FBSDID("$FreeBSD: head/sys/arm/mv/ic.c 238873 2012-07-28 21:56:24Z hrs $"); |
| 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/bus.h> 37#include <sys/kernel.h> 38#include <sys/ktr.h> 39#include <sys/module.h> 40#include <sys/rman.h> --- 59 unchanged lines hidden (view full) --- 100 return (ENXIO); 101 mv_ic_sc = sc; 102 103 soc_id(&dev_id, &rev_id); 104 105 sc->ic_high_regs = 0; 106 sc->ic_error_regs = 0; 107 | 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/bus.h> 37#include <sys/kernel.h> 38#include <sys/ktr.h> 39#include <sys/module.h> 40#include <sys/rman.h> --- 59 unchanged lines hidden (view full) --- 100 return (ENXIO); 101 mv_ic_sc = sc; 102 103 soc_id(&dev_id, &rev_id); 104 105 sc->ic_high_regs = 0; 106 sc->ic_error_regs = 0; 107 |
| 108 if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100 || | 108 if (dev_id == MV_DEV_88F6281 || 109 dev_id == MV_DEV_88F6282 || 110 dev_id == MV_DEV_MV78100 || |
| 109 dev_id == MV_DEV_MV78100_Z0) 110 sc->ic_high_regs = 1; 111 112 if (dev_id == MV_DEV_MV78100 || dev_id == MV_DEV_MV78100_Z0) 113 sc->ic_error_regs = 1; 114 115 error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res); 116 if (error) { --- 192 unchanged lines hidden --- | 111 dev_id == MV_DEV_MV78100_Z0) 112 sc->ic_high_regs = 1; 113 114 if (dev_id == MV_DEV_MV78100 || dev_id == MV_DEV_MV78100_Z0) 115 sc->ic_error_regs = 1; 116 117 error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res); 118 if (error) { --- 192 unchanged lines hidden --- |