hdata/test: Fix proc_gen when testing

In the hdata_to_dt test application the PVR override flags do not
correctly set proc_gen. This causes some butchering of the compatible
strings and some XSCOM addresses.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

3 files changed, 70 insertions, 62 deletions

diff --git a/hdata/test/hdata_to_dt.c b/hdata/test/hdata_to_dt.c
index 717fc9af..54f37613 100644
--- a/hdata/test/hdata_to_dt.c
+++ b/hdata/test/hdata_to_dt.c
@@ -234,15 +234,19 @@ int main(int argc, char *argv[])
 			opt_count++;
 		} else if (strcmp(argv[i], "-7") == 0) {
 			fake_pvr_type = PVR_TYPE_P7;
+			proc_gen = proc_gen_p7;
 			opt_count++;
 		} else if (strcmp(argv[i], "-8E") == 0) {
 			fake_pvr_type = PVR_TYPE_P8;
+			proc_gen = proc_gen_p8;
 			opt_count++;
 		} else if (strcmp(argv[i], "-8") == 0) {
 			fake_pvr_type = PVR_TYPE_P8;
+			proc_gen = proc_gen_p8;
 			opt_count++;
 		} else if (strcmp(argv[i], "-9") == 0) {
 			fake_pvr_type = PVR_TYPE_P9;
+			proc_gen = proc_gen_p9;
 			opt_count++;
 		}
 	}
diff --git a/hdata/test/p8-840-spira.dts b/hdata/test/p8-840-spira.dts
index b4a0797b..c787fa6d 100644
--- a/hdata/test/p8-840-spira.dts
+++ b/hdata/test/p8-840-spira.dts
@@ -11,6 +11,8 @@
 	compatible = "ibm,powernv", "ibm,firenze";
 	nest-frequency = <0x0 0x77359400>;
 	vendor = "IBM";
+	ibm,io-base-loc-code = "U78C9.001.WZS0CWX-P1";
+	ibm,vpd-lx-info = <0x0 0x1040031 0x43003000>;
 	model = "8286-41A";
 	system-id = "TU00163";
 	system-brand = "S0";
@@ -467,7 +469,7 @@
 
 	interrupt-controller@3ffff80028000 {
 		phandle = <0x9>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x28 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80028000 0x0 0x1000 0x3ffff 0x80029000 0x0 0x1000 0x3ffff 0x8002a000 0x0 0x1000 0x3ffff 0x8002b000 0x0 0x1000 0x3ffff 0x8002c000 0x0 0x1000 0x3ffff 0x8002d000 0x0 0x1000 0x3ffff 0x8002e000 0x0 0x1000 0x3ffff 0x8002f000 0x0 0x1000>;
@@ -477,7 +479,7 @@
 
 	interrupt-controller@3ffff80060000 {
 		phandle = <0xd>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x60 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80060000 0x0 0x1000 0x3ffff 0x80061000 0x0 0x1000 0x3ffff 0x80062000 0x0 0x1000 0x3ffff 0x80063000 0x0 0x1000 0x3ffff 0x80064000 0x0 0x1000 0x3ffff 0x80065000 0x0 0x1000 0x3ffff 0x80066000 0x0 0x1000 0x3ffff 0x80067000 0x0 0x1000>;
@@ -487,7 +489,7 @@
 
 	interrupt-controller@3ffff80068000 {
 		phandle = <0x11>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x68 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80068000 0x0 0x1000 0x3ffff 0x80069000 0x0 0x1000 0x3ffff 0x8006a000 0x0 0x1000 0x3ffff 0x8006b000 0x0 0x1000 0x3ffff 0x8006c000 0x0 0x1000 0x3ffff 0x8006d000 0x0 0x1000 0x3ffff 0x8006e000 0x0 0x1000 0x3ffff 0x8006f000 0x0 0x1000>;
@@ -497,7 +499,7 @@
 
 	interrupt-controller@3ffff80130000 {
 		phandle = <0x15>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xb0 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80130000 0x0 0x1000 0x3ffff 0x80131000 0x0 0x1000 0x3ffff 0x80132000 0x0 0x1000 0x3ffff 0x80133000 0x0 0x1000 0x3ffff 0x80134000 0x0 0x1000 0x3ffff 0x80135000 0x0 0x1000 0x3ffff 0x80136000 0x0 0x1000 0x3ffff 0x80137000 0x0 0x1000>;
@@ -507,7 +509,7 @@
 
 	interrupt-controller@3ffff80168000 {
 		phandle = <0x19>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xe8 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80168000 0x0 0x1000 0x3ffff 0x80169000 0x0 0x1000 0x3ffff 0x8016a000 0x0 0x1000 0x3ffff 0x8016b000 0x0 0x1000 0x3ffff 0x8016c000 0x0 0x1000 0x3ffff 0x8016d000 0x0 0x1000 0x3ffff 0x8016e000 0x0 0x1000 0x3ffff 0x8016f000 0x0 0x1000>;
@@ -517,7 +519,7 @@
 
 	interrupt-controller@3ffff80170000 {
 		phandle = <0x1d>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xf0 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80170000 0x0 0x1000 0x3ffff 0x80171000 0x0 0x1000 0x3ffff 0x80172000 0x0 0x1000 0x3ffff 0x80173000 0x0 0x1000 0x3ffff 0x80174000 0x0 0x1000 0x3ffff 0x80175000 0x0 0x1000 0x3ffff 0x80176000 0x0 0x1000 0x3ffff 0x80177000 0x0 0x1000>;
@@ -874,7 +876,7 @@
 		#address-cells = <0x1>;
 		#size-cells = <0x1>;
 		scom-controller;
-		compatible = "ibm,xscom", "ibm,power7-xscom";
+		compatible = "ibm,xscom", "ibm,power8-xscom";
 		reg = <0x3fc00 0x0 0x8 0x0>;
 		bus-frequency = <0x0 0x1dcd6500>;
 		ibm,dbob-id = <0x0>;
@@ -888,14 +890,14 @@
 		chiptod@40000 {
 			phandle = <0x49>;
 			reg = <0x40000 0x34>;
-			compatible = "ibm,power-chiptod", "ibm,power7-chiptod";
+			compatible = "ibm,power-chiptod", "ibm,power8-chiptod";
 			primary;
 		};
 
 		nx@2010000 {
 			phandle = <0x4b>;
 			reg = <0x2010000 0x4000>;
-			compatible = "ibm,power-nx", "ibm,power7-nx";
+			compatible = "ibm,power-nx", "ibm,power8-nx";
 		};
 
 		pbcq@2012000 {
@@ -920,10 +922,10 @@
 			ibm,lane-eq = <0x77777777 0x77777777 0x77777777 0x77777777 0x0 0x0 0x0 0x0>;
 		};
 
-		psihb@2010c00 {
+		psihb@2010900 {
 			phandle = <0x44>;
-			reg = <0x2010c00 0x10>;
-			compatible = "ibm,power7-psihb-x", "ibm,psihb-x";
+			reg = <0x2010900 0x20>;
+			compatible = "ibm,power8-psihb-x", "ibm,psihb-x";
 			boot-link;
 			status = "ok";
 		};
@@ -936,7 +938,7 @@
 		#address-cells = <0x1>;
 		#size-cells = <0x1>;
 		scom-controller;
-		compatible = "ibm,xscom", "ibm,power7-xscom";
+		compatible = "ibm,xscom", "ibm,power8-xscom";
 		reg = <0x3fc08 0x0 0x8 0x0>;
 		bus-frequency = <0x0 0x1dcd6500>;
 		ibm,dbob-id = <0x0>;
@@ -950,14 +952,14 @@
 		chiptod@40000 {
 			phandle = <0x4a>;
 			reg = <0x40000 0x34>;
-			compatible = "ibm,power-chiptod", "ibm,power7-chiptod";
+			compatible = "ibm,power-chiptod", "ibm,power8-chiptod";
 			secondary;
 		};
 
 		nx@2010000 {
 			phandle = <0x4c>;
 			reg = <0x2010000 0x4000>;
-			compatible = "ibm,power-nx", "ibm,power7-nx";
+			compatible = "ibm,power-nx", "ibm,power8-nx";
 		};
 
 		pbcq@2012000 {
@@ -982,10 +984,10 @@
 			ibm,lane-eq = <0x68686868 0x68686868 0x68686868 0x68686868 0x0 0x0 0x0 0x0>;
 		};
 
-		psihb@2010c00 {
+		psihb@2010900 {
 			phandle = <0x46>;
-			reg = <0x2010c00 0x10>;
-			compatible = "ibm,power7-psihb-x", "ibm,psihb-x";
+			reg = <0x2010900 0x20>;
+			compatible = "ibm,power8-psihb-x", "ibm,psihb-x";
 		};
 	};
 };
diff --git a/hdata/test/p81-811.spira.dts b/hdata/test/p81-811.spira.dts
index a668d45f..770fb341 100644
--- a/hdata/test/p81-811.spira.dts
+++ b/hdata/test/p81-811.spira.dts
@@ -11,6 +11,8 @@
 	compatible = "ibm,powernv", "ibm,firenze";
 	nest-frequency = <0x0 0x77359400>;
 	vendor = "IBM";
+	ibm,io-base-loc-code = "U78CB.001.WZS00AL-P1";
+	ibm,vpd-lx-info = <0x0 0x1040031 0x42003000>;
 	model = "8247-22L";
 	system-id = "1010C8A";
 	system-brand = "S0";
@@ -1419,7 +1421,7 @@
 
 	interrupt-controller@3ffff80020000 {
 		phandle = <0x9>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x20 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80020000 0x0 0x1000 0x3ffff 0x80021000 0x0 0x1000 0x3ffff 0x80022000 0x0 0x1000 0x3ffff 0x80023000 0x0 0x1000 0x3ffff 0x80024000 0x0 0x1000 0x3ffff 0x80025000 0x0 0x1000 0x3ffff 0x80026000 0x0 0x1000 0x3ffff 0x80027000 0x0 0x1000>;
@@ -1429,7 +1431,7 @@
 
 	interrupt-controller@3ffff80030000 {
 		phandle = <0xd>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x30 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80030000 0x0 0x1000 0x3ffff 0x80031000 0x0 0x1000 0x3ffff 0x80032000 0x0 0x1000 0x3ffff 0x80033000 0x0 0x1000 0x3ffff 0x80034000 0x0 0x1000 0x3ffff 0x80035000 0x0 0x1000 0x3ffff 0x80036000 0x0 0x1000 0x3ffff 0x80037000 0x0 0x1000>;
@@ -1439,7 +1441,7 @@
 
 	interrupt-controller@3ffff80060000 {
 		phandle = <0x11>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x60 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80060000 0x0 0x1000 0x3ffff 0x80061000 0x0 0x1000 0x3ffff 0x80062000 0x0 0x1000 0x3ffff 0x80063000 0x0 0x1000 0x3ffff 0x80064000 0x0 0x1000 0x3ffff 0x80065000 0x0 0x1000 0x3ffff 0x80066000 0x0 0x1000 0x3ffff 0x80067000 0x0 0x1000>;
@@ -1449,7 +1451,7 @@
 
 	interrupt-controller@3ffff80068000 {
 		phandle = <0x15>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x68 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80068000 0x0 0x1000 0x3ffff 0x80069000 0x0 0x1000 0x3ffff 0x8006a000 0x0 0x1000 0x3ffff 0x8006b000 0x0 0x1000 0x3ffff 0x8006c000 0x0 0x1000 0x3ffff 0x8006d000 0x0 0x1000 0x3ffff 0x8006e000 0x0 0x1000 0x3ffff 0x8006f000 0x0 0x1000>;
@@ -1459,7 +1461,7 @@
 
 	interrupt-controller@3ffff80070000 {
 		phandle = <0x19>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x70 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80070000 0x0 0x1000 0x3ffff 0x80071000 0x0 0x1000 0x3ffff 0x80072000 0x0 0x1000 0x3ffff 0x80073000 0x0 0x1000 0x3ffff 0x80074000 0x0 0x1000 0x3ffff 0x80075000 0x0 0x1000 0x3ffff 0x80076000 0x0 0x1000 0x3ffff 0x80077000 0x0 0x1000>;
@@ -1469,7 +1471,7 @@
 
 	interrupt-controller@3ffff80128000 {
 		phandle = <0x1d>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xa8 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80128000 0x0 0x1000 0x3ffff 0x80129000 0x0 0x1000 0x3ffff 0x8012a000 0x0 0x1000 0x3ffff 0x8012b000 0x0 0x1000 0x3ffff 0x8012c000 0x0 0x1000 0x3ffff 0x8012d000 0x0 0x1000 0x3ffff 0x8012e000 0x0 0x1000 0x3ffff 0x8012f000 0x0 0x1000>;
@@ -1479,7 +1481,7 @@
 
 	interrupt-controller@3ffff80130000 {
 		phandle = <0x21>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xb0 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80130000 0x0 0x1000 0x3ffff 0x80131000 0x0 0x1000 0x3ffff 0x80132000 0x0 0x1000 0x3ffff 0x80133000 0x0 0x1000 0x3ffff 0x80134000 0x0 0x1000 0x3ffff 0x80135000 0x0 0x1000 0x3ffff 0x80136000 0x0 0x1000 0x3ffff 0x80137000 0x0 0x1000>;
@@ -1489,7 +1491,7 @@
 
 	interrupt-controller@3ffff80160000 {
 		phandle = <0x25>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xe0 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80160000 0x0 0x1000 0x3ffff 0x80161000 0x0 0x1000 0x3ffff 0x80162000 0x0 0x1000 0x3ffff 0x80163000 0x0 0x1000 0x3ffff 0x80164000 0x0 0x1000 0x3ffff 0x80165000 0x0 0x1000 0x3ffff 0x80166000 0x0 0x1000 0x3ffff 0x80167000 0x0 0x1000>;
@@ -1499,7 +1501,7 @@
 
 	interrupt-controller@3ffff80168000 {
 		phandle = <0x29>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xe8 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80168000 0x0 0x1000 0x3ffff 0x80169000 0x0 0x1000 0x3ffff 0x8016a000 0x0 0x1000 0x3ffff 0x8016b000 0x0 0x1000 0x3ffff 0x8016c000 0x0 0x1000 0x3ffff 0x8016d000 0x0 0x1000 0x3ffff 0x8016e000 0x0 0x1000 0x3ffff 0x8016f000 0x0 0x1000>;
@@ -1509,7 +1511,7 @@
 
 	interrupt-controller@3ffff80170000 {
 		phandle = <0x2d>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0xf0 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80170000 0x0 0x1000 0x3ffff 0x80171000 0x0 0x1000 0x3ffff 0x80172000 0x0 0x1000 0x3ffff 0x80173000 0x0 0x1000 0x3ffff 0x80174000 0x0 0x1000 0x3ffff 0x80175000 0x0 0x1000 0x3ffff 0x80176000 0x0 0x1000 0x3ffff 0x80177000 0x0 0x1000>;
@@ -1519,7 +1521,7 @@
 
 	interrupt-controller@3ffff80828000 {
 		phandle = <0x31>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x828 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80828000 0x0 0x1000 0x3ffff 0x80829000 0x0 0x1000 0x3ffff 0x8082a000 0x0 0x1000 0x3ffff 0x8082b000 0x0 0x1000 0x3ffff 0x8082c000 0x0 0x1000 0x3ffff 0x8082d000 0x0 0x1000 0x3ffff 0x8082e000 0x0 0x1000 0x3ffff 0x8082f000 0x0 0x1000>;
@@ -1529,7 +1531,7 @@
 
 	interrupt-controller@3ffff80830000 {
 		phandle = <0x35>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x830 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80830000 0x0 0x1000 0x3ffff 0x80831000 0x0 0x1000 0x3ffff 0x80832000 0x0 0x1000 0x3ffff 0x80833000 0x0 0x1000 0x3ffff 0x80834000 0x0 0x1000 0x3ffff 0x80835000 0x0 0x1000 0x3ffff 0x80836000 0x0 0x1000 0x3ffff 0x80837000 0x0 0x1000>;
@@ -1539,7 +1541,7 @@
 
 	interrupt-controller@3ffff80860000 {
 		phandle = <0x39>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x860 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80860000 0x0 0x1000 0x3ffff 0x80861000 0x0 0x1000 0x3ffff 0x80862000 0x0 0x1000 0x3ffff 0x80863000 0x0 0x1000 0x3ffff 0x80864000 0x0 0x1000 0x3ffff 0x80865000 0x0 0x1000 0x3ffff 0x80866000 0x0 0x1000 0x3ffff 0x80867000 0x0 0x1000>;
@@ -1549,7 +1551,7 @@
 
 	interrupt-controller@3ffff80868000 {
 		phandle = <0x3d>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x868 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80868000 0x0 0x1000 0x3ffff 0x80869000 0x0 0x1000 0x3ffff 0x8086a000 0x0 0x1000 0x3ffff 0x8086b000 0x0 0x1000 0x3ffff 0x8086c000 0x0 0x1000 0x3ffff 0x8086d000 0x0 0x1000 0x3ffff 0x8086e000 0x0 0x1000 0x3ffff 0x8086f000 0x0 0x1000>;
@@ -1559,7 +1561,7 @@
 
 	interrupt-controller@3ffff80870000 {
 		phandle = <0x41>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x870 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80870000 0x0 0x1000 0x3ffff 0x80871000 0x0 0x1000 0x3ffff 0x80872000 0x0 0x1000 0x3ffff 0x80873000 0x0 0x1000 0x3ffff 0x80874000 0x0 0x1000 0x3ffff 0x80875000 0x0 0x1000 0x3ffff 0x80876000 0x0 0x1000 0x3ffff 0x80877000 0x0 0x1000>;
@@ -1569,7 +1571,7 @@
 
 	interrupt-controller@3ffff80920000 {
 		phandle = <0x45>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x8a0 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80920000 0x0 0x1000 0x3ffff 0x80921000 0x0 0x1000 0x3ffff 0x80922000 0x0 0x1000 0x3ffff 0x80923000 0x0 0x1000 0x3ffff 0x80924000 0x0 0x1000 0x3ffff 0x80925000 0x0 0x1000 0x3ffff 0x80926000 0x0 0x1000 0x3ffff 0x80927000 0x0 0x1000>;
@@ -1579,7 +1581,7 @@
 
 	interrupt-controller@3ffff80928000 {
 		phandle = <0x49>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x8a8 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80928000 0x0 0x1000 0x3ffff 0x80929000 0x0 0x1000 0x3ffff 0x8092a000 0x0 0x1000 0x3ffff 0x8092b000 0x0 0x1000 0x3ffff 0x8092c000 0x0 0x1000 0x3ffff 0x8092d000 0x0 0x1000 0x3ffff 0x8092e000 0x0 0x1000 0x3ffff 0x8092f000 0x0 0x1000>;
@@ -1589,7 +1591,7 @@
 
 	interrupt-controller@3ffff80930000 {
 		phandle = <0x4d>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x8b0 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80930000 0x0 0x1000 0x3ffff 0x80931000 0x0 0x1000 0x3ffff 0x80932000 0x0 0x1000 0x3ffff 0x80933000 0x0 0x1000 0x3ffff 0x80934000 0x0 0x1000 0x3ffff 0x80935000 0x0 0x1000 0x3ffff 0x80936000 0x0 0x1000 0x3ffff 0x80937000 0x0 0x1000>;
@@ -1599,7 +1601,7 @@
 
 	interrupt-controller@3ffff80968000 {
 		phandle = <0x51>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x8e8 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80968000 0x0 0x1000 0x3ffff 0x80969000 0x0 0x1000 0x3ffff 0x8096a000 0x0 0x1000 0x3ffff 0x8096b000 0x0 0x1000 0x3ffff 0x8096c000 0x0 0x1000 0x3ffff 0x8096d000 0x0 0x1000 0x3ffff 0x8096e000 0x0 0x1000 0x3ffff 0x8096f000 0x0 0x1000>;
@@ -1609,7 +1611,7 @@
 
 	interrupt-controller@3ffff80970000 {
 		phandle = <0x55>;
-		compatible = "ibm,ppc-xicp", "IBM,power7-icp";
+		compatible = "ibm,ppc-xicp", "IBM,power8-icp";
 		ibm,interrupt-server-ranges = <0x8f0 0x8>;
 		interrupt-controller;
 		reg = <0x3ffff 0x80970000 0x0 0x1000 0x3ffff 0x80971000 0x0 0x1000 0x3ffff 0x80972000 0x0 0x1000 0x3ffff 0x80973000 0x0 0x1000 0x3ffff 0x80974000 0x0 0x1000 0x3ffff 0x80975000 0x0 0x1000 0x3ffff 0x80976000 0x0 0x1000 0x3ffff 0x80977000 0x0 0x1000>;
@@ -2069,7 +2071,7 @@
 		#address-cells = <0x1>;
 		#size-cells = <0x1>;
 		scom-controller;
-		compatible = "ibm,xscom", "ibm,power7-xscom";
+		compatible = "ibm,xscom", "ibm,power8-xscom";
 		reg = <0x3fc00 0x0 0x8 0x0>;
 		bus-frequency = <0x0 0x1dcd6500>;
 		ibm,dbob-id = <0x0>;
@@ -2083,14 +2085,14 @@
 		chiptod@40000 {
 			phandle = <0x8e>;
 			reg = <0x40000 0x34>;
-			compatible = "ibm,power-chiptod", "ibm,power7-chiptod";
+			compatible = "ibm,power-chiptod", "ibm,power8-chiptod";
 			primary;
 		};
 
 		nx@2010000 {
 			phandle = <0x92>;
 			reg = <0x2010000 0x4000>;
-			compatible = "ibm,power-nx", "ibm,power7-nx";
+			compatible = "ibm,power-nx", "ibm,power8-nx";
 		};
 
 		pbcq@2012000 {
@@ -2115,10 +2117,10 @@
 			ibm,lane-eq = <0x77777777 0x77777777 0x77777777 0x77777777 0x0 0x0 0x0 0x0>;
 		};
 
-		psihb@2010c00 {
+		psihb@2010900 {
 			phandle = <0x85>;
-			reg = <0x2010c00 0x10>;
-			compatible = "ibm,power7-psihb-x", "ibm,psihb-x";
+			reg = <0x2010900 0x20>;
+			compatible = "ibm,power8-psihb-x", "ibm,psihb-x";
 			boot-link;
 			status = "ok";
 		};
@@ -2131,7 +2133,7 @@
 		#address-cells = <0x1>;
 		#size-cells = <0x1>;
 		scom-controller;
-		compatible = "ibm,xscom", "ibm,power7-xscom";
+		compatible = "ibm,xscom", "ibm,power8-xscom";
 		reg = <0x3fc08 0x0 0x8 0x0>;
 		bus-frequency = <0x0 0x1dcd6500>;
 		ibm,dbob-id = <0x0>;
@@ -2145,13 +2147,13 @@
 		chiptod@40000 {
 			phandle = <0x8f>;
 			reg = <0x40000 0x34>;
-			compatible = "ibm,power-chiptod", "ibm,power7-chiptod";
+			compatible = "ibm,power-chiptod", "ibm,power8-chiptod";
 		};
 
 		nx@2010000 {
 			phandle = <0x93>;
 			reg = <0x2010000 0x4000>;
-			compatible = "ibm,power-nx", "ibm,power7-nx";
+			compatible = "ibm,power-nx", "ibm,power8-nx";
 		};
 
 		pbcq@2012000 {
@@ -2176,10 +2178,10 @@
 			ibm,lane-eq = <0x68686868 0x68686868 0x68686868 0x68686868 0x0 0x0 0x0 0x0>;
 		};
 
-		psihb@2010c00 {
+		psihb@2010900 {
 			phandle = <0x87>;
-			reg = <0x2010c00 0x10>;
-			compatible = "ibm,power7-psihb-x", "ibm,psihb-x";
+			reg = <0x2010900 0x20>;
+			compatible = "ibm,power8-psihb-x", "ibm,psihb-x";
 		};
 	};
 
@@ -2190,7 +2192,7 @@
 		#address-cells = <0x1>;
 		#size-cells = <0x1>;
 		scom-controller;
-		compatible = "ibm,xscom", "ibm,power7-xscom";
+		compatible = "ibm,xscom", "ibm,power8-xscom";
 		reg = <0x3fc80 0x0 0x8 0x0>;
 		bus-frequency = <0x0 0x1dcd6500>;
 		ibm,dbob-id = <0x0>;
@@ -2204,14 +2206,14 @@
 		chiptod@40000 {
 			phandle = <0x90>;
 			reg = <0x40000 0x34>;
-			compatible = "ibm,power-chiptod", "ibm,power7-chiptod";
+			compatible = "ibm,power-chiptod", "ibm,power8-chiptod";
 			secondary;
 		};
 
 		nx@2010000 {
 			phandle = <0x94>;
 			reg = <0x2010000 0x4000>;
-			compatible = "ibm,power-nx", "ibm,power7-nx";
+			compatible = "ibm,power-nx", "ibm,power8-nx";
 		};
 
 		pbcq@2012000 {
@@ -2225,10 +2227,10 @@
 			ibm,lane-eq = <0x77777777 0x77777777 0x77777777 0x77777777 0x77777777 0x77777777 0x77777777 0x77777777>;
 		};
 
-		psihb@2010c00 {
+		psihb@2010900 {
 			phandle = <0x89>;
-			reg = <0x2010c00 0x10>;
-			compatible = "ibm,power7-psihb-x", "ibm,psihb-x";
+			reg = <0x2010900 0x20>;
+			compatible = "ibm,power8-psihb-x", "ibm,psihb-x";
 			status = "ok";
 		};
 	};
@@ -2240,7 +2242,7 @@
 		#address-cells = <0x1>;
 		#size-cells = <0x1>;
 		scom-controller;
-		compatible = "ibm,xscom", "ibm,power7-xscom";
+		compatible = "ibm,xscom", "ibm,power8-xscom";
 		reg = <0x3fc88 0x0 0x8 0x0>;
 		bus-frequency = <0x0 0x1dcd6500>;
 		ibm,dbob-id = <0x0>;
@@ -2254,13 +2256,13 @@
 		chiptod@40000 {
 			phandle = <0x91>;
 			reg = <0x40000 0x34>;
-			compatible = "ibm,power-chiptod", "ibm,power7-chiptod";
+			compatible = "ibm,power-chiptod", "ibm,power8-chiptod";
 		};
 
 		nx@2010000 {
 			phandle = <0x95>;
 			reg = <0x2010000 0x4000>;
-			compatible = "ibm,power-nx", "ibm,power7-nx";
+			compatible = "ibm,power-nx", "ibm,power8-nx";
 		};
 
 		pbcq@2012000 {
@@ -2285,10 +2287,10 @@
 			ibm,lane-eq = <0x77777777 0x77777777 0x77777777 0x77777777 0x0 0x0 0x0 0x0>;
 		};
 
-		psihb@2010c00 {
+		psihb@2010900 {
 			phandle = <0x8b>;
-			reg = <0x2010c00 0x10>;
-			compatible = "ibm,power7-psihb-x", "ibm,psihb-x";
+			reg = <0x2010900 0x20>;
+			compatible = "ibm,power8-psihb-x", "ibm,psihb-x";
 		};
 	};
 };