diff options
-rw-r--r-- | arch/mips/include/asm/mach-ralink/mt7620.h | 8 | ||||
-rw-r--r-- | arch/mips/ralink/mt7620.c | 20 |
2 files changed, 28 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h index b272649933c9..9809972ea882 100644 --- a/arch/mips/include/asm/mach-ralink/mt7620.h +++ b/arch/mips/include/asm/mach-ralink/mt7620.h | |||
@@ -50,6 +50,14 @@ | |||
50 | #define SYSCFG0_DRAM_TYPE_DDR1 1 | 50 | #define SYSCFG0_DRAM_TYPE_DDR1 1 |
51 | #define SYSCFG0_DRAM_TYPE_DDR2 2 | 51 | #define SYSCFG0_DRAM_TYPE_DDR2 2 |
52 | 52 | ||
53 | #define MT7620_DRAM_BASE 0x0 | ||
54 | #define MT7620_SDRAM_SIZE_MIN 2 | ||
55 | #define MT7620_SDRAM_SIZE_MAX 64 | ||
56 | #define MT7620_DDR1_SIZE_MIN 32 | ||
57 | #define MT7620_DDR1_SIZE_MAX 128 | ||
58 | #define MT7620_DDR2_SIZE_MIN 32 | ||
59 | #define MT7620_DDR2_SIZE_MAX 256 | ||
60 | |||
53 | #define MT7620_GPIO_MODE_I2C BIT(0) | 61 | #define MT7620_GPIO_MODE_I2C BIT(0) |
54 | #define MT7620_GPIO_MODE_UART0_SHIFT 2 | 62 | #define MT7620_GPIO_MODE_UART0_SHIFT 2 |
55 | #define MT7620_GPIO_MODE_UART0_MASK 0x7 | 63 | #define MT7620_GPIO_MODE_UART0_MASK 0x7 |
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c index af19ae740162..0018b1a661f6 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c | |||
@@ -211,4 +211,24 @@ void prom_soc_init(struct ralink_soc_info *soc_info) | |||
211 | 211 | ||
212 | cfg0 = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG0); | 212 | cfg0 = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG0); |
213 | dram_type = (cfg0 >> SYSCFG0_DRAM_TYPE_SHIFT) & SYSCFG0_DRAM_TYPE_MASK; | 213 | dram_type = (cfg0 >> SYSCFG0_DRAM_TYPE_SHIFT) & SYSCFG0_DRAM_TYPE_MASK; |
214 | |||
215 | switch (dram_type) { | ||
216 | case SYSCFG0_DRAM_TYPE_SDRAM: | ||
217 | soc_info->mem_size_min = MT7620_SDRAM_SIZE_MIN; | ||
218 | soc_info->mem_size_max = MT7620_SDRAM_SIZE_MAX; | ||
219 | break; | ||
220 | |||
221 | case SYSCFG0_DRAM_TYPE_DDR1: | ||
222 | soc_info->mem_size_min = MT7620_DDR1_SIZE_MIN; | ||
223 | soc_info->mem_size_max = MT7620_DDR1_SIZE_MAX; | ||
224 | break; | ||
225 | |||
226 | case SYSCFG0_DRAM_TYPE_DDR2: | ||
227 | soc_info->mem_size_min = MT7620_DDR2_SIZE_MIN; | ||
228 | soc_info->mem_size_max = MT7620_DDR2_SIZE_MAX; | ||
229 | break; | ||
230 | default: | ||
231 | BUG(); | ||
232 | } | ||
233 | soc_info->mem_base = MT7620_DRAM_BASE; | ||
214 | } | 234 | } |