Merge tag 'mailbox-v5.5' of git://git.linaro.org/landing-teams/working/fujitsu/integr...

[sfrench/cifs-2.6.git] / drivers / mailbox / imx-mailbox.c

diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
index 9f74dee1a58c71aa2749f1e1d81f6110d751c366..2cdcdc5f1119e35bf8592e3cfec11a4c62b28fc7 100644 (file)
--- a/drivers/mailbox/imx-mailbox.c
+++ b/drivers/mailbox/imx-mailbox.c
@@ -12,19 +12,11 @@
 #include <linux/of_device.h>
 #include <linux/slab.h>
 
-/* Transmit Register */
-#define IMX_MU_xTRn(x)         (0x00 + 4 * (x))
-/* Receive Register */
-#define IMX_MU_xRRn(x)         (0x10 + 4 * (x))
-/* Status Register */
-#define IMX_MU_xSR             0x20
 #define IMX_MU_xSR_GIPn(x)     BIT(28 + (3 - (x)))
 #define IMX_MU_xSR_RFn(x)      BIT(24 + (3 - (x)))
 #define IMX_MU_xSR_TEn(x)      BIT(20 + (3 - (x)))
 #define IMX_MU_xSR_BRDIP       BIT(9)
 
-/* Control Register */
-#define IMX_MU_xCR             0x24
 /* General Purpose Interrupt Enable */
 #define IMX_MU_xCR_GIEn(x)     BIT(28 + (3 - (x)))
 /* Receive Interrupt Enable */
@@ -44,6 +36,13 @@ enum imx_mu_chan_type {
        IMX_MU_TYPE_RXDB,       /* Rx doorbell */
 };
 
+struct imx_mu_dcfg {
+       u32     xTR[4];         /* Transmit Registers */
+       u32     xRR[4];         /* Receive Registers */
+       u32     xSR;            /* Status Register */
+       u32     xCR;            /* Control Register */
+};
+
 struct imx_mu_con_priv {
        unsigned int            idx;
        char                    irq_desc[IMX_MU_CHAN_NAME_SIZE];
@@ -61,12 +60,27 @@ struct imx_mu_priv {
        struct mbox_chan        mbox_chans[IMX_MU_CHANS];
 
        struct imx_mu_con_priv  con_priv[IMX_MU_CHANS];
+       const struct imx_mu_dcfg        *dcfg;
        struct clk              *clk;
        int                     irq;
 
        bool                    side_b;
 };
 
+static const struct imx_mu_dcfg imx_mu_cfg_imx6sx = {
+       .xTR    = {0x0, 0x4, 0x8, 0xc},
+       .xRR    = {0x10, 0x14, 0x18, 0x1c},
+       .xSR    = 0x20,
+       .xCR    = 0x24,
+};
+
+static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = {
+       .xTR    = {0x20, 0x24, 0x28, 0x2c},
+       .xRR    = {0x40, 0x44, 0x48, 0x4c},
+       .xSR    = 0x60,
+       .xCR    = 0x64,
+};
+
 static struct imx_mu_priv *to_imx_mu_priv(struct mbox_controller *mbox)
 {
        return container_of(mbox, struct imx_mu_priv, mbox);
@@ -88,10 +102,10 @@ static u32 imx_mu_xcr_rmw(struct imx_mu_priv *priv, u32 set, u32 clr)
        u32 val;
 
        spin_lock_irqsave(&priv->xcr_lock, flags);
-       val = imx_mu_read(priv, IMX_MU_xCR);
+       val = imx_mu_read(priv, priv->dcfg->xCR);
        val &= ~clr;
        val |= set;
-       imx_mu_write(priv, val, IMX_MU_xCR);
+       imx_mu_write(priv, val, priv->dcfg->xCR);
        spin_unlock_irqrestore(&priv->xcr_lock, flags);
 
        return val;
@@ -111,8 +125,8 @@ static irqreturn_t imx_mu_isr(int irq, void *p)
        struct imx_mu_con_priv *cp = chan->con_priv;
        u32 val, ctrl, dat;
 
-       ctrl = imx_mu_read(priv, IMX_MU_xCR);
-       val = imx_mu_read(priv, IMX_MU_xSR);
+       ctrl = imx_mu_read(priv, priv->dcfg->xCR);
+       val = imx_mu_read(priv, priv->dcfg->xSR);
 
        switch (cp->type) {
        case IMX_MU_TYPE_TX:
@@ -138,10 +152,10 @@ static irqreturn_t imx_mu_isr(int irq, void *p)
                imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_TIEn(cp->idx));
                mbox_chan_txdone(chan, 0);
        } else if (val == IMX_MU_xSR_RFn(cp->idx)) {
-               dat = imx_mu_read(priv, IMX_MU_xRRn(cp->idx));
+               dat = imx_mu_read(priv, priv->dcfg->xRR[cp->idx]);
                mbox_chan_received_data(chan, (void *)&dat);
        } else if (val == IMX_MU_xSR_GIPn(cp->idx)) {
-               imx_mu_write(priv, IMX_MU_xSR_GIPn(cp->idx), IMX_MU_xSR);
+               imx_mu_write(priv, IMX_MU_xSR_GIPn(cp->idx), priv->dcfg->xSR);
                mbox_chan_received_data(chan, NULL);
        } else {
                dev_warn_ratelimited(priv->dev, "Not handled interrupt\n");
@@ -159,7 +173,7 @@ static int imx_mu_send_data(struct mbox_chan *chan, void *data)
 
        switch (cp->type) {
        case IMX_MU_TYPE_TX:
-               imx_mu_write(priv, *arg, IMX_MU_xTRn(cp->idx));
+               imx_mu_write(priv, *arg, priv->dcfg->xTR[cp->idx]);
                imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0);
                break;
        case IMX_MU_TYPE_TXDB:
@@ -214,11 +228,24 @@ static void imx_mu_shutdown(struct mbox_chan *chan)
        struct imx_mu_priv *priv = to_imx_mu_priv(chan->mbox);
        struct imx_mu_con_priv *cp = chan->con_priv;
 
-       if (cp->type == IMX_MU_TYPE_TXDB)
+       if (cp->type == IMX_MU_TYPE_TXDB) {
                tasklet_kill(&cp->txdb_tasklet);
+               return;
+       }
 
-       imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_TIEn(cp->idx) |
-                      IMX_MU_xCR_RIEn(cp->idx) | IMX_MU_xCR_GIEn(cp->idx));
+       switch (cp->type) {
+       case IMX_MU_TYPE_TX:
+               imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_TIEn(cp->idx));
+               break;
+       case IMX_MU_TYPE_RX:
+               imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_RIEn(cp->idx));
+               break;
+       case IMX_MU_TYPE_RXDB:
+               imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_GIEn(cp->idx));
+               break;
+       default:
+               break;
+       }
 
        free_irq(priv->irq, chan);
 }
@@ -257,7 +284,7 @@ static void imx_mu_init_generic(struct imx_mu_priv *priv)
                return;
 
        /* Set default MU configuration */
-       imx_mu_write(priv, 0, IMX_MU_xCR);
+       imx_mu_write(priv, 0, priv->dcfg->xCR);
 }
 
 static int imx_mu_probe(struct platform_device *pdev)
@@ -265,6 +292,7 @@ static int imx_mu_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
        struct imx_mu_priv *priv;
+       const struct imx_mu_dcfg *dcfg;
        unsigned int i;
        int ret;
 
@@ -282,6 +310,11 @@ static int imx_mu_probe(struct platform_device *pdev)
        if (priv->irq < 0)
                return priv->irq;
 
+       dcfg = of_device_get_match_data(dev);
+       if (!dcfg)
+               return -EINVAL;
+       priv->dcfg = dcfg;
+
        priv->clk = devm_clk_get(dev, NULL);
        if (IS_ERR(priv->clk)) {
                if (PTR_ERR(priv->clk) != -ENOENT)
@@ -335,7 +368,8 @@ static int imx_mu_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id imx_mu_dt_ids[] = {
-       { .compatible = "fsl,imx6sx-mu" },
+       { .compatible = "fsl,imx7ulp-mu", .data = &imx_mu_cfg_imx7ulp },
+       { .compatible = "fsl,imx6sx-mu", .data = &imx_mu_cfg_imx6sx },
        { },
 };
 MODULE_DEVICE_TABLE(of, imx_mu_dt_ids);