diff options
-rw-r--r-- | firmware/export/rk27xx.h | 15 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/sd-rk27xx.c | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/firmware/export/rk27xx.h b/firmware/export/rk27xx.h index 6fb69d46c1..6f5859f6f8 100644 --- a/firmware/export/rk27xx.h +++ b/firmware/export/rk27xx.h | |||
@@ -157,6 +157,21 @@ | |||
157 | #define CLKCFG_WDT (1<<31) | 157 | #define CLKCFG_WDT (1<<31) |
158 | 158 | ||
159 | #define SCU_RSTCFG (*(volatile unsigned long *)(APB0_SCU + 0x1C)) | 159 | #define SCU_RSTCFG (*(volatile unsigned long *)(APB0_SCU + 0x1C)) |
160 | #define RSTCFG_UHC (1<<0) | ||
161 | #define RSTCFG_UDC (1<<1) | ||
162 | #define RSTCFG_LCDC (1<<2) | ||
163 | #define RSTCFG_VIP (1<<3) | ||
164 | #define RSTCFG_DSP_CORE (1<<4) | ||
165 | #define RSTCFG_DSP_PERI (1<<5) | ||
166 | #define RSTCFG_CODEC (1<<6) | ||
167 | #define RSTCFG_LSADC (1<<7) | ||
168 | #define RSTCFG_HSADC (1<<8) | ||
169 | #define RSTCFG_SD (1<<9) | ||
170 | #define RSTCFG_MAILBOX (1<<10) | ||
171 | #define RSTCFG_ECT (1<<11) | ||
172 | #define RSTCFG_ARM_CORE (1<<12) | ||
173 | /* 13 - 31 reserved */ | ||
174 | |||
160 | #define SCU_PWM (*(volatile unsigned long *)(APB0_SCU + 0x20)) | 175 | #define SCU_PWM (*(volatile unsigned long *)(APB0_SCU + 0x20)) |
161 | #define SCU_CPUPD (*(volatile unsigned long *)(APB0_SCU + 0x24)) | 176 | #define SCU_CPUPD (*(volatile unsigned long *)(APB0_SCU + 0x24)) |
162 | #define SCU_CHIPCFG (*(volatile unsigned long *)(APB0_SCU + 0x28)) | 177 | #define SCU_CHIPCFG (*(volatile unsigned long *)(APB0_SCU + 0x28)) |
diff --git a/firmware/target/arm/rk27xx/sd-rk27xx.c b/firmware/target/arm/rk27xx/sd-rk27xx.c index a6049e7154..cb5c02e0b6 100644 --- a/firmware/target/arm/rk27xx/sd-rk27xx.c +++ b/firmware/target/arm/rk27xx/sd-rk27xx.c | |||
@@ -393,9 +393,9 @@ static void sd_thread(void) | |||
393 | static void init_controller(void) | 393 | static void init_controller(void) |
394 | { | 394 | { |
395 | /* reset SD module */ | 395 | /* reset SD module */ |
396 | SCU_RSTCFG |= (1<<9); | 396 | SCU_RSTCFG |= RSTCFG_SD; |
397 | sleep(1); | 397 | sleep(1); |
398 | SCU_RSTCFG &= ~(1<<9); | 398 | SCU_RSTCFG &= ~RSTCFG_SD; |
399 | 399 | ||
400 | /* set pins functions as SD signals */ | 400 | /* set pins functions as SD signals */ |
401 | SCU_IOMUXA_CON |= IOMUX_SD; | 401 | SCU_IOMUXA_CON |= IOMUX_SD; |