From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed, 21 Sep 2016 22:42:22 +0000 (+0900)
Subject: clk: uniphier: allow to have clock node under syscon node
X-Git-Tag: v2016.11-rc1~111^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6dc5b6b1ff030a811d1747c19009d9f3b0908099;p=u-boot

clk: uniphier: allow to have clock node under syscon node

To sync the DT binding with Linux, the register base must be taken
from the parent syscon node.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index 2db4a7c0bd..394832607e 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -30,7 +30,7 @@ int uniphier_clk_probe(struct udevice *dev)
 	struct uniphier_clk_priv *priv = dev_get_priv(dev);
 	fdt_addr_t addr;
 
-	addr = dev_get_addr(dev);
+	addr = dev_get_addr(dev->parent);
 	if (addr == FDT_ADDR_T_NONE)
 		return -EINVAL;
 
@@ -159,35 +159,35 @@ const struct clk_ops uniphier_clk_ops = {
 
 static const struct udevice_id uniphier_clk_match[] = {
 	{
-		.compatible = "socionext,ph1-sld3-mioctrl",
+		.compatible = "socionext,uniphier-sld3-mio-clock",
 		.data = (ulong)&uniphier_mio_clk_data,
 	},
 	{
-		.compatible = "socionext,ph1-ld4-mioctrl",
+		.compatible = "socionext,uniphier-ld4-mio-clock",
 		.data = (ulong)&uniphier_mio_clk_data,
 	},
 	{
-		.compatible = "socionext,ph1-pro4-mioctrl",
+		.compatible = "socionext,uniphier-pro4-mio-clock",
 		.data = (ulong)&uniphier_mio_clk_data,
 	},
 	{
-		.compatible = "socionext,ph1-sld8-mioctrl",
+		.compatible = "socionext,uniphier-sld8-mio-clock",
 		.data = (ulong)&uniphier_mio_clk_data,
 	},
 	{
-		.compatible = "socionext,ph1-pro5-mioctrl",
+		.compatible = "socionext,uniphier-pro5-mio-clock",
 		.data = (ulong)&uniphier_mio_clk_data,
 	},
 	{
-		.compatible = "socionext,proxstream2-mioctrl",
+		.compatible = "socionext,uniphier-pxs2-mio-clock",
 		.data = (ulong)&uniphier_mio_clk_data,
 	},
 	{
-		.compatible = "socionext,ph1-ld11-mioctrl",
+		.compatible = "socionext,uniphier-ld11-mio-clock",
 		.data = (ulong)&uniphier_mio_clk_data,
 	},
 	{
-		.compatible = "socionext,ph1-ld20-mioctrl",
+		.compatible = "socionext,uniphier-ld20-mio-clock",
 		.data = (ulong)&uniphier_mio_clk_data,
 	},
 	{ /* sentinel */ }