arm64: update fdts for models from arm upstreamleg-20131205.0

Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>

8 files changed, 11 insertions, 17 deletions

diff --git a/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts b/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts
index 7aa18a5ffaf8..646afb7de396 100644
--- a/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts
+++ b/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -115,10 +115,8 @@
 
 	memory@80000000 {
 		device_type = "memory";
-		reg = <0x00000000 0x80000000 0 0x80000000>;
-		/*
+		reg = <0x00000000 0x80000000 0 0x80000000>,
 		      <0x00000008 0x80000000 0 0x80000000>;
-		*/
 	};
 
 	gic: interrupt-controller@2f000000 {
diff --git a/arch/arm64/boot/dts/fvp-base-gicv2legacy-psci.dts b/arch/arm64/boot/dts/fvp-base-gicv2legacy-psci.dts
index 340ae500c247..a5e0f492270c 100644
--- a/arch/arm64/boot/dts/fvp-base-gicv2legacy-psci.dts
+++ b/arch/arm64/boot/dts/fvp-base-gicv2legacy-psci.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -115,10 +115,8 @@
 
 	memory@80000000 {
 		device_type = "memory";
-		reg = <0x00000000 0x80000000 0 0x80000000>;
-		/*
+		reg = <0x00000000 0x80000000 0 0x80000000>,
 		      <0x00000008 0x80000000 0 0x80000000>;
-		*/
 	};
 
 	gic: interrupt-controller@2c001000 {
diff --git a/arch/arm64/boot/dts/fvp-base-gicv3-psci.dts b/arch/arm64/boot/dts/fvp-base-gicv3-psci.dts
index 8bafe2675ac5..4e95ee72bb7c 100644
--- a/arch/arm64/boot/dts/fvp-base-gicv3-psci.dts
+++ b/arch/arm64/boot/dts/fvp-base-gicv3-psci.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -115,10 +115,8 @@
 
 	memory@80000000 {
 		device_type = "memory";
-		reg = <0x00000000 0x80000000 0 0x80000000>;
-		/*
+		reg = <0x00000000 0x80000000 0 0x80000000>,
 		      <0x00000008 0x80000000 0 0x80000000>;
-		*/
 	};
 
 	gic: interrupt-controller@2f000000 {
diff --git a/arch/arm64/boot/dts/fvp-foundation-gicv2-psci.dts b/arch/arm64/boot/dts/fvp-foundation-gicv2-psci.dts
index 7924ff2124da..983ae159e943 100644
--- a/arch/arm64/boot/dts/fvp-foundation-gicv2-psci.dts
+++ b/arch/arm64/boot/dts/fvp-foundation-gicv2-psci.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/arch/arm64/boot/dts/fvp-foundation-gicv2legacy-psci.dts b/arch/arm64/boot/dts/fvp-foundation-gicv2legacy-psci.dts
index 656802eaa9b9..18b4f1e38dcd 100644
--- a/arch/arm64/boot/dts/fvp-foundation-gicv2legacy-psci.dts
+++ b/arch/arm64/boot/dts/fvp-foundation-gicv2legacy-psci.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/arch/arm64/boot/dts/fvp-foundation-gicv3-psci.dts b/arch/arm64/boot/dts/fvp-foundation-gicv3-psci.dts
index 87ee3c01619f..bbe1e07b360c 100644
--- a/arch/arm64/boot/dts/fvp-foundation-gicv3-psci.dts
+++ b/arch/arm64/boot/dts/fvp-foundation-gicv3-psci.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/arch/arm64/boot/dts/fvp-foundation-motherboard.dtsi b/arch/arm64/boot/dts/fvp-foundation-motherboard.dtsi
index 76cae31f4f85..cac7aa2782af 100644
--- a/arch/arm64/boot/dts/fvp-foundation-motherboard.dtsi
+++ b/arch/arm64/boot/dts/fvp-foundation-motherboard.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
index 00e92c5b5212..3f429da32599 100644
--- a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met: