lkml.org 
[lkml]   [2018]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 019/150] ARM: dts: BCM63xx: Fix incorrect interrupt specifiers
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 3ab97942d0213b6583a5408630a8cbbfbf54730f ]

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

    Fixes: b5762cacc411 ("ARM: bcm63138: add NAND DT support")
    Fixes: 46d4bca0445a ("ARM: BCM63XX: add BCM63138 minimal Device Tree")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/bcm63138.dtsi | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
    index 43ee992ccdcf..6df61518776f 100644
    --- a/arch/arm/boot/dts/bcm63138.dtsi
    +++ b/arch/arm/boot/dts/bcm63138.dtsi
    @@ -106,21 +106,23 @@
    global_timer: timer@1e200 {
    compatible = "arm,cortex-a9-global-timer";
    reg = <0x1e200 0x20>;
    - interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
    + interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
    clocks = <&axi_clk>;
    };

    local_timer: local-timer@1e600 {
    compatible = "arm,cortex-a9-twd-timer";
    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>;
    };

    twd_watchdog: watchdog@1e620 {
    compatible = "arm,cortex-a9-twd-wdt";
    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 {
    @@ -158,7 +160,7 @@
    serial0: serial@600 {
    compatible = "brcm,bcm6345-uart";
    reg = <0x600 0x1b>;
    - interrupts = <GIC_SPI 32 0>;
    + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
    clocks = <&periph_clk>;
    clock-names = "periph";
    status = "disabled";
    @@ -167,7 +169,7 @@
    serial1: serial@620 {
    compatible = "brcm,bcm6345-uart";
    reg = <0x620 0x1b>;
    - interrupts = <GIC_SPI 33 0>;
    + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
    clocks = <&periph_clk>;
    clock-names = "periph";
    status = "disabled";
    @@ -180,7 +182,7 @@
    reg = <0x2000 0x600>, <0xf0 0x10>;
    reg-names = "nand", "nand-int-base";
    status = "disabled";
    - interrupts = <GIC_SPI 38 0>;
    + interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
    interrupt-names = "nand";
    };

    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-02 20:11    [W:5.234 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site