media: apple: isp: Use a second region for MBOX_IRQ_{DOORBELL,ACK}

t8112 uses a different register layout.

Signed-off-by: Janne Grunau <j@jannau.net>

Author: jannau

drivers/media/platform/apple/isp/isp-drv.c

@@ -276,6 +276,12 @@ static int apple_isp_probe(struct platform_device *pdev)
 		goto detach_genpd;
 	}
 
+	isp->mbox2 = devm_platform_ioremap_resource_byname(pdev, "mbox2");
+	if (IS_ERR(isp->mbox2)) {
+		err = PTR_ERR(isp->mbox2);
+		goto detach_genpd;
+	}
+
 	isp->irq = platform_get_irq(pdev, 0);
 	if (isp->irq < 0) {
 		err = isp->irq;

drivers/media/platform/apple/isp/isp-drv.h

@@ -199,6 +199,7 @@ struct apple_isp {
 	void __iomem *coproc;
 	void __iomem *mbox;
 	void __iomem *gpio;
+	void __iomem *mbox2;
 
 	struct iommu_domain *domain;
 	unsigned long shift;

drivers/media/platform/apple/isp/isp-fw.c

@@ -122,7 +122,7 @@ static irqreturn_t apple_isp_isr(int irq, void *dev)
 {
 	struct apple_isp *isp = dev;
 
-	isp_mbox_write32(isp, ISP_MBOX_IRQ_ACK,
+	isp_mbox2_write32(isp, ISP_MBOX2_IRQ_ACK,
 			 isp_mbox_read32(isp, ISP_MBOX_IRQ_INTERRUPT));
 
 	return IRQ_WAKE_THREAD;

drivers/media/platform/apple/isp/isp-ipc.c

@@ -118,7 +118,7 @@ static int chan_handle_once(struct apple_isp *isp, struct isp_channel *chan)
 
 	chan_write_msg(isp, chan, &chan->rsp);
 
-	isp_mbox_write32(isp, ISP_MBOX_IRQ_DOORBELL, chan->doorbell);
+	isp_mbox2_write32(isp, ISP_MBOX2_IRQ_DOORBELL, chan->doorbell);
 
 	chan_update_cursor(chan);
 
@@ -173,7 +173,7 @@ int ipc_chan_send(struct apple_isp *isp, struct isp_channel *chan,
 	chan_write_msg(isp, chan, &chan->req);
 	dma_wmb();
 
-	isp_mbox_write32(isp, ISP_MBOX_IRQ_DOORBELL, chan->doorbell);
+	isp_mbox2_write32(isp, ISP_MBOX2_IRQ_DOORBELL, chan->doorbell);
 
 	if (!timeout)
 		return 0;

drivers/media/platform/apple/isp/isp-regs.h

@@ -23,10 +23,10 @@
 #define ISP_COPROC_IRQ_MASK_4  0x1400a10
 #define ISP_COPROC_IRQ_MASK_5  0x1400a14
 
-#define ISP_MBOX_IRQ_INTERRUPT 0x000
-#define ISP_MBOX_IRQ_ENABLE    0x004
-#define ISP_MBOX_IRQ_DOORBELL  0x3f0
-#define ISP_MBOX_IRQ_ACK       0x3fc
+#define ISP_MBOX_IRQ_INTERRUPT 0x00
+#define ISP_MBOX_IRQ_ENABLE    0x04
+#define ISP_MBOX2_IRQ_DOORBELL 0x00
+#define ISP_MBOX2_IRQ_ACK      0x0c
 
 #define ISP_GPIO_0	       0x00
 #define ISP_GPIO_1	       0x04
@@ -48,4 +48,9 @@ static inline void isp_mbox_write32(struct apple_isp *isp, u32 reg, u32 val)
 	writel(val, isp->mbox + reg);
 }
 
+static inline void isp_mbox2_write32(struct apple_isp *isp, u32 reg, u32 val)
+{
+	writel(val, isp->mbox2 + reg);
+}
+
 #endif /* __ISP_REGS_H__ */