Skip to contentSkip to conversation

ARM: Zynq: DT: Disable xadc node by default in zynq-7000.dtsi

PATCH New Xander Huff 3 participants 9 messages May 7, 2015 – May 12, 2015

Subsystems (2)
Device tree bindings Arm/Zynq architecture
lore
Share & tools
lore

Xander Huff

author
#0 lore raw

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

This is the de-facto practice.

Signed-off-by Xander Huff <[email protected]>
Reviewed-by Ben Shelton <[email protected]>
Reviewed-by Josh Cartwright <[email protected]>
Reviewed-by Joe Hershberger <[email protected]>
---
 arch/arm/boot/dts/zynq-7000.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/zynq-7000.dtsi +1 -0
index a5cd2ed..7640bdc 100644
@@ -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>;
Signature · 1 line
1.9.1
author
#1 lore raw

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

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

Signed-off-by Xander Huff <[email protected]>
---
 arch/arm/boot/dts/zynq-parallella.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/zynq-parallella.dts +6 -0
index 1745712..b1a1f7a 100644
@@ -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 {
Signature · 1 line
1.9.1
#2 lore raw

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

Am 08.05.2015 um 00:32 schrieb Xander Huff:

Quoted 13 lines

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

Signed-off-by Xander Huff <[email protected]>
---
 arch/arm/boot/dts/zynq-parallella.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/zynq-parallella.dts +0 -0
index 1745712..b1a1f7a 100644

arch/arm/boot/dts/zynq-parallella.dts line 40

Quoted 9 lines
arch/arm/boot/dts/zynq-parallella.dts +6 -0
@@ -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.

arch/arm/boot/dts/zynq-parallella.dts line 41

Quoted 1 line
arch/arm/boot/dts/zynq-parallella.dts +0 -0
 };

&adc {
	status = "okay";
};

Regards,
Andreas

Quoted 3 lines
arch/arm/boot/dts/zynq-parallella.dts +0 -0
 &clkc {
Signature · 3 lines
SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany
GF: Felix Imend?rffer, Jane Smithard, Dilip Upmanyu, Graham Norton; HRB
21284 (AG N?rnberg)
author
#3 lore raw

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

In reply to Xander Huff

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

Signed-off-by Xander Huff <[email protected]>
---
 arch/arm/boot/dts/zynq-zc702.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/zynq-zc702.dts +6 -0
index 1fc1d39..74b3b8a 100644
@@ -47,6 +47,12 @@
 		compatible = "usb-nop-xceiv";
 		#phy-cells = <0>;
 	};
+
+	amba {
+		adc: adc at f8007100 {
+			status = "okay";
+		};
+	};
 };
 
 &can0 {
Signature · 1 line
1.9.1
author
#4 lore raw

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

In reply to Xander Huff

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

Signed-off-by Xander Huff <[email protected]>
---
 arch/arm/boot/dts/zynq-zc706.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/zynq-zc706.dts +6 -0
index 850518d..e7f81e3 100644
@@ -37,6 +37,12 @@
 		compatible = "usb-nop-xceiv";
 		#phy-cells = <0>;
 	};
+
+	amba {
+		adc: adc at f8007100 {
+			status = "okay";
+		};
+	};
 };
 
 &clkc {
Signature · 1 line
1.9.1
author
#5 lore raw

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

In reply to Xander Huff

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

Signed-off-by Xander Huff <[email protected]>
---
 arch/arm/boot/dts/zynq-zed.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/zynq-zed.dts +6 -0
index 5658bc8..a794f54 100644
@@ -36,6 +36,12 @@
 		compatible = "usb-nop-xceiv";
 		#phy-cells = <0>;
 	};
+
+	amba {
+		adc: adc at f8007100 {
+			status = "okay";
+		};
+	};
 };
 
 &clkc {
Signature · 1 line
1.9.1
author
#6 lore raw

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

In reply to Xander Huff

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

Signed-off-by Xander Huff <[email protected]>
---
 arch/arm/boot/dts/zynq-zybo.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/zynq-zybo.dts +6 -0
index a9a12ce..a6298fb 100644
@@ -27,6 +27,12 @@
 		bootargs = "console=ttyPS0,115200 earlyprintk";
 	};
 
+	amba {
+		adc: adc at f8007100 {
+			status = "okay";
+		};
+	};
+
 };
 
 &clkc {
Signature · 1 line
1.9.1
#7 lore raw

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

In reply to Xander Huff
Quoted 1 line · Xander Huff

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

author
#8 lore raw

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

Quoted 3 lines · S?ren Brinkmann

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

Signature · 3 lines
Xander Huff
Staff Software Engineer
National Instruments