Commit 364d1ac2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.7/devicetree-fixes-part2-v2' of... 

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/20200524203714.17035-1-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ccffeae7 be0ec060

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

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
		timer@20200 {

			compatible = "arm,cortex-a9-global-timer";

			reg = <0x20200 0x100>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

			clocks = <&periph_clk>;

		};
@@ -83,7 +83,7 @@ 
			compatible = "arm,cortex-a9-twd-timer";

			reg = <0x20600 0x20>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) |

						  IRQ_TYPE_LEVEL_HIGH)>;

						  IRQ_TYPE_EDGE_RISING)>;

			clocks = <&periph_clk>;

		};
@@ -91,7 +91,7 @@ 
			compatible = "arm,cortex-a9-twd-wdt";

			reg = <0x20620 0x20>;

			interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) |

						  IRQ_TYPE_LEVEL_HIGH)>;

						  IRQ_TYPE_EDGE_RISING)>;

			clocks = <&periph_clk>;

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


	leds {

		act {

			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE