1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

[mcs814x] provide an early ioremap cookie of the system configuration register

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32489 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian
2012-06-23 11:03:50 +00:00
parent a699bb193a
commit 27abc2e19f
6 changed files with 38 additions and 29 deletions

View File

@@ -16,6 +16,8 @@
#include <mach/mcs814x.h>
#include "common.h"
#define KHZ 1000
#define MHZ (KHZ * KHZ)
@@ -32,7 +34,7 @@ struct clk {
unsigned long divider; /* clock divider */
u32 usecount; /* reference count */
struct clk_ops *ops; /* clock operation */
void __iomem *enable_reg; /* clock enable register */
u32 enable_reg; /* clock enable register */
u32 enable_mask; /* clock enable mask */
};
@@ -52,13 +54,13 @@ static int clk_local_onoff_enable(struct clk *clk, int enable)
if (!clk->enable_reg)
return 0;
tmp = __raw_readl(clk->enable_reg);
tmp = __raw_readl(mcs814x_sysdbg_base + clk->enable_reg);
if (!enable)
tmp &= ~clk->enable_mask;
else
tmp |= clk->enable_mask;
__raw_writel(tmp, clk->enable_reg);
__raw_writel(tmp, mcs814x_sysdbg_base + clk->enable_reg);
return 0;
}
@@ -117,19 +119,19 @@ static struct clk clk_wdt = {
static struct clk clk_emac = {
.ops = &default_clk_ops,
.enable_reg = (void __iomem *)(_CONFADDR_SYSDBG + SYSDBG_SYSCTL),
.enable_reg = SYSDBG_SYSCTL,
.enable_mask = SYSCTL_EMAC,
};
static struct clk clk_ephy = {
.ops = &default_clk_ops,
.enable_reg = (void __iomem *)(_CONFADDR_SYSDBG + SYSDBG_PLL_CTL),
.enable_mask = ~(1 << 0),
.enable_reg = SYSDBG_PLL_CTL,
.enable_mask = ~SYSCTL_EPHY, /* active low */
};
static struct clk clk_cipher = {
.ops = &default_clk_ops,
.enable_reg = (void __iomem *)(_CONFADDR_SYSDBG + SYSDBG_SYSCTL),
.enable_reg = SYSDBG_SYSCTL,
.enable_mask = SYSCTL_CIPHER,
};
@@ -252,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(_CONFADDR_SYSDBG + SYSDBG_BS1);
bs1 = __raw_readl(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]);