| ic.c (183840) | ic.c (191140) |
|---|---|
| 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 183840 2008-10-13 20:07:13Z raj $"); | 32__FBSDID("$FreeBSD: head/sys/arm/mv/ic.c 191140 2009-04-16 11:20:18Z raj $"); |
| 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/bus.h> 37#include <sys/kernel.h> 38#include <sys/module.h> 39#include <sys/rman.h> 40#include <machine/bus.h> --- 52 unchanged lines hidden (view full) --- 93 return (ENXIO); 94 mv_ic_sc = sc; 95 96 soc_id(&dev_id, &rev_id); 97 98 sc->ic_high_regs = 0; 99 sc->ic_error_regs = 0; 100 | 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/bus.h> 37#include <sys/kernel.h> 38#include <sys/module.h> 39#include <sys/rman.h> 40#include <machine/bus.h> --- 52 unchanged lines hidden (view full) --- 93 return (ENXIO); 94 mv_ic_sc = sc; 95 96 soc_id(&dev_id, &rev_id); 97 98 sc->ic_high_regs = 0; 99 sc->ic_error_regs = 0; 100 |
| 101 if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100) | 101 if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100 || 102 dev_id == MV_DEV_MV78100_Z0) |
| 102 sc->ic_high_regs = 1; 103 | 103 sc->ic_high_regs = 1; 104 |
| 104 if (dev_id == MV_DEV_MV78100) | 105 if (dev_id == MV_DEV_MV78100 || dev_id == MV_DEV_MV78100_Z0) |
| 105 sc->ic_error_regs = 1; 106 107 error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res); 108 if (error) { 109 device_printf(dev, "could not allocate resources\n"); 110 return (ENXIO); 111 } 112 --- 177 unchanged lines hidden --- | 106 sc->ic_error_regs = 1; 107 108 error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res); 109 if (error) { 110 device_printf(dev, "could not allocate resources\n"); 111 return (ENXIO); 112 } 113 --- 177 unchanged lines hidden --- |