Skip to content

Commit 364d1ac

Browse files
committed
Merge tag 'arm-soc/for-5.7/devicetree-fixes-part2-v2' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-based SoCs Device Tree fixes for 5.7, please pull the following: - Vincent fixes the polarity of the ACT LED on the Raspberry Pi Zero W board - Hamish fixes the ARM PPI interrupts sensitivy for the Hurricane 2 SoCs * tag 'arm-soc/for-5.7/devicetree-fixes-part2-v2' of https://github.com/Broadcom/stblinux: ARM: dts: bcm: HR2: Fix PPI interrupt types ARM: dts: bcm2835-rpi-zero-w: Fix led polarity Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents ccffeae + be0ec06 commit 364d1ac

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/arm/boot/dts/bcm-hr2.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,23 @@
7575
timer@20200 {
7676
compatible = "arm,cortex-a9-global-timer";
7777
reg = <0x20200 0x100>;
78-
interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
78+
interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
7979
clocks = <&periph_clk>;
8080
};
8181

8282
twd-timer@20600 {
8383
compatible = "arm,cortex-a9-twd-timer";
8484
reg = <0x20600 0x20>;
8585
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) |
86-
IRQ_TYPE_LEVEL_HIGH)>;
86+
IRQ_TYPE_EDGE_RISING)>;
8787
clocks = <&periph_clk>;
8888
};
8989

9090
twd-watchdog@20620 {
9191
compatible = "arm,cortex-a9-twd-wdt";
9292
reg = <0x20620 0x20>;
9393
interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) |
94-
IRQ_TYPE_LEVEL_HIGH)>;
94+
IRQ_TYPE_EDGE_RISING)>;
9595
clocks = <&periph_clk>;
9696
};
9797

arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
leds {
2626
act {
27-
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
27+
gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
2828
};
2929
};
3030

0 commit comments

Comments
 (0)