Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b12f5d0f authored by Stefan Wahren's avatar Stefan Wahren Committed by Marc Zyngier
Browse files

dt-bindings/bcm283x: Define polarity of per-cpu interrupts 



This patch define the polarity of the per-cpu interrupts on BCM2836
and BCM2837 in order to avoid the warnings from ARM arch timer code:

    arch_timer: WARNING: Invalid trigger for IRQ19, assuming level low
    arch_timer: WARNING: Please fix your firmware
    arch_timer: cp15 timer(s) running at 19.20MHz (virt).

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent ad83c7cb

arch/arm/boot/dts/bcm2836.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -13,24 +13,24 @@ 
			compatible = "brcm,bcm2836-l1-intc";

			reg = <0x40000000 0x100>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

			interrupt-parent = <&local_intc>;

		};



		arm-pmu {

			compatible = "arm,cortex-a7-pmu";

			interrupt-parent = <&local_intc>;

			interrupts = <9>;

			interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;

		};

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupt-parent = <&local_intc>;

		interrupts = <0>, // PHYS_SECURE_PPI

			     <1>, // PHYS_NONSECURE_PPI

			     <3>, // VIRT_PPI

			     <2>; // HYP_PPI

		interrupts = <0 IRQ_TYPE_LEVEL_HIGH>, // PHYS_SECURE_PPI

			     <1 IRQ_TYPE_LEVEL_HIGH>, // PHYS_NONSECURE_PPI

			     <3 IRQ_TYPE_LEVEL_HIGH>, // VIRT_PPI

			     <2 IRQ_TYPE_LEVEL_HIGH>; // HYP_PPI

		always-on;

	};
@@ -76,7 +76,7 @@ 
	compatible = "brcm,bcm2836-armctrl-ic";

	reg = <0x7e00b200 0x200>;

	interrupt-parent = <&local_intc>;

	interrupts = <8>;

	interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;

};



&cpu_thermal {

arch/arm/boot/dts/bcm2837.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
			compatible = "brcm,bcm2836-l1-intc";

			reg = <0x40000000 0x100>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

			interrupt-parent = <&local_intc>;

		};

	};
@@ -20,10 +20,10 @@ 
	timer {

		compatible = "arm,armv7-timer";

		interrupt-parent = <&local_intc>;

		interrupts = <0>, // PHYS_SECURE_PPI

			     <1>, // PHYS_NONSECURE_PPI

			     <3>, // VIRT_PPI

			     <2>; // HYP_PPI

		interrupts = <0 IRQ_TYPE_LEVEL_HIGH>, // PHYS_SECURE_PPI

			     <1 IRQ_TYPE_LEVEL_HIGH>, // PHYS_NONSECURE_PPI

			     <3 IRQ_TYPE_LEVEL_HIGH>, // VIRT_PPI

			     <2 IRQ_TYPE_LEVEL_HIGH>; // HYP_PPI

		always-on;

	};
@@ -73,7 +73,7 @@ 
	compatible = "brcm,bcm2836-armctrl-ic";

	reg = <0x7e00b200 0x200>;

	interrupt-parent = <&local_intc>;

	interrupts = <8>;

	interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;

};



&cpu_thermal {

arch/arm/boot/dts/bcm283x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <dt-bindings/clock/bcm2835.h>

#include <dt-bindings/clock/bcm2835-aux.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>



/* firmware-provided startup stubs live here, where the secondary CPUs are

 * spinning.