diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-03-30 20:17:02 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-30 20:17:02 +0200 |
| commit | a939ea3ab459d5fb3d1eaaec289c6ca85f2f74c1 (patch) | |
| tree | b343c2aeb1dbfbd9a64cfb9da9f39d70e6d077f9 /doc/README.AVR32-port-muxing | |
| parent | bc6f6c87b685bcdcd5bef522982d15209b6b9601 (diff) | |
| parent | f3e6110a10b694b3beb1ba7704fb7632cc371844 (diff) | |
| download | u-boot-imx-a939ea3ab459d5fb3d1eaaec289c6ca85f2f74c1.zip u-boot-imx-a939ea3ab459d5fb3d1eaaec289c6ca85f2f74c1.tar.gz u-boot-imx-a939ea3ab459d5fb3d1eaaec289c6ca85f2f74c1.tar.bz2 | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
lzma: fix printf warnings
Remove CONFIG_SYS_EXTBDINFO from snapper9260.h
cmd_pxe.c: fix strict-aliasing warnings
net: smc91111: use mdelay()
doc: Fix some typos in different files
disk/part.c: Fix device enumeration through API
mkenvimage: Really set the redundant byte when applicable
mkenvimage: Don't try to detect comments in the input file
mkenvimage: Use mmap() when reading from a regular file
mkenvimage: Read/Write from/to stdin/out by default or if the filename is "-"
mkenvimage: More error handling
mkenvimage: Correct an include and add a missing one
mkenvimage: correct and clarify comments and error messages
MAKEALL: display SPL size if present
ARMV7/Vexpress: add missing get_ticks() and get_tbclk()
mkenvimage: fix usage message
cmd_fat: add FAT write command
fs/fat/fat_write.c: Fix GCC 4.6 warnings
FAT write: Fix compile errors
Diffstat (limited to 'doc/README.AVR32-port-muxing')
| -rw-r--r-- | doc/README.AVR32-port-muxing | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/README.AVR32-port-muxing b/doc/README.AVR32-port-muxing index b53799d..8c1718c 100644 --- a/doc/README.AVR32-port-muxing +++ b/doc/README.AVR32-port-muxing @@ -91,7 +91,7 @@ of the flags are the same on all implementations. PORTMUX_DIR_OUTPUT PORTMUX_DIR_INPUT -These mutually-exlusive flags configure the initial direction of the +These mutually-exclusive flags configure the initial direction of the pins. PORTMUX_DIR_OUTPUT means that the pins are driven by the CPU, while PORTMUX_DIR_INPUT means that the pins are tristated by the CPU. These flags are ignored by portmux_select_peripheral(). @@ -125,7 +125,7 @@ PORTMUX_PULL_UP. PORTMUX_DRIVE_HIGH PORTMUX_DRIVE_MAX -These mutually-exlusive flags determine the drive strength of the +These mutually-exclusive flags determine the drive strength of the pins. PORTMUX_DRIVE_MIN will give low power-consumption, but may cause corruption of high-speed signals. PORTMUX_DRIVE_MAX will give high power-consumption, but may be necessary on pins toggling at very high |