X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstellaris.h;h=949a346de47222434e43e79256bcca8c3b2c162d;hb=664ba309d5dac2532c83fed441d14f93c7381d62;hp=f2d376055ce2a6e05a496af67a2c08e68538e4c8;hpb=1840226d555b9863a2315bcc6218671fdfa2af32;p=openocd.git

diff --git a/src/flash/stellaris.h b/src/flash/stellaris.h
index f2d376055c..949a346de4 100644
--- a/src/flash/stellaris.h
+++ b/src/flash/stellaris.h
@@ -22,7 +22,7 @@
 
 #include "flash.h"
 
-typedef struct stellaris_flash_bank_s
+struct stellaris_flash_bank
 {
 	/* chip id register */
 	uint32_t did0;
@@ -45,9 +45,14 @@ typedef struct stellaris_flash_bank_s
 
 	/* main clock status */
 	uint32_t rcc;
+	uint32_t rcc2;
 	uint8_t  mck_valid;
+	uint8_t  xtal_mask;
+	uint32_t iosc_freq;
 	uint32_t mck_freq;
-} stellaris_flash_bank_t;
+	const char *iosc_desc;
+	const char *mck_desc;
+};
 
 /* STELLARIS control registers */
 #define SCB_BASE	0x400FE000
@@ -62,18 +67,19 @@ typedef struct stellaris_flash_bank_s
 #define	RIS			0x050
 #define	RCC			0x060
 #define	PLLCFG		0x064
+#define	RCC2		0x070
 
 #define FMPRE		0x130
 #define FMPPE		0x134
 #define USECRL		0x140
 
 #define FLASH_CONTROL_BASE	0x400FD000
-#define FLASH_FMA	(FLASH_CONTROL_BASE|0x000)
-#define FLASH_FMD	(FLASH_CONTROL_BASE|0x004)
-#define FLASH_FMC	(FLASH_CONTROL_BASE|0x008)
-#define FLASH_CRIS	(FLASH_CONTROL_BASE|0x00C)
-#define FLASH_CIM	(FLASH_CONTROL_BASE|0x010)
-#define FLASH_MISC	(FLASH_CONTROL_BASE|0x014)
+#define FLASH_FMA	(FLASH_CONTROL_BASE | 0x000)
+#define FLASH_FMD	(FLASH_CONTROL_BASE | 0x004)
+#define FLASH_FMC	(FLASH_CONTROL_BASE | 0x008)
+#define FLASH_CRIS	(FLASH_CONTROL_BASE | 0x00C)
+#define FLASH_CIM	(FLASH_CONTROL_BASE | 0x010)
+#define FLASH_MISC	(FLASH_CONTROL_BASE | 0x014)
 
 #define AMISC	1
 #define PMISC	2
@@ -82,11 +88,11 @@ typedef struct stellaris_flash_bank_s
 #define PMASK	2
 
 /* Flash Controller Command bits */
-#define FMC_WRKEY	(0xA442<<16)
-#define FMC_COMT	(1<<3)
-#define FMC_MERASE	(1<<2)
-#define FMC_ERASE	(1<<1)
-#define FMC_WRITE	(1<<0)
+#define FMC_WRKEY	(0xA442 << 16)
+#define FMC_COMT	(1 << 3)
+#define FMC_MERASE	(1 << 2)
+#define FMC_ERASE	(1 << 1)
+#define FMC_WRITE	(1 << 0)
 
 /* STELLARIS constants */