linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lubomir Rintel <lkundrak@v3.sk>
To: Eric Miao <eric.y.miao@gmail.com>,
	Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Russell King <linux@armlinux.org.uk>,
	Robert Jarzmik <robert.jarzmik@free.fr>,
	Lubomir Rintel <lkundrak@v3.sk>
Subject: [PATCH v3 06/18] DT: marvell,mmp2: fix TWSI2
Date: Mon, 12 Nov 2018 04:20:15 +0100	[thread overview]
Message-ID: <20181112032027.653931-7-lkundrak@v3.sk> (raw)
In-Reply-To: <20181112032027.653931-1-lkundrak@v3.sk>

Marvell keeps their MMP2 datasheet secret, but there are good clues
that TWSI2 is not on 0xd4025000 on that platform, not does it use
IRQ 58. In fact, the IRQ 58 on MMP2 seems to be a signal processor:

   arch/arm/mach-mmp/irqs.h:#define IRQ_MMP2_MSP  58

I'm taking a somewhat educated guess that is probably a copy & paste
error from PXA168 or PXA910 and that the real controller in fact hides
at address 0xd4031000 and uses an interrupt line multiplexed via IRQ 17.

I'm also copying some properties from TWSI1 that were missing or
incorrect.

Tested on a OLPC XO 1.75 machine, where the RTC is on TWSI2.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Tested-by: Pavel Machek <pavel@ucw.cz>
---
 arch/arm/boot/dts/mmp2.dtsi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index 063382b3eaca..63d49abf4e92 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -257,12 +257,15 @@
 				status = "disabled";
 			};
 
-			twsi2: i2c@d4025000 {
+			twsi2: i2c@d4031000 {
 				compatible = "mrvl,mmp-twsi";
-				reg = <0xd4025000 0x1000>;
-				interrupts = <58>;
+				reg = <0xd4031000 0x1000>;
+				interrupt-parent = <&intcmux17>;
+				interrupts = <0>;
 				clocks = <&soc_clocks MMP2_CLK_TWSI1>;
 				resets = <&soc_clocks MMP2_CLK_TWSI1>;
+				#address-cells = <1>;
+				#size-cells = <0>;
 				status = "disabled";
 			};
 
-- 
2.19.1


  parent reply	other threads:[~2018-11-12  3:21 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-12  3:20 [PATCH v3 00/18] MMP platform fixes Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 01/18] dt-bindings: mrvl,mmp-timer: add clock Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 02/18] DT: marvell,mmp2: fix the gpio interrupt cell number Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 03/18] DT: marvell,mmp2: give gpio node a name Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 04/18] DT: marvell,mmp2: add clock to the timer Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 05/18] DT: marvell,mmp2: add MMC controllers Lubomir Rintel
2018-11-12  3:20 ` Lubomir Rintel [this message]
2018-11-12  3:20 ` [PATCH v3 07/18] DT: marvell,mmp2: add more TWSI controllers Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 08/18] DT: marvell,mmp2: add OTG PHY Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 09/18] DT: marvell,mmp2: add USB OTG host controller Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 10/18] irqchip/mmp: only touch the PJ4 & FIQ bits on enable/disable Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 11/18] gpio: pxa: avoid attempting to set pin direction via pinctrl on MMP2 Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 12/18] ARM: mmp/mmp2: use cpu_is_pj4() instead of cpu_is_mmp2() Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 13/18] ARM: mmp2: initialize clocks before the timer Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 14/18] ARM: mmp/mmp2: dt: enable the clock Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 15/18] ARM: mmp: add a pxa-usb-phy device Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 16/18] ARM: mmp: add an instance of pxa-usb-phy to ttc_dkb and aspenite Lubomir Rintel
2018-11-12  3:20 ` [PATCH v3 17/18] USB: phy-mv-usb: use phy-pxa-usb Lubomir Rintel
2018-11-13 17:02   ` Robert Jarzmik
2018-11-12  3:20 ` [PATCH v3 18/18] USB: gadget: mv-udc: " Lubomir Rintel

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=20181112032027.653931-7-lkundrak@v3.sk \
    --to=lkundrak@v3.sk \
    --cc=eric.y.miao@gmail.com \
    --cc=haojian.zhuang@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=robert.jarzmik@free.fr \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).