[PATCH 0/4] add ISI support for i.MX93

[PATCH 0/4] add ISI support for i.MX93

[guoniu.zhou]

From: "Guoniu.zhou" <guoniu.zhou@nxp.com>

NXP i.MX9 serials reuse ISI IP from i.MX8M family. So reuse the current
driver code for ISI and remove reference to i.MX8.

Guoniu.zhou (4):
  media: dt-bindings: media: rename nxp,imx8-isi.yaml to
    nxp,imx-isi.yaml
  media: nxp: rename imx8-isi to imx-isi and remove reference to i.MX8
  media: dt-bindings: media: nxp,imx-isi: i.MX93 support
  media: nxp: imx-isi: add ISI support for i.MX93

 .../{nxp,imx8-isi.yaml => nxp,imx-isi.yaml}   |   9 +-
 MAINTAINERS                                   |   6 +-
 drivers/media/platform/nxp/Kconfig            |   2 +-
 drivers/media/platform/nxp/Makefile           |   2 +-
 .../nxp/{imx8-isi => imx-isi}/Kconfig         |  14 +--
 drivers/media/platform/nxp/imx-isi/Makefile   |   8 ++
 .../imx-isi-core.c}                           | 114 +++++++++++++++++-
 .../imx-isi-core.h}                           |  35 +++++-
 .../imx-isi-crossbar.c}                       |  55 ++++-----
 .../imx-isi-debug.c}                          |   4 +-
 .../imx8-isi-hw.c => imx-isi/imx-isi-hw.c}    |   4 +-
 .../imx8-isi-m2m.c => imx-isi/imx-isi-m2m.c}  |   2 +-
 .../imx-isi-pipe.c}                           |   4 +-
 .../imx-isi-regs.h}                           |   6 +-
 .../imx-isi-video.c}                          |   8 +-
 drivers/media/platform/nxp/imx8-isi/Makefile  |   8 --
 16 files changed, 214 insertions(+), 67 deletions(-)
 rename Documentation/devicetree/bindings/media/{nxp,imx8-isi.yaml => nxp,imx-isi.yaml} (95%)
 rename drivers/media/platform/nxp/{imx8-isi => imx-isi}/Kconfig (60%)
 create mode 100644 drivers/media/platform/nxp/imx-isi/Makefile
 rename drivers/media/platform/nxp/{imx8-isi/imx8-isi-core.c => imx-isi/imx-isi-core.c} (81%)
 rename drivers/media/platform/nxp/{imx8-isi/imx8-isi-core.h => imx-isi/imx-isi-core.h} (89%)
 rename drivers/media/platform/nxp/{imx8-isi/imx8-isi-crossbar.c => imx-isi/imx-isi-crossbar.c} (92%)
 rename drivers/media/platform/nxp/{imx8-isi/imx8-isi-debug.c => imx-isi/imx-isi-debug.c} (98%)
 rename drivers/media/platform/nxp/{imx8-isi/imx8-isi-hw.c => imx-isi/imx-isi-hw.c} (99%)
 rename drivers/media/platform/nxp/{imx8-isi/imx8-isi-m2m.c => imx-isi/imx-isi-m2m.c} (99%)
 rename drivers/media/platform/nxp/{imx8-isi/imx8-isi-pipe.c => imx-isi/imx-isi-pipe.c} (99%)
 rename drivers/media/platform/nxp/{imx8-isi/imx8-isi-regs.h => imx-isi/imx-isi-regs.h} (99%)
 rename drivers/media/platform/nxp/{imx8-isi/imx8-isi-video.c => imx-isi/imx-isi-video.c} (99%)
 delete mode 100644 drivers/media/platform/nxp/imx8-isi/Makefile

base-commit: be9aac187433af6abba5fcc2e73d91d0794ba360
-- 
2.37.1

[PATCH 1/4] media: dt-bindings: media: rename nxp,imx8-isi.yaml to nxp,imx-isi.yaml

[guoniu.zhou]

From: "Guoniu.zhou" <guoniu.zhou@nxp.com>

Rename nxp,imx8-isi.yaml to nxp,imx-isi.yaml since the binding doc will
also be used in other i.MX SoC, such as i.MX9 serials.

Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
---
 .../bindings/media/{nxp,imx8-isi.yaml => nxp,imx-isi.yaml}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
similarity index 97%
rename from Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
rename to Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
index 6038b9b5ab36..1ce9440bde32 100644
--- a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
+++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/media/nxp,imx8-isi.yaml#
+$id: http://devicetree.org/schemas/media/nxp,imx-isi.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: i.MX8 Image Sensing Interface
+title: i.MX Image Sensing Interface
 
 maintainers:
   - Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-- 
2.37.1

Re: [PATCH 1/4] media: dt-bindings: media: rename nxp,imx8-isi.yaml to nxp,imx-isi.yaml

[Krzysztof Kozlowski]

On 25/06/2023 10:09, guoniu.zhou@oss.nxp.com wrote:
> From: "Guoniu.zhou" <guoniu.zhou@nxp.com>
> 
> Rename nxp,imx8-isi.yaml to nxp,imx-isi.yaml since the binding doc will
> also be used in other i.MX SoC, such as i.MX9 serials.

Subject: you have too many "media:". One, first is enough.

> 
> Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
> ---
>  .../bindings/media/{nxp,imx8-isi.yaml => nxp,imx-isi.yaml}    | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> similarity index 97%
> rename from Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> rename to Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> index 6038b9b5ab36..1ce9440bde32 100644
> --- a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> +++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> @@ -1,10 +1,10 @@
>  # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>  %YAML 1.2
>  ---
> -$id: http://devicetree.org/schemas/media/nxp,imx8-isi.yaml#
> +$id: http://devicetree.org/schemas/media/nxp,imx-isi.yaml#
>  $schema: http://devicetree.org/meta-schemas/core.yaml#
>  
> -title: i.MX8 Image Sensing Interface
> +title: i.MX Image Sensing Interface


This patch by itself does not make sense. Could be squashed or just drop
it. No real reason for renaming.

Best regards,
Krzysztof

[PATCH 2/4] media: nxp: rename imx8-isi to imx-isi and remove reference to i.MX8

[guoniu.zhou]

From: "Guoniu.zhou" <guoniu.zhou@nxp.com>

ISI is used both in i.MX8 and i.MX9 SoC, so do not specify a SoC
version number in the driver name and header file.

Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
---
 MAINTAINERS                                        |  6 +++---
 drivers/media/platform/nxp/Kconfig                 |  2 +-
 drivers/media/platform/nxp/Makefile                |  2 +-
 .../platform/nxp/{imx8-isi => imx-isi}/Kconfig     | 14 +++++++-------
 drivers/media/platform/nxp/imx-isi/Makefile        |  8 ++++++++
 .../imx8-isi-core.c => imx-isi/imx-isi-core.c}     |  4 ++--
 .../imx8-isi-core.h => imx-isi/imx-isi-core.h}     |  2 +-
 .../imx-isi-crossbar.c}                            |  4 ++--
 .../imx8-isi-debug.c => imx-isi/imx-isi-debug.c}   |  4 ++--
 .../imx8-isi-hw.c => imx-isi/imx-isi-hw.c}         |  4 ++--
 .../imx8-isi-m2m.c => imx-isi/imx-isi-m2m.c}       |  2 +-
 .../imx8-isi-pipe.c => imx-isi/imx-isi-pipe.c}     |  4 ++--
 .../imx8-isi-regs.h => imx-isi/imx-isi-regs.h}     |  6 +++---
 .../imx8-isi-video.c => imx-isi/imx-isi-video.c}   |  8 ++++----
 drivers/media/platform/nxp/imx8-isi/Makefile       |  8 --------
 15 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index c83475103a25..2e2fc3c2b338 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15081,12 +15081,12 @@ F:	drivers/iio/adc/imx7d_adc.c
 F:	drivers/iio/adc/imx93_adc.c
 F:	drivers/iio/adc/vf610_adc.c
 
-NXP i.MX 8M ISI DRIVER
+NXP i.MX ISI DRIVER
 M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:	linux-media@vger.kernel.org
 S:	Maintained
-F:	Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
-F:	drivers/media/platform/nxp/imx8-isi/
+F:	Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
+F:	drivers/media/platform/nxp/imx-isi/
 
 NXP i.MX 8MP DW100 V4L2 DRIVER
 M:	Xavier Roumegue <xavier.roumegue@oss.nxp.com>
diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig
index a0ca6b297fb8..55ce6a44b3fd 100644
--- a/drivers/media/platform/nxp/Kconfig
+++ b/drivers/media/platform/nxp/Kconfig
@@ -28,7 +28,7 @@ config VIDEO_IMX_MIPI_CSIS
 	  Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
 	  v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
 
-source "drivers/media/platform/nxp/imx8-isi/Kconfig"
+source "drivers/media/platform/nxp/imx-isi/Kconfig"
 
 # mem2mem drivers
 
diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/nxp/Makefile
index b8e672b75fed..c95d23f1f521 100644
--- a/drivers/media/platform/nxp/Makefile
+++ b/drivers/media/platform/nxp/Makefile
@@ -2,7 +2,7 @@
 
 obj-y += dw100/
 obj-y += imx-jpeg/
-obj-y += imx8-isi/
+obj-y += imx-isi/
 
 obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
 obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
diff --git a/drivers/media/platform/nxp/imx8-isi/Kconfig b/drivers/media/platform/nxp/imx-isi/Kconfig
similarity index 60%
rename from drivers/media/platform/nxp/imx8-isi/Kconfig
rename to drivers/media/platform/nxp/imx-isi/Kconfig
index fcff33fc2630..ce222fa67a2f 100644
--- a/drivers/media/platform/nxp/imx8-isi/Kconfig
+++ b/drivers/media/platform/nxp/imx-isi/Kconfig
@@ -1,22 +1,22 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-config VIDEO_IMX8_ISI
-	tristate "i.MX8 Image Sensor Interface (ISI) driver"
+config VIDEO_IMX_ISI
+	tristate "i.MX Image Sensor Interface (ISI) driver"
 	depends on ARCH_MXC || COMPILE_TEST
 	depends on HAS_DMA && PM
 	depends on VIDEO_DEV
 	select MEDIA_CONTROLLER
 	select V4L2_FWNODE
-	select V4L2_MEM2MEM_DEV if VIDEO_IMX8_ISI_M2M
+	select V4L2_MEM2MEM_DEV if VIDEO_IMX_ISI_M2M
 	select VIDEO_V4L2_SUBDEV_API
 	select VIDEOBUF2_DMA_CONTIG
 	help
 	  V4L2 driver for the Image Sensor Interface (ISI) found in various
-	  i.MX8 SoCs.
+	  i.MX SoCs.
 
-config VIDEO_IMX8_ISI_M2M
-	bool "i.MX8 Image Sensor Interface (ISI) memory-to-memory support"
-	depends on VIDEO_IMX8_ISI
+config VIDEO_IMX_ISI_M2M
+	bool "i.MX Image Sensor Interface (ISI) memory-to-memory support"
+	depends on VIDEO_IMX_ISI
 	help
 	  Select 'yes' here to enable support for memory-to-memory processing
 	  in the ISI driver.
diff --git a/drivers/media/platform/nxp/imx-isi/Makefile b/drivers/media/platform/nxp/imx-isi/Makefile
new file mode 100644
index 000000000000..f72e0ce8f17d
--- /dev/null
+++ b/drivers/media/platform/nxp/imx-isi/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+imx-isi-y := imx-isi-core.o imx-isi-crossbar.o imx-isi-hw.o \
+	imx-isi-pipe.o imx-isi-video.o
+imx-isi-$(CONFIG_DEBUG_FS) += imx-isi-debug.o
+imx-isi-$(CONFIG_VIDEO_IMX_ISI_M2M) += imx-isi-m2m.o
+
+obj-$(CONFIG_VIDEO_IMX_ISI) += imx-isi.o
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx-isi/imx-isi-core.c
similarity index 99%
rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
rename to drivers/media/platform/nxp/imx-isi/imx-isi-core.c
index 253e77189b69..cd5678139ddf 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-core.c
@@ -23,7 +23,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-mc.h>
 
-#include "imx8-isi-core.h"
+#include "imx-isi-core.h"
 
 /* -----------------------------------------------------------------------------
  * V4L2 async subdevs
@@ -535,5 +535,5 @@ module_platform_driver(mxc_isi_driver);
 
 MODULE_ALIAS("ISI");
 MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-MODULE_DESCRIPTION("IMX8 Image Sensing Interface driver");
+MODULE_DESCRIPTION("IMX Image Sensing Interface driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h b/drivers/media/platform/nxp/imx-isi/imx-isi-core.h
similarity index 99%
rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
rename to drivers/media/platform/nxp/imx-isi/imx-isi-core.h
index e469788a9e6c..2cb0caf44c42 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-core.h
@@ -327,7 +327,7 @@ int mxc_isi_video_buffer_prepare(struct mxc_isi_dev *isi, struct vb2_buffer *vb2
 				 const struct mxc_isi_format_info *info,
 				 const struct v4l2_pix_format_mplane *pix);
 
-#ifdef CONFIG_VIDEO_IMX8_ISI_M2M
+#ifdef CONFIG_VIDEO_IMX_ISI_M2M
 int mxc_isi_m2m_register(struct mxc_isi_dev *isi, struct v4l2_device *v4l2_dev);
 int mxc_isi_m2m_unregister(struct mxc_isi_dev *isi);
 #else
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c b/drivers/media/platform/nxp/imx-isi/imx-isi-crossbar.c
similarity index 99%
rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
rename to drivers/media/platform/nxp/imx-isi/imx-isi-crossbar.c
index f7447b2f4d77..f3e3ed080b07 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-crossbar.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * i.MX8 ISI - Input crossbar switch
+ * i.MX ISI - Input crossbar switch
  *
  * Copyright (c) 2022 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  */
@@ -18,7 +18,7 @@
 #include <media/mipi-csi2.h>
 #include <media/v4l2-subdev.h>
 
-#include "imx8-isi-core.h"
+#include "imx-isi-core.h"
 
 static inline struct mxc_isi_crossbar *to_isi_crossbar(struct v4l2_subdev *sd)
 {
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-debug.c b/drivers/media/platform/nxp/imx-isi/imx-isi-debug.c
similarity index 98%
rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-debug.c
rename to drivers/media/platform/nxp/imx-isi/imx-isi-debug.c
index 6709ab7ea1f3..302bfbd527ea 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-debug.c
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-debug.c
@@ -11,8 +11,8 @@
 #include <linux/seq_file.h>
 #include <linux/types.h>
 
-#include "imx8-isi-core.h"
-#include "imx8-isi-regs.h"
+#include "imx-isi-core.h"
+#include "imx-isi-regs.h"
 
 static inline u32 mxc_isi_read(struct mxc_isi_pipe *pipe, u32 reg)
 {
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c b/drivers/media/platform/nxp/imx-isi/imx-isi-hw.c
similarity index 99%
rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
rename to drivers/media/platform/nxp/imx-isi/imx-isi-hw.c
index 19e80b95ffea..3803ea1d4073 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-hw.c
@@ -8,8 +8,8 @@
 #include <linux/io.h>
 #include <linux/types.h>
 
-#include "imx8-isi-core.h"
-#include "imx8-isi-regs.h"
+#include "imx-isi-core.h"
+#include "imx-isi-regs.h"
 
 #define	ISI_DOWNSCALE_THRESHOLD		0x4000
 
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c b/drivers/media/platform/nxp/imx-isi/imx-isi-m2m.c
similarity index 99%
rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
rename to drivers/media/platform/nxp/imx-isi/imx-isi-m2m.c
index 9745d6219a16..5138524ed1d3 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-m2m.c
@@ -32,7 +32,7 @@
 #include <media/videobuf2-core.h>
 #include <media/videobuf2-dma-contig.h>
 
-#include "imx8-isi-core.h"
+#include "imx-isi-core.h"
 
 struct mxc_isi_m2m_buffer {
 	struct v4l2_m2m_buffer buf;
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c b/drivers/media/platform/nxp/imx-isi/imx-isi-pipe.c
similarity index 99%
rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
rename to drivers/media/platform/nxp/imx-isi/imx-isi-pipe.c
index c4454aa1cb34..7c1ba4e45f5d 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-pipe.c
@@ -23,8 +23,8 @@
 #include <media/v4l2-subdev.h>
 #include <media/videobuf2-v4l2.h>
 
-#include "imx8-isi-core.h"
-#include "imx8-isi-regs.h"
+#include "imx-isi-core.h"
+#include "imx-isi-regs.h"
 
 /*
  * While the ISI receives data from the gasket on a 3x12-bit bus, the pipeline
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h b/drivers/media/platform/nxp/imx-isi/imx-isi-regs.h
similarity index 99%
rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h
rename to drivers/media/platform/nxp/imx-isi/imx-isi-regs.h
index 1b65eccdf0da..2b4f8248b761 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-regs.h
@@ -3,8 +3,8 @@
  * Copyright 2019-2020 NXP
  */
 
-#ifndef __IMX8_ISI_REGS_H__
-#define __IMX8_ISI_REGS_H__
+#ifndef __IMX_ISI_REGS_H__
+#define __IMX_ISI_REGS_H__
 
 #include <linux/bits.h>
 
@@ -415,4 +415,4 @@
 /* Channel Input Buffer Extended Address Bits */
 #define CHNL_IN_BUF_XTND_ADDR					0x00b8
 
-#endif /* __IMX8_ISI_REGS_H__ */
+#endif /* __IMX_ISI_REGS_H__ */
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c b/drivers/media/platform/nxp/imx-isi/imx-isi-video.c
similarity index 99%
rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
rename to drivers/media/platform/nxp/imx-isi/imx-isi-video.c
index 10840c9a0912..0b5cc7c08332 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-video.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * V4L2 Capture ISI subdev driver for i.MX8QXP/QM platform
+ * V4L2 Capture ISI subdev driver for i.MX platform
  *
- * ISI is a Image Sensor Interface of i.MX8QXP/QM platform, which
+ * ISI is a Image Sensor Interface of i.MX platform, which
  * used to process image from camera sensor to memory or DC
  *
  * Copyright (c) 2019 NXP Semiconductor
@@ -30,8 +30,8 @@
 #include <media/videobuf2-dma-contig.h>
 #include <media/videobuf2-v4l2.h>
 
-#include "imx8-isi-core.h"
-#include "imx8-isi-regs.h"
+#include "imx-isi-core.h"
+#include "imx-isi-regs.h"
 
 /* Keep the first entry matching MXC_ISI_DEF_PIXEL_FORMAT */
 static const struct mxc_isi_format_info mxc_isi_formats[] = {
diff --git a/drivers/media/platform/nxp/imx8-isi/Makefile b/drivers/media/platform/nxp/imx8-isi/Makefile
deleted file mode 100644
index 9bff9297686d..000000000000
--- a/drivers/media/platform/nxp/imx8-isi/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-imx8-isi-y := imx8-isi-core.o imx8-isi-crossbar.o imx8-isi-hw.o \
-	imx8-isi-pipe.o imx8-isi-video.o
-imx8-isi-$(CONFIG_DEBUG_FS) += imx8-isi-debug.o
-imx8-isi-$(CONFIG_VIDEO_IMX8_ISI_M2M) += imx8-isi-m2m.o
-
-obj-$(CONFIG_VIDEO_IMX8_ISI) += imx8-isi.o
-- 
2.37.1

Re: [PATCH 2/4] media: nxp: rename imx8-isi to imx-isi and remove reference to i.MX8

[Krzysztof Kozlowski]

On 25/06/2023 10:09, guoniu.zhou@oss.nxp.com wrote:
> From: "Guoniu.zhou" <guoniu.zhou@nxp.com>
> 
> ISI is used both in i.MX8 and i.MX9 SoC, so do not specify a SoC
> version number in the driver name and header file.
> 
> Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
> ---
>  MAINTAINERS                                        |  6 +++---
>  drivers/media/platform/nxp/Kconfig                 |  2 +-
>  drivers/media/platform/nxp/Makefile                |  2 +-
>  .../platform/nxp/{imx8-isi => imx-isi}/Kconfig     | 14 +++++++-------
>  drivers/media/platform/nxp/imx-isi/Makefile        |  8 ++++++++
>  .../imx8-isi-core.c => imx-isi/imx-isi-core.c}     |  4 ++--
>  .../imx8-isi-core.h => imx-isi/imx-isi-core.h}     |  2 +-
>  .../imx-isi-crossbar.c}                            |  4 ++--
>  .../imx8-isi-debug.c => imx-isi/imx-isi-debug.c}   |  4 ++--
>  .../imx8-isi-hw.c => imx-isi/imx-isi-hw.c}         |  4 ++--
>  .../imx8-isi-m2m.c => imx-isi/imx-isi-m2m.c}       |  2 +-
>  .../imx8-isi-pipe.c => imx-isi/imx-isi-pipe.c}     |  4 ++--
>  .../imx8-isi-regs.h => imx-isi/imx-isi-regs.h}     |  6 +++---
>  .../imx8-isi-video.c => imx-isi/imx-isi-video.c}   |  8 ++++----
>  drivers/media/platform/nxp/imx8-isi/Makefile       |  8 --------
>  15 files changed, 39 insertions(+), 39 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index c83475103a25..2e2fc3c2b338 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -15081,12 +15081,12 @@ F:	drivers/iio/adc/imx7d_adc.c
>  F:	drivers/iio/adc/imx93_adc.c
>  F:	drivers/iio/adc/vf610_adc.c
>  
> -NXP i.MX 8M ISI DRIVER
> +NXP i.MX ISI DRIVER
>  M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>  L:	linux-media@vger.kernel.org
>  S:	Maintained
> -F:	Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> -F:	drivers/media/platform/nxp/imx8-isi/

No, your patchset is not bistectable.


> +F:	Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> +F:	drivers/media/platform/nxp/imx-isi/
>  
>  NXP i.MX 8MP DW100 V4L2 DRIVER
>  M:	Xavier Roumegue <xavier.roumegue@oss.nxp.com>
> diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig
> index a0ca6b297fb8..55ce6a44b3fd 100644
> --- a/drivers/media/platform/nxp/Kconfig
> +++ b/drivers/media/platform/nxp/Kconfig
> @@ -28,7 +28,7 @@ config VIDEO_IMX_MIPI_CSIS
>  	  Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
>  	  v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
>  
> -source "drivers/media/platform/nxp/imx8-isi/Kconfig"
> +source "drivers/media/platform/nxp/imx-isi/Kconfig"

There is no need for this.

>  
>  # mem2mem drivers
>  
> diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/nxp/Makefile
> index b8e672b75fed..c95d23f1f521 100644
> --- a/drivers/media/platform/nxp/Makefile
> +++ b/drivers/media/platform/nxp/Makefile
> @@ -2,7 +2,7 @@
>  
>  obj-y += dw100/
>  obj-y += imx-jpeg/
> -obj-y += imx8-isi/
> +obj-y += imx-isi/
>  
>  obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
>  obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
> diff --git a/drivers/media/platform/nxp/imx8-isi/Kconfig b/drivers/media/platform/nxp/imx-isi/Kconfig
> similarity index 60%
> rename from drivers/media/platform/nxp/imx8-isi/Kconfig
> rename to drivers/media/platform/nxp/imx-isi/Kconfig
> index fcff33fc2630..ce222fa67a2f 100644
> --- a/drivers/media/platform/nxp/imx8-isi/Kconfig
> +++ b/drivers/media/platform/nxp/imx-isi/Kconfig
> @@ -1,22 +1,22 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  
> -config VIDEO_IMX8_ISI
> -	tristate "i.MX8 Image Sensor Interface (ISI) driver"
> +config VIDEO_IMX_ISI
> +	tristate "i.MX Image Sensor Interface (ISI) driver"
>  	depends on ARCH_MXC || COMPILE_TEST
>  	depends on HAS_DMA && PM
>  	depends on VIDEO_DEV
>  	select MEDIA_CONTROLLER
>  	select V4L2_FWNODE
> -	select V4L2_MEM2MEM_DEV if VIDEO_IMX8_ISI_M2M
> +	select V4L2_MEM2MEM_DEV if VIDEO_IMX_ISI_M2M
>  	select VIDEO_V4L2_SUBDEV_API
>  	select VIDEOBUF2_DMA_CONTIG
>  	help
>  	  V4L2 driver for the Image Sensor Interface (ISI) found in various
> -	  i.MX8 SoCs.
> +	  i.MX SoCs.
>  
> -config VIDEO_IMX8_ISI_M2M
> -	bool "i.MX8 Image Sensor Interface (ISI) memory-to-memory support"
> -	depends on VIDEO_IMX8_ISI
> +config VIDEO_IMX_ISI_M2M
> +	bool "i.MX Image Sensor Interface (ISI) memory-to-memory support"
> +	depends on VIDEO_IMX_ISI
>  	help
>  	  Select 'yes' here to enable support for memory-to-memory processing
>  	  in the ISI driver.
> diff --git a/drivers/media/platform/nxp/imx-isi/Makefile b/drivers/media/platform/nxp/imx-isi/Makefile
> new file mode 100644
> index 000000000000..f72e0ce8f17d
> --- /dev/null
> +++ b/drivers/media/platform/nxp/imx-isi/Makefile
> @@ -0,0 +1,8 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +
> +imx-isi-y := imx-isi-core.o imx-isi-crossbar.o imx-isi-hw.o \
> +	imx-isi-pipe.o imx-isi-video.o
> +imx-isi-$(CONFIG_DEBUG_FS) += imx-isi-debug.o
> +imx-isi-$(CONFIG_VIDEO_IMX_ISI_M2M) += imx-isi-m2m.o
> +
> +obj-$(CONFIG_VIDEO_IMX_ISI) += imx-isi.o
> diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx-isi/imx-isi-core.c
> similarity index 99%
> rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> rename to drivers/media/platform/nxp/imx-isi/imx-isi-core.c
> index 253e77189b69..cd5678139ddf 100644
> --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> +++ b/drivers/media/platform/nxp/imx-isi/imx-isi-core.c

Stop renaming everything. You affect users of modules, make backporting
a bit trickier for no real reason.

Best regards,
Krzysztof

[PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support

[guoniu.zhou]

From: "Guoniu.zhou" <guoniu.zhou@nxp.com>

Add i.MX93 support since it reuse ISI which used in i.MX8M family.

Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
---
 Documentation/devicetree/bindings/media/nxp,imx-isi.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
index 1ce9440bde32..ddad1d8778f3 100644
--- a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
+++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
@@ -21,6 +21,7 @@ properties:
     enum:
       - fsl,imx8mn-isi
       - fsl,imx8mp-isi
+      - fsl,imx93-isi
 
   reg:
     maxItems: 1
@@ -72,7 +73,9 @@ allOf:
       properties:
         compatible:
           contains:
-            const: fsl,imx8mn-isi
+            enum:
+              - fsl,imx8mn-isi
+              - fsl,imx93-isi
     then:
       properties:
         interrupts:
-- 
2.37.1

Re: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support

[Krzysztof Kozlowski]

On 25/06/2023 10:09, guoniu.zhou@oss.nxp.com wrote:
> From: "Guoniu.zhou" <guoniu.zhou@nxp.com>
> 
> Add i.MX93 support since it reuse ISI which used in i.MX8M family.
> 
> Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>

Subject: Drop duplicated "media:"

> ---
>  Documentation/devicetree/bindings/media/nxp,imx-isi.yaml | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> index 1ce9440bde32..ddad1d8778f3 100644
> --- a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> +++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> @@ -21,6 +21,7 @@ properties:
>      enum:
>        - fsl,imx8mn-isi
>        - fsl,imx8mp-isi
> +      - fsl,imx93-isi

Imx93 is a family of devices, not specific device, so I hope you
understand that it is a bit against the recommendation of specific
compatibles and you guarantee that all devices within family will be
identical.



Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>


---

This is an automated instruction, just in case, because many review tags
are being ignored. If you do not know the process, here is a short
explanation:

Please add Acked-by/Reviewed-by/Tested-by tags when posting new
versions, under or above your Signed-off-by tag. Tools like b4 can help
here. However, there's no need to repost patches *only* to add the tags.
The upstream maintainer will do that for acks received on the version
they apply.

https://elixir.bootlin.com/linux/v5.17/source/Documentation/process/submitting-patches.rst#L540

Best regards,
Krzysztof

Re: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support

[Krzysztof Kozlowski]

On 25/06/2023 10:22, Krzysztof Kozlowski wrote:
> On 25/06/2023 10:09, guoniu.zhou@oss.nxp.com wrote:
>> From: "Guoniu.zhou" <guoniu.zhou@nxp.com>
>>
>> Add i.MX93 support since it reuse ISI which used in i.MX8M family.
>>
>> Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
> 
> Subject: Drop duplicated "media:"
> 
>> ---
>>  Documentation/devicetree/bindings/media/nxp,imx-isi.yaml | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
>> index 1ce9440bde32..ddad1d8778f3 100644
>> --- a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
>> +++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
>> @@ -21,6 +21,7 @@ properties:
>>      enum:
>>        - fsl,imx8mn-isi
>>        - fsl,imx8mp-isi
>> +      - fsl,imx93-isi
> 
> Imx93 is a family of devices, not specific device, so I hope you
> understand that it is a bit against the recommendation of specific
> compatibles and you guarantee that all devices within family will be
> identical.


And looking more this won't be true. There are significant differences
between devices in the "imx93" family:
1. number of A55 cores and their frequency
2. Presence or not of NPU
3. MIPI-CSI or Parallel camera
4. MIPI-DSI, LVDS or Parallel display
5. 1 or 2 Gigabit Ethernet

Why NXP just cannot follow standard rules here?

https://elixir.bootlin.com/linux/v6.1-rc1/source/Documentation/devicetree/bindings/writing-bindings.rst#L42


Best regards,
Krzysztof

Re: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support

[Rob Herring]

On Sun, Jun 25, 2023 at 10:27:08AM +0200, Krzysztof Kozlowski wrote:
> On 25/06/2023 10:22, Krzysztof Kozlowski wrote:
> > On 25/06/2023 10:09, guoniu.zhou@oss.nxp.com wrote:
> >> From: "Guoniu.zhou" <guoniu.zhou@nxp.com>
> >>
> >> Add i.MX93 support since it reuse ISI which used in i.MX8M family.
> >>
> >> Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
> > 
> > Subject: Drop duplicated "media:"
> > 
> >> ---
> >>  Documentation/devicetree/bindings/media/nxp,imx-isi.yaml | 5 ++++-
> >>  1 file changed, 4 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> >> index 1ce9440bde32..ddad1d8778f3 100644
> >> --- a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> >> +++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> >> @@ -21,6 +21,7 @@ properties:
> >>      enum:
> >>        - fsl,imx8mn-isi
> >>        - fsl,imx8mp-isi
> >> +      - fsl,imx93-isi
> > 
> > Imx93 is a family of devices, not specific device, so I hope you
> > understand that it is a bit against the recommendation of specific
> > compatibles and you guarantee that all devices within family will be
> > identical.
> 
> 
> And looking more this won't be true. There are significant differences
> between devices in the "imx93" family:
> 1. number of A55 cores and their frequency
> 2. Presence or not of NPU
> 3. MIPI-CSI or Parallel camera
> 4. MIPI-DSI, LVDS or Parallel display
> 5. 1 or 2 Gigabit Ethernet
> 
> Why NXP just cannot follow standard rules here?

That could all be just binning, packaging, or fused options in which 
case a common compatible is fine.

Rob

RE: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support

[G.N. Zhou (OSS)]

Hi Krzysztof Kozlowski,

Got it, will update. Thanks for your quick reviewing.

> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Sent: 2023年6月25日 16:22
> To: G.N. Zhou (OSS) <guoniu.zhou@oss.nxp.com>; linux-media@vger.kernel.org;
> dl-linux-imx <linux-imx@nxp.com>; devicetree@vger.kernel.org
> Cc: laurent.pinchart@ideasonboard.com; mchehab@kernel.org;
> robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org; conor+dt@kernel.org;
> Xavier Roumegue (OSS) <xavier.roumegue@oss.nxp.com>;
> kernel@pengutronix.de; jacopo.mondi@ideasonboard.com;
> sakari.ailus@linux.intel.com
> Subject: Re: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support
> 
> Caution: This is an external email. Please take care when clicking links or opening
> attachments. When in doubt, report the message using the 'Report this email'
> button
> 
> 
> On 25/06/2023 10:09, guoniu.zhou@oss.nxp.com wrote:
> > From: "Guoniu.zhou" <guoniu.zhou@nxp.com>
> >
> > Add i.MX93 support since it reuse ISI which used in i.MX8M family.
> >
> > Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
> 
> Subject: Drop duplicated "media:"
> 
> > ---
> >  Documentation/devicetree/bindings/media/nxp,imx-isi.yaml | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> > b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> > index 1ce9440bde32..ddad1d8778f3 100644
> > --- a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> > +++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> > @@ -21,6 +21,7 @@ properties:
> >      enum:
> >        - fsl,imx8mn-isi
> >        - fsl,imx8mp-isi
> > +      - fsl,imx93-isi
> 
> Imx93 is a family of devices, not specific device, so I hope you understand that it
> is a bit against the recommendation of specific compatibles and you guarantee
> that all devices within family will be identical.
> 
> 
> 
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> 
> ---
> 
> This is an automated instruction, just in case, because many review tags are
> being ignored. If you do not know the process, here is a short
> explanation:
> 
> Please add Acked-by/Reviewed-by/Tested-by tags when posting new versions,
> under or above your Signed-off-by tag. Tools like b4 can help here. However,
> there's no need to repost patches *only* to add the tags.
> The upstream maintainer will do that for acks received on the version they apply.
> 
> https://elixir.bootlin.com/linux/v5.17/source/Documentation/process/submittin
> g-patches.rst#L540
> 
> Best regards,
> Krzysztof

RE: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support

[G.N. Zhou]

Hi Krzysztof Kozlowski,

> -----Original Message-----
> From: G.N. Zhou (OSS)
> Sent: 2023年6月25日 16:28
> To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>; G.N. Zhou (OSS)
> <guoniu.zhou@oss.nxp.com>; linux-media@vger.kernel.org; dl-linux-imx
> <linux-imx@nxp.com>; devicetree@vger.kernel.org
> Cc: laurent.pinchart@ideasonboard.com; mchehab@kernel.org;
> robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org; conor+dt@kernel.org;
> Xavier Roumegue (OSS) <xavier.roumegue@oss.nxp.com>;
> kernel@pengutronix.de; jacopo.mondi@ideasonboard.com;
> sakari.ailus@linux.intel.com
> Subject: RE: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support
> 
> Hi Krzysztof Kozlowski,
> 
> Got it, will update. Thanks for your quick reviewing.
> 
> > -----Original Message-----
> > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > Sent: 2023年6月25日 16:22
> > To: G.N. Zhou (OSS) <guoniu.zhou@oss.nxp.com>;
> > linux-media@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>;
> > devicetree@vger.kernel.org
> > Cc: laurent.pinchart@ideasonboard.com; mchehab@kernel.org;
> > robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> > robh+conor+dt@kernel.org;
> > Xavier Roumegue (OSS) <xavier.roumegue@oss.nxp.com>;
> > kernel@pengutronix.de; jacopo.mondi@ideasonboard.com;
> > sakari.ailus@linux.intel.com
> > Subject: Re: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi:
> > i.MX93 support
> >
> > Caution: This is an external email. Please take care when clicking
> > links or opening attachments. When in doubt, report the message using the
> 'Report this email'
> > button
> >
> >
> > On 25/06/2023 10:09, guoniu.zhou@oss.nxp.com wrote:
> > > From: "Guoniu.zhou" <guoniu.zhou@nxp.com>
> > >
> > > Add i.MX93 support since it reuse ISI which used in i.MX8M family.
> > >
> > > Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
> >
> > Subject: Drop duplicated "media:"
> >
> > > ---
> > >  Documentation/devicetree/bindings/media/nxp,imx-isi.yaml | 5 ++++-
> > >  1 file changed, 4 insertions(+), 1 deletion(-)
> > >
> > > diff --git
> > > a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> > > b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> > > index 1ce9440bde32..ddad1d8778f3 100644
> > > --- a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> > > +++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> > > @@ -21,6 +21,7 @@ properties:
> > >      enum:
> > >        - fsl,imx8mn-isi
> > >        - fsl,imx8mp-isi
> > > +      - fsl,imx93-isi
> >
> > Imx93 is a family of devices, not specific device, so I hope you
> > understand that it is a bit against the recommendation of specific
> > compatibles and you guarantee that all devices within family will be identical.

I'm litter confused about this since iMX93 is a specific device and belong to iMX9 family. Could you help to provide more details?

> >
> >
> >
> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> >
> >
> > ---
> >
> > This is an automated instruction, just in case, because many review
> > tags are being ignored. If you do not know the process, here is a
> > short
> > explanation:
> >
> > Please add Acked-by/Reviewed-by/Tested-by tags when posting new
> > versions, under or above your Signed-off-by tag. Tools like b4 can
> > help here. However, there's no need to repost patches *only* to add the tags.
> > The upstream maintainer will do that for acks received on the version they
> apply.
> >
> > https://elixir.bootlin.com/linux/v5.17/source/Documentation/process/su
> > bmittin
> > g-patches.rst#L540

Thanks for you reminding.

> >
> > Best regards,
> > Krzysztof

Re: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support

[Krzysztof Kozlowski]

On 25/06/2023 10:47, G.N. Zhou wrote:
> Hi Krzysztof Kozlowski,
> 
>> -----Original Message-----
>> From: G.N. Zhou (OSS)
>> Sent: 2023年6月25日 16:28
>> To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>; G.N. Zhou (OSS)
>> <guoniu.zhou@oss.nxp.com>; linux-media@vger.kernel.org; dl-linux-imx
>> <linux-imx@nxp.com>; devicetree@vger.kernel.org
>> Cc: laurent.pinchart@ideasonboard.com; mchehab@kernel.org;
>> robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org; conor+dt@kernel.org;
>> Xavier Roumegue (OSS) <xavier.roumegue@oss.nxp.com>;
>> kernel@pengutronix.de; jacopo.mondi@ideasonboard.com;
>> sakari.ailus@linux.intel.com
>> Subject: RE: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support
>>
>> Hi Krzysztof Kozlowski,
>>
>> Got it, will update. Thanks for your quick reviewing.
>>
>>> -----Original Message-----
>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>> Sent: 2023年6月25日 16:22
>>> To: G.N. Zhou (OSS) <guoniu.zhou@oss.nxp.com>;
>>> linux-media@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>;
>>> devicetree@vger.kernel.org
>>> Cc: laurent.pinchart@ideasonboard.com; mchehab@kernel.org;
>>> robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
>>> robh+conor+dt@kernel.org;
>>> Xavier Roumegue (OSS) <xavier.roumegue@oss.nxp.com>;
>>> kernel@pengutronix.de; jacopo.mondi@ideasonboard.com;
>>> sakari.ailus@linux.intel.com
>>> Subject: Re: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi:
>>> i.MX93 support
>>>
>>> Caution: This is an external email. Please take care when clicking
>>> links or opening attachments. When in doubt, report the message using the
>> 'Report this email'
>>> button
>>>
>>>
>>> On 25/06/2023 10:09, guoniu.zhou@oss.nxp.com wrote:
>>>> From: "Guoniu.zhou" <guoniu.zhou@nxp.com>
>>>>
>>>> Add i.MX93 support since it reuse ISI which used in i.MX8M family.
>>>>
>>>> Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
>>>
>>> Subject: Drop duplicated "media:"
>>>
>>>> ---
>>>>  Documentation/devicetree/bindings/media/nxp,imx-isi.yaml | 5 ++++-
>>>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git
>>>> a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
>>>> b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
>>>> index 1ce9440bde32..ddad1d8778f3 100644
>>>> --- a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
>>>> +++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
>>>> @@ -21,6 +21,7 @@ properties:
>>>>      enum:
>>>>        - fsl,imx8mn-isi
>>>>        - fsl,imx8mp-isi
>>>> +      - fsl,imx93-isi
>>>
>>> Imx93 is a family of devices, not specific device, so I hope you
>>> understand that it is a bit against the recommendation of specific
>>> compatibles and you guarantee that all devices within family will be identical.
> 
> I'm litter confused about this since iMX93 is a specific device and belong to iMX9 family. Could you help to provide more details?

What's confusing exactly? Open the website of NXP - it clearly says
"i.MX 93 Applications Processor Family", so what do you mean by
"specific device"? It's not. Open the datasheet. I already listed
several differences between different imx93 SoCs. Basically - there is
no such thing as imx93 SoC. There is imx9355 (or imx935x), imx933x etc.

Why I need to provide more details about NXP SoCs? Aren't you from NXP?

Best regards,
Krzysztof

RE: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support

[G.N. Zhou (OSS)]

Hi Krzysztof,

> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Sent: 2023年6月25日 17:16
> To: G.N. Zhou <guoniu.zhou@nxp.com>; G.N. Zhou (OSS)
> <guoniu.zhou@oss.nxp.com>; linux-media@vger.kernel.org; dl-linux-imx
> <linux-imx@nxp.com>; devicetree@vger.kernel.org
> Cc: laurent.pinchart@ideasonboard.com; mchehab@kernel.org;
> robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org; conor+dt@kernel.org;
> Xavier Roumegue (OSS) <xavier.roumegue@oss.nxp.com>;
> kernel@pengutronix.de; jacopo.mondi@ideasonboard.com;
> sakari.ailus@linux.intel.com
> Subject: Re: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi: i.MX93 support
> 
> Caution: This is an external email. Please take care when clicking links or opening
> attachments. When in doubt, report the message using the 'Report this email'
> button
> 
> 
> On 25/06/2023 10:47, G.N. Zhou wrote:
> > Hi Krzysztof Kozlowski,
> >
> >> -----Original Message-----
> >> From: G.N. Zhou (OSS)
> >> Sent: 2023年6月25日 16:28
> >> To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>; G.N. Zhou
> >> (OSS) <guoniu.zhou@oss.nxp.com>; linux-media@vger.kernel.org;
> >> dl-linux-imx <linux-imx@nxp.com>; devicetree@vger.kernel.org
> >> Cc: laurent.pinchart@ideasonboard.com; mchehab@kernel.org;
> >> robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> >> robh+conor+dt@kernel.org;
> >> Xavier Roumegue (OSS) <xavier.roumegue@oss.nxp.com>;
> >> kernel@pengutronix.de; jacopo.mondi@ideasonboard.com;
> >> sakari.ailus@linux.intel.com
> >> Subject: RE: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi:
> >> i.MX93 support
> >>
> >> Hi Krzysztof Kozlowski,
> >>
> >> Got it, will update. Thanks for your quick reviewing.
> >>
> >>> -----Original Message-----
> >>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> >>> Sent: 2023年6月25日 16:22
> >>> To: G.N. Zhou (OSS) <guoniu.zhou@oss.nxp.com>;
> >>> linux-media@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>;
> >>> devicetree@vger.kernel.org
> >>> Cc: laurent.pinchart@ideasonboard.com; mchehab@kernel.org;
> >>> robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> >>> robh+conor+dt@kernel.org;
> >>> Xavier Roumegue (OSS) <xavier.roumegue@oss.nxp.com>;
> >>> kernel@pengutronix.de; jacopo.mondi@ideasonboard.com;
> >>> sakari.ailus@linux.intel.com
> >>> Subject: Re: [PATCH 3/4] media: dt-bindings: media: nxp,imx-isi:
> >>> i.MX93 support
> >>>
> >>> Caution: This is an external email. Please take care when clicking
> >>> links or opening attachments. When in doubt, report the message
> >>> using the
> >> 'Report this email'
> >>> button
> >>>
> >>>
> >>> On 25/06/2023 10:09, guoniu.zhou@oss.nxp.com wrote:
> >>>> From: "Guoniu.zhou" <guoniu.zhou@nxp.com>
> >>>>
> >>>> Add i.MX93 support since it reuse ISI which used in i.MX8M family.
> >>>>
> >>>> Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
> >>>
> >>> Subject: Drop duplicated "media:"
> >>>
> >>>> ---
> >>>>  Documentation/devicetree/bindings/media/nxp,imx-isi.yaml | 5 ++++-
> >>>>  1 file changed, 4 insertions(+), 1 deletion(-)
> >>>>
> >>>> diff --git
> >>>> a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> >>>> b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> >>>> index 1ce9440bde32..ddad1d8778f3 100644
> >>>> --- a/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> >>>> +++ b/Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> >>>> @@ -21,6 +21,7 @@ properties:
> >>>>      enum:
> >>>>        - fsl,imx8mn-isi
> >>>>        - fsl,imx8mp-isi
> >>>> +      - fsl,imx93-isi
> >>>
> >>> Imx93 is a family of devices, not specific device, so I hope you
> >>> understand that it is a bit against the recommendation of specific
> >>> compatibles and you guarantee that all devices within family will be
> identical.
> >
> > I'm litter confused about this since iMX93 is a specific device and belong to
> iMX9 family. Could you help to provide more details?
> 
> What's confusing exactly? Open the website of NXP - it clearly says "i.MX 93
> Applications Processor Family", so what do you mean by "specific device"? It's
> not. Open the datasheet. I already listed several differences between different
> imx93 SoCs. Basically - there is no such thing as imx93 SoC. There is imx9355 (or
> imx935x), imx933x etc.
> 
> Why I need to provide more details about NXP SoCs? Aren't you from NXP?

Yes, you are right according to NXP website and i.MX93 have many specific devices which show core number, NPU, package type, etc. The reason why I(NXP) name it iMX93, not iMX933x/935x, is we don't distinguish them in kernel since our uboot will do the work and for ISI, all i.MX93 family devices include same ISI IP.

Thanks again for your valuable comments.

> 
> Best regards,
> Krzysztof

[PATCH 4/4] media: nxp: imx-isi: add ISI support for i.MX93

[guoniu.zhou]

From: "Guoniu.zhou" <guoniu.zhou@nxp.com>

Abstract gasket operation and driver should implement them for SoC
which support gasket.

i.MX93 use a different gasket which has different register definition
compared with i.MX8. Hence implement the gasket callbacks in order to
add ISI support for i.MX93 SoC.

Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
---
 .../media/platform/nxp/imx-isi/imx-isi-core.c | 110 ++++++++++++++++++
 .../media/platform/nxp/imx-isi/imx-isi-core.h |  33 ++++++
 .../platform/nxp/imx-isi/imx-isi-crossbar.c   |  51 ++++----
 3 files changed, 169 insertions(+), 25 deletions(-)

diff --git a/drivers/media/platform/nxp/imx-isi/imx-isi-core.c b/drivers/media/platform/nxp/imx-isi/imx-isi-core.c
index cd5678139ddf..1fc0d2a67042 100644
--- a/drivers/media/platform/nxp/imx-isi/imx-isi-core.c
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-core.c
@@ -14,6 +14,7 @@
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
+#include <linux/regmap.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
@@ -279,6 +280,54 @@ static const struct clk_bulk_data mxc_imx8mn_clks[] = {
 	{ .id = "apb" },
 };
 
+static int mxc_imx8_gasket_config(struct mxc_isi_dev *isi,
+				  const struct v4l2_mbus_frame_desc *fd,
+				  const struct v4l2_mbus_framefmt *fmt,
+				  const unsigned int port)
+{
+	u32 val;
+
+	regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_HSIZE, fmt->width);
+	regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_VSIZE, fmt->height);
+
+	val = GASKET_CTRL_DATA_TYPE(fd->entry[0].bus.csi2.dt);
+	if (fd->entry[0].bus.csi2.dt == MIPI_CSI2_DT_YUV422_8B)
+		val |= GASKET_CTRL_DUAL_COMP_ENABLE;
+
+	regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_CTRL, val);
+
+	dev_dbg(isi->dev, "w/h=(%d, %d), data type=0x%x\n",
+			  fmt->width, fmt->height,
+			  fd->entry[0].bus.csi2.dt);
+
+	return 0;
+}
+
+static int mxc_imx8_gasket_enable(struct mxc_isi_dev *isi,
+				  const unsigned int port)
+{
+	u32 val;
+
+	regmap_read(isi->gasket, GASKET_BASE(port), &val);
+	val |= GASKET_CTRL_ENABLE;
+
+	regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_CTRL, val);
+
+	return 0;
+}
+
+static void mxc_imx8_gasket_disable(struct mxc_isi_dev *isi,
+				    const unsigned int port)
+{
+	regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_CTRL, 0);
+}
+
+static const struct mxc_gasket_ops mxc_imx8_gasket_ops = {
+	.config = mxc_imx8_gasket_config,
+	.enable = mxc_imx8_gasket_enable,
+	.disable = mxc_imx8_gasket_disable,
+};
+
 static const struct mxc_isi_plat_data mxc_imx8mn_data = {
 	.model			= MXC_ISI_IMX8MN,
 	.num_ports		= 1,
@@ -290,6 +339,7 @@ static const struct mxc_isi_plat_data mxc_imx8mn_data = {
 	.num_clks		= ARRAY_SIZE(mxc_imx8mn_clks),
 	.buf_active_reverse	= false,
 	.has_gasket		= true,
+	.gasket_ops		= &mxc_imx8_gasket_ops,
 	.has_36bit_dma		= false,
 };
 
@@ -304,6 +354,65 @@ static const struct mxc_isi_plat_data mxc_imx8mp_data = {
 	.num_clks		= ARRAY_SIZE(mxc_imx8mn_clks),
 	.buf_active_reverse	= true,
 	.has_gasket		= true,
+	.gasket_ops		= &mxc_imx8_gasket_ops,
+	.has_36bit_dma		= true,
+};
+
+static int mxc_imx93_gasket_config(struct mxc_isi_dev *isi,
+				   const struct v4l2_mbus_frame_desc *fd,
+				   const struct v4l2_mbus_framefmt *fmt,
+				   const unsigned int port)
+{
+	u32 val;
+
+	val = DISP_MIX_CAMERA_MUX_DATA_TYPE(fd->entry[0].bus.csi2.dt);
+	regmap_write(isi->gasket, DISP_MIX_CAMERA_MUX, val);
+
+	dev_dbg(isi->dev, "data type=0x%x\n", fd->entry[0].bus.csi2.dt);
+
+	return 0;
+}
+
+static int mxc_imx93_gasket_enable(struct mxc_isi_dev *isi,
+				   const unsigned int port)
+{
+	u32 val;
+
+	regmap_read(isi->gasket, DISP_MIX_CAMERA_MUX, &val);
+	val |= DISP_MIX_CAMERA_MUX_GASKET_ENABLE;
+	regmap_write(isi->gasket, DISP_MIX_CAMERA_MUX, val);
+
+	return 0;
+}
+
+static void mxc_imx93_gasket_disable(struct mxc_isi_dev *isi,
+				     unsigned int port)
+{
+	u32 val;
+
+	regmap_read(isi->gasket, DISP_MIX_CAMERA_MUX, &val);
+	val &= ~DISP_MIX_CAMERA_MUX_GASKET_ENABLE;
+	regmap_write(isi->gasket, DISP_MIX_CAMERA_MUX, val);
+}
+
+static const struct mxc_gasket_ops mxc_imx93_gasket_ops = {
+	.config = mxc_imx93_gasket_config,
+	.enable = mxc_imx93_gasket_enable,
+	.disable = mxc_imx93_gasket_disable,
+};
+
+static const struct mxc_isi_plat_data mxc_imx93_data = {
+	.model			= MXC_ISI_IMX93,
+	.num_ports		= 1,
+	.num_channels		= 1,
+	.reg_offset		= 0,
+	.ier_reg		= &mxc_imx8_isi_ier_v2,
+	.set_thd		= &mxc_imx8_isi_thd_v1,
+	.clks			= mxc_imx8mn_clks,
+	.num_clks		= ARRAY_SIZE(mxc_imx8mn_clks),
+	.buf_active_reverse	= true,
+	.has_gasket		= true,
+	.gasket_ops		= &mxc_imx93_gasket_ops,
 	.has_36bit_dma		= true,
 };
 
@@ -518,6 +627,7 @@ static int mxc_isi_remove(struct platform_device *pdev)
 static const struct of_device_id mxc_isi_of_match[] = {
 	{ .compatible = "fsl,imx8mn-isi", .data = &mxc_imx8mn_data },
 	{ .compatible = "fsl,imx8mp-isi", .data = &mxc_imx8mp_data },
+	{ .compatible = "fsl,imx93-isi", .data = &mxc_imx93_data },
 	{ /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, mxc_isi_of_match);
diff --git a/drivers/media/platform/nxp/imx-isi/imx-isi-core.h b/drivers/media/platform/nxp/imx-isi/imx-isi-core.h
index 2cb0caf44c42..bbe939e91850 100644
--- a/drivers/media/platform/nxp/imx-isi/imx-isi-core.h
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-core.h
@@ -18,6 +18,7 @@
 
 #include <media/media-device.h>
 #include <media/media-entity.h>
+#include <media/mipi-csi2.h>
 #include <media/v4l2-async.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-dev.h>
@@ -59,6 +60,27 @@ struct v4l2_m2m_dev;
 #define MXC_ISI_M2M			"mxc-isi-m2m"
 #define MXC_MAX_PLANES			3
 
+/* GASKET (i.MX8MN and i.MX8MP only) */
+#define GASKET_BASE(n)				(0x0060 + (n) * 0x30)
+
+#define GASKET_CTRL				0x0000
+#define GASKET_CTRL_DATA_TYPE(dt)		((dt) << 8)
+#define GASKET_CTRL_DATA_TYPE_MASK		(0x3f << 8)
+#define GASKET_CTRL_DUAL_COMP_ENABLE		BIT(1)
+#define GASKET_CTRL_ENABLE			BIT(0)
+
+#define GASKET_HSIZE				0x0004
+#define GASKET_VSIZE				0x0008
+
+/* dispmix_GPR register (i.MX93 only) */
+#define DISP_MIX_CAMERA_MUX                     0x30
+#define DISP_MIX_CAMERA_MUX_DATA_TYPE(x)        (((x) & 0x3f) << 3)
+#define DISP_MIX_CAMERA_MUX_GASKET_ENABLE       BIT(16)
+
+#define DISP_MIX_CSI_REG                        0x48
+#define DISP_MIX_CSI_REG_CFGFREQRANGE(x)        ((x)  & 0x3f)
+#define DISP_MIX_CSI_REG_HSFREQRANGE(x)         (((x) & 0x7f) << 8)
+
 struct mxc_isi_dev;
 struct mxc_isi_m2m_ctx;
 
@@ -147,9 +169,19 @@ struct mxc_isi_set_thd {
 	struct mxc_isi_panic_thd panic_set_thd_v;
 };
 
+struct mxc_gasket_ops {
+	int (*enable)(struct mxc_isi_dev *isi, const unsigned int port);
+	int (*config)(struct mxc_isi_dev *isi,
+		      const struct v4l2_mbus_frame_desc *fd,
+		      const struct v4l2_mbus_framefmt *fmt,
+		      const unsigned int port);
+	void (*disable)(struct mxc_isi_dev *isi, const unsigned int port);
+};
+
 enum model {
 	MXC_ISI_IMX8MN,
 	MXC_ISI_IMX8MP,
+	MXC_ISI_IMX93,
 };
 
 struct mxc_isi_plat_data {
@@ -160,6 +192,7 @@ struct mxc_isi_plat_data {
 	const struct mxc_isi_ier_reg  *ier_reg;
 	const struct mxc_isi_set_thd *set_thd;
 	const struct clk_bulk_data *clks;
+	const struct mxc_gasket_ops *gasket_ops;
 	unsigned int num_clks;
 	bool buf_active_reverse;
 	bool has_gasket;
diff --git a/drivers/media/platform/nxp/imx-isi/imx-isi-crossbar.c b/drivers/media/platform/nxp/imx-isi/imx-isi-crossbar.c
index f3e3ed080b07..f3b49ff132d4 100644
--- a/drivers/media/platform/nxp/imx-isi/imx-isi-crossbar.c
+++ b/drivers/media/platform/nxp/imx-isi/imx-isi-crossbar.c
@@ -25,20 +25,6 @@ static inline struct mxc_isi_crossbar *to_isi_crossbar(struct v4l2_subdev *sd)
 	return container_of(sd, struct mxc_isi_crossbar, sd);
 }
 
-/* -----------------------------------------------------------------------------
- * Media block control (i.MX8MN and i.MX8MP only)
- */
-#define GASKET_BASE(n)				(0x0060 + (n) * 0x30)
-
-#define GASKET_CTRL				0x0000
-#define GASKET_CTRL_DATA_TYPE(dt)		((dt) << 8)
-#define GASKET_CTRL_DATA_TYPE_MASK		(0x3f << 8)
-#define GASKET_CTRL_DUAL_COMP_ENABLE		BIT(1)
-#define GASKET_CTRL_ENABLE			BIT(0)
-
-#define GASKET_HSIZE				0x0004
-#define GASKET_VSIZE				0x0008
-
 static int mxc_isi_crossbar_gasket_enable(struct mxc_isi_crossbar *xbar,
 					  struct v4l2_subdev_state *state,
 					  struct v4l2_subdev *remote_sd,
@@ -46,13 +32,16 @@ static int mxc_isi_crossbar_gasket_enable(struct mxc_isi_crossbar *xbar,
 {
 	struct mxc_isi_dev *isi = xbar->isi;
 	const struct v4l2_mbus_framefmt *fmt;
+	const struct mxc_gasket_ops *gasket_ops = NULL;
 	struct v4l2_mbus_frame_desc fd;
-	u32 val;
 	int ret;
 
 	if (!isi->pdata->has_gasket)
 		return 0;
 
+	if (isi->pdata->gasket_ops)
+		gasket_ops = isi->pdata->gasket_ops;
+
 	/*
 	 * Configure and enable the gasket with the frame size and CSI-2 data
 	 * type. For YUV422 8-bit, enable dual component mode unconditionally,
@@ -77,16 +66,23 @@ static int mxc_isi_crossbar_gasket_enable(struct mxc_isi_crossbar *xbar,
 	if (!fmt)
 		return -EINVAL;
 
-	regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_HSIZE, fmt->width);
-	regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_VSIZE, fmt->height);
-
-	val = GASKET_CTRL_DATA_TYPE(fd.entry[0].bus.csi2.dt)
-	    | GASKET_CTRL_ENABLE;
-
-	if (fd.entry[0].bus.csi2.dt == MIPI_CSI2_DT_YUV422_8B)
-		val |= GASKET_CTRL_DUAL_COMP_ENABLE;
+	if (gasket_ops && gasket_ops->config) {
+		ret = gasket_ops->config(isi, &fd, fmt, port);
+		if (ret) {
+			dev_err(isi->dev,
+				"failed to configure gasket%d\n", port);
+			return ret;
+		}
+	}
 
-	regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_CTRL, val);
+	if (gasket_ops && gasket_ops->enable) {
+		ret = gasket_ops->enable(isi, port);
+		if (ret) {
+			dev_err(isi->dev,
+				"failed to enable gasket%d\n", port);
+			return ret;
+		}
+	}
 
 	return 0;
 }
@@ -95,11 +91,16 @@ static void mxc_isi_crossbar_gasket_disable(struct mxc_isi_crossbar *xbar,
 					    unsigned int port)
 {
 	struct mxc_isi_dev *isi = xbar->isi;
+	const struct mxc_gasket_ops *gasket_ops = NULL;
 
 	if (!isi->pdata->has_gasket)
 		return;
 
-	regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_CTRL, 0);
+	if (isi->pdata->gasket_ops)
+		gasket_ops = isi->pdata->gasket_ops;
+
+	if (gasket_ops && gasket_ops->disable)
+		gasket_ops->disable(isi, port);
 }
 
 /* -----------------------------------------------------------------------------
-- 
2.37.1