Merge tag 'arm-soc/for-6.3/drivers' of https://github.com/Broadcom/stblinux into...

[linux-2.6-microblaze.git] / include / memory / renesas-rpc-if.h

diff --git a/include/memory/renesas-rpc-if.h b/include/memory/renesas-rpc-if.h
index 862eff6..b8fa30f 100644 (file)
--- a/include/memory/renesas-rpc-if.h
+++ b/include/memory/renesas-rpc-if.h
@@ -65,41 +65,15 @@ enum rpcif_type {
 
 struct rpcif {
        struct device *dev;
-       void __iomem *base;
        void __iomem *dirmap;
-       struct regmap *regmap;
-       struct reset_control *rstc;
        size_t size;
-       enum rpcif_type type;
-       enum rpcif_data_dir dir;
-       u8 bus_size;
-       u8 xfer_size;
-       void *buffer;
-       u32 xferlen;
-       u32 smcr;
-       u32 smadr;
-       u32 command;            /* DRCMR or SMCMR */
-       u32 option;             /* DROPR or SMOPR */
-       u32 enable;             /* DRENR or SMENR */
-       u32 dummy;              /* DRDMCR or SMDMCR */
-       u32 ddr;                /* DRDRENR or SMDRENR */
 };
 
 int rpcif_sw_init(struct rpcif *rpc, struct device *dev);
-int rpcif_hw_init(struct rpcif *rpc, bool hyperflash);
-void rpcif_prepare(struct rpcif *rpc, const struct rpcif_op *op, u64 *offs,
+int rpcif_hw_init(struct device *dev, bool hyperflash);
+void rpcif_prepare(struct device *dev, const struct rpcif_op *op, u64 *offs,
                   size_t *len);
-int rpcif_manual_xfer(struct rpcif *rpc);
-ssize_t rpcif_dirmap_read(struct rpcif *rpc, u64 offs, size_t len, void *buf);
-
-static inline void rpcif_enable_rpm(struct rpcif *rpc)
-{
-       pm_runtime_enable(rpc->dev);
-}
-
-static inline void rpcif_disable_rpm(struct rpcif *rpc)
-{
-       pm_runtime_disable(rpc->dev);
-}
+int rpcif_manual_xfer(struct device *dev);
+ssize_t rpcif_dirmap_read(struct device *dev, u64 offs, size_t len, void *buf);
 
 #endif // __RENESAS_RPC_IF_H