? share/man/man4/g760a.4 ? share/man/man4/m41t80rtc.4 ? sys/arch/arm/marvell ? sys/arch/evbarm/orion_nas ? sys/arch/evbarm/conf/DNS323 ? sys/arch/evbarm/conf/KUROBOX_PRO ? sys/arch/evbarm/conf/KUROBOX_TERA ? sys/arch/evbarm/conf/ORION_NAS ? sys/arch/evbarm/conf/files.orion_nas ? sys/arch/evbarm/conf/mk.orion_nas ? sys/arch/evbarm/conf/std.orion_nas ? sys/dev/i2c/g760a.c ? sys/dev/i2c/g760areg.h ? sys/dev/i2c/m41t80.c ? sys/dev/i2c/m41t80reg.h ? sys/dev/ic/mvsata.c ? sys/dev/ic/mvsatareg.h ? sys/dev/ic/mvsatavar.h ? sys/dev/pci/mvsata_pci.c Index: distrib/sets/lists/man/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/man/mi,v retrieving revision 1.1096 diff -u -r1.1096 mi --- distrib/sets/lists/man/mi 9 Sep 2008 01:17:23 -0000 1.1096 +++ distrib/sets/lists/man/mi 12 Sep 2008 14:07:09 -0000 @@ -901,6 +901,7 @@ ./usr/share/man/cat4/fwiso.0 man-obsolete obsolete ./usr/share/man/cat4/fwohci.0 man-sys-catman .cat ./usr/share/man/cat4/fxp.0 man-sys-catman .cat +./usr/share/man/cat4/g760a.0 man-sys-catman .cat ./usr/share/man/cat4/gem.0 man-sys-catman .cat ./usr/share/man/cat4/genfb.0 man-sys-catman .cat ./usr/share/man/cat4/gentbi.0 man-sys-catman .cat @@ -1116,6 +1117,7 @@ ./usr/share/man/cat4/lsu.0 man-obsolete obsolete ./usr/share/man/cat4/lxtphy.0 man-sys-catman .cat ./usr/share/man/cat4/m25p.0 man-sys-catman .cat +./usr/share/man/cat4/m41t80rtc.0 man-sys-catman .cat ./usr/share/man/cat4/mac68k/adb.0 man-obsolete obsolete ./usr/share/man/cat4/mac68k/ae.0 man-sys-catman .cat ./usr/share/man/cat4/mac68k/autoconf.0 man-sys-catman .cat @@ -3409,6 +3411,7 @@ ./usr/share/man/html4/fwip.html man-sys-htmlman html ./usr/share/man/html4/fwohci.html man-sys-htmlman html ./usr/share/man/html4/fxp.html man-sys-htmlman html +./usr/share/man/html4/g760a.html man-sys-htmlman html ./usr/share/man/html4/gem.html man-sys-htmlman html ./usr/share/man/html4/genfb.html man-sys-htmlman html ./usr/share/man/html4/gentbi.html man-sys-htmlman html @@ -3590,6 +3593,7 @@ ./usr/share/man/html4/lo.html man-sys-htmlman html ./usr/share/man/html4/lxtphy.html man-sys-htmlman html ./usr/share/man/html4/m25p.html man-sys-htmlman html +./usr/share/man/html4/m41t80rtc.html man-sys-htmlman html ./usr/share/man/html4/mac68k/ae.html man-sys-htmlman html ./usr/share/man/html4/mac68k/autoconf.html man-sys-htmlman html ./usr/share/man/html4/mac68k/cpi.html man-sys-htmlman html @@ -5697,6 +5701,7 @@ ./usr/share/man/man4/fwiso.4 man-obsolete obsolete ./usr/share/man/man4/fwohci.4 man-sys-man .man ./usr/share/man/man4/fxp.4 man-sys-man .man +./usr/share/man/man4/g760a.4 man-sys-man .man ./usr/share/man/man4/gem.4 man-sys-man .man ./usr/share/man/man4/genfb.4 man-sys-man .man ./usr/share/man/man4/gentbi.4 man-sys-man .man @@ -5912,6 +5917,7 @@ ./usr/share/man/man4/lsu.4 man-obsolete obsolete ./usr/share/man/man4/lxtphy.4 man-sys-man .man ./usr/share/man/man4/m25p.4 man-sys-man .man +./usr/share/man/man4/m41t80rtc.4 man-sys-man .man ./usr/share/man/man4/mac68k/adb.4 man-obsolete obsolete ./usr/share/man/man4/mac68k/ae.4 man-sys-man .man ./usr/share/man/man4/mac68k/autoconf.4 man-sys-man .man Index: share/man/man4/Makefile =================================================================== RCS file: /cvsroot/src/share/man/man4/Makefile,v retrieving revision 1.473 diff -u -r1.473 Makefile --- share/man/man4/Makefile 9 Sep 2008 01:16:03 -0000 1.473 +++ share/man/man4/Makefile 12 Sep 2008 06:02:49 -0000 @@ -110,7 +110,7 @@ MAN+= fwohci.4 fwip.4 sbp.4 # machine-independent I2C devices -MAN+= lmtemp.4 spdmem.4 +MAN+= g760a.4 lmtemp.4 m41t80rtc.4 spdmem.4 # machine-independent SPI devices MAN += m25p.4 tm121temp.4 Index: sys/arch/arm/conf/files.arm =================================================================== RCS file: /cvsroot/src/sys/arch/arm/conf/files.arm,v retrieving revision 1.92 diff -u -r1.92 files.arm --- sys/arch/arm/conf/files.arm 27 Aug 2008 11:18:40 -0000 1.92 +++ sys/arch/arm/conf/files.arm 12 Sep 2008 06:02:51 -0000 @@ -11,6 +11,7 @@ CPU_XSCALE_80200 CPU_XSCALE_80321 CPU_XSCALE_PXA250 CPU_XSCALE_PXA270 CPU_XSCALE_IXP425 + CPU_FEROCEON_MV88F1181 CPU_FEROCEON_MV88F5181 defflag opt_cputypes.h CPU_ARM1136: CPU_ARM11 defflag opt_cputypes.h CPU_ARM1176: CPU_ARM11 defflag opt_cputypes.h CPU_CORTEXA8: CPU_ARM11 Index: sys/dev/DEVNAMES =================================================================== RCS file: /cvsroot/src/sys/dev/DEVNAMES,v retrieving revision 1.240 diff -u -r1.240 DEVNAMES --- sys/dev/DEVNAMES 12 Aug 2008 17:54:47 -0000 1.240 +++ sys/dev/DEVNAMES 12 Sep 2008 06:03:00 -0000 @@ -475,6 +475,7 @@ fwohci MI fxp MI g2bus dreamcast +g740a MI gapspci dreamcast gayle amiga Attribute gayle amigappc Attribute @@ -741,6 +742,7 @@ lsi64854 MI Attribute lxtphy MI m38813c hpcmips +m41t80 MI mace sgimips macepci sgimips macfb mac68k Index: sys/dev/i2c/files.i2c =================================================================== RCS file: /cvsroot/src/sys/dev/i2c/files.i2c,v retrieving revision 1.18 diff -u -r1.18 files.i2c --- sys/dev/i2c/files.i2c 11 Sep 2008 20:48:50 -0000 1.18 +++ sys/dev/i2c/files.i2c 12 Sep 2008 06:03:01 -0000 @@ -113,3 +113,13 @@ device spdmem attach spdmem at iic file dev/i2c/spdmem.c spdmem + +# M41T80 Real Time Clock +device m41t80rtc +attach m41t80rtc at iic +file dev/i2c/m41t80.c m41t80rtc + +# G760a FAN controller +device g760a: sysmon_envsys +attach g760a at iic +file dev/i2c/g760a.c g760a Index: sys/dev/usb/ehci.c =================================================================== RCS file: /cvsroot/src/sys/dev/usb/ehci.c,v retrieving revision 1.148 diff -u -r1.148 ehci.c --- sys/dev/usb/ehci.c 10 Sep 2008 06:08:27 -0000 1.148 +++ sys/dev/usb/ehci.c 12 Sep 2008 06:03:12 -0000 @@ -325,7 +325,7 @@ usbd_status ehci_init(ehci_softc_t *sc) { - u_int32_t vers, sparams, cparams, hcr; + u_int32_t vers, sparams, cparams, hcr, mode; u_int i; usbd_status err; ehci_soft_qh_t *sqh; @@ -395,6 +395,15 @@ aprint_error("%s: reset timeout\n", device_xname(sc->sc_dev)); return (USBD_IOERROR); } + if (sc->sc_flags & EHCIF_HAVE_TT) { + /* put TDI/ARC silicon into EHCI mode */ + mode = EOREAD4(sc, EHCI_USBMODE); + mode &= ~EHCI_MODE_HDMASK; /* Host/Device Mask */ + mode |= EHCI_MODE_HOST; + if (sc->sc_flags & EHCIF_NO_STREAM) + mode |= EHCI_MODE_STRMDIS; + EOWRITE4(sc, EHCI_USBMODE, mode); + } /* XXX need proper intr scheduling */ sc->sc_rand = 96; @@ -514,7 +523,8 @@ /* Turn on controller */ EOWRITE4(sc, EHCI_USBCMD, - EHCI_CMD_ITC_2 | /* 2 microframes interrupt delay */ + /* 2 microframes interrupt delay, if no TT */ + ((sc->sc_flags & EHCIF_HAVE_TT) ? 0 : EHCI_CMD_ITC_2) | (EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_FLS_M) | EHCI_CMD_ASE | EHCI_CMD_PSE | @@ -2271,8 +2281,23 @@ v = EOREAD4(sc, EHCI_PORTSC(index)); DPRINTFN(8,("ehci_root_ctrl_start: port status=0x%04x\n", v)); - i = UPS_HIGH_SPEED; - if (v & EHCI_PS_CS) i |= UPS_CURRENT_CONNECT_STATUS; + i = 0; + if (v & EHCI_PS_CS) { + if (sc->sc_flags & EHCIF_HAVE_TT) + switch ((v >> 26) & 0x3) { + case 0: + break; + case 1: + i |= UPS_LOW_SPEED; + break; + case 2: + default: + i |= UPS_HIGH_SPEED; + } + else + i |= UPS_HIGH_SPEED; + i |= UPS_CURRENT_CONNECT_STATUS; + } if (v & EHCI_PS_PE) i |= UPS_PORT_ENABLED; if (v & EHCI_PS_SUSP) i |= UPS_SUSPEND; if (v & EHCI_PS_OCA) i |= UPS_OVERCURRENT_INDICATOR; @@ -2328,7 +2353,8 @@ goto ret; } /* Terminate reset sequence. */ - EOWRITE4(sc, port, v); + v = EOREAD4(sc, port); + EOWRITE4(sc, port, v & ~EHCI_PS_PR); /* Wait for HC to complete reset. */ usb_delay_ms(&sc->sc_bus, EHCI_PORT_RESET_COMPLETE); if (sc->sc_dying) { @@ -2342,7 +2368,8 @@ device_xname(sc->sc_dev)); return (USBD_TIMEOUT); } - if (!(v & EHCI_PS_PE)) { + if (!(v & EHCI_PS_PE) && + !(sc->sc_flags & EHCIF_HAVE_TT)) { /* Not a high speed device, give up ownership.*/ ehci_disown(sc, index, 0); break; Index: sys/dev/usb/ehcireg.h =================================================================== RCS file: /cvsroot/src/sys/dev/usb/ehcireg.h,v retrieving revision 1.28 diff -u -r1.28 ehcireg.h --- sys/dev/usb/ehcireg.h 2 Aug 2008 22:23:18 -0000 1.28 +++ sys/dev/usb/ehcireg.h 12 Sep 2008 06:03:12 -0000 @@ -167,6 +167,12 @@ #define EHCI_PS_CS 0x00000001 /* RO connect status */ #define EHCI_PS_CLEAR (EHCI_PS_OCC|EHCI_PS_PEC|EHCI_PS_CSC) +#define EHCI_USBMODE 0x68 +#define EHCI_MODE_HDMASK 0x00000003 /* RW host/device Mask */ +#define EHCI_MODE_HOST 0x00000003 /* RW mode host */ +#define EHCI_MODE_DEVICE 0x00000002 /* RW mode device */ +#define EHCI_MODE_STRMDIS 0x00000010 /* RW straming disable */ + #define EHCI_PORT_RESET_COMPLETE 2 /* ms */ #define EHCI_FLALIGN_ALIGN 0x1000 Index: sys/dev/usb/ehcivar.h =================================================================== RCS file: /cvsroot/src/sys/dev/usb/ehcivar.h,v retrieving revision 1.32 diff -u -r1.32 ehcivar.h --- sys/dev/usb/ehcivar.h 2 Aug 2008 22:23:18 -0000 1.32 +++ sys/dev/usb/ehcivar.h 12 Sep 2008 06:03:12 -0000 @@ -116,6 +116,8 @@ u_int sc_offs; /* offset to operational regs */ int sc_flags; /* misc flags */ #define EHCIF_DROPPED_INTR_WORKAROUND 0x01 +#define EHCIF_HAVE_TT 0x02 /* Transaction Translator */ +#define EHCIF_NO_STREAM 0x04 char sc_vendor[32]; /* vendor string for root hub */ int sc_id_vendor; /* vendor ID for root hub */ Index: sys/dev/usb/uhub.c =================================================================== RCS file: /cvsroot/src/sys/dev/usb/uhub.c,v retrieving revision 1.103 diff -u -r1.103 uhub.c --- sys/dev/usb/uhub.c 18 Aug 2008 18:03:21 -0000 1.103 +++ sys/dev/usb/uhub.c 12 Sep 2008 06:03:13 -0000 @@ -509,6 +509,14 @@ #endif continue; } + if (!(status & UPS_PORT_ENABLED)) { + /* Not allowed send/receive packet. */ +#ifdef DIAGNOSTIC + printf("%s: port %d, device not enable\n", + USBDEVNAME(sc->sc_dev), port); +#endif + continue; + } /* Figure out device speed */ if (status & UPS_HIGH_SPEED) +const int usb_nproducts = 1289;