diff options
Diffstat (limited to 'arch/mips/lantiq/falcon/sysctrl.c')
-rw-r--r-- | arch/mips/lantiq/falcon/sysctrl.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c index 468ffa043607..7edcd4946fc1 100644 --- a/arch/mips/lantiq/falcon/sysctrl.c +++ b/arch/mips/lantiq/falcon/sysctrl.c | |||
@@ -49,6 +49,7 @@ | |||
49 | 49 | ||
50 | /* Activation Status Register */ | 50 | /* Activation Status Register */ |
51 | #define ACTS_ASC0_ACT 0x00001000 | 51 | #define ACTS_ASC0_ACT 0x00001000 |
52 | #define ACTS_SSC0 0x00002000 | ||
52 | #define ACTS_ASC1_ACT 0x00000800 | 53 | #define ACTS_ASC1_ACT 0x00000800 |
53 | #define ACTS_I2C_ACT 0x00004000 | 54 | #define ACTS_I2C_ACT 0x00004000 |
54 | #define ACTS_P0 0x00010000 | 55 | #define ACTS_P0 0x00010000 |
@@ -147,12 +148,11 @@ static void falcon_gpe_enable(void) | |||
147 | if (status & (1 << (GPPC_OFFSET + 1))) | 148 | if (status & (1 << (GPPC_OFFSET + 1))) |
148 | return; | 149 | return; |
149 | 150 | ||
150 | if (status_r32(STATUS_CONFIG) == 0) | 151 | freq = (status_r32(STATUS_CONFIG) & |
152 | GPEFREQ_MASK) >> | ||
153 | GPEFREQ_OFFSET; | ||
154 | if (freq == 0) | ||
151 | freq = 1; /* use 625MHz on unfused chip */ | 155 | freq = 1; /* use 625MHz on unfused chip */ |
152 | else | ||
153 | freq = (status_r32(STATUS_CONFIG) & | ||
154 | GPEFREQ_MASK) >> | ||
155 | GPEFREQ_OFFSET; | ||
156 | 156 | ||
157 | /* apply new frequency */ | 157 | /* apply new frequency */ |
158 | sysctl_w32_mask(SYSCTL_SYS1, 7 << (GPPC_OFFSET + 1), | 158 | sysctl_w32_mask(SYSCTL_SYS1, 7 << (GPPC_OFFSET + 1), |
@@ -260,5 +260,6 @@ void __init ltq_soc_init(void) | |||
260 | clkdev_add_sys("1e800600.pad", SYSCTL_SYS1, ACTS_PADCTRL4); | 260 | clkdev_add_sys("1e800600.pad", SYSCTL_SYS1, ACTS_PADCTRL4); |
261 | clkdev_add_sys("1e100b00.serial", SYSCTL_SYS1, ACTS_ASC1_ACT); | 261 | clkdev_add_sys("1e100b00.serial", SYSCTL_SYS1, ACTS_ASC1_ACT); |
262 | clkdev_add_sys("1e100c00.serial", SYSCTL_SYS1, ACTS_ASC0_ACT); | 262 | clkdev_add_sys("1e100c00.serial", SYSCTL_SYS1, ACTS_ASC0_ACT); |
263 | clkdev_add_sys("1e100d00.spi", SYSCTL_SYS1, ACTS_SSC0); | ||
263 | clkdev_add_sys("1e200000.i2c", SYSCTL_SYS1, ACTS_I2C_ACT); | 264 | clkdev_add_sys("1e200000.i2c", SYSCTL_SYS1, ACTS_I2C_ACT); |
264 | } | 265 | } |