Commit 53bcbb83 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Miquel Raynal

mtd: rawnand: denali_dt: remove single anonymous clock support

Commit 6f1fe97b ("mtd: rawnand: denali_dt: add more clocks based
on IP datasheet") introduced a more correct binding that requires
three named clocks.

Now that all upstream DT files migrated over to it, remove the single
anonymous clock support.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Acked-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 0119720a
...@@ -109,25 +109,17 @@ static int denali_dt_probe(struct platform_device *pdev) ...@@ -109,25 +109,17 @@ static int denali_dt_probe(struct platform_device *pdev)
if (IS_ERR(denali->host)) if (IS_ERR(denali->host))
return PTR_ERR(denali->host); return PTR_ERR(denali->host);
/*
* A single anonymous clock is supported for the backward compatibility.
* New platforms should support all the named clocks.
*/
dt->clk = devm_clk_get(dev, "nand"); dt->clk = devm_clk_get(dev, "nand");
if (IS_ERR(dt->clk)) if (IS_ERR(dt->clk))
dt->clk = devm_clk_get(dev, NULL);
if (IS_ERR(dt->clk)) {
dev_err(dev, "no clk available\n");
return PTR_ERR(dt->clk); return PTR_ERR(dt->clk);
}
dt->clk_x = devm_clk_get(dev, "nand_x"); dt->clk_x = devm_clk_get(dev, "nand_x");
if (IS_ERR(dt->clk_x)) if (IS_ERR(dt->clk_x))
dt->clk_x = NULL; return PTR_ERR(dt->clk_x);
dt->clk_ecc = devm_clk_get(dev, "ecc"); dt->clk_ecc = devm_clk_get(dev, "ecc");
if (IS_ERR(dt->clk_ecc)) if (IS_ERR(dt->clk_ecc))
dt->clk_ecc = NULL; return PTR_ERR(dt->clk_ecc);
ret = clk_prepare_enable(dt->clk); ret = clk_prepare_enable(dt->clk);
if (ret) if (ret)
...@@ -141,19 +133,8 @@ static int denali_dt_probe(struct platform_device *pdev) ...@@ -141,19 +133,8 @@ static int denali_dt_probe(struct platform_device *pdev)
if (ret) if (ret)
goto out_disable_clk_x; goto out_disable_clk_x;
if (dt->clk_x) {
denali->clk_rate = clk_get_rate(dt->clk); denali->clk_rate = clk_get_rate(dt->clk);
denali->clk_x_rate = clk_get_rate(dt->clk_x); denali->clk_x_rate = clk_get_rate(dt->clk_x);
} else {
/*
* Hardcode the clock rates for the backward compatibility.
* This works for both SOCFPGA and UniPhier.
*/
dev_notice(dev,
"necessary clock is missing. default clock rates are used.\n");
denali->clk_rate = 50000000;
denali->clk_x_rate = 200000000;
}
ret = denali_init(denali); ret = denali_init(denali);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment