From patchwork Thu Jan 5 15:13:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9499155 X-Patchwork-Delegate: agross@codeaurora.org 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 E61B9606DE for ; Thu, 5 Jan 2017 15:13:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE1CE26B39 for ; Thu, 5 Jan 2017 15:13:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2DBA28401; Thu, 5 Jan 2017 15:13:51 +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=ham 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 81EAE26B39 for ; Thu, 5 Jan 2017 15:13:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760719AbdAEPNu (ORCPT ); Thu, 5 Jan 2017 10:13:50 -0500 Received: from mail-lf0-f52.google.com ([209.85.215.52]:36347 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759173AbdAEPNu (ORCPT ); Thu, 5 Jan 2017 10:13:50 -0500 Received: by mail-lf0-f52.google.com with SMTP id x140so29027563lfa.3 for ; Thu, 05 Jan 2017 07:13:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Odz1lrO+f/T6Bgvgih2VUx/7ElWm0jmvSZwRpQfMWsQ=; b=cvDb5kD4cPv+nmOsXDBwDIf21iNS0FGtKKRegmqjv3avEJ+t9MSy25ME7Jjqn8g9mz m/biLpyae4AEu6U7oXZAu+XpxiaHwLPPWBAN50c4ndeySIsWRYUCgmaE+nz8lYMCuuL7 haOvA4InyC5y7IN/C+H0xS7UzrN4SfJX+Y+us= 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=Odz1lrO+f/T6Bgvgih2VUx/7ElWm0jmvSZwRpQfMWsQ=; b=Lb3Z1iT7N2awrk0F9aUd3mu7WdF17SgyBGElTbKJeO628UONQ/yYoirKBc2LE++rEO ZoehTaZSdA7COmlhelX7jdiv6AUyrF/HanYqo6RSuCHvhci6BJt6M4MA+pqf6x0z8mcD Caf0gKMQARn5A/kraSsCUhkPH8BUNoTGdu23NNSt5wFOVDddWQUIhDnemzRpZboOTpX2 ImC31gX/LGYn1xfONo/fD/3PP1bWXuSlWZk6IsPWF53+VNT/PMCIxjMQl2eIT89Phxxl X6x3viDsYwXPDRO6XSeK+/blXPS24hIaguVK9wyrfg9bp3Nlc7fGvSq2mIoboZyB4uU6 Y1aQ== X-Gm-Message-State: AIkVDXJYC3u9NEhKHJKqIv9pWk0/OQduQ5pr0zRaE0uU1TMCjrOMbGs8Cgo9PKAJc3aZR/QA X-Received: by 10.46.13.9 with SMTP id 9mr26958331ljn.37.1483629228653; Thu, 05 Jan 2017 07:13:48 -0800 (PST) Received: from localhost.localdomain (c-357171d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.113.53]) by smtp.gmail.com with ESMTPSA id v9sm18325988lja.0.2017.01.05.07.13.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jan 2017 07:13:48 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson Cc: Stephen Boyd , David Brown , Linus Walleij Subject: [PATCH 2/3 v5] ARM: dts: reference PM8058 as IRQ parent Date: Thu, 5 Jan 2017 16:13:35 +0100 Message-Id: <20170105151336.18667-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170105151336.18667-1-linus.walleij@linaro.org> References: <20170105151336.18667-1-linus.walleij@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some nodes are referencing the pm8058_gpio as IRQ parent, but the HW IRQ offset they are supplying is actually that for the parent to that controller: the PM8058 itself. Since that is the proper parent, reference it directly. We can switch this to the pm8058_gpio and the proper offset once we have fixed the SSBI GPIO driver to properly deal with the hierarchical IRQ domain and get proper local offset translation. Acked-by: Bjorn Andersson Signed-off-by: Linus Walleij --- ChangeLog v4->v5: - No changes, just rebased on v4.10-rc1 ChangeLog v1->v2: - Add Bjorn's ACK. - Follow version numbering of the primary patch. --- arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts index 4a532ddab53a..ea660ffa03ea 100644 --- a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts +++ b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts @@ -369,8 +369,8 @@ ak8975@0c { compatible = "asahi-kasei,ak8975"; reg = <0x0c>; - /* GPIO33 has interrupt 224 on the PM8058 */ - interrupt-parent = <&pm8058_gpio>; + /* FIXME: GPIO33 has interrupt 224 on the PM8058 */ + interrupt-parent = <&pm8058>; interrupts = <224 IRQ_TYPE_EDGE_RISING>; pinctrl-names = "default"; pinctrl-0 = <&dragon_ak8975_gpios>; @@ -380,8 +380,8 @@ bmp085@77 { compatible = "bosch,bmp085"; reg = <0x77>; - /* GPIO16 has interrupt 207 on the PM8058 */ - interrupt-parent = <&pm8058_gpio>; + /* FIXME: GPIO16 has interrupt 207 on the PM8058 */ + interrupt-parent = <&pm8058>; interrupts = <207 IRQ_TYPE_EDGE_RISING>; reset-gpios = <&tlmm 86 GPIO_ACTIVE_LOW>; pinctrl-names = "default";