From patchwork Sat Mar 18 13:33:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 95445 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp209980qgd; Sat, 18 Mar 2017 06:42:10 -0700 (PDT) X-Received: by 10.98.102.11 with SMTP id a11mr22480772pfc.227.1489844530335; Sat, 18 Mar 2017 06:42:10 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i23si11706312pll.33.2017.03.18.06.42.10; Sat, 18 Mar 2017 06:42:10 -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 S1750907AbdCRNmI (ORCPT + 7 others); Sat, 18 Mar 2017 09:42:08 -0400 Received: from mail-lf0-f47.google.com ([209.85.215.47]:33792 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751337AbdCRNmE (ORCPT ); Sat, 18 Mar 2017 09:42:04 -0400 Received: by mail-lf0-f47.google.com with SMTP id z15so42097967lfd.1 for ; Sat, 18 Mar 2017 06:41:01 -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=q8cSJsbDiOugSwmHHXoS2v8QkonnIGBgmdkkVQiEAgk=; b=gSwSppGKLoCTAf6mYTTbFoTZzy2eZTJLxXfMV2EhywYY+fGg10pkoFZeml8qKEmxem JnfkZ6GsLhknkhvqhTdS9+85Z896vxwoM5ULJR/8qr2hFsEJyvTHMlMymHOcG2UHZZhi 9bSbyjUzjgBQj+kSUYYwo+cI5BzT/06XJjQPA= 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=q8cSJsbDiOugSwmHHXoS2v8QkonnIGBgmdkkVQiEAgk=; b=j8Vv/LokKcrvmUTzsnTkOJw35tjuZj/l1q1kcNPMOn9PjHs0ve0wvGQdEXMQ0euFGU VPJPR7PCeDdlxj5xyOgH5EmmEIDLJivob/D/ppe/opM8UoZrzzW9OMJzWnzvB+zrExec RbmNSvcq8D9wqHE2PlUrR9hU6wF6I02KoQ/9wISP60XRRaU9pL4u0DYZqIectbP3/fO1 f5hADESg5R7EcT3f+r12yZmEMoqDVbiXiG/hayeAakq5XWH6OeqlVXwISmafs10TBcAN 8Rm9n281VndGTIAjqvaSAHjixpHtv5RJS1+YTICedd3QxovXyZUcrIfY+6GMIRGcPRpb l5Zg== X-Gm-Message-State: AFeK/H2royWUr8uaB9SrxA8U2W3DU4yt6QY7/LKF+i3mcKySN0BqUGgf7gw/ZJXR3ladju8X X-Received: by 10.46.69.87 with SMTP id s84mr6652053lja.69.1489844046264; Sat, 18 Mar 2017 06:34:06 -0700 (PDT) Received: from localhost.localdomain (c-357171d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.113.53]) by smtp.gmail.com with ESMTPSA id p27sm2045900lfg.5.2017.03.18.06.34.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Mar 2017 06:34:04 -0700 (PDT) From: Linus Walleij To: Jonathan Cameron , linux-iio@vger.kernel.org, Bjorn Andersson , devicetree@vger.kernel.org Cc: Linus Walleij Subject: [PATCH 1/5] iio: xoadc: augment DT bindings a bit Date: Sat, 18 Mar 2017 14:33:58 +0100 Message-Id: <20170318133358.22314-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 find 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. Suggested-by: Björn Andersson Signed-off-by: Linus Walleij --- .../bindings/iio/adc/qcom,pm8xxx-xoadc.txt | 117 ++++++++++++--------- 1 file changed, 69 insertions(+), 48 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 diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt b/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt index 53cd146d8096..680bb7a29dd5 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. -adc-channel@c { - reg = <0x0c>; +Since some of them are used for calibrating the ADC, these nodes are +compulsory: + +adc-channel@0c { + reg = <0x00 0x0c>; }; -adc-channel@d { - reg = <0x0d>; +adc-channel@0d { + reg = <0x00 0x0d>; }; -adc-channel@f { - reg = <0x0f>; +adc-channel@0f { + reg = <0x00 0x0f>; }; These three nodes are used for absolute and ratiometric calibration @@ -52,13 +62,26 @@ 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). + + On PM8058 the hardware only supports 16 channels, but we get the same + channels repeating with its input divided down by 1 or 3. Channels 00, + 10, 20, ... f0 are the raw values, 04, 14, 24 .. f4 are "unity" channels + divided by 1, and 08, 18, 28 .. f8 are channels divided by 3. Bits 0 + and 1 of the channel index should always be 0. + + On PM8921 the hardware supports more than 16 channels through a complex + routing matrix using a premux, so 00, 10, 20 .. f0 are the basic raw + channels while another set of channels appear for 04, 14, 24 .. f4, + and again some of the same channels appear again divided down by 3 + in 08, 18, 28 .. f8. Again bits 0 and 1 of the channel index should + always be 0. Optional channel node properties: @@ -94,56 +117,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>; + vcoin: adc-channel@00 { + reg = <0x00 0x00>; }; - vbat: adc-channel@1 { - reg = <0x01>; + vbat: adc-channel@01 { + reg = <0x00 0x01>; }; - dcin: adc-channel@2 { - reg = <0x02>; + dcin: adc-channel@02 { + reg = <0x00 0x02>; }; - ichg: adc-channel@3 { - reg = <0x03>; + ichg: adc-channel@30 { + reg = <0x00 0x03>; }; - vph_pwr: adc-channel@4 { - reg = <0x04>; + vph_pwr: adc-channel@04 { + reg = <0x00 0x04>; }; - usb_vbus: adc-channel@a { - reg = <0x0a>; + usb_vbus: adc-channel@0a { + reg = <0x00 0x0a>; }; - die_temp: adc-channel@b { - reg = <0x0b>; + die_temp: adc-channel@0b { + reg = <0x00 0x0b>; }; - ref_625mv: adc-channel@c { - reg = <0x0c>; + ref_625mv: adc-channel@0c { + reg = <0x00 0x0c>; }; - ref_1250mv: adc-channel@d { - reg = <0x0d>; + ref_1250mv: adc-channel@0d { + reg = <0x00 0x0d>; }; - ref_325mv: adc-channel@e { - reg = <0x0e>; + ref_325mv: adc-channel@0e { + reg = <0x00 0x0e>; }; - ref_muxoff: adc-channel@f { - reg = <0x0f>; + ref_muxoff: adc-channel@0f { + 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 */ };