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

Commit 3ab97942 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

ARM: dts: BCM63xx: Fix incorrect interrupt specifiers 



A number of our interrupts were incorrectly specified, fix both the PPI
and SPI interrupts to be correct.

Fixes: b5762cac ("ARM: bcm63138: add NAND DT support")
Fixes: 46d4bca0 ("ARM: BCM63XX: add BCM63138 minimal Device Tree")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 5b394b2d

arch/arm/boot/dts/bcm63138.dtsi

+8 −6
Original line number Original line Diff line number Diff line
@@ -106,21 +106,23 @@ 
		global_timer: timer@1e200 {

		global_timer: timer@1e200 {

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

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

			reg = <0x1e200 0x20>;

			reg = <0x1e200 0x20>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

			clocks = <&axi_clk>;

			clocks = <&axi_clk>;

		};

		};





		local_timer: local-timer@1e600 {

		local_timer: local-timer@1e600 {

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

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

			reg = <0x1e600 0x20>;

			reg = <0x1e600 0x20>;

			interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |

						  IRQ_TYPE_EDGE_RISING)>;

			clocks = <&axi_clk>;

			clocks = <&axi_clk>;

		};

		};





		twd_watchdog: watchdog@1e620 {

		twd_watchdog: watchdog@1e620 {

			compatible = "arm,cortex-a9-twd-wdt";

			compatible = "arm,cortex-a9-twd-wdt";

			reg = <0x1e620 0x20>;

			reg = <0x1e620 0x20>;

			interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |

						  IRQ_TYPE_LEVEL_HIGH)>;

		};

		};





		armpll: armpll {

		armpll: armpll {
@@ -158,7 +160,7 @@ 
		serial0: serial@600 {

		serial0: serial@600 {

			compatible = "brcm,bcm6345-uart";

			compatible = "brcm,bcm6345-uart";

			reg = <0x600 0x1b>;

			reg = <0x600 0x1b>;

			interrupts = <GIC_SPI 32 0>;

			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&periph_clk>;

			clocks = <&periph_clk>;

			clock-names = "periph";

			clock-names = "periph";

			status = "disabled";

			status = "disabled";
@@ -167,7 +169,7 @@ 
		serial1: serial@620 {

		serial1: serial@620 {

			compatible = "brcm,bcm6345-uart";

			compatible = "brcm,bcm6345-uart";

			reg = <0x620 0x1b>;

			reg = <0x620 0x1b>;

			interrupts = <GIC_SPI 33 0>;

			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&periph_clk>;

			clocks = <&periph_clk>;

			clock-names = "periph";

			clock-names = "periph";

			status = "disabled";

			status = "disabled";
@@ -180,7 +182,7 @@ 
			reg = <0x2000 0x600>, <0xf0 0x10>;

			reg = <0x2000 0x600>, <0xf0 0x10>;

			reg-names = "nand", "nand-int-base";

			reg-names = "nand", "nand-int-base";

			status = "disabled";

			status = "disabled";

			interrupts = <GIC_SPI 38 0>;

			interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "nand";

			interrupt-names = "nand";

		};

		};