All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lubomir Rintel <lkundrak@v3.sk>
To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>
Cc: Rob Herring <robh+dt@kernel.org>, SoC Team <soc@kernel.org>,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, Lubomir Rintel <lkundrak@v3.sk>
Subject: [PATCH 12/12] ARM: dts: mmp3: Fix the CCIC interrupts
Date: Thu, 21 Jan 2021 04:41:30 +0100	[thread overview]
Message-ID: <20210121034130.1381872-13-lkundrak@v3.sk> (raw)
In-Reply-To: <20210121034130.1381872-1-lkundrak@v3.sk>

A copy & paste oversight from MMP2; camera interrupts are handled
via a multiplexer on MMP3.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp3.dtsi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index 9f2b059f0900b..a4fb9203ec1fb 100644
--- a/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@ -293,7 +293,8 @@ mmc5: mmc@d4217000 {
 			camera0: camera@d420a000 {
 				compatible = "marvell,mmp2-ccic";
 				reg = <0xd420a000 0x800>;
-				interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+				interrupts = <1>;
+				interrupt-parent = <&ci_mux>;
 				clocks = <&soc_clocks MMP2_CLK_CCIC0>;
 				clock-names = "axi";
 				power-domains = <&soc_clocks MMP3_POWER_DOMAIN_CAMERA>;
@@ -305,7 +306,8 @@ camera0: camera@d420a000 {
 			camera1: camera@d420a800 {
 				compatible = "marvell,mmp2-ccic";
 				reg = <0xd420a800 0x800>;
-				interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+				interrupts = <2>;
+				interrupt-parent = <&ci_mux>;
 				clocks = <&soc_clocks MMP2_CLK_CCIC1>;
 				clock-names = "axi";
 				power-domains = <&soc_clocks MMP3_POWER_DOMAIN_CAMERA>;
-- 
2.29.2


WARNING: multiple messages have this Message-ID (diff)
From: Lubomir Rintel <lkundrak@v3.sk>
To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	Lubomir Rintel <lkundrak@v3.sk>, SoC Team <soc@kernel.org>,
	Rob Herring <robh+dt@kernel.org>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/12] ARM: dts: mmp3: Fix the CCIC interrupts
Date: Thu, 21 Jan 2021 04:41:30 +0100	[thread overview]
Message-ID: <20210121034130.1381872-13-lkundrak@v3.sk> (raw)
Message-ID: <20210121034130.GfRGJL8sOZbUa3QUca9egrTe2ztyuUBkSU-NXut7_l4@z> (raw)
In-Reply-To: <20210121034130.1381872-1-lkundrak@v3.sk>

A copy & paste oversight from MMP2; camera interrupts are handled
via a multiplexer on MMP3.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp3.dtsi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index 9f2b059f0900b..a4fb9203ec1fb 100644
--- a/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@ -293,7 +293,8 @@ mmc5: mmc@d4217000 {
 			camera0: camera@d420a000 {
 				compatible = "marvell,mmp2-ccic";
 				reg = <0xd420a000 0x800>;
-				interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+				interrupts = <1>;
+				interrupt-parent = <&ci_mux>;
 				clocks = <&soc_clocks MMP2_CLK_CCIC0>;
 				clock-names = "axi";
 				power-domains = <&soc_clocks MMP3_POWER_DOMAIN_CAMERA>;
@@ -305,7 +306,8 @@ camera0: camera@d420a000 {
 			camera1: camera@d420a800 {
 				compatible = "marvell,mmp2-ccic";
 				reg = <0xd420a800 0x800>;
-				interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+				interrupts = <2>;
+				interrupt-parent = <&ci_mux>;
 				clocks = <&soc_clocks MMP2_CLK_CCIC1>;
 				clock-names = "axi";
 				power-domains = <&soc_clocks MMP3_POWER_DOMAIN_CAMERA>;
-- 
2.29.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-01-21  4:29 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-21  3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
2021-01-21  3:41 ` Lubomir Rintel
2021-01-21  3:41 ` [PATCH 01/12] dt-bindings: gpio: mrvl-gpio: Fix the gpio-ranges property Lubomir Rintel
2021-01-21  3:41   ` Lubomir Rintel
2021-02-02 17:20   ` patchwork-bot+linux-soc
2021-01-21  3:41 ` [PATCH 02/12] media: dt-bindings: marvell,mmp2-ccic: Allow power-domains property Lubomir Rintel
2021-01-21  3:41   ` [PATCH 02/12] media: dt-bindings: marvell, mmp2-ccic: " Lubomir Rintel
2021-01-21  3:41 ` [PATCH 03/12] ARM: dts: mmp2-olpc-xo-1-75: Fix memory node name Lubomir Rintel
2021-01-21  3:41   ` Lubomir Rintel
2021-01-21  3:41 ` [PATCH 04/12] ARM: dts: mmp2-olpc-xo-1-75: Drop linux,usable-memory from /memory Lubomir Rintel
2021-01-21  3:41   ` [PATCH 04/12] ARM: dts: mmp2-olpc-xo-1-75: Drop linux, usable-memory " Lubomir Rintel
2021-01-21  3:41 ` [PATCH 05/12] ARM: dts: mmp3-dell-ariel: Drop linux,usable-memory " Lubomir Rintel
2021-01-21  3:41   ` [PATCH 05/12] ARM: dts: mmp3-dell-ariel: Drop linux, usable-memory " Lubomir Rintel
2021-01-21  3:41 ` [PATCH 06/12] ARM: dts: mmp3: Extend the MPMU reg range Lubomir Rintel
2021-01-21  3:41   ` Lubomir Rintel
2021-01-21  3:41 ` [PATCH 07/12] ARM: dts: mmp2: Use symbolic names for audio clocks Lubomir Rintel
2021-01-21  3:41   ` Lubomir Rintel
2021-01-21  3:41 ` [PATCH 08/12] ARM: dts: mmp2-olpc-xo-1-75: " Lubomir Rintel
2021-01-21  3:41   ` Lubomir Rintel
2021-01-21  3:41 ` [PATCH 09/12] ARM: dts: mmp3-dell-ariel: Add the embedded controller Lubomir Rintel
2021-01-21  3:41   ` Lubomir Rintel
2021-01-21  3:41 ` [PATCH 10/12] ARM: dts: mmp3-dell-ariel: Add the power button node Lubomir Rintel
2021-01-21  3:41   ` Lubomir Rintel
2021-01-21  3:41 ` [PATCH 11/12] ARM: dts: mmp3-dell-ariel: Replace SSP2 with spi-gpio Lubomir Rintel
2021-01-21  3:41   ` Lubomir Rintel
2021-01-21  3:41 ` Lubomir Rintel [this message]
2021-01-21  3:41   ` [PATCH 12/12] ARM: dts: mmp3: Fix the CCIC interrupts Lubomir Rintel
2021-01-22 14:09 ` ARM: dts: mmp devicetree updates Arnd Bergmann
2021-01-22 14:09   ` Arnd Bergmann
2021-01-29 22:12   ` Lubomir Rintel
2021-01-29 22:12     ` Lubomir Rintel
2021-02-02 16:41   ` Arnd Bergmann
2021-02-02 16:41     ` Arnd Bergmann
2021-02-02 17:13     ` Arnd Bergmann
2021-02-02 17:13       ` Arnd Bergmann
2021-02-02 19:01       ` Lubomir Rintel
2021-02-02 19:01         ` Lubomir Rintel
2021-02-02 19:26         ` Arnd Bergmann
2021-02-02 19:26           ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210121034130.1381872-13-lkundrak@v3.sk \
    --to=lkundrak@v3.sk \
    --cc=arnd@arndb.de \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=robh+dt@kernel.org \
    --cc=soc@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.