From patchwork Mon Oct 31 18:24:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 620481 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 2B458FA3741 for ; Mon, 31 Oct 2022 18:25:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229781AbiJaSZH (ORCPT ); Mon, 31 Oct 2022 14:25:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229476AbiJaSZH (ORCPT ); Mon, 31 Oct 2022 14:25:07 -0400 Received: from mail.z3ntu.xyz (mail.z3ntu.xyz [128.199.32.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E54F4D80; Mon, 31 Oct 2022 11:25:05 -0700 (PDT) Received: from g550jk.arnhem.chello.nl (31-151-115-246.dynamic.upc.nl [31.151.115.246]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id 2BA7CD03F1; Mon, 31 Oct 2022 18:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=z3ntu.xyz; s=z3ntu; t=1667240704; bh=7iBgek2JhQmhnFtXHoGRmTx0yH0Ccd14S9GW/5t6pqA=; h=From:To:Cc:Subject:Date; b=h7dN2NmmyBT7y2iKa4vKczh+OqKqzBYxukUc4OiQJiWi4rjECNgRpuJAcKgEkLWOD Se47FJJP5crCFoSPZf54v0Xt/EsF+ksYGXU2FzZ7TCsLBA78jELvmuFOW18ZIkyCIj JeWzQx8jByRKd5zACLqDNcXxkeyzRQSri+kyYNsY= From: Luca Weiss To: linux-arm-msm@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, afd@ti.com, Luca Weiss , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] dt-bindings: iio/adc: qcom,spmi-iadc: use double compatibles Date: Mon, 31 Oct 2022 19:24:54 +0100 Message-Id: <20221031182456.952648-1-luca@z3ntu.xyz> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As in other bindings, let's use specific compatibles together with the fallback compatible. Adjust the bindings for it. Signed-off-by: Luca Weiss Acked-by: Rob Herring Reviewed-by: Krzysztof Kozlowski Acked-by: Jonathan Cameron --- Changes in v2: * New patch .../devicetree/bindings/iio/adc/qcom,spmi-iadc.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.yaml b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.yaml index 2a94db688830..fa855baa368c 100644 --- a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.yaml +++ b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.yaml @@ -18,7 +18,10 @@ description: | properties: compatible: - const: qcom,spmi-iadc + items: + - enum: + - qcom,pm8941-iadc + - const: qcom,spmi-iadc reg: description: IADC base address and length in the SPMI PMIC register map @@ -50,7 +53,7 @@ examples: #address-cells = <1>; #size-cells = <0>; pmic_iadc: adc@3600 { - compatible = "qcom,spmi-iadc"; + compatible = "qcom,pm8941-iadc", "qcom,spmi-iadc"; reg = <0x3600>; interrupts = <0x0 0x36 0x0 IRQ_TYPE_EDGE_RISING>; qcom,external-resistor-micro-ohms = <10000>; From patchwork Mon Oct 31 18:10:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 620482 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 C28A3FA3743 for ; Mon, 31 Oct 2022 18:10:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229565AbiJaSKg (ORCPT ); Mon, 31 Oct 2022 14:10:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229469AbiJaSKg (ORCPT ); Mon, 31 Oct 2022 14:10:36 -0400 Received: from mail.z3ntu.xyz (mail.z3ntu.xyz [128.199.32.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FC59100E; Mon, 31 Oct 2022 11:10:33 -0700 (PDT) Received: from g550jk.arnhem.chello.nl (31-151-115-246.dynamic.upc.nl [31.151.115.246]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id 1B387D03F1; Mon, 31 Oct 2022 18:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=z3ntu.xyz; s=z3ntu; t=1667239832; bh=03cs4/GWsyd+zjE3smFFK0Esd6yU/N6x5URAFrq3wvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jxb/3OdvVt08kmnwvFljeu24VvqY+2DSRdzzVQ2SxLOtTeA1gR941UQzO+9K7RrxL CDwSrosLe8DWgoRZvcMlLPLhAt8ngoXJV+TFpBGRs3ysckQJjeQZXy6EwZ5HnmC/qO wH8MNrq371XiaApjahIBXERXqBZZWLQvA18tyJOk= From: Luca Weiss To: linux-arm-msm@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, afd@ti.com, Luca Weiss , Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] ARM: dts: qcom: pm8941: fix vadc channel node names Date: Mon, 31 Oct 2022 19:10:22 +0100 Message-Id: <20221031181022.947412-2-luca@z3ntu.xyz> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221031181022.947412-1-luca@z3ntu.xyz> References: <20221031181022.947412-1-luca@z3ntu.xyz> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The spmi-vadc bindings require the '@' in the node. Additionally change the node name to adc-chan which both makes it a generic node name and also removes the underscore from it. At the same time sort the nodes by reg value. Reviewed-by: Konrad Dybcio Signed-off-by: Luca Weiss --- Changes in v2: * Make commit message more accurate * Make number actually hex in node address (made it decimal before) arch/arm/boot/dts/qcom-pm8941.dtsi | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi index 863e598591b7..a9e83836bf86 100644 --- a/arch/arm/boot/dts/qcom-pm8941.dtsi +++ b/arch/arm/boot/dts/qcom-pm8941.dtsi @@ -101,26 +101,33 @@ pm8941_vadc: adc@3100 { #size-cells = <0>; #io-channel-cells = <1>; - bat_temp { - reg = ; + + adc-chan@6 { + reg = ; }; - die_temp { + + adc-chan@8 { reg = ; }; - ref_625mv { + + adc-chan@9 { reg = ; }; - ref_1250v { + + adc-chan@a { reg = ; }; - ref_gnd { + + adc-chan@e { reg = ; }; - ref_vdd { + + adc-chan@f { reg = ; }; - vbat_sns { - reg = ; + + adc-chan@30 { + reg = ; }; };