aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Langer <thomas.langer@lantiq.com>2013-08-08 05:07:26 -0400
committerRalf Baechle <ralf@linux-mips.org>2013-09-03 17:22:16 -0400
commitdf8b5bed1b6f2c0d0ba6ca71013b370da7d79691 (patch)
tree79599b1784e556a7bb4567c33360f96ea17a532e
parent362b34faef29f445dda1ef4bf856a64f331a80f7 (diff)
MIPS: Lantiq: Falcon: fix asc clock definition
The clocks of the serial ports were not setup properly. Signed-off-by: Thomas Langer <thomas.langer@lantiq.com> Acked-by: John Crispin <blogic@openwrt.org> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/5659/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/lantiq/falcon/sysctrl.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c
index ff4894a833ee..8f1866d8124d 100644
--- a/arch/mips/lantiq/falcon/sysctrl.c
+++ b/arch/mips/lantiq/falcon/sysctrl.c
@@ -48,6 +48,7 @@
48#define CPU0CC_CPUDIV 0x0001 48#define CPU0CC_CPUDIV 0x0001
49 49
50/* Activation Status Register */ 50/* Activation Status Register */
51#define ACTS_ASC0_ACT 0x00001000
51#define ACTS_ASC1_ACT 0x00000800 52#define ACTS_ASC1_ACT 0x00000800
52#define ACTS_I2C_ACT 0x00004000 53#define ACTS_I2C_ACT 0x00004000
53#define ACTS_P0 0x00010000 54#define ACTS_P0 0x00010000
@@ -108,6 +109,7 @@ static void sysctl_deactivate(struct clk *clk)
108static int sysctl_clken(struct clk *clk) 109static int sysctl_clken(struct clk *clk)
109{ 110{
110 sysctl_w32(clk->module, clk->bits, SYSCTL_CLKEN); 111 sysctl_w32(clk->module, clk->bits, SYSCTL_CLKEN);
112 sysctl_w32(clk->module, clk->bits, SYSCTL_ACT);
111 sysctl_wait(clk, clk->bits, SYSCTL_CLKS); 113 sysctl_wait(clk, clk->bits, SYSCTL_CLKS);
112 return 0; 114 return 0;
113} 115}
@@ -256,6 +258,7 @@ void __init ltq_soc_init(void)
256 clkdev_add_sys("1e800400.pad", SYSCTL_SYS1, ACTS_PADCTRL1); 258 clkdev_add_sys("1e800400.pad", SYSCTL_SYS1, ACTS_PADCTRL1);
257 clkdev_add_sys("1e800500.pad", SYSCTL_SYS1, ACTS_PADCTRL3); 259 clkdev_add_sys("1e800500.pad", SYSCTL_SYS1, ACTS_PADCTRL3);
258 clkdev_add_sys("1e800600.pad", SYSCTL_SYS1, ACTS_PADCTRL4); 260 clkdev_add_sys("1e800600.pad", SYSCTL_SYS1, ACTS_PADCTRL4);
259 clkdev_add_sys("1e100C00.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);
260 clkdev_add_sys("1e200000.i2c", SYSCTL_SYS1, ACTS_I2C_ACT); 263 clkdev_add_sys("1e200000.i2c", SYSCTL_SYS1, ACTS_I2C_ACT);
261} 264}