diff mbox

iio: mxs-lradc: Move binding document out of staging as well

Message ID 1460293398-23654-1-git-send-email-harald@ccbib.org
State Changes Requested, archived
Headers show

Commit Message

Harald Geyer April 10, 2016, 1:03 p.m. UTC
commit f836c45922446df872250a12dd08e48978aceb2f moved mxs-lradc driver
out of staging. However the binding document was left in the old place.

Signed-off-by: Harald Geyer <harald@ccbib.org>
---
 .../devicetree/bindings/iio/adc/mxs-lradc.txt      | 47 ++++++++++++++++++++++
 .../bindings/staging/iio/adc/mxs-lradc.txt         | 47 ----------------------
 2 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
 delete mode 100644 Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt

Comments

Jonathan Cameron April 10, 2016, 1:26 p.m. UTC | #1
On 10/04/16 14:03, Harald Geyer wrote:
> commit f836c45922446df872250a12dd08e48978aceb2f moved mxs-lradc driver
> out of staging. However the binding document was left in the old place.
> 
> Signed-off-by: Harald Geyer <harald@ccbib.org>
Oops and thanks!

Applied to the togreg branch of iio.git - initially pushed out as testing
so the autobuilders can completely ignore this patch.

Jonathan
> ---
>  .../devicetree/bindings/iio/adc/mxs-lradc.txt      | 47 ++++++++++++++++++++++
>  .../bindings/staging/iio/adc/mxs-lradc.txt         | 47 ----------------------
>  2 files changed, 47 insertions(+), 47 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>  delete mode 100644 Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
> 
> diff --git a/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
> new file mode 100644
> index 0000000..555fb11
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
> @@ -0,0 +1,47 @@
> +* Freescale MXS LRADC device driver
> +
> +Required properties:
> +- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"
> +              for i.MX28 SoC
> +- reg: Address and length of the register set for the device
> +- interrupts: Should contain the LRADC interrupts
> +
> +Optional properties:
> +- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen
> +                               to LRADC. Valid value is either 4 or 5. If this
> +                               property is not present, then the touchscreen is
> +                               disabled. 5 wires is valid for i.MX28 SoC only.
> +- fsl,ave-ctrl: number of samples per direction to calculate an average value.
> +                Allowed value is 1 ... 32, default is 4
> +- fsl,ave-delay: delay between consecutive samples. Allowed value is
> +                 2 ... 2048. It is used if 'fsl,ave-ctrl' > 1, counts at
> +                 2 kHz and its default is 2 (= 1 ms)
> +- fsl,settling: delay between plate switch to next sample. Allowed value is
> +                1 ... 2047. It counts at 2 kHz and its default is
> +                10 (= 5 ms)
> +
> +Example for i.MX23 SoC:
> +
> +	lradc@80050000 {
> +		compatible = "fsl,imx23-lradc";
> +		reg = <0x80050000 0x2000>;
> +		interrupts = <36 37 38 39 40 41 42 43 44>;
> +		status = "okay";
> +		fsl,lradc-touchscreen-wires = <4>;
> +		fsl,ave-ctrl = <4>;
> +		fsl,ave-delay = <2>;
> +		fsl,settling = <10>;
> +	};
> +
> +Example for i.MX28 SoC:
> +
> +	lradc@80050000 {
> +		compatible = "fsl,imx28-lradc";
> +		reg = <0x80050000 0x2000>;
> +		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;
> +		status = "okay";
> +		fsl,lradc-touchscreen-wires = <5>;
> +		fsl,ave-ctrl = <4>;
> +		fsl,ave-delay = <2>;
> +		fsl,settling = <10>;
> +	};
> diff --git a/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
> deleted file mode 100644
> index 555fb11..0000000
> --- a/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -* Freescale MXS LRADC device driver
> -
> -Required properties:
> -- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"
> -              for i.MX28 SoC
> -- reg: Address and length of the register set for the device
> -- interrupts: Should contain the LRADC interrupts
> -
> -Optional properties:
> -- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen
> -                               to LRADC. Valid value is either 4 or 5. If this
> -                               property is not present, then the touchscreen is
> -                               disabled. 5 wires is valid for i.MX28 SoC only.
> -- fsl,ave-ctrl: number of samples per direction to calculate an average value.
> -                Allowed value is 1 ... 32, default is 4
> -- fsl,ave-delay: delay between consecutive samples. Allowed value is
> -                 2 ... 2048. It is used if 'fsl,ave-ctrl' > 1, counts at
> -                 2 kHz and its default is 2 (= 1 ms)
> -- fsl,settling: delay between plate switch to next sample. Allowed value is
> -                1 ... 2047. It counts at 2 kHz and its default is
> -                10 (= 5 ms)
> -
> -Example for i.MX23 SoC:
> -
> -	lradc@80050000 {
> -		compatible = "fsl,imx23-lradc";
> -		reg = <0x80050000 0x2000>;
> -		interrupts = <36 37 38 39 40 41 42 43 44>;
> -		status = "okay";
> -		fsl,lradc-touchscreen-wires = <4>;
> -		fsl,ave-ctrl = <4>;
> -		fsl,ave-delay = <2>;
> -		fsl,settling = <10>;
> -	};
> -
> -Example for i.MX28 SoC:
> -
> -	lradc@80050000 {
> -		compatible = "fsl,imx28-lradc";
> -		reg = <0x80050000 0x2000>;
> -		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;
> -		status = "okay";
> -		fsl,lradc-touchscreen-wires = <5>;
> -		fsl,ave-ctrl = <4>;
> -		fsl,ave-delay = <2>;
> -		fsl,settling = <10>;
> -	};
> 

--
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
Rob Herring April 11, 2016, 7:42 p.m. UTC | #2
On Sun, Apr 10, 2016 at 01:03:18PM +0000, Harald Geyer wrote:
> commit f836c45922446df872250a12dd08e48978aceb2f moved mxs-lradc driver
> out of staging. However the binding document was left in the old place.

A move out of staging should probably imply a review. Though we don't 
have clear rules around that for bindings.

> 
> Signed-off-by: Harald Geyer <harald@ccbib.org>
> ---
>  .../devicetree/bindings/iio/adc/mxs-lradc.txt      | 47 ++++++++++++++++++++++
>  .../bindings/staging/iio/adc/mxs-lradc.txt         | 47 ----------------------
>  2 files changed, 47 insertions(+), 47 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>  delete mode 100644 Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
> 
> diff --git a/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
> new file mode 100644
> index 0000000..555fb11
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
> @@ -0,0 +1,47 @@
> +* Freescale MXS LRADC device driver
> +
> +Required properties:
> +- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"
> +              for i.MX28 SoC
> +- reg: Address and length of the register set for the device
> +- interrupts: Should contain the LRADC interrupts
> +
> +Optional properties:
> +- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen
> +                               to LRADC. Valid value is either 4 or 5. If this
> +                               property is not present, then the touchscreen is
> +                               disabled. 5 wires is valid for i.MX28 SoC only.

Standard touchscreen property?

> +- fsl,ave-ctrl: number of samples per direction to calculate an average value.
> +                Allowed value is 1 ... 32, default is 4
> +- fsl,ave-delay: delay between consecutive samples. Allowed value is
> +                 2 ... 2048. It is used if 'fsl,ave-ctrl' > 1, counts at
> +                 2 kHz and its default is 2 (= 1 ms)

ditto.

If not, it should have units.

> +- fsl,settling: delay between plate switch to next sample. Allowed value is
> +                1 ... 2047. It counts at 2 kHz and its default is
> +                10 (= 5 ms)

ditto.

> +
> +Example for i.MX23 SoC:
> +
> +	lradc@80050000 {
> +		compatible = "fsl,imx23-lradc";
> +		reg = <0x80050000 0x2000>;
> +		interrupts = <36 37 38 39 40 41 42 43 44>;
> +		status = "okay";
> +		fsl,lradc-touchscreen-wires = <4>;
> +		fsl,ave-ctrl = <4>;
> +		fsl,ave-delay = <2>;
> +		fsl,settling = <10>;
> +	};
> +
> +Example for i.MX28 SoC:
> +
> +	lradc@80050000 {
> +		compatible = "fsl,imx28-lradc";
> +		reg = <0x80050000 0x2000>;
> +		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;
> +		status = "okay";
> +		fsl,lradc-touchscreen-wires = <5>;
> +		fsl,ave-ctrl = <4>;
> +		fsl,ave-delay = <2>;
> +		fsl,settling = <10>;
> +	};
--
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
Marek Vasut April 13, 2016, 10:20 p.m. UTC | #3
On 04/11/2016 09:42 PM, Rob Herring wrote:
> On Sun, Apr 10, 2016 at 01:03:18PM +0000, Harald Geyer wrote:
>> commit f836c45922446df872250a12dd08e48978aceb2f moved mxs-lradc driver
>> out of staging. However the binding document was left in the old place.
> 
> A move out of staging should probably imply a review. Though we don't 
> have clear rules around that for bindings.
> 
>>
>> Signed-off-by: Harald Geyer <harald@ccbib.org>
>> ---
>>  .../devicetree/bindings/iio/adc/mxs-lradc.txt      | 47 ++++++++++++++++++++++
>>  .../bindings/staging/iio/adc/mxs-lradc.txt         | 47 ----------------------
>>  2 files changed, 47 insertions(+), 47 deletions(-)
>>  create mode 100644 Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>>  delete mode 100644 Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
>>
>> diff --git a/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>> new file mode 100644
>> index 0000000..555fb11
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>> @@ -0,0 +1,47 @@
>> +* Freescale MXS LRADC device driver
>> +
>> +Required properties:
>> +- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"
>> +              for i.MX28 SoC
>> +- reg: Address and length of the register set for the device
>> +- interrupts: Should contain the LRADC interrupts
>> +
>> +Optional properties:
>> +- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen
>> +                               to LRADC. Valid value is either 4 or 5. If this
>> +                               property is not present, then the touchscreen is
>> +                               disabled. 5 wires is valid for i.MX28 SoC only.
> 
> Standard touchscreen property?

Looks quite standard-ish to me indeed. It is my fault for bringing this
baggage in back when I wrote the driver, but now that we're moving the
driver out of staging, it would make sense to deprecate such properties
and use standard ones (if they got fleshed out during that time).

We now have "atmel,adc-ts-wires" , "ti,wires" ,
"fsl,lradc-touchscreen-wires" , so some sort of pattern is developing here.

>> +- fsl,ave-ctrl: number of samples per direction to calculate an average value.
>> +                Allowed value is 1 ... 32, default is 4
>> +- fsl,ave-delay: delay between consecutive samples. Allowed value is
>> +                 2 ... 2048. It is used if 'fsl,ave-ctrl' > 1, counts at
>> +                 2 kHz and its default is 2 (= 1 ms)
> 
> ditto.
> 
> If not, it should have units.

Agreed, this is standard ADC sampling frequency I think.

>> +- fsl,settling: delay between plate switch to next sample. Allowed value is
>> +                1 ... 2047. It counts at 2 kHz and its default is
>> +                10 (= 5 ms)
> 
> ditto.
> 
>> +
>> +Example for i.MX23 SoC:
>> +
>> +	lradc@80050000 {
>> +		compatible = "fsl,imx23-lradc";
>> +		reg = <0x80050000 0x2000>;
>> +		interrupts = <36 37 38 39 40 41 42 43 44>;
>> +		status = "okay";
>> +		fsl,lradc-touchscreen-wires = <4>;
>> +		fsl,ave-ctrl = <4>;
>> +		fsl,ave-delay = <2>;
>> +		fsl,settling = <10>;
>> +	};
>> +
>> +Example for i.MX28 SoC:
>> +
>> +	lradc@80050000 {
>> +		compatible = "fsl,imx28-lradc";
>> +		reg = <0x80050000 0x2000>;
>> +		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;
>> +		status = "okay";
>> +		fsl,lradc-touchscreen-wires = <5>;
>> +		fsl,ave-ctrl = <4>;
>> +		fsl,ave-delay = <2>;
>> +		fsl,settling = <10>;
>> +	};
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Jonathan Cameron April 17, 2016, 8:57 a.m. UTC | #4
On 11/04/16 20:42, Rob Herring wrote:
> On Sun, Apr 10, 2016 at 01:03:18PM +0000, Harald Geyer wrote:
>> commit f836c45922446df872250a12dd08e48978aceb2f moved mxs-lradc driver
>> out of staging. However the binding document was left in the old place.
> 
> A move out of staging should probably imply a review. Though we don't 
> have clear rules around that for bindings.
Sorry, my bad.  We kind of forgot this even had bindings during the review.
It sat in staging a long time on the basis we ideally were going to split
the touchscreen and IIO bits round an mfd.  Eventually it became clear no
one was going to work on it so we agreed with Dmitry that it could go out
of staging as is. Original bindings were back in 2012 so before the whole
devicetree binding maintainership really got going (IIRC). 

Will make sure to insist on a device tree binding review opportunity at
least in future!   We'll have to keep what is here as there are doubtless
a number of device trees out there using it, but we can of course deprecate
them and add additional new bindings.

Jonathan
> 
>>
>> Signed-off-by: Harald Geyer <harald@ccbib.org>
>> ---
>>  .../devicetree/bindings/iio/adc/mxs-lradc.txt      | 47 ++++++++++++++++++++++
>>  .../bindings/staging/iio/adc/mxs-lradc.txt         | 47 ----------------------
>>  2 files changed, 47 insertions(+), 47 deletions(-)
>>  create mode 100644 Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>>  delete mode 100644 Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
>>
>> diff --git a/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>> new file mode 100644
>> index 0000000..555fb11
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>> @@ -0,0 +1,47 @@
>> +* Freescale MXS LRADC device driver
>> +
>> +Required properties:
>> +- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"
>> +              for i.MX28 SoC
>> +- reg: Address and length of the register set for the device
>> +- interrupts: Should contain the LRADC interrupts
>> +
>> +Optional properties:
>> +- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen
>> +                               to LRADC. Valid value is either 4 or 5. If this
>> +                               property is not present, then the touchscreen is
>> +                               disabled. 5 wires is valid for i.MX28 SoC only.
> 
> Standard touchscreen property?
> 
>> +- fsl,ave-ctrl: number of samples per direction to calculate an average value.
>> +                Allowed value is 1 ... 32, default is 4
>> +- fsl,ave-delay: delay between consecutive samples. Allowed value is
>> +                 2 ... 2048. It is used if 'fsl,ave-ctrl' > 1, counts at
>> +                 2 kHz and its default is 2 (= 1 ms)
> 
> ditto.
> 
> If not, it should have units.
> 
>> +- fsl,settling: delay between plate switch to next sample. Allowed value is
>> +                1 ... 2047. It counts at 2 kHz and its default is
>> +                10 (= 5 ms)
> 
> ditto.
> 
>> +
>> +Example for i.MX23 SoC:
>> +
>> +	lradc@80050000 {
>> +		compatible = "fsl,imx23-lradc";
>> +		reg = <0x80050000 0x2000>;
>> +		interrupts = <36 37 38 39 40 41 42 43 44>;
>> +		status = "okay";
>> +		fsl,lradc-touchscreen-wires = <4>;
>> +		fsl,ave-ctrl = <4>;
>> +		fsl,ave-delay = <2>;
>> +		fsl,settling = <10>;
>> +	};
>> +
>> +Example for i.MX28 SoC:
>> +
>> +	lradc@80050000 {
>> +		compatible = "fsl,imx28-lradc";
>> +		reg = <0x80050000 0x2000>;
>> +		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;
>> +		status = "okay";
>> +		fsl,lradc-touchscreen-wires = <5>;
>> +		fsl,ave-ctrl = <4>;
>> +		fsl,ave-delay = <2>;
>> +		fsl,settling = <10>;
>> +	};
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

--
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
Jonathan Cameron April 17, 2016, 8:59 a.m. UTC | #5
On 13/04/16 23:20, Marek Vasut wrote:
> On 04/11/2016 09:42 PM, Rob Herring wrote:
>> On Sun, Apr 10, 2016 at 01:03:18PM +0000, Harald Geyer wrote:
>>> commit f836c45922446df872250a12dd08e48978aceb2f moved mxs-lradc driver
>>> out of staging. However the binding document was left in the old place.
>>
>> A move out of staging should probably imply a review. Though we don't 
>> have clear rules around that for bindings.
>>
>>>
>>> Signed-off-by: Harald Geyer <harald@ccbib.org>
cc'ing Dmitry and linux-input.
>>> ---
>>>  .../devicetree/bindings/iio/adc/mxs-lradc.txt      | 47 ++++++++++++++++++++++
>>>  .../bindings/staging/iio/adc/mxs-lradc.txt         | 47 ----------------------
>>>  2 files changed, 47 insertions(+), 47 deletions(-)
>>>  create mode 100644 Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>>>  delete mode 100644 Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
>>>
>>> diff --git a/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>>> new file mode 100644
>>> index 0000000..555fb11
>>> --- /dev/null
>>> +++ b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
>>> @@ -0,0 +1,47 @@
>>> +* Freescale MXS LRADC device driver
>>> +
>>> +Required properties:
>>> +- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"
>>> +              for i.MX28 SoC
>>> +- reg: Address and length of the register set for the device
>>> +- interrupts: Should contain the LRADC interrupts
>>> +
>>> +Optional properties:
>>> +- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen
>>> +                               to LRADC. Valid value is either 4 or 5. If this
>>> +                               property is not present, then the touchscreen is
>>> +                               disabled. 5 wires is valid for i.MX28 SoC only.
>>
>> Standard touchscreen property?
> 
> Looks quite standard-ish to me indeed. It is my fault for bringing this
> baggage in back when I wrote the driver, but now that we're moving the
> driver out of staging, it would make sense to deprecate such properties
> and use standard ones (if they got fleshed out during that time).
> 
> We now have "atmel,adc-ts-wires" , "ti,wires" ,
> "fsl,lradc-touchscreen-wires" , so some sort of pattern is developing here.
> 
>>> +- fsl,ave-ctrl: number of samples per direction to calculate an average value.
>>> +                Allowed value is 1 ... 32, default is 4
>>> +- fsl,ave-delay: delay between consecutive samples. Allowed value is
>>> +                 2 ... 2048. It is used if 'fsl,ave-ctrl' > 1, counts at
>>> +                 2 kHz and its default is 2 (= 1 ms)
>>
>> ditto.
>>
>> If not, it should have units.
> 
> Agreed, this is standard ADC sampling frequency I think.
> 
>>> +- fsl,settling: delay between plate switch to next sample. Allowed value is
>>> +                1 ... 2047. It counts at 2 kHz and its default is
>>> +                10 (= 5 ms)
>>
>> ditto.
>>
>>> +
>>> +Example for i.MX23 SoC:
>>> +
>>> +	lradc@80050000 {
>>> +		compatible = "fsl,imx23-lradc";
>>> +		reg = <0x80050000 0x2000>;
>>> +		interrupts = <36 37 38 39 40 41 42 43 44>;
>>> +		status = "okay";
>>> +		fsl,lradc-touchscreen-wires = <4>;
>>> +		fsl,ave-ctrl = <4>;
>>> +		fsl,ave-delay = <2>;
>>> +		fsl,settling = <10>;
>>> +	};
>>> +
>>> +Example for i.MX28 SoC:
>>> +
>>> +	lradc@80050000 {
>>> +		compatible = "fsl,imx28-lradc";
>>> +		reg = <0x80050000 0x2000>;
>>> +		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;
>>> +		status = "okay";
>>> +		fsl,lradc-touchscreen-wires = <5>;
>>> +		fsl,ave-ctrl = <4>;
>>> +		fsl,ave-delay = <2>;
>>> +		fsl,settling = <10>;
>>> +	};
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
> 
> 

--
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 mbox

Patch

diff --git a/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
new file mode 100644
index 0000000..555fb11
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/mxs-lradc.txt
@@ -0,0 +1,47 @@ 
+* Freescale MXS LRADC device driver
+
+Required properties:
+- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"
+              for i.MX28 SoC
+- reg: Address and length of the register set for the device
+- interrupts: Should contain the LRADC interrupts
+
+Optional properties:
+- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen
+                               to LRADC. Valid value is either 4 or 5. If this
+                               property is not present, then the touchscreen is
+                               disabled. 5 wires is valid for i.MX28 SoC only.
+- fsl,ave-ctrl: number of samples per direction to calculate an average value.
+                Allowed value is 1 ... 32, default is 4
+- fsl,ave-delay: delay between consecutive samples. Allowed value is
+                 2 ... 2048. It is used if 'fsl,ave-ctrl' > 1, counts at
+                 2 kHz and its default is 2 (= 1 ms)
+- fsl,settling: delay between plate switch to next sample. Allowed value is
+                1 ... 2047. It counts at 2 kHz and its default is
+                10 (= 5 ms)
+
+Example for i.MX23 SoC:
+
+	lradc@80050000 {
+		compatible = "fsl,imx23-lradc";
+		reg = <0x80050000 0x2000>;
+		interrupts = <36 37 38 39 40 41 42 43 44>;
+		status = "okay";
+		fsl,lradc-touchscreen-wires = <4>;
+		fsl,ave-ctrl = <4>;
+		fsl,ave-delay = <2>;
+		fsl,settling = <10>;
+	};
+
+Example for i.MX28 SoC:
+
+	lradc@80050000 {
+		compatible = "fsl,imx28-lradc";
+		reg = <0x80050000 0x2000>;
+		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;
+		status = "okay";
+		fsl,lradc-touchscreen-wires = <5>;
+		fsl,ave-ctrl = <4>;
+		fsl,ave-delay = <2>;
+		fsl,settling = <10>;
+	};
diff --git a/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
deleted file mode 100644
index 555fb11..0000000
--- a/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
+++ /dev/null
@@ -1,47 +0,0 @@ 
-* Freescale MXS LRADC device driver
-
-Required properties:
-- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"
-              for i.MX28 SoC
-- reg: Address and length of the register set for the device
-- interrupts: Should contain the LRADC interrupts
-
-Optional properties:
-- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen
-                               to LRADC. Valid value is either 4 or 5. If this
-                               property is not present, then the touchscreen is
-                               disabled. 5 wires is valid for i.MX28 SoC only.
-- fsl,ave-ctrl: number of samples per direction to calculate an average value.
-                Allowed value is 1 ... 32, default is 4
-- fsl,ave-delay: delay between consecutive samples. Allowed value is
-                 2 ... 2048. It is used if 'fsl,ave-ctrl' > 1, counts at
-                 2 kHz and its default is 2 (= 1 ms)
-- fsl,settling: delay between plate switch to next sample. Allowed value is
-                1 ... 2047. It counts at 2 kHz and its default is
-                10 (= 5 ms)
-
-Example for i.MX23 SoC:
-
-	lradc@80050000 {
-		compatible = "fsl,imx23-lradc";
-		reg = <0x80050000 0x2000>;
-		interrupts = <36 37 38 39 40 41 42 43 44>;
-		status = "okay";
-		fsl,lradc-touchscreen-wires = <4>;
-		fsl,ave-ctrl = <4>;
-		fsl,ave-delay = <2>;
-		fsl,settling = <10>;
-	};
-
-Example for i.MX28 SoC:
-
-	lradc@80050000 {
-		compatible = "fsl,imx28-lradc";
-		reg = <0x80050000 0x2000>;
-		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;
-		status = "okay";
-		fsl,lradc-touchscreen-wires = <5>;
-		fsl,ave-ctrl = <4>;
-		fsl,ave-delay = <2>;
-		fsl,settling = <10>;
-	};