clk: at91: Use dev_read_addr_ptr()

Replace devfdt_get_addr_ptr() with dev_read_addr_ptr() when retrieving the
register base address.

dev_read_addr_ptr() supports both live device tree and flat DT backends,
avoiding direct dependency on devfdt_* helpers.

No functional changes.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Manikandan Muralidharan <manikandan.m@microchip.com>

diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c
index 2251e2846fa787ab4494127b1892a0695ad657f8..0d0e39db57e94516fc12bd779de80a9feacbc3d7 100644 (file)
--- a/drivers/clk/at91/sam9x60.c
+++ b/drivers/clk/at91/sam9x60.c
@@ -426,7 +426,7 @@ static const struct pmc_clk_setup sam9x60_clk_setup[] = {
 
 static int sam9x60_clk_probe(struct udevice *dev)
 {
-       void __iomem *base = (void *)devfdt_get_addr_ptr(dev);
+       void __iomem *base = dev_read_addr_ptr(dev);
        unsigned int *clkmuxallocs[64], *muxallocs[64];
        const char *p[10];
        unsigned int cm[10], m[10], *tmpclkmux, *tmpmux;

diff --git a/drivers/clk/at91/sam9x7.c b/drivers/clk/at91/sam9x7.c
index 9ea253e6ff88eeea26e10e4a1337eb0e992df550..93f899b6617e3c375a787bdee861f2641862bc88 100644 (file)
--- a/drivers/clk/at91/sam9x7.c
+++ b/drivers/clk/at91/sam9x7.c
@@ -817,7 +817,7 @@ static const struct {
 
 static int sam9x7_clk_probe(struct udevice *dev)
 {
-       void __iomem *base = (void *)devfdt_get_addr_ptr(dev);
+       void __iomem *base = dev_read_addr_ptr(dev);
        unsigned int *clkmuxallocs[64], *muxallocs[64];
        const char *p[10];
        unsigned int cm[10], m[10], *tmpclkmux, *tmpmux;

diff --git a/drivers/clk/at91/sama7d65.c b/drivers/clk/at91/sama7d65.c
index 9f0b394543bf94c71645d3297bd6f6fbc23b4b4d..0c17a8cf67b612e20eee84577ce94675182d728a 100644 (file)
--- a/drivers/clk/at91/sama7d65.c
+++ b/drivers/clk/at91/sama7d65.c
@@ -1176,7 +1176,7 @@ static const struct pmc_clk_setup sama7d65_clk_setup[] = {
 
 static int sama7d65_clk_probe(struct udevice *dev)
 {
-       void __iomem *base = (void *)devfdt_get_addr(dev);
+       void __iomem *base = dev_read_addr_ptr(dev);
        unsigned int *clkmuxallocs[SAMA7D65_MAX_MUX_ALLOCS];
        unsigned int *muxallocs[SAMA7D65_MAX_MUX_ALLOCS];
        const char *p[12];
@@ -1185,8 +1185,8 @@ static int sama7d65_clk_probe(struct udevice *dev)
        bool main_osc_bypass;
        int ret, muxallocindex = 0, clkmuxallocindex = 0, i, j;
 
-       if (IS_ERR(base))
-               return PTR_ERR(base);
+       if (!base)
+               return -EINVAL;
 
        memset(muxallocs,    0, ARRAY_SIZE(muxallocs));
        memset(clkmuxallocs, 0, ARRAY_SIZE(clkmuxallocs));

diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c
index f24d251857fc9c647a41a1059ca9a0818dadd00c..c436038aed2488d79d3346f054882bc5b20ed0ae 100644 (file)
--- a/drivers/clk/at91/sama7g5.c
+++ b/drivers/clk/at91/sama7g5.c
@@ -1109,7 +1109,7 @@ static const struct pmc_clk_setup sama7g5_clk_setup[] = {
 
 static int sama7g5_clk_probe(struct udevice *dev)
 {
-       void __iomem *base = devfdt_get_addr_ptr(dev);
+       void __iomem *base = dev_read_addr_ptr(dev);
        unsigned int *clkmuxallocs[SAMA7G5_MAX_MUX_ALLOCS];
        unsigned int *muxallocs[SAMA7G5_MAX_MUX_ALLOCS];
        const char *p[10];
@@ -1118,8 +1118,8 @@ static int sama7g5_clk_probe(struct udevice *dev)
        bool main_osc_bypass;
        int ret, muxallocindex = 0, clkmuxallocindex = 0, i, j;
 
-       if (IS_ERR(base))
-               return PTR_ERR(base);
+       if (!base)
+               return -EINVAL;
 
        memset(muxallocs,    0, sizeof(muxallocs));
        memset(clkmuxallocs, 0, sizeof(clkmuxallocs));

diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c
index dcaffd360fdf75e12e678893df5e027b3ac3d99b..410bc0882489db919278e342f1e432f8f2e6dcda 100644 (file)
--- a/drivers/clk/at91/sckc.c
+++ b/drivers/clk/at91/sckc.c
@@ -124,12 +124,15 @@ U_BOOT_DRIVER(at91_sam9x60_td_slck) = {
 static int at91_sam9x60_sckc_probe(struct udevice *dev)
 {
        struct sam9x60_sckc *sckc = dev_get_priv(dev);
-       void __iomem *base = devfdt_get_addr_ptr(dev);
+       void __iomem *base = dev_read_addr_ptr(dev);
        const char *slow_rc_osc, *slow_osc;
        const char *parents[2];
        struct clk *clk, c;
        int ret;
 
+       if (!base)
+               return -EINVAL;
+
        ret = clk_get_by_index(dev, 0, &c);
        if (ret)
                return ret;