AMBAPP: update AMBA PnP ID database

2 files changed, 77 insertions, 22 deletions

diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_names.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_names.c
index 1fe65537aa..db1aa09b12 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_names.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_names.c
@@ -45,10 +45,12 @@ static ambapp_device_name GAISLER_devices[] =
   {GAISLER_SRCTRL, "SRCTRL"},
   {GAISLER_SDCTRL, "SDCTRL"},
   {GAISLER_SSRCTRL, "SSRCTRL"},
+  {GAISLER_I2C2AHB, "I2C2AHB"},
   {GAISLER_APBUART, "APBUART"},
   {GAISLER_IRQMP, "IRQMP"},
   {GAISLER_AHBRAM, "AHBRAM"},
   {GAISLER_AHBDPRAM, "AHBDPRAM"},
+  {GAISLER_GRIOMMU2, "GRIOMMU2"},
   {GAISLER_GPTIMER, "GPTIMER"},
   {GAISLER_PCITRG, "PCITRG"},
   {GAISLER_PCISBRG, "PCISBRG"},
@@ -102,9 +104,15 @@ static ambapp_device_name GAISLER_devices[] =
   {GAISLER_ASCS, "ASCS"},
   {GAISLER_IPMVBCTRL, "IPMVBCTRL"},
   {GAISLER_SPIMCTRL, "SPIMCTRL"},
+  {GAISLER_L4STAT, "L4STAT"},
   {GAISLER_LEON4, "LEON4"},
   {GAISLER_LEON4DSU, "LEON4DSU"},
-  {GAISLER_GRPWM, "GRPWM"},
+  {GAISLER_PWM, "PWM"},
+  {GAISLER_L2CACHE, "L2CACHE"},
+  {GAISLER_SDCTRL64, "SDCTRL64"},
+  {GAISLER_GR1553B, "GR1553B"},
+  {GAISLER_1553TST, "1553TST"},
+  {GAISLER_GRIOMMU, "GRIOMMU"},
   {GAISLER_FTAHBRAM, "FTAHBRAM"},
   {GAISLER_FTSRCTRL, "FTSRCTRL"},
   {GAISLER_AHBSTAT, "AHBSTAT"},
@@ -113,6 +121,12 @@ static ambapp_device_name GAISLER_devices[] =
   {GAISLER_FTSDCTRL, "FTSDCTRL"},
   {GAISLER_FTSRCTRL8, "FTSRCTRL8"},
   {GAISLER_MEMSCRUB, "MEMSCRUB"},
+  {GAISLER_FTSDCTRL64, "FTSDCTRL64"},
+  {GAISLER_NANDFCTRL, "NANDFCTRL"},
+  {GAISLER_N2DLLCTRL, "N2DLLCTRL"},
+  {GAISLER_N2PLLCTRL, "N2PLLCTRL"},
+  {GAISLER_SPI2AHB, "SPI2AHB"},
+  {GAISLER_DDRSDMUX, "DDRSDMUX"},
   {GAISLER_APBPS2, "APBPS2"},
   {GAISLER_VGACTRL, "VGACTRL"},
   {GAISLER_LOGAN, "LOGAN"},
@@ -121,18 +135,18 @@ static ambapp_device_name GAISLER_devices[] =
   {GAISLER_MP7WRAP, "MP7WRAP"},
   {GAISLER_GRSYSMON, "GRSYSMON"},
   {GAISLER_GRACECTRL, "GRACECTRL"},
+  {GAISLER_ATAHBSLV, "ATAHBSLV"},
+  {GAISLER_ATAHBMST, "ATAHBMST"},
+  {GAISLER_ATAPBSLV, "ATAPBSLV"},
+  {GAISLER_MIGDDR2, "MIGDDR2"},
+  {GAISLER_LCDCTRL, "LCDCTRL"},
+  {GAISLER_SWITCHOVER, "SWITCHOVER"},
+  {GAISLER_FIFOUART, "FIFOUART"},
+  {GAISLER_MUXCTRL, "MUXCTRL"},
   {GAISLER_B1553BC, "B1553BC"},
   {GAISLER_B1553RT, "B1553RT"},
   {GAISLER_B1553BRM, "B1553BRM"},
-  {GAISLER_SATCAN, "SATCAN"},
-  {GAISLER_CANMUX, "CANMUX"},
-  {GAISLER_GRTMRX, "GRTMRX"},
-  {GAISLER_GRTCTX, "GRTCTX"},
-  {GAISLER_GRTMDESC, "GRTMDESC"},
-  {GAISLER_GRTMVC, "GRTMVC"},
-  {GAISLER_GEFFE, "GEFFE"},
   {GAISLER_AES, "AES"},
-  {GAISLER_GRAESDMA, "GRAESDMA"},
   {GAISLER_ECC, "ECC"},
   {GAISLER_PCIF, "PCIF"},
   {GAISLER_CLKMOD, "CLKMOD"},
@@ -140,14 +154,27 @@ static ambapp_device_name GAISLER_devices[] =
   {GAISLER_TEST_1X2, "TEST_1X2"},
   {GAISLER_WILD2AHB, "WILD2AHB"},
   {GAISLER_BIO1, "BIO1"},
-  {GAISLER_GR1553B, "GR1553B"},
-  {GAISLER_L2CACHE, "L2CACHE"},
-  {GAISLER_L4STAT, "L4STAT"},
+  {GAISLER_AESDMA, "AESDMA"},
   {GAISLER_GRPCI2, "GRPCI2"},
   {GAISLER_GRPCI2_DMA, "GRPCI2_DMA"},
-  {GAISLER_GRIOMMU, "GRIOMMU"},
+  {GAISLER_GRPCI2_TB, "GRPCI2_TB"},
+  {GAISLER_SATCAN, "SATCAN"},
+  {GAISLER_CANMUX, "CANMUX"},
+  {GAISLER_GRTMRX, "GRTMRX"},
+  {GAISLER_GRTCTX, "GRTCTX"},
+  {GAISLER_GRTMDESC, "GRTMDESC"},
+  {GAISLER_GRTMVC, "GRTMVC"},
+  {GAISLER_GEFFE, "GEFFE"},
+  {GAISLER_GPREG, "GPREG"},
+  {GAISLER_GRTMPAHB, "GRTMPAHB"},
+  {GAISLER_SPWCUC, "SPWCUC"},
   {GAISLER_SPW2_DMA, "SPW2_DMA"},
-  {GAISLER_SPW_ROUTER, "SPW_ROUTER"},
+  {GAISLER_SPWROUTER, "SPWROUTER"},
+  {GAISLER_EDCLMST, "EDCLMST"},
+  {GAISLER_GRPWTX, "GRPWTX"},
+  {GAISLER_GRPWRX, "GRPWRX"},
+  {GAISLER_GPREGBANK, "GPREGBANK"},
+  {GAISLER_MIG_SERIES7, "MIG_SERIES7"},
   {0, NULL}
 };
 
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h b/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h
index e6f3601ee2..c845f7fdfa 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h
+++ b/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h
@@ -48,10 +48,12 @@
 #define GAISLER_SRCTRL       0x008
 #define GAISLER_SDCTRL       0x009
 #define GAISLER_SSRCTRL      0x00a
+#define GAISLER_I2C2AHB      0x00b
 #define GAISLER_APBUART      0x00c
 #define GAISLER_IRQMP        0x00d
 #define GAISLER_AHBRAM       0x00e
 #define GAISLER_AHBDPRAM     0x00f
+#define GAISLER_GRIOMMU2     0x010
 #define GAISLER_GPTIMER      0x011
 #define GAISLER_PCITRG       0x012
 #define GAISLER_PCISBRG      0x013
@@ -109,8 +111,11 @@
 #define GAISLER_LEON4        0x048
 #define GAISLER_LEON4DSU     0x049
 #define GAISLER_GRPWM        0x04a
+#define GAISLER_PWM          0x04a
 #define GAISLER_L2CACHE      0x04b
+#define GAISLER_SDCTRL64     0x04c
 #define GAISLER_GR1553B      0x04d
+#define GAISLER_1553TST      0x04e
 #define GAISLER_GRIOMMU      0x04f
 #define GAISLER_FTAHBRAM     0x050
 #define GAISLER_FTSRCTRL     0x051
@@ -120,6 +125,12 @@
 #define GAISLER_FTSDCTRL     0x055
 #define GAISLER_FTSRCTRL8    0x056
 #define GAISLER_MEMSCRUB     0x057
+#define GAISLER_FTSDCTRL64   0x058
+#define GAISLER_NANDFCTRL    0x059
+#define GAISLER_N2DLLCTRL    0x05a
+#define GAISLER_N2PLLCTRL    0x05b
+#define GAISLER_SPI2AHB      0x05c
+#define GAISLER_DDRSDMUX     0x05d
 #define GAISLER_APBPS2       0x060
 #define GAISLER_VGACTRL      0x061
 #define GAISLER_LOGAN        0x062
@@ -128,17 +139,18 @@
 #define GAISLER_MP7WRAP      0x065
 #define GAISLER_GRSYSMON     0x066
 #define GAISLER_GRACECTRL    0x067
+#define GAISLER_ATAHBSLV     0x068
+#define GAISLER_ATAHBMST     0x069
+#define GAISLER_ATAPBSLV     0x06a
+#define GAISLER_MIGDDR2      0x06b
+#define GAISLER_LCDCTRL      0x06c
+#define GAISLER_SWITCHOVER   0x06d
+#define GAISLER_FIFOUART     0x06e
+#define GAISLER_MUXCTRL      0x06f
 #define GAISLER_B1553BC      0x070
 #define GAISLER_B1553RT      0x071
 #define GAISLER_B1553BRM     0x072
 #define GAISLER_GRAES        0x073
-#define GAISLER_SATCAN       0x080
-#define GAISLER_CANMUX       0x081
-#define GAISLER_GRTMRX       0x082
-#define GAISLER_GRTCTX       0x083
-#define GAISLER_GRTMDESC     0x084
-#define GAISLER_GRTMVC       0x085
-#define GAISLER_GEFFE        0x086
 #define GAISLER_AES          0x073
 #define GAISLER_ECC          0x074
 #define GAISLER_PCIF         0x075
@@ -148,12 +160,28 @@
 #define GAISLER_WILD2AHB     0x079
 #define GAISLER_BIO1         0x07a
 #define GAISLER_GRAESDMA     0x07b
+#define GAISLER_AESDMA       0x07b
 #define GAISLER_GRPCI2       0x07c
 #define GAISLER_GRPCI2_DMA   0x07d
+#define GAISLER_GRPCI2_TB    0x07e
+#define GAISLER_SATCAN       0x080
+#define GAISLER_CANMUX       0x081
+#define GAISLER_GRTMRX       0x082
+#define GAISLER_GRTCTX       0x083
+#define GAISLER_GRTMDESC     0x084
+#define GAISLER_GRTMVC       0x085
+#define GAISLER_GEFFE        0x086
+#define GAISLER_GPREG        0x087
+#define GAISLER_GRTMPAHB     0x088
 #define GAISLER_SPWCUC       0x089
 #define GAISLER_SPW2_DMA     0x08a
 #define GAISLER_SPW_ROUTER   0x08b
-
+#define GAISLER_SPWROUTER    0x08b
+#define GAISLER_EDCLMST      0x08c
+#define GAISLER_GRPWTX       0x08d
+#define GAISLER_GRPWRX       0x08e
+#define GAISLER_GPREGBANK    0x08f
+#define GAISLER_MIG_SERIES7  0x090
 
 #define GAISLER_PIPEWRAPPER  0xffa
 #define GAISLER_L2TIME       0xffd  /* internal device: leon2 timer */