From patchwork Thu Sep 28 11:02:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 727210 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 37C8CE732CE for ; Thu, 28 Sep 2023 11:03:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231784AbjI1LDc (ORCPT ); Thu, 28 Sep 2023 07:03:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231877AbjI1LDW (ORCPT ); Thu, 28 Sep 2023 07:03:22 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 854A51A8 for ; Thu, 28 Sep 2023 04:03:20 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-50437c618b4so18159358e87.2 for ; Thu, 28 Sep 2023 04:03:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695898999; x=1696503799; 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=wblF4wah6BmHW/8HH3+se0OjDANdbSlRJHajeFa81aM=; b=ZiMK4l5cPFNUHurF/Rqs2Pw1ni/erQHqOf9jEPaRNcOvoy/CpOPyw5+lchom/817cP lJE3+W1rQ61NfJU6soGsp8+q0G3p5P+Pdo7GaEwBcv3puDBvoOYCxhczz8UkI5RhJ/gv q8k3NAUK+p89ot7j2h7IkKq18Bcwmz7/0hKd2yCtwuDUUQxcVYY9zDZ/VBl6dgMnz4qp OxeLLMNpXU6jP/eKTxUacAhiGRKSlT1hvRsRM33lNho0fzkV1SBHYQjV29vI75we/BBr m4mdWEZ4SbT1RlSq0OBzP5RdyTyA8aV1Y4wxvHw3u1UCcOSRc5E74lEzukVp/eANZtgQ QrdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695898999; x=1696503799; 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=wblF4wah6BmHW/8HH3+se0OjDANdbSlRJHajeFa81aM=; b=htISAAcOVlHFL6MSaYvv5d1Vw3HqlapeyMajPO23z4w3oZXPMDrJKD1I94btxwC4u0 dp1WxO3AP+WsIcBHarqpIQDlZDtUQC3jDvvwil1+/o5kaXoQJ6cMmLzaCH9YAvex6D2v yJ8nzJmnOguyiUPgD/m8pAn8p0Cb8j/qn2SjxhXrgd5ALiHZOMfKFKj83pz6DV/gprI6 JxbdL9SKoydKFPLZmq0r8Sipngaz2PrgzhcU/+OjRhlb3/3pj/UgkMc4kFiAPQaP/FkF GsUkkdrlzCvFsOayygHjZxmUJhQ4fj7/vD2JLUiIcn7/XXO8QOgUYMKaj1qY7nIzeyCA X94A== X-Gm-Message-State: AOJu0Yx4GNwsRvOx+XZKjZIZ5T4HBupmcPnQ6pI5GbLxikI8+IHAxqDY FI4z34hvYEzY9+88CSDBpz6oKQ== X-Google-Smtp-Source: AGHT+IFYEuA4BgRKtuKLrkcZOILNlxP008Q6jptnI9+Y0JAfh3d2YZh6f1vkadtUjwb7Qh0RkPQxMA== X-Received: by 2002:a05:6512:1143:b0:503:3756:9ff1 with SMTP id m3-20020a056512114300b0050337569ff1mr601308lfg.49.1695898998831; 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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 04:03:18 -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 10/36] ARM: dts: qcom: msm8660: fix PMIC node labels Date: Thu, 28 Sep 2023 14:02:43 +0300 Message-Id: <20230928110309.1212221-11-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 PM8058 node labels to start with pm8058_ prefix, following other Qualcomm PMIC device nodes. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- .../boot/dts/qcom/qcom-apq8060-dragonboard.dts | 4 ++-- arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts index db4c791b2e2f..48fd1a1feea3 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts @@ -72,7 +72,7 @@ cm3605 { /* Trig on both edges - getting close or far away */ interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>; /* MPP05 analog input to the XOADC */ - io-channels = <&xoadc 0x00 0x05>; + io-channels = <&pm8058_xoadc 0x00 0x05>; io-channel-names = "aout"; pinctrl-names = "default"; pinctrl-0 = <&dragon_cm3605_gpios>, <&dragon_cm3605_mpps>; @@ -945,7 +945,7 @@ irq-pins { }; }; -&xoadc { +&pm8058_xoadc { /* Reference voltage 2.2 V */ xoadc-ref-supply = <&pm8058_l18>; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi index 78023ed2fdf7..9217ced108c4 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi @@ -80,13 +80,13 @@ sleep-clk { */ iio-hwmon { compatible = "iio-hwmon"; - io-channels = <&xoadc 0x00 0x01>, /* Battery */ - <&xoadc 0x00 0x02>, /* DC in (charger) */ - <&xoadc 0x00 0x04>, /* VPH the main system voltage */ - <&xoadc 0x00 0x0b>, /* Die temperature */ - <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ - <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ - <&xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ + io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */ + <&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */ + <&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */ + <&pm8058_xoadc 0x00 0x0b>, /* Die temperature */ + <&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ + <&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ + <&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ }; soc: soc { @@ -390,7 +390,7 @@ pm8058_keypad: keypad@148 { row-hold = <91500>; }; - xoadc: xoadc@197 { + pm8058_xoadc: xoadc@197 { compatible = "qcom,pm8058-adc"; reg = <0x197>; interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>;