|
@@ -16,6 +16,7 @@
|
|
|
#include <linux/device.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/kernel.h>
|
|
|
+#include <linux/soc/renesas/rcar-rst.h>
|
|
|
|
|
|
#include <dt-bindings/clock/r8a7796-cpg-mssr.h>
|
|
|
|
|
@@ -190,7 +191,12 @@ static const struct rcar_gen3_cpg_pll_config cpg_pll_configs[16] __initconst = {
|
|
|
static int __init r8a7796_cpg_mssr_init(struct device *dev)
|
|
|
{
|
|
|
const struct rcar_gen3_cpg_pll_config *cpg_pll_config;
|
|
|
- u32 cpg_mode = rcar_gen3_read_mode_pins();
|
|
|
+ u32 cpg_mode;
|
|
|
+ int error;
|
|
|
+
|
|
|
+ error = rcar_rst_read_mode_pins(&cpg_mode);
|
|
|
+ if (error)
|
|
|
+ return error;
|
|
|
|
|
|
cpg_pll_config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX(cpg_mode)];
|
|
|
if (!cpg_pll_config->extal_div) {
|