Date: Tue, 23 Sep 2008 08:50:01 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 150332 for review Message-ID: <200809230850.m8N8o1qu000915@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150332 Change 150332 by raj@raj_mimi on 2008/09/23 08:49:12 Minor MV78100 SOC ID adjustment. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/common.c#3 edit .. //depot/projects/arm/src/sys/arm/mv/gpio.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/ic.c#5 edit .. //depot/projects/arm/src/sys/arm/mv/mvreg.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/common.c#3 (text+ko) ==== @@ -83,7 +83,7 @@ uint32_t ef = 0; soc_id(&dev, &rev); - if (dev == MV_DEV_88F6281 || dev == MV_DEV_78100) + if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100) __asm __volatile("mrc p15, 1, %0, c15, c1, 0" : "=r" (ef)); else if (dev == MV_DEV_88F5182 || dev == MV_DEV_88F5281) __asm __volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (ef)); @@ -165,7 +165,7 @@ case MV_DEV_88F6281: dev = "Marvell 88F6281"; break; - case MV_DEV_78100: + case MV_DEV_MV78100: dev = "Marvell MV78100"; break; default: ==== //depot/projects/arm/src/sys/arm/mv/gpio.c#2 (text+ko) ==== @@ -128,7 +128,7 @@ if (dev_id == MV_DEV_88F5182 || dev_id == MV_DEV_88F5281 || - dev_id == MV_DEV_78100) { + dev_id == MV_DEV_MV78100) { sc->pin_num = 32; sc->irq_num = 4; sc->use_high = 0; ==== //depot/projects/arm/src/sys/arm/mv/ic.c#5 (text+ko) ==== @@ -98,10 +98,10 @@ sc->ic_high_regs = 0; sc->ic_error_regs = 0; - if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_78100) + if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100) sc->ic_high_regs = 1; - if (dev_id == MV_DEV_78100) + if (dev_id == MV_DEV_MV78100) sc->ic_error_regs = 1; error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res); ==== //depot/projects/arm/src/sys/arm/mv/mvreg.h#3 (text+ko) ==== @@ -439,7 +439,7 @@ #define MV_DEV_88F5182 0x5182 #define MV_DEV_88F5281 0x5281 #define MV_DEV_88F6281 0x6281 -#define MV_DEV_78100 0x6381 +#define MV_DEV_MV78100 0x6381 /* * Decode windows definitions and macros
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809230850.m8N8o1qu000915>