From patchwork Thu Sep 28 11:02:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 727212 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 BEAC9EED612 for ; Thu, 28 Sep 2023 11:03:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231843AbjI1LD1 (ORCPT ); Thu, 28 Sep 2023 07:03:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231869AbjI1LDW (ORCPT ); Thu, 28 Sep 2023 07:03:22 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6BF71A5 for ; Thu, 28 Sep 2023 04:03:19 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-50444e756deso16706545e87.0 for ; Thu, 28 Sep 2023 04:03:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695898998; x=1696503798; darn=vger.kernel.org; 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=9TSiCQU8z8gMyHopnKHftqR+4tVxRcnW4JwBU1qA13I=; b=i9zwaxGbXM5Yn/uQuK2TeE/xE8TGrj06wi/BjDyVIM5lx+XmIhg5/gpKL7ucxXQ0p7 1JdzdC0gK9TVkHsKFt1OhKHsPcSE/sK7flhf3WacJ6jCmO6+fhjcPAl6TvPpGMC+xkUN Pler6g3Jv93U5yK2q9lBGTzQVHdEHeOW4sFzdVhoJVRqwKhSjX9y1x0eO8P9TNOvgktf 99pTqmZeZNCnzYxDjgPvIWgHX+GsFUqawXuwtbs6mlQMksGOwsfwgcWsRq650c/YSkiK zK1J/gAQI6pKzwfh9WWNf35HNxQ940YCg8DzYMr7eaqEcNIuX2EsA1jBgJl67ZxSYj9I R7Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695898998; x=1696503798; 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=9TSiCQU8z8gMyHopnKHftqR+4tVxRcnW4JwBU1qA13I=; b=v/ELM9sKwhgsvPZkV5vq+h/gtGA4JnNSpezL43+AysTWMZsLj5QJ3OVkcvFd+QzKek DbTJOGhaK3x4LtPeeHhgWHEnysECsR2btvotJSRpGCH+C8iiNmJF+e9ZywT+qfa5pN22 MriB5udBSyE19xykekDBmt62lK96qRYugx5phm9lS1Zu+FuXwXV1B9iRloY38T+F0Hkh 9qskRRFGIVlaWJIFTwiAj1Iv8aNRPfhBTvrlejY6eEXnTPkbxB6DUmZbsEPRUhSfVxG+ vbkwHHkoIjaG9DAyfkn7yam1Nuh+wVYN/u+1HsEP4IArGfsHFWQa/CUJjTxblms7XmRb sIaA== X-Gm-Message-State: AOJu0YzLFy12fVug6QuVz/lvpQYT/KBjoN9eIHEhswnEBEuaNLz/zbYy h1lbswQfdW5Zjav9wlhJplCofw== X-Google-Smtp-Source: AGHT+IEgG+OOOLxBm17dg0OkbanZKUatP89MDcpO0Dl04sXqOP/c6kUvs0qQnoZCrLUCSAf2vDfFVw== X-Received: by 2002:a05:6512:158d:b0:4fd:d92e:31ca with SMTP id bp13-20020a056512158d00b004fdd92e31camr1039651lfb.36.1695898998139; Thu, 28 Sep 2023 04:03:18 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u2-20020a056512040200b005030a35019dsm3052953lfk.178.2023.09.28.04.03.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 04:03:17 -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, linux-input@vger.kernel.org Subject: [PATCH v6 09/36] ARM: dts: qcom: mdm9615: fix PMIC node labels Date: Thu, 28 Sep 2023 14:02:42 +0300 Message-Id: <20230928110309.1212221-10-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230928110309.1212221-1-dmitry.baryshkov@linaro.org> References: <20230928110309.1212221-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change PM8018 node labels to start with pm8018_ prefix, following other Qualcomm PMIC device nodes. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 2 +- arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi index 92c8003dac25..dac3aa793f71 100644 --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi @@ -76,7 +76,7 @@ reset-out-pins { }; }; -&pmicgpio { +&pm8018_gpio { usb_vbus_5v_pins: usb-vbus-5v-state { pins = "gpio4"; function = "normal"; diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi index fc4f52f9e9f7..c4cfbdbcdf14 100644 --- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi @@ -263,7 +263,7 @@ qcom,ssbi@500000 { reg = <0x500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pmicintc: pmic { + pm8018: pmic { compatible = "qcom,pm8018", "qcom,pm8921"; interrupts = ; #interrupt-cells = <2>; @@ -274,38 +274,38 @@ pmicintc: pmic { pwrkey@1c { compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey"; reg = <0x1c>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8018>; interrupts = <50 IRQ_TYPE_EDGE_RISING>, <51 IRQ_TYPE_EDGE_RISING>; debounce = <15625>; pull-up; }; - pmicmpp: mpps@50 { + pm8018_mpps: mpps@50 { compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp"; interrupt-controller; #interrupt-cells = <2>; reg = <0x50>; gpio-controller; #gpio-cells = <2>; - gpio-ranges = <&pmicmpp 0 0 6>; + gpio-ranges = <&pm8018_mpps 0 0 6>; }; rtc@11d { compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc"; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8018>; interrupts = <39 IRQ_TYPE_EDGE_RISING>; reg = <0x11d>; allow-set-time; }; - pmicgpio: gpio@150 { + pm8018_gpio: gpio@150 { compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio"; reg = <0x150>; interrupt-controller; #interrupt-cells = <2>; gpio-controller; - gpio-ranges = <&pmicgpio 0 0 6>; + gpio-ranges = <&pm8018_gpio 0 0 6>; #gpio-cells = <2>; }; };