From patchwork Wed Feb 6 15:32:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10799519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A19031390 for ; Wed, 6 Feb 2019 15:33:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 904F028844 for ; Wed, 6 Feb 2019 15:33:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81EE52CC7A; Wed, 6 Feb 2019 15:33:01 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 EBCB528844 for ; Wed, 6 Feb 2019 15:33:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727999AbfBFPdA (ORCPT ); Wed, 6 Feb 2019 10:33:00 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:38071 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726767AbfBFPdA (ORCPT ); Wed, 6 Feb 2019 10:33:00 -0500 Received: by mail-lj1-f193.google.com with SMTP id c19-v6so6430543lja.5 for ; Wed, 06 Feb 2019 07:32:58 -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:mime-version :content-transfer-encoding; bh=9HWf7hUgZh6GIFRMufOwE+uKd6NEJBNzajxfUgCI2cM=; b=cxo0DPSNn8stamen6WhwIv3zX86XRg+9930fbKrefnz0bJ/hjS+g4d3qLmefhYR9mZ yf020WVRim6CsCm3iwTb8nXMc5c9Eal1OPRYqL63eA/EGDvKL6N3yV33TpYMnfGp6YDE WB4obuqHDXF8vIgpH2ofSZAcEz6MgvicbZkK+F7dfRCfo9mdmzqJ2URW8oap8q7jj7lM A1so2EAggPqlp26C0AZbuMukVtfhQVP5PpTHhNIANfKKikAJrIbvWeDUEa6c4tu2o3MC o/OCnkSiK1+EioycQFWvLPuHKkp1WaYbNLUxkXbT4OIBlzSpNfzjLotpQ8JZ8TJCrMVy LWUw== 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:mime-version :content-transfer-encoding; bh=9HWf7hUgZh6GIFRMufOwE+uKd6NEJBNzajxfUgCI2cM=; b=jt9r8xEcuI+aVHQsgTNQkzjX600+4Vk9fs/9cvVArq3EaTEeEJpOMYkgBLbeAZGIEH jJytiP5qhaLlIKxNISHMvwoa8V/KuDnvChBAC2hdHi7OUOPrhRtN0XwdBdhhlRuoNdPb MEILGAycGseb/Zn8tW/gSuBBTvr3zdGd3IsB3uvPsGmMef4ZmJFHlk2d1XFVejAYb0UM 3lhwkBiQoiofYcbc/oZPIHYexczzStxYUSWE3sDGVM6FwMtc/uqaf9T4HZPlpTxnR/hx Vvv7Ou2evoAaDBwFrzjeukzo9GNzDjSTlv8xWwxXOnNLHcsqrAy3HOGL0IHKjC1m8Ype QSsw== X-Gm-Message-State: AHQUAuYix6iIp6HegYqmmJknlxSefSh5UFpnxRDESPmhl3twiddYNLBy I9K+0UEgTQsBOiLYmkhj3FwmZjwDcHA= X-Google-Smtp-Source: AHgI3Ibd1jaZJlKhRFZcBqMZzXaAu25p0sJrt1IlS940IAP4geo18XOD6RG9rsXyQdMsOTDPD2sGLA== X-Received: by 2002:a2e:4503:: with SMTP id s3-v6mr6624228lja.44.1549467177474; Wed, 06 Feb 2019 07:32:57 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id d3sm2660180lfj.39.2019.02.06.07.32.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 07:32:56 -0800 (PST) From: Linus Walleij To: linux-arm-msm@vger.kernel.org, Andy Gross , David Brown Cc: linux-arm-kernel@lists.infradead.org, Linus Walleij , Brian Masney Subject: [PATCH] ARM: dts: qcom-apq8060: Fix up interrupt parents Date: Wed, 6 Feb 2019 16:32:50 +0100 Message-Id: <20190206153250.16495-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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 Before we fixed up the interrupt hierarchy for the SSBI GPIO controller, we had to use the PM8058 directly to pick interrupts. After making the interrupt controller work properly, we can reference the real interrupt parent. Cc: Brian Masney Signed-off-by: Linus Walleij --- Brian: please include this at the end of your series. --- .../arm/boot/dts/qcom-apq8060-dragonboard.dts | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts index 497bb065eb9d..4e6c50d45cb2 100644 --- a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts +++ b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts @@ -93,9 +93,8 @@ vdd-supply = <&pm8058_l14>; // 2.85V aset-gpios = <&pm8058_gpio 35 GPIO_ACTIVE_LOW>; capella,aset-resistance-ohms = <100000>; - /* GPIO34 has interrupt 225 on the PM8058 */ /* Trig on both edges - getting close or far away */ - interrupts-extended = <&pm8058 225 IRQ_TYPE_EDGE_BOTH>; + interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>; /* MPP05 analog input to the XOADC */ io-channels = <&xoadc 0x00 0x05>; io-channel-names = "aout"; @@ -515,9 +514,8 @@ ak8975@c { compatible = "asahi-kasei,ak8975"; reg = <0x0c>; - /* FIXME: GPIO33 has interrupt 224 on the PM8058 */ - interrupt-parent = <&pm8058>; - interrupts = <224 IRQ_TYPE_EDGE_RISING>; + interrupt-parent = <&pm8058_gpio>; + interrupts = <33 IRQ_TYPE_EDGE_RISING>; pinctrl-names = "default"; pinctrl-0 = <&dragon_ak8975_gpios>; vid-supply = <&pm8058_lvs0>; // 1.8V @@ -526,9 +524,8 @@ bmp085@77 { compatible = "bosch,bmp085"; reg = <0x77>; - /* FIXME: GPIO16 has interrupt 207 on the PM8058 */ - interrupt-parent = <&pm8058>; - interrupts = <207 IRQ_TYPE_EDGE_RISING>; + interrupt-parent = <&pm8058_gpio>; + interrupts = <16 IRQ_TYPE_EDGE_RISING>; reset-gpios = <&tlmm 86 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&dragon_bmp085_gpios>; @@ -539,12 +536,11 @@ compatible = "invensense,mpu3050"; reg = <0x68>; /* - * GPIO17 has interrupt 208 on the - * PM8058, it is pulled high by a 10k + * GPIO17 is pulled high by a 10k * resistor to VLOGIC so needs to be * active low/falling edge. */ - interrupts-extended = <&pm8058 208 IRQ_TYPE_EDGE_FALLING>; + interrupts-extended = <&pm8058_gpio 17 IRQ_TYPE_EDGE_FALLING>; pinctrl-names = "default"; pinctrl-0 = <&dragon_mpu3050_gpios>; vlogic-supply = <&pm8058_lvs0>; // 1.8V @@ -589,11 +585,10 @@ compatible = "smsc,lan9221", "smsc,lan9115"; reg = <2 0x0 0x100>; /* - * GPIO7 has interrupt 198 on the PM8058 * The second interrupt is the PME interrupt * for network wakeup, connected to the TLMM. */ - interrupts-extended = <&pm8058 198 IRQ_TYPE_EDGE_FALLING>, + interrupts-extended = <&pm8058_gpio 7 IRQ_TYPE_EDGE_FALLING>, <&tlmm 29 IRQ_TYPE_EDGE_RISING>; reset-gpios = <&tlmm 30 GPIO_ACTIVE_LOW>; vdd33a-supply = <&dragon_veth>;