diff mbox series

ARM: dts: BCM5301X: Fix I2C controller interrupt

Message ID 20211027193730.3941945-1-f.fainelli@gmail.com (mailing list archive)
State New, archived
Headers show
Series ARM: dts: BCM5301X: Fix I2C controller interrupt | expand

Commit Message

Florian Fainelli Oct. 27, 2021, 7:37 p.m. UTC
The I2C interrupt controller line is off by 32 because the datasheet
describes interrupt inputs into the GIC which are for Shared Peripheral
Interrupts and are starting at offset 32. The ARM GIC binding expects
the SPI interrupts to be numbered from 0 relative to the SPI base.

Fixes: bb097e3e0045 ("ARM: dts: BCM5301X: Add I2C support to the DT")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm/boot/dts/bcm5301x.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rafał Miłecki Oct. 27, 2021, 8:28 p.m. UTC | #1
On 27.10.2021 21:37, Florian Fainelli wrote:
> The I2C interrupt controller line is off by 32 because the datasheet
> describes interrupt inputs into the GIC which are for Shared Peripheral
> Interrupts and are starting at offset 32. The ARM GIC binding expects
> the SPI interrupts to be numbered from 0 relative to the SPI base.
> 
> Fixes: bb097e3e0045 ("ARM: dts: BCM5301X: Add I2C support to the DT")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Thanks for fixing that. I don't have any device utilzing I2C and so
never notice that issue.
Christian Lamparter Oct. 27, 2021, 8:32 p.m. UTC | #2
On 27/10/2021 21:37, Florian Fainelli wrote:
> The I2C interrupt controller line is off by 32 because the datasheet
> describes interrupt inputs into the GIC which are for Shared Peripheral
> Interrupts and are starting at offset 32. The ARM GIC binding expects
> the SPI interrupts to be numbered from 0 relative to the SPI base.
 >
> Fixes: bb097e3e0045 ("ARM: dts: BCM5301X: Add I2C support to the DT")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Thank you! This fixed the MR32 iproc-i2c issue.
It's working now (will post the patch for the MR32 tomorrow):

# cat /proc/interrupts
            CPU0       CPU1
  24:          1          0     GIC-0  27 Edge      gt
  25:     110418     108252     GIC-0  29 Edge      twd
  26:        476          0     GIC-0 117 Level     gpio, ttyS0
  31:        128          0     GIC-0 121 Level     18009000.i2c <--- YES!
  32:      49477          0     GIC-0 100 Level     brcmnand
  33:          0          0     GIC-0 109 Level     mspi_done
  34:          0          0     GIC-0 110 Level     mspi_halted
  35:          0          0     GIC-0 104 Level     spi_lr_fullness_reached
  36:          0          0     GIC-0 105 Level     spi_lr_session_aborted
  37:          0          0     GIC-0 106 Level     spi_lr_impatient
  38:          0          0     GIC-0 107 Level     spi_lr_session_done
  40:       7227          0     GIC-0 179 Level     eth2
  51:          0          0  BCMA-GPIO  21 Edge      keys

and the attached AT24 + PoE-Power monitor can be probed + read as before.

[   12.042576] at24 0-0050: 8192 byte 24c64 EEPROM, read-only
...
[   12.077671] ina2xx 0-0045: power monitor ina219 (Rshunt = 60000 uOhm)

Tested-by: Christian Lamparter <chunkeey@gmail.com>


Regards
Christian
Florian Fainelli Nov. 15, 2021, 5:31 p.m. UTC | #3
On Wed, 27 Oct 2021 12:37:29 -0700, Florian Fainelli <f.fainelli@gmail.com> wrote:
> The I2C interrupt controller line is off by 32 because the datasheet
> describes interrupt inputs into the GIC which are for Shared Peripheral
> Interrupts and are starting at offset 32. The ARM GIC binding expects
> the SPI interrupts to be numbered from 0 relative to the SPI base.
> 
> Fixes: bb097e3e0045 ("ARM: dts: BCM5301X: Add I2C support to the DT")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/fixes, thanks!
--
Florian
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index f92089290ccd..ec5de636796e 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -408,7 +408,7 @@  uart2: serial@18008000 {
 	i2c0: i2c@18009000 {
 		compatible = "brcm,iproc-i2c";
 		reg = <0x18009000 0x50>;
-		interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 		clock-frequency = <100000>;