diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-09-08 09:51:05 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-09-08 09:51:05 +0000 |
| commit | 08b17128a1856c8ba1f7c7286fdba2d993564cff (patch) | |
| tree | 61a81d8d65835646b47deeba086f086a431e6a4e /target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c | |
| parent | 555155f8ea01c68f86eb246374942db03c126622 (diff) | |
[mcs814x] use the recommended ARM I/O accessors
use {read,write}l_relaxed instead of the plain __raw_{read,write}l variants.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33330 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c')
| -rw-r--r-- | target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c index 88ecdffbb..413bfecaa 100644 --- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c +++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c @@ -54,13 +54,13 @@ static int clk_local_onoff_enable(struct clk *clk, int enable) if (!clk->enable_reg) return 0; - tmp = __raw_readl(mcs814x_sysdbg_base + clk->enable_reg); + tmp = readl_relaxed(mcs814x_sysdbg_base + clk->enable_reg); if (!enable) tmp &= ~clk->enable_mask; else tmp |= clk->enable_mask; - __raw_writel(tmp, mcs814x_sysdbg_base + clk->enable_reg); + writel_relaxed(tmp, mcs814x_sysdbg_base + clk->enable_reg); return 0; } @@ -254,7 +254,7 @@ void __init mcs814x_clk_init(void) clkdev_add_table(mcs814x_chip_clks, ARRAY_SIZE(mcs814x_chip_clks)); /* read the bootstrap registers to know the exact clocking scheme */ - bs1 = __raw_readl(mcs814x_sysdbg_base + SYSDBG_BS1); + bs1 = readl_relaxed(mcs814x_sysdbg_base + SYSDBG_BS1); cpu_freq = (bs1 >> CPU_FREQ_SHIFT) & CPU_FREQ_MASK; pr_info("CPU frequency: %lu (kHz)\n", cpu_freq_table[cpu_freq]); |