diff for duplicates of <20181103115819.1aa65a6c@archlinux> diff --git a/a/1.txt b/N1/1.txt index 5117ee9..db0d1b1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,28 +3,23 @@ Rob Herring <robh@kernel.org> wrote: > On Mon, Oct 29, 2018 at 06:39:30PM +0200, Stefan Popa wrote: > > Add support for Analog Devices AD7124 4-channels and 8-channels ADC. -> >=20 +> > > > Signed-off-by: Stefan Popa <stefan.popa@analog.com> > > --- > > Changes in v2: > > - Nothing changed. > > Changes in v3: > > - Removed the "adi,channels" property. -> > - Used the "reg" property to get the channel number and "adi,diff-chan= -nels" -> > for the differential pins. The "adi,channel-number" property was rem= -oved. +> > - Used the "reg" property to get the channel number and "adi,diff-channels" +> > for the differential pins. The "adi,channel-number" property was removed. > > - adi,bipolar is of boolean type. -> >=20 -> > .../devicetree/bindings/iio/adc/adi,ad7124.txt | 90 ++++++++++++++= -++++++++ +> > +> > .../devicetree/bindings/iio/adc/adi,ad7124.txt | 90 ++++++++++++++++++++++ > > MAINTAINERS | 1 + > > 2 files changed, 91 insertions(+) -> > create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad712= -4.txt -> >=20 -> > diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt b= -/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt +> > create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt +> > +> > diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt b/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt > > new file mode 100644 > > index 0000000..46a9b71 > > --- /dev/null @@ -41,30 +36,24 @@ oved. > > + see: Documentation/devicetree/bindings/clock/clock-bindings.txt > > + - clock-names: Must be "mclk". > > + - interrupts: IRQ line for the ADC -> > + see: Documentation/devicetree/bindings/interrupt-controller/interrup= -ts.txt +> > + see: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt > > + > > + Required properties: > > + * #address-cells: Must be 1. > > + * #size-cells: Must be 0. > > + -> > + Subnode(s) represent the external channels which are connected to t= -he ADC. -> > + Each subnode represents one channel and has the following propertie= -s: +> > + Subnode(s) represent the external channels which are connected to the ADC. +> > + Each subnode represents one channel and has the following properties: > > + Required properties: > > + * reg: The channel number. It can have up to 4 channels on ad7124-4 > > + and 8 channels on ad7124-8, numbered from 0 to 15. -> > + * adi,diff-channels: Pins the channel is connected to. The first va= -lue -> > + specifies the positive input pin, the second value the negative i= -nput pin. +> > + * adi,diff-channels: Pins the channel is connected to. The first value +> > + specifies the positive input pin, the second value the negative input pin. > > + > > + Optional properties: -> > + * adi,bipolar: Boolean, if set the channel is used in bipolar mode.= - =20 ->=20 -> Both this and Xilinx AMS which I just reviewed are defining a bipolar=20 +> > + * adi,bipolar: Boolean, if set the channel is used in bipolar mode. +> +> Both this and Xilinx AMS which I just reviewed are defining a bipolar > property. Can we come up with a common property please. Sometimes it's implicit given particular channel selects but agreed for this particular simple case, lets just put it in the generic @@ -81,71 +70,68 @@ in the top level binding. I'm not adverse to changing that (as it's not actually user visible and we don't enforce it anyway) but we should discuss that in a separate thread so as to get more eyes on it. ->=20 +> > > + * adi,reference-select: Select the reference source to use when > > + converting on the the specific channel. Valid values are: -> > + 0: REFIN1(+)/REFIN1(=E2=88=92). -> > + 1: REFIN2(+)/REFIN2(=E2=88=92). +> > + 0: REFIN1(+)/REFIN1(−). +> > + 1: REFIN2(+)/REFIN2(−). > > + 3: AVDD > > + If this field is left empty, internal reference is selected. > > + * adi,gain: Select the gain when converting on the specific channel. > > + Valid values are: 1, 2, 4, 8, 16, 32, 64, 128. > > + If this field is left empty, gain of 1 is selected. > > + * adi,odr-hz: The output data rate can be programmed from: -> > + 9 to 19200 for full power mode (when the master clock is 614.4 kH= -z) +> > + 9 to 19200 for full power mode (when the master clock is 614.4 kHz) > > + 2 to 4800 for mid power mode (when the master clock is 153.6 kHz) > > + 1 to 2400 for low power mode (when the master clock is 76.8 kHz) > > + If this field is left empty, odr of 9 is selected. > > + > > +Optional properties: -> > + - refin1-supply: refin1 supply can be used as reference for conversio= -n. -> > + - refin2-supply: refin2 supply can be used as reference for conversio= -n. +> > + - refin1-supply: refin1 supply can be used as reference for conversion. +> > + - refin2-supply: refin2 supply can be used as reference for conversion. > > + - avdd-supply: avdd supply can be used as reference for conversion. > > + > > +Example: > > + adc@0 { -> > + compatible =3D "adi,ad7124-4"; -> > + reg =3D <0>; -> > + spi-max-frequency =3D <5000000>; -> > + interrupts =3D <25 2>; -> > + interrupt-parent =3D <&gpio>; -> > + refin1-supply =3D <&adc_vref>; -> > + clocks =3D <&ad7124_mclk>; -> > + clock-names =3D "mclk"; +> > + compatible = "adi,ad7124-4"; +> > + reg = <0>; +> > + spi-max-frequency = <5000000>; +> > + interrupts = <25 2>; +> > + interrupt-parent = <&gpio>; +> > + refin1-supply = <&adc_vref>; +> > + clocks = <&ad7124_mclk>; +> > + clock-names = "mclk"; > > + -> > + #address-cells =3D <1>; -> > + #size-cells =3D <0>; +> > + #address-cells = <1>; +> > + #size-cells = <0>; > > + > > + channel@0 { -> > + reg =3D <0>; -> > + adi,diff-channels =3D <0 1>; -> > + adi,reference-select =3D <0>; -> > + adi,gain =3D <2>; -> > + adi,odr-hz =3D <10>; +> > + reg = <0>; +> > + adi,diff-channels = <0 1>; +> > + adi,reference-select = <0>; +> > + adi,gain = <2>; +> > + adi,odr-hz = <10>; > > + }; > > + > > + channel@1 { -> > + reg =3D <1>; +> > + reg = <1>; > > + adi,bipolar; -> > + adi,diff-channels =3D <2 3>; -> > + adi,reference-select =3D <0>; -> > + adi,gain =3D <4>; -> > + adi,odr-hz =3D <50>; +> > + adi,diff-channels = <2 3>; +> > + adi,reference-select = <0>; +> > + adi,gain = <4>; +> > + adi,odr-hz = <50>; > > + }; > > + > > + channel@2 { -> > + reg =3D <2>; -> > + adi,diff-channels =3D <4 5>; -> > + adi,gain =3D <128>; -> > + adi,odr-hz =3D <19200>; +> > + reg = <2>; +> > + adi,diff-channels = <4 5>; +> > + adi,gain = <128>; +> > + adi,odr-hz = <19200>; > > + }; > > + > > + channel@3 { -> > + reg =3D <3>; -> > + adi,diff-channels =3D <6 7>; +> > + reg = <3>; +> > + adi,diff-channels = <6 7>; > > + }; > > + }; > > diff --git a/MAINTAINERS b/MAINTAINERS @@ -157,9 +143,9 @@ n. > > S: Supported > > F: drivers/iio/adc/ad7124.c > > +F: Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt -> > =20 +> > > > ANALOG DEVICES INC AD9389B DRIVER > > M: Hans Verkuil <hans.verkuil@cisco.com> -> > --=20 +> > -- > > 2.7.4 -> > =20 +> > diff --git a/a/content_digest b/N1/content_digest index 9578932..0fa814f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -21,28 +21,23 @@ "\n" "> On Mon, Oct 29, 2018 at 06:39:30PM +0200, Stefan Popa wrote:\n" "> > Add support for Analog Devices AD7124 4-channels and 8-channels ADC.\n" - "> >=20\n" + "> > \n" "> > Signed-off-by: Stefan Popa <stefan.popa@analog.com>\n" "> > ---\n" "> > Changes in v2:\n" "> > \t- Nothing changed.\n" "> > Changes in v3:\n" "> > \t- Removed the \"adi,channels\" property.\n" - "> > \t- Used the \"reg\" property to get the channel number and \"adi,diff-chan=\n" - "nels\"\n" - "> > \t for the differential pins. The \"adi,channel-number\" property was rem=\n" - "oved.\n" + "> > \t- Used the \"reg\" property to get the channel number and \"adi,diff-channels\"\n" + "> > \t for the differential pins. The \"adi,channel-number\" property was removed.\n" "> > \t- adi,bipolar is of boolean type.\n" - "> >=20\n" - "> > .../devicetree/bindings/iio/adc/adi,ad7124.txt | 90 ++++++++++++++=\n" - "++++++++\n" + "> > \n" + "> > .../devicetree/bindings/iio/adc/adi,ad7124.txt | 90 ++++++++++++++++++++++\n" "> > MAINTAINERS | 1 +\n" "> > 2 files changed, 91 insertions(+)\n" - "> > create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad712=\n" - "4.txt\n" - "> >=20\n" - "> > diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt b=\n" - "/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt\n" + "> > create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt\n" + "> > \n" + "> > diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt b/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt\n" "> > new file mode 100644\n" "> > index 0000000..46a9b71\n" "> > --- /dev/null\n" @@ -59,30 +54,24 @@ "> > +\t\tsee: Documentation/devicetree/bindings/clock/clock-bindings.txt\n" "> > +\t- clock-names: Must be \"mclk\".\n" "> > +\t- interrupts: IRQ line for the ADC\n" - "> > +\t\tsee: Documentation/devicetree/bindings/interrupt-controller/interrup=\n" - "ts.txt\n" + "> > +\t\tsee: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt\n" "> > +\n" "> > +\t Required properties:\n" "> > +\t\t* #address-cells: Must be 1.\n" "> > +\t\t* #size-cells: Must be 0.\n" "> > +\n" - "> > +\t Subnode(s) represent the external channels which are connected to t=\n" - "he ADC.\n" - "> > +\t Each subnode represents one channel and has the following propertie=\n" - "s:\n" + "> > +\t Subnode(s) represent the external channels which are connected to the ADC.\n" + "> > +\t Each subnode represents one channel and has the following properties:\n" "> > +\t\tRequired properties:\n" "> > +\t\t\t* reg: The channel number. It can have up to 4 channels on ad7124-4\n" "> > +\t\t\t and 8 channels on ad7124-8, numbered from 0 to 15.\n" - "> > +\t\t\t* adi,diff-channels: Pins the channel is connected to. The first va=\n" - "lue\n" - "> > +\t\t\t specifies the positive input pin, the second value the negative i=\n" - "nput pin.\n" + "> > +\t\t\t* adi,diff-channels: Pins the channel is connected to. The first value\n" + "> > +\t\t\t specifies the positive input pin, the second value the negative input pin.\n" "> > +\n" "> > +\t\tOptional properties:\n" - "> > +\t\t\t* adi,bipolar: Boolean, if set the channel is used in bipolar mode.=\n" - " =20\n" - ">=20\n" - "> Both this and Xilinx AMS which I just reviewed are defining a bipolar=20\n" + "> > +\t\t\t* adi,bipolar: Boolean, if set the channel is used in bipolar mode. \n" + "> \n" + "> Both this and Xilinx AMS which I just reviewed are defining a bipolar \n" "> property. Can we come up with a common property please.\n" "Sometimes it's implicit given particular channel selects but agreed\n" "for this particular simple case, lets just put it in the generic\n" @@ -99,71 +88,68 @@ "not actually user visible and we don't enforce it anyway) but we should\n" "discuss that in a separate thread so as to get more eyes on it.\n" "\n" - ">=20\n" + "> \n" "> > +\t\t\t* adi,reference-select: Select the reference source to use when\n" "> > +\t\t\t converting on the the specific channel. Valid values are:\n" - "> > +\t\t\t 0: REFIN1(+)/REFIN1(=E2=88=92).\n" - "> > +\t\t\t 1: REFIN2(+)/REFIN2(=E2=88=92).\n" + "> > +\t\t\t 0: REFIN1(+)/REFIN1(\342\210\222).\n" + "> > +\t\t\t 1: REFIN2(+)/REFIN2(\342\210\222).\n" "> > +\t\t\t 3: AVDD\n" "> > +\t\t\t If this field is left empty, internal reference is selected.\n" "> > +\t\t\t* adi,gain: Select the gain when converting on the specific channel.\n" "> > +\t\t\t Valid values are: 1, 2, 4, 8, 16, 32, 64, 128.\n" "> > +\t\t\t If this field is left empty, gain of 1 is selected.\n" "> > +\t\t\t* adi,odr-hz: The output data rate can be programmed from:\n" - "> > +\t\t\t 9 to 19200 for full power mode (when the master clock is 614.4 kH=\n" - "z)\n" + "> > +\t\t\t 9 to 19200 for full power mode (when the master clock is 614.4 kHz)\n" "> > +\t\t\t 2 to 4800 for mid power mode (when the master clock is 153.6 kHz)\n" "> > +\t\t\t 1 to 2400 for low power mode (when the master clock is 76.8 kHz)\n" "> > +\t\t\t If this field is left empty, odr of 9 is selected.\n" "> > +\n" "> > +Optional properties:\n" - "> > +\t- refin1-supply: refin1 supply can be used as reference for conversio=\n" - "n.\n" - "> > +\t- refin2-supply: refin2 supply can be used as reference for conversio=\n" - "n.\n" + "> > +\t- refin1-supply: refin1 supply can be used as reference for conversion.\n" + "> > +\t- refin2-supply: refin2 supply can be used as reference for conversion.\n" "> > +\t- avdd-supply: avdd supply can be used as reference for conversion.\n" "> > +\n" "> > +Example:\n" "> > +\tadc@0 {\n" - "> > +\t\tcompatible =3D \"adi,ad7124-4\";\n" - "> > +\t\treg =3D <0>;\n" - "> > +\t\tspi-max-frequency =3D <5000000>;\n" - "> > +\t\tinterrupts =3D <25 2>;\n" - "> > +\t\tinterrupt-parent =3D <&gpio>;\n" - "> > +\t\trefin1-supply =3D <&adc_vref>;\n" - "> > +\t\tclocks =3D <&ad7124_mclk>;\n" - "> > +\t\tclock-names =3D \"mclk\";\n" + "> > +\t\tcompatible = \"adi,ad7124-4\";\n" + "> > +\t\treg = <0>;\n" + "> > +\t\tspi-max-frequency = <5000000>;\n" + "> > +\t\tinterrupts = <25 2>;\n" + "> > +\t\tinterrupt-parent = <&gpio>;\n" + "> > +\t\trefin1-supply = <&adc_vref>;\n" + "> > +\t\tclocks = <&ad7124_mclk>;\n" + "> > +\t\tclock-names = \"mclk\";\n" "> > +\n" - "> > +\t\t#address-cells =3D <1>;\n" - "> > +\t\t#size-cells =3D <0>;\n" + "> > +\t\t#address-cells = <1>;\n" + "> > +\t\t#size-cells = <0>;\n" "> > +\n" "> > +\t\tchannel@0 {\n" - "> > +\t\t\treg =3D <0>;\n" - "> > +\t\t\tadi,diff-channels =3D <0 1>;\n" - "> > +\t\t\tadi,reference-select =3D <0>;\n" - "> > +\t\t\tadi,gain =3D <2>;\n" - "> > +\t\t\tadi,odr-hz =3D <10>;\n" + "> > +\t\t\treg = <0>;\n" + "> > +\t\t\tadi,diff-channels = <0 1>;\n" + "> > +\t\t\tadi,reference-select = <0>;\n" + "> > +\t\t\tadi,gain = <2>;\n" + "> > +\t\t\tadi,odr-hz = <10>;\n" "> > +\t\t};\n" "> > +\n" "> > +\t\tchannel@1 {\n" - "> > +\t\t\treg =3D <1>;\n" + "> > +\t\t\treg = <1>;\n" "> > +\t\t\tadi,bipolar;\n" - "> > +\t\t\tadi,diff-channels =3D <2 3>;\n" - "> > +\t\t\tadi,reference-select =3D <0>;\n" - "> > +\t\t\tadi,gain =3D <4>;\n" - "> > +\t\t\tadi,odr-hz =3D <50>;\n" + "> > +\t\t\tadi,diff-channels = <2 3>;\n" + "> > +\t\t\tadi,reference-select = <0>;\n" + "> > +\t\t\tadi,gain = <4>;\n" + "> > +\t\t\tadi,odr-hz = <50>;\n" "> > +\t\t};\n" "> > +\n" "> > +\t\tchannel@2 {\n" - "> > +\t\t\treg =3D <2>;\n" - "> > +\t\t\tadi,diff-channels =3D <4 5>;\n" - "> > +\t\t\tadi,gain =3D <128>;\n" - "> > +\t\t\tadi,odr-hz =3D <19200>;\n" + "> > +\t\t\treg = <2>;\n" + "> > +\t\t\tadi,diff-channels = <4 5>;\n" + "> > +\t\t\tadi,gain = <128>;\n" + "> > +\t\t\tadi,odr-hz = <19200>;\n" "> > +\t\t};\n" "> > +\n" "> > +\t\tchannel@3 {\n" - "> > +\t\t\treg =3D <3>;\n" - "> > +\t\t\tadi,diff-channels =3D <6 7>;\n" + "> > +\t\t\treg = <3>;\n" + "> > +\t\t\tadi,diff-channels = <6 7>;\n" "> > +\t\t};\n" "> > +\t};\n" "> > diff --git a/MAINTAINERS b/MAINTAINERS\n" @@ -175,11 +161,11 @@ "> > S:\tSupported\n" "> > F:\tdrivers/iio/adc/ad7124.c\n" "> > +F:\tDocumentation/devicetree/bindings/iio/adc/adi,ad7124.txt\n" - "> > =20\n" + "> > \n" "> > ANALOG DEVICES INC AD9389B DRIVER\n" "> > M:\tHans Verkuil <hans.verkuil@cisco.com>\n" - "> > --=20\n" + "> > -- \n" "> > 2.7.4\n" - > > =20 + > > -f585596d914815e9c6d744eb8ed367b98cd4ed8cada5f8dbe940b86d7572be2c +9efe44f6876ea84e38172304aa84c16dd26c95eb444013c0ee6460019449e927
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.