diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-11-12 22:56:12 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-11-12 22:56:13 +0100 |
| commit | 4bdb7837913615e7da816d4754771074397793f4 (patch) | |
| tree | 359b21a58dc6aa5e2c436e95998111203071329b /arch/arm | |
| parent | 2f992e73462a72397ce6e49a39c6096141ba2838 (diff) | |
| parent | 68bc6a71f56875a7dbde4f44aa4404c214651e1c (diff) | |
Merge tag 'mvebu-dt-6.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt for 6.13 (part 1)
turris-omnia: prepare device tree for LED brightness change detection
kirkwood: fix at24 EEPROM node name
* tag 'mvebu-dt-6.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
ARM: dts: turris-omnia: Add global LED brightness change interrupt
ARM: dts: marvell: kirkwood: Fix at24 EEPROM node name
Link: https://lore.kernel.org/r/87bjyq83x0.fsf@BLaptop.bootlin.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts index 43202890c959..83fe00abd652 100644 --- a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts @@ -251,6 +251,7 @@ led-controller@2b { compatible = "cznic,turris-omnia-leds"; reg = <0x2b>; + interrupts-extended = <&mcu 11 IRQ_TYPE_NONE>; #address-cells = <1>; #size-cells = <0>; status = "okay"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts index 9c438f10f737..2bc4b68bd723 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts @@ -44,7 +44,7 @@ i2c@11100 { status = "okay"; - s24c02: s24c02@50 { + s24c02: eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; }; |