From patchwork Tue Jun 27 01:24:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 697003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 120D8EB64D7 for ; Tue, 27 Jun 2023 01:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230145AbjF0BYj (ORCPT ); Mon, 26 Jun 2023 21:24:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230154AbjF0BYf (ORCPT ); Mon, 26 Jun 2023 21:24:35 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A97919AA for ; Mon, 26 Jun 2023 18:24:33 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4fa48b5dc2eso3566962e87.1 for ; Mon, 26 Jun 2023 18:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687829071; x=1690421071; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sy2e1ggp1vHbOn3G0Qk99CIMEAjoXXFsnUrXNs8mD+8=; b=zBeH0ZYPbfRI5bHbX3BO7o7i0/pPu1srICUf0FyMfLaNfxuDgLBDNWlSyKi6OPulYn xbiyFxVcWT6CMQG5XPtZ3uzYrDFvIGKQmlf1EEVZlpgO6J44ASAZDAR25ozIKbrRUc09 YIV4UZsEwqdiZV31Q7rTez2bST6QfIgLzsYBVA66vaXpRTLeSTg5nYBXJd/GuI20Zyaw lnpBM94E4nafUoUzygQvgSl7vuGe1SFtb3sANq3+ReW4aShQlNwYsaDqrGaFnJkZcCz1 d4JbVrpx1KeKmTvADDzjvGt3Ib8lygKJrM5565YZrMYCFmxMhCLlV/5qbTwoBJACU85R 1X8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687829071; x=1690421071; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sy2e1ggp1vHbOn3G0Qk99CIMEAjoXXFsnUrXNs8mD+8=; b=J0/TDAl9NHPZbyD4YkIYZCUxoPOed8AUI47g0JLVZjb/TngLp3e7wZHtB5O8VVffFF y2OBoWi6cppIuYhBUIH7tPxSwLhG8QZmFap8z+lf3vCJALURnqDp+g+x4wiTDwpkAaJT eiLbTDkvVZdaYgqhHKGme98SirDehYoD7cQePq0WSfBuQuL4dW7/B6O7DJmxg0z3w1dy gmal7Xyo+2EvURw1wYpntJG9E6EfgxuHcWHsnpZ59oMKLO5AafkU2v2chzJbBhlhtPOq sSgQSItzROS+bArE9WbPyPwwKwFoEG71/Z334BeJabJLvPQzB36DW9QzgfHkKapM2Hcx /ODA== X-Gm-Message-State: AC+VfDyvP06sz/qwM9Z9pCwiRsALj3Yife9PxoP1GIKDSaio2eGZCLey 1VBIV/lgxlP7C7t+2tU1bEOr3w== X-Google-Smtp-Source: ACHHUZ5V4FRuOW3NMByAQ10+lg1Z+49mK666VOjskcclat9IyWf7msdAcH7z5xcDqbMZzV3UpsHeWw== X-Received: by 2002:a05:6512:31cd:b0:4fb:61ea:95dc with SMTP id j13-20020a05651231cd00b004fb61ea95dcmr3533051lfe.7.1687829071520; Mon, 26 Jun 2023 18:24:31 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id z7-20020ac24187000000b004cc9042c9cfsm1331301lfh.158.2023.06.26.18.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 18:24:31 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 10/15] ARM: dts: qcom: msm8960: split PMIC to separate dtsi files Date: Tue, 27 Jun 2023 04:24:17 +0300 Message-Id: <20230627012422.206077-11-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627012422.206077-1-dmitry.baryshkov@linaro.org> References: <20230627012422.206077-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The PMIC is not a part of the SoC, so move PMIC to a separate file and include it from the board files. Suggested-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/pm8921.dtsi | 11 ++++++ arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 1 + .../qcom/qcom-msm8960-samsung-expressatt.dts | 3 +- arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 38 +------------------ 4 files changed, 16 insertions(+), 37 deletions(-) diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi index 63e95b56dcf1..06fa32c444fa 100644 --- a/arch/arm/boot/dts/qcom/pm8921.dtsi +++ b/arch/arm/boot/dts/qcom/pm8921.dtsi @@ -37,6 +37,17 @@ rtc@11d { allow-set-time; }; + pm8921_keypad: keypad@148 { + compatible = "qcom,pm8921-keypad"; + reg = <0x148>; + interrupt-parent = <&pm8921>; + interrupts = <74 IRQ_TYPE_EDGE_RISING>, + <75 IRQ_TYPE_EDGE_RISING>; + debounce = <15>; + scan-delay = <32>; + row-hold = <91500>; + }; + pm8921_gpio: gpio@150 { compatible = "qcom,pm8921-gpio", "qcom,ssbi-gpio"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts index 4641b4f2195d..414881d34c60 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts @@ -2,6 +2,7 @@ #include #include "qcom-msm8960.dtsi" +#include "pm8921.dtsi" / { model = "Qualcomm MSM8960 CDP"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts index 13e85c287498..2e7d98e132be 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts @@ -1,8 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include "qcom-msm8960.dtsi" -#include +#include "pm8921.dtsi" / { model = "Samsung Galaxy Express SGH-I437"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi index 913bc6afd0a1..8157236f249d 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi @@ -259,48 +259,14 @@ gsbi5_serial: serial@16440000 { }; }; - ssbi@500000 { + ssbi: ssbi@500000 { compatible = "qcom,ssbi"; reg = <0x500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pmicintc: pmic { - compatible = "qcom,pm8921"; + pmic { interrupt-parent = <&msmgpio>; interrupts = <104 IRQ_TYPE_LEVEL_LOW>; - #interrupt-cells = <2>; - interrupt-controller; - #address-cells = <1>; - #size-cells = <0>; - - pwrkey@1c { - compatible = "qcom,pm8921-pwrkey"; - reg = <0x1c>; - interrupt-parent = <&pmicintc>; - interrupts = <50 IRQ_TYPE_EDGE_RISING>, - <51 IRQ_TYPE_EDGE_RISING>; - debounce = <15625>; - pull-up; - }; - - pm8921_keypad: keypad@148 { - compatible = "qcom,pm8921-keypad"; - reg = <0x148>; - interrupt-parent = <&pmicintc>; - interrupts = <74 IRQ_TYPE_EDGE_RISING>, - <75 IRQ_TYPE_EDGE_RISING>; - debounce = <15>; - scan-delay = <32>; - row-hold = <91500>; - }; - - rtc@11d { - compatible = "qcom,pm8921-rtc"; - interrupt-parent = <&pmicintc>; - interrupts = <39 IRQ_TYPE_EDGE_RISING>; - reg = <0x11d>; - allow-set-time; - }; }; };