From patchwork Tue Dec 13 00:55:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Chanudet X-Patchwork-Id: 13071622 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 C40E5C4332F for ; Tue, 13 Dec 2022 00:58:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233718AbiLMA6H (ORCPT ); Mon, 12 Dec 2022 19:58:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233250AbiLMA6F (ORCPT ); Mon, 12 Dec 2022 19:58:05 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB297FCEB for ; Mon, 12 Dec 2022 16:57:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670893026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LmjUSyg67D39D4GXwHdsjU8ybX4fVmhyxG/436wX9C0=; b=EY00KgQ3lWMlNVbKfaEVQoJNkta+TIOvCVLSOPl5RR5utbgYsgLCLCRlUnPozGUe4LfZcL YJIQ0sGpLtU/+GOHt+G717ZOFZItGEPQEAnSeBYIJCjgJmf9qY5zGnXxrdsnk4J+CEWJ+8 zDyfVukr7vhml8CGcBvKJTl5ixizcKY= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-15-Tc11qnRoNM-55hnpY4ml0w-1; Mon, 12 Dec 2022 19:57:04 -0500 X-MC-Unique: Tc11qnRoNM-55hnpY4ml0w-1 Received: by mail-qv1-f69.google.com with SMTP id s9-20020a0cf789000000b004d544bd8258so9088986qvn.16 for ; Mon, 12 Dec 2022 16:57:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=LmjUSyg67D39D4GXwHdsjU8ybX4fVmhyxG/436wX9C0=; b=Mmf1SwiLBYZ0sLgjLJyl7VuIsC0iyyg/+N5DtXob+S9CUcUs+CoRebEecCsc/ja4Li zzuj6O+YaS/H9aoaYx0XM9qDrJyu/OEUXwESuMe+SuUrNCNnVe9I30JL5KWz4+drf6CT AfIM4tAd5T7iTGBoPx56fdcrkgqyT9GG1PgBExDPJQ4hJbK1G/gniIBkeHZQW2mFAsZa 0fSCZ8hJ7T+4EHuMulCJXGlpbNOVb38xuXhn19TdxLJYoggcJrjkwnkmufXexZ2Fnt9A eTihWu6sKKzOvU/87s8oZ1Op/9oNnm+jptc31M6O3OokswPmib5Gw+L9oZghnAST1m+Q EDxQ== X-Gm-Message-State: ANoB5plSSUC0ac5MeQOCFBJXGK1XGmx/W3ZOlY/KGwJm3yudiEoI6zaf zijTJq3xCDJvlQ+bVBV0n+SvKapfBs8IFeFR8V83q/aaH4z+Atnt3hlOjIkZbqxRKEnNPAytzf/ V6sPzjlsT2NRxF62fk74u2eyTCA== X-Received: by 2002:ac8:774b:0:b0:3a6:8f7c:5936 with SMTP id g11-20020ac8774b000000b003a68f7c5936mr1754135qtu.25.1670893024249; Mon, 12 Dec 2022 16:57:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf674cJF6yhclcLs4EvITmWpHOXQVs9weEWZ55ytja8rJmZ3rdmQO2pxz9sI7RA8elgBIz1d6A== X-Received: by 2002:ac8:774b:0:b0:3a6:8f7c:5936 with SMTP id g11-20020ac8774b000000b003a68f7c5936mr1754116qtu.25.1670893024030; Mon, 12 Dec 2022 16:57:04 -0800 (PST) Received: from localhost (pool-96-230-116-121.bstnma.fios.verizon.net. [96.230.116.121]) by smtp.gmail.com with ESMTPSA id m11-20020a05620a290b00b006fc6529abaesm6829570qkp.101.2022.12.12.16.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 16:57:03 -0800 (PST) From: Eric Chanudet To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Halaney , Brian Masney , Eric Chanudet Subject: [PATCH 2/2] arm64: dts: qcom: sa8295p-adp: use pm8450a dtsi Date: Mon, 12 Dec 2022 19:55:39 -0500 Message-Id: <20221213005539.1133443-2-echanude@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221213005539.1133443-1-echanude@redhat.com> References: <20221213005539.1133443-1-echanude@redhat.com> MIME-Version: 1.0 Content-type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Include the dtsi to use a single pmic descriptions. Both sa8295p-adp and sa8540p-adp have the same spmi pmic apparently. Signed-off-by: Eric Chanudet --- arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 79 +----------------------- 1 file changed, 1 insertion(+), 78 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts index 84cb6f3eeb56..889259df3287 100644 --- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts @@ -11,6 +11,7 @@ #include #include "sa8540p.dtsi" +#include "pm8450a.dtsi" / { model = "Qualcomm SA8295P ADP"; @@ -260,84 +261,6 @@ &remoteproc_nsp1 { status = "okay"; }; -&spmi_bus { - pm8450a: pmic@0 { - compatible = "qcom,pm8150", "qcom,spmi-pmic"; - reg = <0x0 SPMI_USID>; - #address-cells = <1>; - #size-cells = <0>; - - rtc@6000 { - compatible = "qcom,pm8941-rtc"; - reg = <0x6000>; - reg-names = "rtc", "alarm"; - interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>; - wakeup-source; - }; - - pm8450a_gpios: gpio@c000 { - compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio"; - reg = <0xc000>; - gpio-controller; - gpio-ranges = <&pm8450a_gpios 0 0 10>; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - }; - - pm8450c: pmic@4 { - compatible = "qcom,pm8150", "qcom,spmi-pmic"; - reg = <0x4 SPMI_USID>; - #address-cells = <1>; - #size-cells = <0>; - - pm8450c_gpios: gpio@c000 { - compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio"; - reg = <0xc000>; - gpio-controller; - gpio-ranges = <&pm8450c_gpios 0 0 10>; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - }; - - pm8450e: pmic@8 { - compatible = "qcom,pm8150", "qcom,spmi-pmic"; - reg = <0x8 SPMI_USID>; - #address-cells = <1>; - #size-cells = <0>; - - pm8450e_gpios: gpio@c000 { - compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio"; - reg = <0xc000>; - gpio-controller; - gpio-ranges = <&pm8450e_gpios 0 0 10>; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - }; - - pm8450g: pmic@c { - compatible = "qcom,pm8150", "qcom,spmi-pmic"; - reg = <0xc SPMI_USID>; - #address-cells = <1>; - #size-cells = <0>; - - pm8450g_gpios: gpio@c000 { - compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio"; - reg = <0xc000>; - gpio-controller; - gpio-ranges = <&pm8450g_gpios 0 0 10>; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - }; -}; - &ufs_mem_hc { reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;