ARM: dts: bcm2835: Add Unicam CSI nodes

Add both MIPI CSI-2 nodes in the bcm283x tree and take care of the
Raspberry Pi / BCM2711 specific in the related files.

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/20240424153542.32503-6-laurent.pinchart@ideasonboard.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
index 22c7f1561344ed57978b4d91d6cdff6a6a84e9ff..1d8f9f80f93531be4ff44d40629ea85163edae50 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
@@ -1114,6 +1114,14 @@
        #address-cells = <2>;
 };
 
+&csi0 {
+       interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
+};
+
+&csi1 {
+       interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+};
+
 &cma {
        /*
         * arm64 reserves the CMA by default somewhere in ZONE_DMA32,

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
index 6e6dc109f0c2d2d2a263d1adb97bb27cbec12ef2..e9bf41b9f5c1814ae79f7b2308db885bf20d50ca 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
@@ -26,6 +26,20 @@
        };
 };
 
+&csi0 {
+       clocks = <&clocks BCM2835_CLOCK_CAM0>,
+                <&firmware_clocks 4>;
+       clock-names = "lp", "vpu";
+       power-domains = <&power RPI_POWER_DOMAIN_UNICAM0>;
+};
+
+&csi1 {
+       clocks = <&clocks BCM2835_CLOCK_CAM1>,
+                <&firmware_clocks 4>;
+       clock-names = "lp", "vpu";
+       power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>;
+};
+
 &gpio {
        gpioout: gpioout {
                brcm,pins = <6>;

diff --git a/arch/arm/boot/dts/broadcom/bcm283x.dtsi b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
index 2ca8a2505a4db87fc6412028c8205b736b29f32f..69b0919f1324abd5d875c70936de1b7f22e3e66d 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm283x.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
@@ -454,6 +454,30 @@
                        status = "disabled";
                };
 
+               csi0: csi@7e800000 {
+                       compatible = "brcm,bcm2835-unicam";
+                       reg = <0x7e800000 0x800>,
+                             <0x7e802000 0x4>;
+                       reg-names = "unicam", "cmi";
+                       interrupts = <2 6>;
+                       brcm,num-data-lanes = <2>;
+                       status = "disabled";
+                       port {
+                       };
+               };
+
+               csi1: csi@7e801000 {
+                       compatible = "brcm,bcm2835-unicam";
+                       reg = <0x7e801000 0x800>,
+                             <0x7e802004 0x4>;
+                       reg-names = "unicam", "cmi";
+                       interrupts = <2 7>;
+                       brcm,num-data-lanes = <4>;
+                       status = "disabled";
+                       port {
+                       };
+               };
+
                i2c1: i2c@7e804000 {
                        compatible = "brcm,bcm2835-i2c";
                        reg = <0x7e804000 0x1000>;