cpu: use dt accessor device tree access

In several cases the make test reference .dts files were incorrectly
byteswapped, these are fixed here too.

Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>

3 files changed, 35 insertions, 26 deletions

diff --git a/hdata/test/op920.wsp.dts b/hdata/test/op920.wsp.dts
index 057021f..e26fa12 100644
--- a/hdata/test/op920.wsp.dts
+++ b/hdata/test/op920.wsp.dts
@@ -76,6 +76,7 @@
 			sensor@8 {
 				phandle = <0x2b>;
 				compatible = "ibm,ipmi-sensor";
+				ibm,chip-id = <0x00>;
 				reg = <0x8>;
 				ipmi-sensor-type = <0x7>;
 			};
@@ -83,6 +84,7 @@
 			sensor@9 {
 				phandle = <0x3f>;
 				compatible = "ibm,ipmi-sensor";
+				ibm,chip-id = <0x08>;
 				reg = <0x9>;
 				ipmi-sensor-type = <0x7>;
 			};
@@ -139,6 +141,7 @@
 			sensor@59 {
 				phandle = <0x18>;
 				compatible = "ibm,ipmi-sensor";
+				ibm,chip-id = <0x00>;
 				reg = <0x59>;
 				ipmi-sensor-type = <0x1>;
 			};
@@ -146,6 +149,7 @@
 			sensor@5a {
 				phandle = <0x1a>;
 				compatible = "ibm,ipmi-sensor";
+				ibm,chip-id = <0x00>;
 				reg = <0x5a>;
 				ipmi-sensor-type = <0x7>;
 			};
@@ -153,6 +157,7 @@
 			sensor@a3 {
 				phandle = <0x2c>;
 				compatible = "ibm,ipmi-sensor";
+				ibm,chip-id = <0x08>;
 				reg = <0xa3>;
 				ipmi-sensor-type = <0x1>;
 			};
@@ -160,6 +165,7 @@
 			sensor@a4 {
 				phandle = <0x2e>;
 				compatible = "ibm,ipmi-sensor";
+				ibm,chip-id = <0x08>;
 				reg = <0xa4>;
 				ipmi-sensor-type = <0x7>;
 			};
@@ -433,6 +439,7 @@
 			sensor@e0 {
 				phandle = <0x19>;
 				compatible = "ibm,ipmi-sensor";
+				ibm,chip-id = <0x00>;
 				reg = <0xe0>;
 				ipmi-sensor-type = <0x1>;
 			};
@@ -440,6 +447,7 @@
 			sensor@e1 {
 				phandle = <0x2d>;
 				compatible = "ibm,ipmi-sensor";
+				ibm,chip-id = <0x08>;
 				reg = <0xe1>;
 				ipmi-sensor-type = <0x1>;
 			};
@@ -4166,7 +4174,7 @@
 
 		pbcq@4010c00 {
 			phandle = <0x140>;
-			reg = <0xc0104 0x10000 0x8010d 0x20000>;
+			reg = <0x4010c00 0x100 0xd010800 0x200>;
 			compatible = "ibm,power9-pbcq";
 			ibm,pec-index = <0x0>;
 			#address-cells = <0x1>;
@@ -4186,7 +4194,7 @@
 
 		pbcq@4011000 {
 			phandle = <0x142>;
-			reg = <0x100104 0x10000 0x8010e 0x20000>;
+			reg = <0x4011000 0x100 0xe010800 0x200>;
 			compatible = "ibm,power9-pbcq";
 			ibm,pec-index = <0x1>;
 			#address-cells = <0x1>;
@@ -4215,7 +4223,7 @@
 
 		pbcq@4011400 {
 			phandle = <0x145>;
-			reg = <0x140104 0x10000 0x8010f 0x20000>;
+			reg = <0x4011400 0x100 0xf010800 0x200>;
 			compatible = "ibm,power9-pbcq";
 			ibm,pec-index = <0x2>;
 			#address-cells = <0x1>;
@@ -4796,7 +4804,7 @@
 
 		pbcq@4010c00 {
 			phandle = <0x15c>;
-			reg = <0xc0104 0x10000 0x8010d 0x20000>;
+			reg = <0x4010c00 0x100 0xd010800 0x200>;
 			compatible = "ibm,power9-pbcq";
 			ibm,pec-index = <0x0>;
 			#address-cells = <0x1>;
@@ -4816,7 +4824,7 @@
 
 		pbcq@4011000 {
 			phandle = <0x15e>;
-			reg = <0x100104 0x10000 0x8010e 0x20000>;
+			reg = <0x4011000 0x100 0xe010800 0x200>;
 			compatible = "ibm,power9-pbcq";
 			ibm,pec-index = <0x1>;
 			#address-cells = <0x1>;
@@ -4845,7 +4853,7 @@
 
 		pbcq@4011400 {
 			phandle = <0x161>;
-			reg = <0x140104 0x10000 0x8010f 0x20000>;
+			reg = <0x4011400 0x100 0xf010800 0x200>;
 			compatible = "ibm,power9-pbcq";
 			ibm,pec-index = <0x2>;
 			#address-cells = <0x1>;
diff --git a/hdata/test/p8-840-spira.dts b/hdata/test/p8-840-spira.dts
index dfd2628..625935d 100644
--- a/hdata/test/p8-840-spira.dts
+++ b/hdata/test/p8-840-spira.dts
@@ -1,8 +1,8 @@
 /dts-v1/;
 
-/memreserve/	0x000070fd07000000 0x0000100000000000;
-/memreserve/	0x00006afd07000000 0x0000060000000000;
-/memreserve/	0x000051fd07000000 0x0000190000000000;
+/memreserve/	0x00000007fd510000 0x0000000000190000;
+/memreserve/	0x00000007fd6a0000 0x0000000000060000;
+/memreserve/	0x00000007fd700000 0x0000000000100000;
 / {
 	phandle = <0x1>;
 	#address-cells = <0x2>;
@@ -12,7 +12,7 @@
 	nest-frequency = <0x0 0x77359400>;
 	vendor = "IBM";
 	ibm,io-base-loc-code = "U78C9.001.WZS0CWX-P1";
-	ibm,vpd-lx-info = <0x0 0x1040031 0x43003000>;
+	ibm,vpd-lx-info = <0x0 0x31000401 0x300043>;
 	model = "8286-41A";
 	system-id = "TU00163";
 	system-brand = "S0";
@@ -991,7 +991,7 @@
 
 		pbcq@2012000 {
 			phandle = <0x4c>;
-			reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+			reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x0>;
 			ibm,hub-id = <0x0>;
@@ -1002,7 +1002,7 @@
 
 		pbcq@2012400 {
 			phandle = <0x4d>;
-			reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+			reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x1>;
 			ibm,hub-id = <0x0>;
@@ -1056,7 +1056,7 @@
 
 		pbcq@2012000 {
 			phandle = <0x4e>;
-			reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+			reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x0>;
 			ibm,hub-id = <0x1>;
@@ -1067,7 +1067,7 @@
 
 		pbcq@2012400 {
 			phandle = <0x4f>;
-			reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+			reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x1>;
 			ibm,hub-id = <0x1>;
diff --git a/hdata/test/p81-811.spira.dts b/hdata/test/p81-811.spira.dts
index cea6a32..ed7bd5d 100644
--- a/hdata/test/p81-811.spira.dts
+++ b/hdata/test/p81-811.spira.dts
@@ -1,8 +1,9 @@
 /dts-v1/;
 
-/memreserve/	0x000070fd1f000000 0x0000100000000000;
-/memreserve/	0x00d06bfd1f000000 0x0030040000000000;
-/memreserve/	0x006058fd1f000000 0x0070130000000000;
+/memreserve/	0x0000001ffd586000 0x0000000000137000;
+/memreserve/	0x0000001ffd6bd000 0x0000000000043000;
+/memreserve/	0x0000001ffd700000 0x0000000000100000;
+
 / {
 	phandle = <0x1>;
 	#address-cells = <0x2>;
@@ -12,7 +13,7 @@
 	nest-frequency = <0x0 0x77359400>;
 	vendor = "IBM";
 	ibm,io-base-loc-code = "U78CB.001.WZS00AL-P1";
-	ibm,vpd-lx-info = <0x0 0x1040031 0x42003000>;
+	ibm,vpd-lx-info = <0x0 0x31000401 0x300042>;
 	model = "8247-22L";
 	system-id = "1010C8A";
 	system-brand = "S0";
@@ -1401,7 +1402,7 @@
 			hw-version = <0x2>;
 			sw-version = <0x1>;
 			primary;
-			ibm,psi-links = <0x0 0x10000000>;
+			ibm,psi-links = <0x0 0x10>;
 		};
 	};
 
@@ -2209,7 +2210,7 @@
 
 		pbcq@2012000 {
 			phandle = <0x95>;
-			reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+			reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x0>;
 			ibm,hub-id = <0x0>;
@@ -2220,7 +2221,7 @@
 
 		pbcq@2012400 {
 			phandle = <0x96>;
-			reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+			reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x1>;
 			ibm,hub-id = <0x0>;
@@ -2273,7 +2274,7 @@
 
 		pbcq@2012000 {
 			phandle = <0x97>;
-			reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+			reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x0>;
 			ibm,hub-id = <0x1>;
@@ -2284,7 +2285,7 @@
 
 		pbcq@2012400 {
 			phandle = <0x98>;
-			reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+			reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x1>;
 			ibm,hub-id = <0x1>;
@@ -2336,7 +2337,7 @@
 
 		pbcq@2012000 {
 			phandle = <0x99>;
-			reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+			reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x0>;
 			ibm,hub-id = <0x2>;
@@ -2388,7 +2389,7 @@
 
 		pbcq@2012000 {
 			phandle = <0x9a>;
-			reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+			reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x0>;
 			ibm,hub-id = <0x3>;
@@ -2399,7 +2400,7 @@
 
 		pbcq@2012400 {
 			phandle = <0x9b>;
-			reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+			reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
 			compatible = "ibm,power8-pbcq";
 			ibm,phb-index = <0x1>;
 			ibm,hub-id = <0x3>;