diff options
| author |   Huacai Chen <chenhc@lemote.com> | 2014-06-26 11:41:27 +0800 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2014-07-30 21:46:00 +0200 |
| commit | 140e39c1e3d29f50e161f55cca60f60b80408c2a (patch) | |
| tree | cf4fc2a0a1896dd80667ead4382012c308ba73ca /arch/mips/loongson/lemote-2f | |
| parent | MIPS: Support CPU topology files in sysfs (diff) | |
| download | linux-dev-140e39c1e3d29f50e161f55cca60f60b80408c2a.tar.xz linux-dev-140e39c1e3d29f50e161f55cca60f60b80408c2a.zip | |
MIPS: Loongson: Modify ChipConfig register definition
This patch is prepared for Multi-chip interconnection. Since each chip
has a ChipConfig register, LOONGSON_CHIPCFG should be an array.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Cc: John Crispin <john@phrozen.org>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/7185/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/loongson/lemote-2f')
| -rw-r--r-- | arch/mips/loongson/lemote-2f/clock.c | 4 | ||||
| -rw-r--r-- | arch/mips/loongson/lemote-2f/reset.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/loongson/lemote-2f/clock.c b/arch/mips/loongson/lemote-2f/clock.c index 1eed38e28b1e..a217061beee3 100644 --- a/arch/mips/loongson/lemote-2f/clock.c +++ b/arch/mips/loongson/lemote-2f/clock.c @@ -114,9 +114,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate) clk->rate = rate; - regval = LOONGSON_CHIPCFG0; + regval = LOONGSON_CHIPCFG(0); regval = (regval & ~0x7) | (pos->driver_data - 1); - LOONGSON_CHIPCFG0 = regval; + LOONGSON_CHIPCFG(0) = regval; return ret; } diff --git a/arch/mips/loongson/lemote-2f/reset.c b/arch/mips/loongson/lemote-2f/reset.c index 90962a3a1731..79ac694fe744 100644 --- a/arch/mips/loongson/lemote-2f/reset.c +++ b/arch/mips/loongson/lemote-2f/reset.c @@ -28,7 +28,7 @@ static void reset_cpu(void) * reset cpu to full speed, this is needed when enabling cpu frequency * scalling */ - LOONGSON_CHIPCFG0 |= 0x7; + LOONGSON_CHIPCFG(0) |= 0x7; } /* reset support for fuloong2f */ |