From patchwork Thu Nov 3 09:13:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9410597 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 6CAB860585 for ; Thu, 3 Nov 2016 09:13:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51F542A4C8 for ; Thu, 3 Nov 2016 09:13:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46D612A857; Thu, 3 Nov 2016 09:13:25 +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 B4B2E2A4B3 for ; Thu, 3 Nov 2016 09:13:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756818AbcKCJNX (ORCPT ); Thu, 3 Nov 2016 05:13:23 -0400 Received: from mail-lf0-f54.google.com ([209.85.215.54]:33463 "EHLO mail-lf0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756799AbcKCJNU (ORCPT ); Thu, 3 Nov 2016 05:13:20 -0400 Received: by mail-lf0-f54.google.com with SMTP id c13so32507774lfg.0 for ; Thu, 03 Nov 2016 02:13:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=RUzzIC2DHR07Q8ZZkSkQX14PAu2WB3NHW24/Zg6pPHg=; b=I0jPimevXHBgpQ0v0EJkqGNFRc9NN9cHKLeuPn8HGVF6Svraiymcr5vwXmvg4X7r25 VKJB7HJLv0/4cS3tMXFH3NdVUZ4OQXCisgzp2MsetykeB67CUkeFoAVFsst7cl7u5UUw TDmIWS3yrSfJGij8/mH3EB92xNg339gB6HQOI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RUzzIC2DHR07Q8ZZkSkQX14PAu2WB3NHW24/Zg6pPHg=; b=YYWnD2Uekma/WOABne389IdjhKiONKU2fAVsXZrb6BbgC2H6SNc+3nisYWKDYlSuML sX+nu5qlnd3lB1d8/J23uhmpW9UfaMXEFy7jiRVZJxOdxRmH8egO+JUesMjW1L3hxjX2 4Tb7t5N0VxeyLIqsN/qzazY6aVU6QpNtUfMX0vi6FSozrxayUjYi4byCDumatr79I7GL wLOsB8ySxSuSpFKCF3d22gtBxlzGZZX0B2oH9Ms5rtQzNvkzkpbAVY4mg4wBxnjHiXDX h616R1ZZZwYQKkJRoyCCOP7caP7zLIdDBR09IybbJcrK+SqdPyxILUM/GESZIfbBKIvO 6Jmg== X-Gm-Message-State: ABUngvdLABd9ociWuxmJ9D9HMgxaxABl46TJ79JIKH2u+2PMA3VSXnG77vhWXZlCBNMwMclm X-Received: by 10.25.200.197 with SMTP id y188mr4822825lff.132.1478164397985; Thu, 03 Nov 2016 02:13:17 -0700 (PDT) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id 89sm1221976lja.42.2016.11.03.02.13.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Nov 2016 02:13:17 -0700 (PDT) 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 1/3] ARM: dts: rename MSM8660/APQ8060 pmicintc to pm8058 Date: Thu, 3 Nov 2016 10:13:08 +0100 Message-Id: <1478164390-21613-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 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 The name "pmicintc" is ambiguous: there is a second power management IC named PM8901 on these systems, and it is also an interrupt controller. To make things clear, just name the node alias "pm8058", this in unambigous and has all information we need. Signed-off-by: Linus Walleij Acked-by: Bjorn Andersson --- arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 2 +- arch/arm/boot/dts/qcom-msm8660-surf.dts | 2 +- arch/arm/boot/dts/qcom-msm8660.dtsi | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts index 4b8872cc8bf9..4a532ddab53a 100644 --- a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts +++ b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts @@ -412,7 +412,7 @@ * The second interrupt is the PME interrupt * for network wakeup, connected to the TLMM. */ - interrupts-extended = <&pmicintc 198 IRQ_TYPE_EDGE_FALLING>, + interrupts-extended = <&pm8058 198 IRQ_TYPE_EDGE_FALLING>, <&tlmm 29 IRQ_TYPE_EDGE_RISING>; reset-gpios = <&tlmm 30 GPIO_ACTIVE_LOW>; vdd33a-supply = <&dragon_veth>; diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts index 23de764558ab..1adc04978a47 100644 --- a/arch/arm/boot/dts/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts @@ -48,7 +48,7 @@ }; }; -&pmicintc { +&pm8058 { keypad@148 { linux,keymap = < MATRIX_KEY(0, 0, KEY_FN_F1) diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi index 4d828f810746..91c9a62ae725 100644 --- a/arch/arm/boot/dts/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -163,7 +163,7 @@ reg = <0x500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pmicintc: pmic@0 { + pm8058: pmic@0 { compatible = "qcom,pm8058"; interrupt-parent = <&tlmm>; interrupts = <88 8>; @@ -176,7 +176,7 @@ compatible = "qcom,pm8058-gpio", "qcom,ssbi-gpio"; reg = <0x150>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8058>; interrupts = <192 IRQ_TYPE_NONE>, <193 IRQ_TYPE_NONE>, <194 IRQ_TYPE_NONE>, @@ -232,7 +232,7 @@ reg = <0x50>; gpio-controller; #gpio-cells = <2>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8058>; interrupts = <128 IRQ_TYPE_NONE>, <129 IRQ_TYPE_NONE>, @@ -251,7 +251,7 @@ pwrkey@1c { compatible = "qcom,pm8058-pwrkey"; reg = <0x1c>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8058>; interrupts = <50 1>, <51 1>; debounce = <15625>; pull-up; @@ -260,7 +260,7 @@ keypad@148 { compatible = "qcom,pm8058-keypad"; reg = <0x148>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8058>; interrupts = <74 1>, <75 1>; debounce = <15>; scan-delay = <32>; @@ -270,7 +270,7 @@ rtc@1e8 { compatible = "qcom,pm8058-rtc"; reg = <0x1e8>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8058>; interrupts = <39 1>; allow-set-time; };