From patchwork Wed Jun 14 16:29:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Elwell X-Patchwork-Id: 9786903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C0982602C9 for ; Wed, 14 Jun 2017 16:30:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1D6126E4F for ; Wed, 14 Jun 2017 16:30:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A57AA274D0; Wed, 14 Jun 2017 16:30:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49ED326E4F for ; Wed, 14 Jun 2017 16:30:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751857AbdFNQaM (ORCPT ); Wed, 14 Jun 2017 12:30:12 -0400 Received: from mx07-00252a01.pphosted.com ([62.209.51.214]:39738 "EHLO mx07-00252a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752539AbdFNQ3l (ORCPT ); Wed, 14 Jun 2017 12:29:41 -0400 Received: from pps.filterd (m0102628.ppops.net [127.0.0.1]) by mx07-00252a01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5EGTYtQ023582 for ; Wed, 14 Jun 2017 17:29:40 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=pp; bh=IYvYTQy4Lh5tNqAyTKvBVhJ/Gvlnm8eAmrsQ7jwkccw=; b=ZydSpI0wb9kFH0bh0oZEbXvnN2j/M/A3ecxVE6adPMrjEgH4HUOsXLUsiwA24i180S4s pw1fDNSKpbjQZwysl6nsTeoQrKIMoYC+quWRa0QTj7IGrqQ6H5CWWATrv9mcwkPlRjr4 WEMJHyhyREFVoT7F7oSHsMHFFhb/UqamqCLNm6gUkUf8aVD35LSKV4foPeHNbtMC+O0W xTEPnjBsX/EeldmSgwR14G2rgQo/65JZDom9V56VJ4dnokwZxAlt/LSO8qU2sWTJnR8Z 9ztHRJjmwqQSmRq772z1JdSIoOUHAlqGh3ieq4PfABdDqaBMyv5UrzdSS6KXrV9e9rmb MQ== Received: from mail-wr0-f197.google.com (mail-wr0-f197.google.com [209.85.128.197]) by mx07-00252a01.pphosted.com with ESMTP id 2b065yt4yn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Wed, 14 Jun 2017 17:29:40 +0100 Received: by mail-wr0-f197.google.com with SMTP id v60so1560997wrc.7 for ; Wed, 14 Jun 2017 09:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IYvYTQy4Lh5tNqAyTKvBVhJ/Gvlnm8eAmrsQ7jwkccw=; b=dXPzlM1/MAPlY4QI3G9HuOjR5PGCJYXihM5lz+uF1BBkWinfesi08js/obAZUc3JsZ enpWMOkldRPkVZhPehw+5VnpOod8vmhDw1AvxxUYAi1Qdh5jZa2yqh614vsbzv0ueeWT ZcHAa284s99bbptSyUrKIy++cLDmJ7fwz+muTwqpIVziawnH0FMbTGrGyETEiW96d9i3 0YALs4c3yxSE53+67Do10ydP9zeRokbn62WUSn34k+vngmVeP8q7xE4Nu/nTTPPsnsca EK9dlRwM/OUwBJ1HOEquc3VhIdS9le8xSb78af4nBy1Wq7O1qx1MdESES+mky3jl6eXR CdIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IYvYTQy4Lh5tNqAyTKvBVhJ/Gvlnm8eAmrsQ7jwkccw=; b=dMqTVzOMAo3/vRJusYCxX3FgwGYYulrphaBRh4NN4+eNSkAy7jS76tY9rVtWhnAuVI OqJ0LdzRbSJykMvi0HGaHwTLtP5KuIF/bMoLYrOFdaAqid5skv0ewNtby6rT29ebPA/o PVzpZQdSdruwSM6XLYBzFxGv+RSeg9S2b6PebkxHpeoeaqiW8iFArAE8wiySU9+C6WYK a/9/Y6OGU6QKLysuscGdONppyfjDB2xZR/C153K7P6gZaxxGWjl2d6hN+CrkhMjkOGDj cmdCaaskc3xmvDESYzA3o5Ri2XIIj63mEiCYlEHZGE/fkJTtwO6VnmVaZ71d1A4jGEqn XzIw== X-Gm-Message-State: AKS2vOwILSHW79HNKyQPrEAtrsP9dpHoweaXPkwSXQJmU5mDqiu+bjI/ Uy+duLA20HYJF9CFgbxPnHGLievz42FMh/UtfQzIoPB5gIgAldJY0p30zEKSC3FrqVKqZPG8Fnt XqIShi6kR58k= X-Received: by 10.28.234.70 with SMTP id i67mr625073wmh.91.1497457779426; Wed, 14 Jun 2017 09:29:39 -0700 (PDT) X-Received: by 10.28.234.70 with SMTP id i67mr625055wmh.91.1497457779212; Wed, 14 Jun 2017 09:29:39 -0700 (PDT) Received: from buildbot.pitowers.org ([217.33.127.173]) by smtp.gmail.com with ESMTPSA id e24sm545129wre.54.2017.06.14.09.29.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 09:29:37 -0700 (PDT) From: Phil Elwell To: Thomas Gleixner , Jason Cooper , Marc Zyngier , Rob Herring , Mark Rutland , Florian Fainelli , Stefan Wahren , Eric Anholt , Russell King , Michael Turquette , Stephen Boyd , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-clk@vger.kernel.org Cc: Phil Elwell Subject: [PATCH v3 4/4] ARM: dts: bcm283x: Add and use bcm2835-aux-intc Date: Wed, 14 Jun 2017 17:29:10 +0100 Message-Id: <1497457750-35585-5-git-send-email-phil@raspberrypi.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497457750-35585-1-git-send-email-phil@raspberrypi.org> References: <4ceb6c92-f752-180e-6a6e-a94dcd120737@raspberrypi.org> <1497457750-35585-1-git-send-email-phil@raspberrypi.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-06-14_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1706140277 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a DT node for the AUX interrupt controller, updating the AUX peripheral nodes to make use of it. Note that the IO region overlaps that of the AUX clock driver, but by the time the irqchip driver appears in the tree the clock driver should have been updated to ioremap the region without reserving it, along with preparing for a point in the future where the clock node may be shrunk to the single word it actually needs. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm283x.dtsi | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 431dcfc..b304221 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -1,6 +1,7 @@ #include #include #include +#include #include /* firmware-provided startup stubs live here, where the secondary CPUs are @@ -459,7 +460,22 @@ status = "disabled"; }; - aux: aux@0x7e215000 { + auxintc: interrupt-controller@7e215000 { + compatible = "brcm,bcm2835-aux-intc"; + reg = <0x7e215000 0x4>; + interrupts = <1 29>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + /* + * N.B. This node overlaps with the previous node, + * but the updated driver remaps the region without + * reserving it. After a suitable period this + * node can be reduced to cover only the single word + * at 7e215004. + */ + aux: aux@7e215000 { compatible = "brcm,bcm2835-aux"; #clock-cells = <1>; reg = <0x7e215000 0x8>; @@ -469,7 +485,8 @@ uart1: serial@7e215040 { compatible = "brcm,bcm2835-aux-uart"; reg = <0x7e215040 0x40>; - interrupts = <1 29>; + interrupt-parent = <&auxintc>; + interrupts = ; clocks = <&aux BCM2835_AUX_CLOCK_UART>; status = "disabled"; }; @@ -477,7 +494,8 @@ spi1: spi@7e215080 { compatible = "brcm,bcm2835-aux-spi"; reg = <0x7e215080 0x40>; - interrupts = <1 29>; + interrupt-parent = <&auxintc>; + interrupts = ; clocks = <&aux BCM2835_AUX_CLOCK_SPI1>; #address-cells = <1>; #size-cells = <0>; @@ -487,7 +505,8 @@ spi2: spi@7e2150c0 { compatible = "brcm,bcm2835-aux-spi"; reg = <0x7e2150c0 0x40>; - interrupts = <1 29>; + interrupt-parent = <&auxintc>; + interrupts = ; clocks = <&aux BCM2835_AUX_CLOCK_SPI2>; #address-cells = <1>; #size-cells = <0>;