Skip to content

Commit 4bdb783

Browse files
committed
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>
2 parents 2f992e7 + 68bc6a7 commit 4bdb783

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@
251251
led-controller@2b {
252252
compatible = "cznic,turris-omnia-leds";
253253
reg = <0x2b>;
254+
interrupts-extended = <&mcu 11 IRQ_TYPE_NONE>;
254255
#address-cells = <1>;
255256
#size-cells = <0>;
256257
status = "okay";

arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
i2c@11100 {
4545
status = "okay";
4646

47-
s24c02: s24c02@50 {
47+
s24c02: eeprom@50 {
4848
compatible = "atmel,24c02";
4949
reg = <0x50>;
5050
};

0 commit comments

Comments
 (0)