On 18/03/17 13:33, Linus Walleij wrote:
> 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 <bjorn.andersson@xxxxxxxxxx>
> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
Hmm.. It kind of feels like the relationships between the different mux
inputs could be nicely described explicitly rather than via describing the
magic mux settings...
But fair enough if not, I guess this isn't that much of a stretch on the
current binding.
A typo inline.
Jonathan
> ---
> .../bindings/iio/adc/qcom,pm8xxx-xoadc.txt | 117 ++++++++++++---------
> 1 file changed, 69 insertions(+), 48 deletions(-)
>
> 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
noitice -> notice (or perhaps note would be better)
> +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>;
What has the above got to do with this patch?
> + #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 */
> };
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
