diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/tcc780x.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/system-tcc780x.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/firmware/export/tcc780x.h b/firmware/export/tcc780x.h index ca6256bf06..1e2052c4be 100644 --- a/firmware/export/tcc780x.h +++ b/firmware/export/tcc780x.h | |||
@@ -89,6 +89,7 @@ | |||
89 | 89 | ||
90 | /* Device bits for SWRESET & BCLKCTR */ | 90 | /* Device bits for SWRESET & BCLKCTR */ |
91 | 91 | ||
92 | #define DEV_USBD (1<<1) | ||
92 | #define DEV_LCDC (1<<2) | 93 | #define DEV_LCDC (1<<2) |
93 | #define DEV_SDMMC (1<<6) | 94 | #define DEV_SDMMC (1<<6) |
94 | #define DEV_NAND (1<<9) | 95 | #define DEV_NAND (1<<9) |
@@ -112,7 +113,7 @@ | |||
112 | #define POL (*(volatile unsigned long *)0xF300101C) | 113 | #define POL (*(volatile unsigned long *)0xF300101C) |
113 | #define MIRQ (*(volatile unsigned long *)0xF3001028) | 114 | #define MIRQ (*(volatile unsigned long *)0xF3001028) |
114 | #define MFIQ (*(volatile unsigned long *)0xF300102C) | 115 | #define MFIQ (*(volatile unsigned long *)0xF300102C) |
115 | #define MODE (*(volatile unsigned long *)0xF3001030) | 116 | #define TMODE (*(volatile unsigned long *)0xF3001030) |
116 | #define ALLMASK (*(volatile unsigned long *)0xF3001044) | 117 | #define ALLMASK (*(volatile unsigned long *)0xF3001044) |
117 | #define VAIRQ (*(volatile unsigned long *)0xF3001080) | 118 | #define VAIRQ (*(volatile unsigned long *)0xF3001080) |
118 | #define VAFIQ (*(volatile unsigned long *)0xF3001084) | 119 | #define VAFIQ (*(volatile unsigned long *)0xF3001084) |
@@ -126,6 +127,7 @@ | |||
126 | #define TIMER0_IRQ_MASK (1<<6) | 127 | #define TIMER0_IRQ_MASK (1<<6) |
127 | #define DAI_RX_IRQ_MASK (1<<14) | 128 | #define DAI_RX_IRQ_MASK (1<<14) |
128 | #define DAI_TX_IRQ_MASK (1<<15) | 129 | #define DAI_TX_IRQ_MASK (1<<15) |
130 | #define USBD_IRQ_MASK (1<<21) | ||
129 | #define ADC_IRQ_MASK (1<<30) | 131 | #define ADC_IRQ_MASK (1<<30) |
130 | 132 | ||
131 | /* Timer / Counters */ | 133 | /* Timer / Counters */ |
diff --git a/firmware/target/arm/tcc780x/system-tcc780x.c b/firmware/target/arm/tcc780x/system-tcc780x.c index 973dbaf719..5ecbbdac7c 100644 --- a/firmware/target/arm/tcc780x/system-tcc780x.c +++ b/firmware/target/arm/tcc780x/system-tcc780x.c | |||
@@ -254,7 +254,7 @@ void system_init(void) | |||
254 | IRQSEL = ~(DAI_RX_IRQ_MASK | DAI_TX_IRQ_MASK); | 254 | IRQSEL = ~(DAI_RX_IRQ_MASK | DAI_TX_IRQ_MASK); |
255 | 255 | ||
256 | POL = 0x200108; /* IRQs 3,8,21 active low (as OF) */ | 256 | POL = 0x200108; /* IRQs 3,8,21 active low (as OF) */ |
257 | MODE = 0x20ce07c0; /* IRQs 6-10,17-19,22-23,29 level-triggered (as OF) */ | 257 | TMODE = 0x20ce07c0; /* IRQs 6-10,17-19,22-23,29 level-triggered (as OF) */ |
258 | 258 | ||
259 | VCTRL |= (1<<31); /* Reading from VNIRQ clears that interrupt */ | 259 | VCTRL |= (1<<31); /* Reading from VNIRQ clears that interrupt */ |
260 | 260 | ||