openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: at91: pmc: merge at91_pmc_init in atmel_pmc_probe 

at91_pmc_init() doesn't do much anymore, merge it in atmel_pmc_probe().

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Alexandre Belloni 2016-01-27 14:59:47 +01:00
parent 99a8170652
commit a5df602bd3
1 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/clk/at91/pmc.c
View File

@ -110,30 +110,6 @@ static const struct at91_pmc_caps sama5d3_caps = {
AT91_PMC_CFDEV,
};
static struct at91_pmc *__init at91_pmc_init(struct device_node *np,
struct regmap *regmap,
void __iomem *regbase,
const struct at91_pmc_caps *caps)
{
struct at91_pmc *pmc;
if (!regbase || !caps)
return NULL;
at91_pmc_base = regbase;
pmc = kzalloc(sizeof(*pmc), GFP_KERNEL);
if (!pmc)
return NULL;
pmc->regmap = regmap;
pmc->caps = caps;
regmap_write(pmc->regmap, AT91_PMC_IDR, 0xffffffff);
return pmc;
}
static void __init of_at91_pmc_setup(struct device_node *np,
const struct at91_pmc_caps *caps)
{
@ -141,13 +117,21 @@ static void __init of_at91_pmc_setup(struct device_node *np,
void __iomem *regbase = of_iomap(np, 0);
struct regmap *regmap;
at91_pmc_base = regbase;
regmap = syscon_node_to_regmap(np);
if (IS_ERR(regmap))
panic("Could not retrieve syscon regmap");
pmc = at91_pmc_init(np, regmap, regbase, caps);
pmc = kzalloc(sizeof(*pmc), GFP_KERNEL);
if (!pmc)
return;
pmc->regmap = regmap;
pmc->caps = caps;
regmap_write(pmc->regmap, AT91_PMC_IDR, 0xffffffff);
}
static void __init of_at91rm9200_pmc_setup(struct device_node *np)