From patchwork Thu Mar 30 08:05:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 96255 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp124726qgd; Thu, 30 Mar 2017 01:05:55 -0700 (PDT) X-Received: by 10.98.216.202 with SMTP id e193mr4627425pfg.80.1490861155516; Thu, 30 Mar 2017 01:05:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i21si1417220pgh.289.2017.03.30.01.05.55; Thu, 30 Mar 2017 01:05:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932864AbdC3IFy (ORCPT + 7 others); Thu, 30 Mar 2017 04:05:54 -0400 Received: from mail-lf0-f46.google.com ([209.85.215.46]:34114 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933276AbdC3IFs (ORCPT ); Thu, 30 Mar 2017 04:05:48 -0400 Received: by mail-lf0-f46.google.com with SMTP id z15so20969971lfd.1 for ; Thu, 30 Mar 2017 01:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sOEo14JnJsE3xTYUFxFRUOWER64r16ibSG1YC309tRg=; b=dkLClb6RMwNihjNrCPuav4MRywNVyMh3K9hLn9SmEMwUqALXRubhzBKMDIrWg8Yhou dgbqDraT7E0GGqNxlqHn7mue5Ezw/WLiavn3rNHCfrubi8f6uRt5wiOMv71OjWFNeA00 Gqcbtuf1EvQkburMZxYM9fZ00xinomfndzFDk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sOEo14JnJsE3xTYUFxFRUOWER64r16ibSG1YC309tRg=; b=hGJw2xkxhv2TIHuNaZoUyXOPxTUfNxO3fsbj5/gYmSifhdJLC56/INaJxXq0cVGswh wRACrYuKonRLEhr6fINTdy9YJqEtmJdx7Cjs9XgkNcZtPqQSWmmrln40pWOtPnIbAK2O X1cJkbV/UQhhEKia5lcYHrfIsmO9yTYb/n+JA0ktQOrMhEO03slLBLYQLY6vU920DSmC nFq7fC4XvBzKAyZgw2ddAWU9h4N4SGkzZl9bh5Ye318k6LKN3Hf2I3S+e91vA6ba+dpx a1CbH12Huwd+hp1pA7V/lJW0kIlfxhEeIxR26tTxEoYYaNr3D8JfscjRPY/T4iH1Z0EU 5Jbg== X-Gm-Message-State: AFeK/H3bRs8E/Xuf/6LXbVWrKYjYlqsnp75fNjlLpu3Axq97wbogLsC8djQ9Ff++swHdSf6H X-Received: by 10.25.20.202 with SMTP id 71mr1529637lfu.102.1490861146285; Thu, 30 Mar 2017 01:05:46 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id e91sm240004lji.40.2017.03.30.01.05.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 01:05:44 -0700 (PDT) From: Linus Walleij To: Jonathan Cameron , linux-iio@vger.kernel.org, Rob Herring Cc: Linus Walleij , devicetree@vger.kernel.org Subject: [PATCH 1/5 v3] iio: xoadc: augment DT bindings a bit Date: Thu, 30 Mar 2017 10:05:41 +0200 Message-Id: <20170330080541.4065-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org In order to accommodate in a logical manner for the premuxed channels in PM8921 and the similarly addressed channels in later PMICs, we need a twocell arrangement with premux and analog mux setting as a tuple to uniquely identify a hardware channel. These bindings are not yet in use, so it should be fine to augment them before we actually start using it in drivers and device trees. This scheme came out of lengthy discussions and reverse-engineering and reading of the few information sources we have. Cc: devicetree@vger.kernel.org Cc: Rob Herring Suggested-by: Björn Andersson Signed-off-by: Linus Walleij --- ChangeLog v2->v3: - Drop leading zeroes on unit addresses. ChangeLog v1->v2: - Name nodes with <01 02> in a foo@0102 pattern. - Minor spelling nits. - Delete flimsy leftover docs from an interrim development path. --- .../bindings/iio/adc/qcom,pm8xxx-xoadc.txt | 76 ++++++++++++---------- 1 file changed, 42 insertions(+), 34 deletions(-) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Rob Herring diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt b/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt index 53cd146d8096..69c404112df1 100644 --- a/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt +++ b/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt @@ -19,32 +19,42 @@ Required properties: with PMIC variant but is typically something like 2.2 or 1.8V. The following required properties are standard for IO channels, see -iio-bindings.txt for more details: +iio-bindings.txt for more details, but noitice that this particular +ADC has a special adressing scheme that require two cells for +identifying each ADC channel: -- #address-cells: should be set to <1> +- #address-cells: should be set to <2>, the first cell is the + prescaler (on PM8058) or premux (on PM8921) with two valid bits + so legal values are 0x00, 0x01 or 0x02. The second cell + is the main analog mux setting (0x00..0x0f). The combination + of prescaler/premux and analog mux uniquely addresses a hardware + channel on all systems. - #size-cells: should be set to <0> -- #io-channel-cells: should be set to <1> +- #io-channel-cells: should be set to <2>, again the cells are + precaler or premux followed by the analog muxing line. - interrupts: should refer to the parent PMIC interrupt controller and reference the proper ADC interrupt. Required subnodes: -The ADC channels are configured as subnodes of the ADC. Since some of -them are used for calibrating the ADC, these nodes are compulsory: +The ADC channels are configured as subnodes of the ADC. + +Since some of them are used for calibrating the ADC, these nodes are +compulsory: adc-channel@c { - reg = <0x0c>; + reg = <0x00 0x0c>; }; adc-channel@d { - reg = <0x0d>; + reg = <0x00 0x0d>; }; adc-channel@f { - reg = <0x0f>; + reg = <0x00 0x0f>; }; These three nodes are used for absolute and ratiometric calibration @@ -52,13 +62,13 @@ and only need to have these reg values: they are by hardware definition 1:1 ratio converters that sample 625, 1250 and 0 milliV and create an interpolation calibration for all other ADCs. -Optional subnodes: any channels other than channel 0x0c, 0x0d and -0x0f are optional. +Optional subnodes: any channels other than channels [0x00 0x0c], +[0x00 0x0d] and [0x00 0x0f] are optional. Required channel node properties: - reg: should contain the hardware channel number in the range - 0 .. 0x0f (4 bits). The hardware only supports 16 channels. + 0 .. 0xff (8 bits). Optional channel node properties: @@ -94,56 +104,54 @@ Example: xoadc: xoadc@197 { compatible = "qcom,pm8058-adc"; reg = <0x197>; - interrupt-parent = <&pm8058>; - interrupts = <76 1>; - #address-cells = <1>; + interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>; + #address-cells = <2>; #size-cells = <0>; - #io-channel-cells = <1>; + #io-channel-cells = <2>; vcoin: adc-channel@0 { - reg = <0x00>; + reg = <0x00 0x00>; }; vbat: adc-channel@1 { - reg = <0x01>; + reg = <0x00 0x01>; }; dcin: adc-channel@2 { - reg = <0x02>; + reg = <0x00 0x02>; }; ichg: adc-channel@3 { - reg = <0x03>; + reg = <0x00 0x03>; }; vph_pwr: adc-channel@4 { - reg = <0x04>; + reg = <0x00 0x04>; }; usb_vbus: adc-channel@a { - reg = <0x0a>; + reg = <0x00 0x0a>; }; die_temp: adc-channel@b { - reg = <0x0b>; + reg = <0x00 0x0b>; }; ref_625mv: adc-channel@c { - reg = <0x0c>; + reg = <0x00 0x0c>; }; ref_1250mv: adc-channel@d { - reg = <0x0d>; + reg = <0x00 0x0d>; }; ref_325mv: adc-channel@e { - reg = <0x0e>; + reg = <0x00 0x0e>; }; ref_muxoff: adc-channel@f { - reg = <0x0f>; + reg = <0x00 0x0f>; }; }; - /* IIO client node */ iio-hwmon { compatible = "iio-hwmon"; - io-channels = <&xoadc 0x01>, /* Battery */ - <&xoadc 0x02>, /* DC in (charger) */ - <&xoadc 0x04>, /* VPH the main system voltage */ - <&xoadc 0x0b>, /* Die temperature */ - <&xoadc 0x0c>, /* Reference voltage 1.25V */ - <&xoadc 0x0d>, /* Reference voltage 0.625V */ - <&xoadc 0x0e>; /* Reference voltage 0.325V */ + 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 */ };