diff options
author | Wolfgang Denk <wd@denx.de> | 2011-04-30 22:45:55 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-04-30 22:45:55 +0200 |
commit | aeabdeb7a33c9cff9ae0cd804521d0d691a7c341 (patch) | |
tree | 2979428a02f5eebf256d18a3fb5839e063c3354a /board/freescale/common/ngpixis.h | |
parent | f3c615b8abc098f5222b061b81c75f1363ff4d32 (diff) | |
parent | a2879634c430df3d308f4a3badb37cddca0328f5 (diff) | |
download | talos-obmc-uboot-aeabdeb7a33c9cff9ae0cd804521d0d691a7c341.tar.gz talos-obmc-uboot-aeabdeb7a33c9cff9ae0cd804521d0d691a7c341.zip |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/common/ngpixis.h')
-rw-r--r-- | board/freescale/common/ngpixis.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/board/freescale/common/ngpixis.h b/board/freescale/common/ngpixis.h index 681b0d0b91..1d4483d8b9 100644 --- a/board/freescale/common/ngpixis.h +++ b/board/freescale/common/ngpixis.h @@ -20,16 +20,17 @@ typedef struct ngpixis { u8 scver; u8 csr; u8 rst; - u8 res1; + u8 serclk; u8 aux; u8 spd; u8 brdcfg0; u8 brdcfg1; /* On some boards, this register is called 'dma' */ u8 addr; - u8 res2[2]; + u8 brdcfg2; + u8 gpiodir; u8 data; u8 led; - u8 res3; + u8 tag; u8 vctl; u8 vstat; u8 vcfgen0; |