powerpc/cpm2: Remove cpm2_map() and cpm2_unmap()

Since commit 449012daa92a ("[POWERPC] cpm2: Infrastructure code
cleanup.") cpm2_map() is just returning cpm2_immr pointer and
cpm2_unmap() does nothing.

We already have parts of code that use cpm2_immr directly so get rid
of cpm2_map() and cpm2_unmap() by using cpm2_immr directly. And avoid
going through local pointers that hide the pointed structure.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/9fe6ff7284e9f968b12abe7de7c08d7ea40e29d6.1691474658.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/include/asm/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h
index 82f0e528e21ca9274a94cb6fbd658b89f5597e64..d530f68b4eef6b56cf6b4aa51593b2280f23e62f 100644 (file)
--- a/arch/powerpc/include/asm/fs_pd.h
+++ b/arch/powerpc/include/asm/fs_pd.h
@@ -14,14 +14,6 @@
 #include <sysdev/fsl_soc.h>
 #include <asm/time.h>
 
-#ifdef CONFIG_CPM2
-#include <asm/cpm2.h>
-
-#define cpm2_map(member) (&cpm2_immr->member)
-#define cpm2_map_size(member, size) (&cpm2_immr->member)
-#define cpm2_unmap(addr) do {} while(0)
-#endif
-
 static inline int uart_baudrate(void)
 {
         return get_baudrate();

diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c
index a926911933141b5e17aa897a7e08f755cd11ed63..14cc5ea936c0a9fd2c067ce4e9e39adbebddfa68 100644 (file)
--- a/arch/powerpc/sysdev/cpm2.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -40,7 +40,6 @@
 #include <asm/page.h>
 #include <asm/cpm2.h>
 #include <asm/rheap.h>
-#include <asm/fs_pd.h>
 
 #include <sysdev/fsl_soc.h>
 
@@ -118,9 +117,9 @@ void __cpm2_setbrg(uint brg, uint rate, uint clk, int div16, int src)
        /* This is good enough to get SMCs running.....
        */
        if (brg < 4) {
-               bp = cpm2_map_size(im_brgc1, 16);
+               bp = &cpm2_immr->im_brgc1;
        } else {
-               bp = cpm2_map_size(im_brgc5, 16);
+               bp = &cpm2_immr->im_brgc5;
                brg -= 4;
        }
        bp += brg;
@@ -130,7 +129,6 @@ void __cpm2_setbrg(uint brg, uint rate, uint clk, int div16, int src)
                val |= CPM_BRG_DIV16;
 
        out_be32(bp, val);
-       cpm2_unmap(bp);
 }
 EXPORT_SYMBOL(__cpm2_setbrg);
 
@@ -139,7 +137,6 @@ int __init cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
        int ret = 0;
        int shift;
        int i, bits = 0;
-       cpmux_t __iomem *im_cpmux;
        u32 __iomem *reg;
        u32 mask = 7;
 
@@ -202,35 +199,33 @@ int __init cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
                {CPM_CLK_SCC4, CPM_CLK8, 7},
        };
 
-       im_cpmux = cpm2_map(im_cpmux);
-
        switch (target) {
        case CPM_CLK_SCC1:
-               reg = &im_cpmux->cmx_scr;
+               reg = &cpm2_immr->im_cpmux.cmx_scr;
                shift = 24;
                break;
        case CPM_CLK_SCC2:
-               reg = &im_cpmux->cmx_scr;
+               reg = &cpm2_immr->im_cpmux.cmx_scr;
                shift = 16;
                break;
        case CPM_CLK_SCC3:
-               reg = &im_cpmux->cmx_scr;
+               reg = &cpm2_immr->im_cpmux.cmx_scr;
                shift = 8;
                break;
        case CPM_CLK_SCC4:
-               reg = &im_cpmux->cmx_scr;
+               reg = &cpm2_immr->im_cpmux.cmx_scr;
                shift = 0;
                break;
        case CPM_CLK_FCC1:
-               reg = &im_cpmux->cmx_fcr;
+               reg = &cpm2_immr->im_cpmux.cmx_fcr;
                shift = 24;
                break;
        case CPM_CLK_FCC2:
-               reg = &im_cpmux->cmx_fcr;
+               reg = &cpm2_immr->im_cpmux.cmx_fcr;
                shift = 16;
                break;
        case CPM_CLK_FCC3:
-               reg = &im_cpmux->cmx_fcr;
+               reg = &cpm2_immr->im_cpmux.cmx_fcr;
                shift = 8;
                break;
        default:
@@ -260,7 +255,6 @@ int __init cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
 
        out_be32(reg, (in_be32(reg) & ~mask) | bits);
 
-       cpm2_unmap(im_cpmux);
        return ret;
 }
 
@@ -269,7 +263,6 @@ int __init cpm2_smc_clk_setup(enum cpm_clk_target target, int clock)
        int ret = 0;
        int shift;
        int i, bits = 0;
-       cpmux_t __iomem *im_cpmux;
        u8 __iomem *reg;
        u8 mask = 3;
 
@@ -284,16 +277,14 @@ int __init cpm2_smc_clk_setup(enum cpm_clk_target target, int clock)
                {CPM_CLK_SMC2, CPM_CLK15, 3},
        };
 
-       im_cpmux = cpm2_map(im_cpmux);
-
        switch (target) {
        case CPM_CLK_SMC1:
-               reg = &im_cpmux->cmx_smr;
+               reg = &cpm2_immr->im_cpmux.cmx_smr;
                mask = 3;
                shift = 4;
                break;
        case CPM_CLK_SMC2:
-               reg = &im_cpmux->cmx_smr;
+               reg = &cpm2_immr->im_cpmux.cmx_smr;
                mask = 3;
                shift = 0;
                break;
@@ -316,7 +307,6 @@ int __init cpm2_smc_clk_setup(enum cpm_clk_target target, int clock)
 
        out_8(reg, (in_8(reg) & ~mask) | bits);
 
-       cpm2_unmap(im_cpmux);
        return ret;
 }
 

diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index d6c1359ae89da9365220f0202e1722b19f7ba14f..e14493685fe872ca2b7e25c2d7816b7adef89c20 100644 (file)
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -34,7 +34,6 @@
 
 #include <asm/immap_cpm2.h>
 #include <asm/io.h>
-#include <asm/fs_pd.h>
 
 #include "cpm2_pic.h"
 
@@ -230,7 +229,7 @@ void cpm2_pic_init(struct device_node *node)
 {
        int i;
 
-       cpm2_intctl = cpm2_map(im_intctl);
+       cpm2_intctl = &cpm2_immr->im_intctl;
 
        /* Clear the CPM IRQ controller, in case it has any bits set
         * from the bootloader