From patchwork Mon Jun 12 14:25:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Elwell X-Patchwork-Id: 9781229 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 C8DAF60212 for ; Mon, 12 Jun 2017 14:25:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C349228426 for ; Mon, 12 Jun 2017 14:25:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B81782854A; Mon, 12 Jun 2017 14:25:59 +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 5B0FC28426 for ; Mon, 12 Jun 2017 14:25:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752474AbdFLOZp (ORCPT ); Mon, 12 Jun 2017 10:25:45 -0400 Received: from mx08-00252a01.pphosted.com ([91.207.212.211]:58313 "EHLO mx08-00252a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752510AbdFLOZn (ORCPT ); Mon, 12 Jun 2017 10:25:43 -0400 Received: from pps.filterd (m0102629.ppops.net [127.0.0.1]) by mx08-00252a01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5CEM6uv031589 for ; Mon, 12 Jun 2017 15:25:36 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : subject : to : message-id : date : mime-version : content-type : content-transfer-encoding; s=pp; bh=36m9Hn8OHpC+KvTGCCH1U5sOjt2lXzF4x0Q79AuZoic=; b=dUhGT+qATk8/emf7+mQvla9uxdifLPvLQPfsFFKsxxWg3AdAbtUxa0Fiy80c/7p6wj45 EHJk3f92XnhKs3X/mdBN3dGRwpOw1p07+FPO3GHU1W8qS3v9tzQldt90R/mzDgo6Fuaq zzXIGncgaVkEQMRjzaYOrYmxE86Zoeb4U2IXzuTThrEWgMPCwVskgMAdLEN2zFQ4DiCy nZGeVseHdzStJbOxjFDIa4SGh6Bpd3mQnc+6R9j4Ejp7yD1mbhHSSVXhc/IxZHehAJyY 3RvPloz1rmWd7xzR/6DaDLIDvitg57XzrzT+VKmheGvXKvOYm5q2ZaKBtp9o3hhuxxFD bA== Received: from mail-wr0-f198.google.com (mail-wr0-f198.google.com [209.85.128.198]) by mx08-00252a01.pphosted.com with ESMTP id 2b058es5v2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Mon, 12 Jun 2017 15:25:36 +0100 Received: by mail-wr0-f198.google.com with SMTP id n7so23200951wrb.0 for ; Mon, 12 Jun 2017 07:25:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi-org.20150623.gappssmtp.com; s=20150623; h=from:subject:to:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=36m9Hn8OHpC+KvTGCCH1U5sOjt2lXzF4x0Q79AuZoic=; b=xP4OCZrr/QbTf3z0yj/pQOFjafAk9Rtr75q8SYpsATPFSYrcFgASmkHj2L+70XEEPN Fq7F39wEdYD9KkbNE02xl9fC3LSfNWxpsO/rJTLj7eWgKUR7kx9PLuDrTfkGCBkNl4sV VXM9BnHR/UAdq8rSf917GluEJjtWoLQ8DYaO5FDIiQjF9anE+7pgmGmzbbFq/hSOm9fY dJtFpFovUEFvkWguhQx/MYSr1Komi3vOEBbLgLtPbTW7K9IdgykP6cW2ub4b9VVWqAN1 4g+NIX5pjJYC5C94s2iQ2ycf4yFQq2jldVGK7nbm+o97yQFBQ1OH4eE95QIDYsXPZFtu z5vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=36m9Hn8OHpC+KvTGCCH1U5sOjt2lXzF4x0Q79AuZoic=; b=ANX1kQnLxgwOAjSHIycwK0+v18PJz0kPiHe5Fy5+UljubE6oz+eCb2N8pQ34o+dVkb gcJu085HRLEFavnx+8Me8e7mjLwUs+IIbEueuGwTQU4P2di7gVutscqHzxyuLQ5FTJxk Sw4kGfPcKHi6DbB7Qd6LNB9q76xB6P3NLmSRtmQI6R8gzypzxT09of/2PcT8ohEYQoIt aC+9nj/THnLCeLU9nwx6VZ2vM9csZ3EFShY17Vn0XUP9p15TmYfF44/qMfeXGmryuP+y fc6V5721ypO9fl155MlcQPiPhV8h/eM/lQvSkKtOzJMl4KChqWNiHV21xmb+ae0t4gy5 hX4g== X-Gm-Message-State: AODbwcDteTky56cnb72RpScqiuf+MMuXybMLKVqek3YTqMuqPSMYuFfj 2DeELu6qaP3IbC6jfSkl+xEZYknRcMY1hv3qIr05OlycMVlQpN9Gh1oRBilD3Zs7rDEKoQS1faq vRaksDwEYixQ= X-Received: by 10.223.133.181 with SMTP id 50mr8581591wrt.27.1497277534269; Mon, 12 Jun 2017 07:25:34 -0700 (PDT) X-Received: by 10.223.133.181 with SMTP id 50mr8581566wrt.27.1497277534055; Mon, 12 Jun 2017 07:25:34 -0700 (PDT) Received: from ?IPv6:2a00:2381:fdf7:14:f582:83ae:5a04:a029? ([2a00:2381:fdf7:14:f582:83ae:5a04:a029]) by smtp.gmail.com with ESMTPSA id 94sm12959816wrp.63.2017.06.12.07.25.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 07:25:33 -0700 (PDT) From: Phil Elwell Subject: [PATCH v2 4/4] ARM: dts: bcm283x: Add and use bcm2835-aux-intc 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 Message-ID: <248bb555-6dff-daf5-ca63-7d55c2992fce@raspberrypi.org> Date: Mon, 12 Jun 2017 15:25:33 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 Content-Language: en-GB X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-06-12_10:, , 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-1706120249 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 intc 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 MEM resource 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 cc721a4..1febb6e 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>;