[PATCH 1/6] ARM: Zynq: DT: Disable xadc node by default in zynq-7000.dtsi

[PATCH 1/6] ARM: Zynq: DT: Disable xadc node by default in zynq-7000.dtsi

[Xander Huff]

This is the de-facto practice.

Signed-off-by: Xander Huff <xander.huff@ni.com>
Reviewed-by: Ben Shelton <ben.shelton@ni.com>
Reviewed-by: Josh Cartwright <joshc@ni.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
---
 arch/arm/boot/dts/zynq-7000.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index a5cd2ed..7640bdc 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -66,6 +66,7 @@
 
 		adc: adc at f8007100 {
 			compatible = "xlnx,zynq-xadc-1.00.a";
+			status = "disabled";
 			reg = <0xf8007100 0x20>;
 			interrupts = <0 7 4>;
 			interrupt-parent = <&intc>;
-- 
1.9.1

[PATCH 2/6] ARM: Zynq: DT: Enable xadc node in zynq-parallella.dts

[Xander Huff]

Now that zynq-7000 disables xadc by default, enable in zynq-parallella
to retain existing behavior.

Signed-off-by: Xander Huff <xander.huff@ni.com>
---
 arch/arm/boot/dts/zynq-parallella.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
index 1745712..b1a1f7a 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -32,6 +32,12 @@
 		bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";
 		linux,stdout-path = "/amba/serial at e0001000";
 	};
+
+	amba {
+		adc: adc at f8007100 {
+			status = "okay";
+		};
+	};
 };
 
 &clkc {
-- 
1.9.1

[PATCH 2/6] ARM: Zynq: DT: Enable xadc node in zynq-parallella.dts

[Andreas Färber]

Am 08.05.2015 um 00:32 schrieb Xander Huff:
> Now that zynq-7000 disables xadc by default, enable in zynq-parallella
> to retain existing behavior.
> 
> Signed-off-by: Xander Huff <xander.huff@ni.com>
> ---
>  arch/arm/boot/dts/zynq-parallella.dts | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
> index 1745712..b1a1f7a 100644
> --- a/arch/arm/boot/dts/zynq-parallella.dts
> +++ b/arch/arm/boot/dts/zynq-parallella.dts
> @@ -32,6 +32,12 @@
>  		bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";
>  		linux,stdout-path = "/amba/serial at e0001000";
>  	};
> +
> +	amba {
> +		adc: adc at f8007100 {
> +			status = "okay";
> +		};
> +	};

You've already discarded this patchset, but please note for the future
that the desired style would've been the one you see below, i.e.

>  };

&adc {
	status = "okay";
};

Regards,
Andreas

>  
>  &clkc {
> 


-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany
GF: Felix Imend?rffer, Jane Smithard, Dilip Upmanyu, Graham Norton; HRB
21284 (AG N?rnberg)

[PATCH 3/6] ARM: Zynq: DT: Enable xadc node in zynq-zc702.dts

[Xander Huff]

Now that zynq-7000 disables xadc by default, enable in zynq-zc702
to retain existing behavior.

Signed-off-by: Xander Huff <xander.huff@ni.com>
---
 arch/arm/boot/dts/zynq-zc702.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index 1fc1d39..74b3b8a 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -47,6 +47,12 @@
 		compatible = "usb-nop-xceiv";
 		#phy-cells = <0>;
 	};
+
+	amba {
+		adc: adc at f8007100 {
+			status = "okay";
+		};
+	};
 };
 
 &can0 {
-- 
1.9.1

[PATCH 4/6] ARM: Zynq: DT: Enable xadc node in zynq-zc706.dts

[Xander Huff]

Now that zynq-7000 disables xadc by default, enable in zynq-zc706
to retain existing behavior.

Signed-off-by: Xander Huff <xander.huff@ni.com>
---
 arch/arm/boot/dts/zynq-zc706.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 850518d..e7f81e3 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -37,6 +37,12 @@
 		compatible = "usb-nop-xceiv";
 		#phy-cells = <0>;
 	};
+
+	amba {
+		adc: adc at f8007100 {
+			status = "okay";
+		};
+	};
 };
 
 &clkc {
-- 
1.9.1

[PATCH 5/6] ARM: Zynq: DT: Enable xadc node in zynq-zed.dts

[Xander Huff]

Now that zynq-7000 disables xadc by default, enable in zynq-zed
to retain existing behavior.

Signed-off-by: Xander Huff <xander.huff@ni.com>
---
 arch/arm/boot/dts/zynq-zed.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 5658bc8..a794f54 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -36,6 +36,12 @@
 		compatible = "usb-nop-xceiv";
 		#phy-cells = <0>;
 	};
+
+	amba {
+		adc: adc at f8007100 {
+			status = "okay";
+		};
+	};
 };
 
 &clkc {
-- 
1.9.1

[PATCH 6/6] ARM: Zynq: DT: Enable xadc node in zynq-zybo.dts

[Xander Huff]

Now that zynq-7000 disables xadc by default, enable in zynq-zybo
to retain existing behavior.

Signed-off-by: Xander Huff <xander.huff@ni.com>
---
 arch/arm/boot/dts/zynq-zybo.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts
index a9a12ce..a6298fb 100644
--- a/arch/arm/boot/dts/zynq-zybo.dts
+++ b/arch/arm/boot/dts/zynq-zybo.dts
@@ -27,6 +27,12 @@
 		bootargs = "console=ttyPS0,115200 earlyprintk";
 	};
 
+	amba {
+		adc: adc at f8007100 {
+			status = "okay";
+		};
+	};
+
 };
 
 &clkc {
-- 
1.9.1

[PATCH 1/6] ARM: Zynq: DT: Disable xadc node by default in zynq-7000.dtsi

[Sören Brinkmann]

On Thu, 2015-05-07 at 05:32PM -0500, Xander Huff wrote:
> This is the de-facto practice.

For peripherals that might not be pinned out on a board. But the XADC is
always present in Zynq and can be used to read the temperature in any
case.

	S?ren

[PATCH 1/6] ARM: Zynq: DT: Disable xadc node by default in zynq-7000.dtsi

[Xander Huff]

On 5/7/2015 5:36 PM, S?ren Brinkmann wrote:
> For peripherals that might not be pinned out on a board. But the XADC is
> always present in Zynq and can be used to read the temperature in any
> case.
OK, this makes sense, thanks!

Please disregard this patch set

-- 
Xander Huff
Staff Software Engineer
National Instruments