clk: ux500: Convert ABx500 clocks to use OF probing
These clocks have been broken for a long time unfortunately, a hurdle of misc problems made them stop working at some point breaking USB and audio on Ux500. The platform as such and all "regular" clocks are migrated to OF/device tree, so let's migrate also this driver. With this patch and the corresponding DTS fixes, and a bunch of probe deferral fixes, audio starts working again on Ux500. Cc: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
parent
839a72af88
commit
55921ce276
|
@ -10,19 +10,26 @@
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
|
#include <linux/of.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/mfd/abx500/ab8500.h>
|
#include <linux/mfd/abx500/ab8500.h>
|
||||||
#include <linux/mfd/abx500/ab8500-sysctrl.h>
|
#include <linux/mfd/abx500/ab8500-sysctrl.h>
|
||||||
#include <linux/clkdev.h>
|
#include <linux/clkdev.h>
|
||||||
#include <linux/clk-provider.h>
|
#include <linux/clk-provider.h>
|
||||||
|
#include <dt-bindings/clock/ste-ab8500.h>
|
||||||
#include "clk.h"
|
#include "clk.h"
|
||||||
|
|
||||||
|
#define AB8500_NUM_CLKS 6
|
||||||
|
|
||||||
|
static struct clk *ab8500_clks[AB8500_NUM_CLKS];
|
||||||
|
static struct clk_onecell_data ab8500_clk_data;
|
||||||
|
|
||||||
/* Clock definitions for ab8500 */
|
/* Clock definitions for ab8500 */
|
||||||
static int ab8500_reg_clks(struct device *dev)
|
static int ab8500_reg_clks(struct device *dev)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
|
struct device_node *np = dev->of_node;
|
||||||
const char *intclk_parents[] = {"ab8500_sysclk", "ulpclk"};
|
const char *intclk_parents[] = {"ab8500_sysclk", "ulpclk"};
|
||||||
u16 intclk_reg_sel[] = {0 , AB8500_SYSULPCLKCTRL1};
|
u16 intclk_reg_sel[] = {0 , AB8500_SYSULPCLKCTRL1};
|
||||||
u8 intclk_reg_mask[] = {0 , AB8500_SYSULPCLKCTRL1_SYSULPCLKINTSEL_MASK};
|
u8 intclk_reg_mask[] = {0 , AB8500_SYSULPCLKCTRL1_SYSULPCLKINTSEL_MASK};
|
||||||
|
@ -31,8 +38,6 @@ static int ab8500_reg_clks(struct device *dev)
|
||||||
(1 << AB8500_SYSULPCLKCTRL1_SYSULPCLKINTSEL_SHIFT)
|
(1 << AB8500_SYSULPCLKCTRL1_SYSULPCLKINTSEL_SHIFT)
|
||||||
};
|
};
|
||||||
|
|
||||||
dev_info(dev, "register clocks for ab850x\n");
|
|
||||||
|
|
||||||
/* Enable SWAT */
|
/* Enable SWAT */
|
||||||
ret = ab8500_sysctrl_set(AB8500_SWATCTRL, AB8500_SWATCTRL_SWATENABLE);
|
ret = ab8500_sysctrl_set(AB8500_SWATCTRL, AB8500_SWATCTRL_SWATENABLE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -42,37 +47,43 @@ static int ab8500_reg_clks(struct device *dev)
|
||||||
clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk2", "ab8500_sysclk",
|
clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk2", "ab8500_sysclk",
|
||||||
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF2REQ,
|
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF2REQ,
|
||||||
AB8500_SYSULPCLKCTRL1_SYSCLKBUF2REQ, 0, 0);
|
AB8500_SYSULPCLKCTRL1_SYSCLKBUF2REQ, 0, 0);
|
||||||
clk_register_clkdev(clk, "sysclk", "0-0070");
|
ab8500_clks[AB8500_SYSCLK_BUF2] = clk;
|
||||||
|
|
||||||
/* ab8500_sysclk3 */
|
/* ab8500_sysclk3 */
|
||||||
clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk3", "ab8500_sysclk",
|
clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk3", "ab8500_sysclk",
|
||||||
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF3REQ,
|
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF3REQ,
|
||||||
AB8500_SYSULPCLKCTRL1_SYSCLKBUF3REQ, 0, 0);
|
AB8500_SYSULPCLKCTRL1_SYSCLKBUF3REQ, 0, 0);
|
||||||
clk_register_clkdev(clk, "sysclk", "cg1960_core.0");
|
ab8500_clks[AB8500_SYSCLK_BUF3] = clk;
|
||||||
|
|
||||||
/* ab8500_sysclk4 */
|
/* ab8500_sysclk4 */
|
||||||
clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk4", "ab8500_sysclk",
|
clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk4", "ab8500_sysclk",
|
||||||
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF4REQ,
|
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF4REQ,
|
||||||
AB8500_SYSULPCLKCTRL1_SYSCLKBUF4REQ, 0, 0);
|
AB8500_SYSULPCLKCTRL1_SYSCLKBUF4REQ, 0, 0);
|
||||||
|
ab8500_clks[AB8500_SYSCLK_BUF4] = clk;
|
||||||
|
|
||||||
/* ab_ulpclk */
|
/* ab_ulpclk */
|
||||||
clk = clk_reg_sysctrl_gate_fixed_rate(dev, "ulpclk", NULL,
|
clk = clk_reg_sysctrl_gate_fixed_rate(dev, "ulpclk", NULL,
|
||||||
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_ULPCLKREQ,
|
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_ULPCLKREQ,
|
||||||
AB8500_SYSULPCLKCTRL1_ULPCLKREQ,
|
AB8500_SYSULPCLKCTRL1_ULPCLKREQ,
|
||||||
38400000, 9000, 0);
|
38400000, 9000, 0);
|
||||||
clk_register_clkdev(clk, "ulpclk", "snd-soc-mop500.0");
|
ab8500_clks[AB8500_SYSCLK_ULP] = clk;
|
||||||
|
|
||||||
/* ab8500_intclk */
|
/* ab8500_intclk */
|
||||||
clk = clk_reg_sysctrl_set_parent(dev , "intclk", intclk_parents, 2,
|
clk = clk_reg_sysctrl_set_parent(dev , "intclk", intclk_parents, 2,
|
||||||
intclk_reg_sel, intclk_reg_mask, intclk_reg_bits, 0);
|
intclk_reg_sel, intclk_reg_mask, intclk_reg_bits, 0);
|
||||||
clk_register_clkdev(clk, "intclk", "snd-soc-mop500.0");
|
ab8500_clks[AB8500_SYSCLK_INT] = clk;
|
||||||
clk_register_clkdev(clk, NULL, "ab8500-pwm.1");
|
|
||||||
|
|
||||||
/* ab8500_audioclk */
|
/* ab8500_audioclk */
|
||||||
clk = clk_reg_sysctrl_gate(dev , "audioclk", "intclk",
|
clk = clk_reg_sysctrl_gate(dev , "audioclk", "intclk",
|
||||||
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_AUDIOCLKENA,
|
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_AUDIOCLKENA,
|
||||||
AB8500_SYSULPCLKCTRL1_AUDIOCLKENA, 0, 0);
|
AB8500_SYSULPCLKCTRL1_AUDIOCLKENA, 0, 0);
|
||||||
clk_register_clkdev(clk, "audioclk", "ab8500-codec.0");
|
ab8500_clks[AB8500_SYSCLK_AUDIO] = clk;
|
||||||
|
|
||||||
|
ab8500_clk_data.clks = ab8500_clks;
|
||||||
|
ab8500_clk_data.clk_num = ARRAY_SIZE(ab8500_clks);
|
||||||
|
of_clk_add_provider(np, of_clk_src_onecell_get, &ab8500_clk_data);
|
||||||
|
|
||||||
|
dev_info(dev, "registered clocks for ab850x\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -108,9 +119,15 @@ static int abx500_clk_probe(struct platform_device *pdev)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const struct of_device_id abx500_clk_match[] = {
|
||||||
|
{ .compatible = "stericsson,ab8500-clk", },
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
static struct platform_driver abx500_clk_driver = {
|
static struct platform_driver abx500_clk_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "abx500-clk",
|
.name = "abx500-clk",
|
||||||
|
.of_match_table = abx500_clk_match,
|
||||||
},
|
},
|
||||||
.probe = abx500_clk_probe,
|
.probe = abx500_clk_probe,
|
||||||
};
|
};
|
||||||
|
@ -119,7 +136,6 @@ static int __init abx500_clk_init(void)
|
||||||
{
|
{
|
||||||
return platform_driver_register(&abx500_clk_driver);
|
return platform_driver_register(&abx500_clk_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
arch_initcall(abx500_clk_init);
|
arch_initcall(abx500_clk_init);
|
||||||
|
|
||||||
MODULE_AUTHOR("Ulf Hansson <ulf.hansson@linaro.org");
|
MODULE_AUTHOR("Ulf Hansson <ulf.hansson@linaro.org");
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
#ifndef __STE_CLK_AB8500_H__
|
||||||
|
#define __STE_CLK_AB8500_H__
|
||||||
|
|
||||||
|
#define AB8500_SYSCLK_BUF2 0
|
||||||
|
#define AB8500_SYSCLK_BUF3 1
|
||||||
|
#define AB8500_SYSCLK_BUF4 2
|
||||||
|
#define AB8500_SYSCLK_ULP 3
|
||||||
|
#define AB8500_SYSCLK_INT 4
|
||||||
|
#define AB8500_SYSCLK_AUDIO 5
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue