Merge branch 'at91-4.19-trunk/dt_sama5d2-icp' into linux-4.19-at91

Author: cristibirsan

arch/arm/boot/dts/at91-sama5d2_icp.dts

@@ -102,42 +102,47 @@
 				pinctrl-0 = <&pinctrl_qspi1_default>;
 				status = "disabled"; /* Conflict with wilc_pwrseq, flx2 */
 
-				flash@0 {
+				qspi1_flash: spi_flash@0 {
 					#address-cells = <1>;
 					#size-cells = <1>;
 					compatible = "jedec,spi-nor";
 					reg = <0>;
 					spi-max-frequency = <80000000>;
-					spi-tx-bus-width = <4>;
 					spi-rx-bus-width = <4>;
+					spi-tx-bus-width = <4>;
 					m25p,fast-read;
+					status = "disabled";
 
-					at91bootstrap@00000000 {
+					at91bootstrap@0 {
 						label = "at91bootstrap";
-						reg = <0x00000000 0x00010000>;
+						reg = <0x0 0x40000>;
 					};
 
-					bootloader@00010000 {
+					bootloader@40000 {
 						label = "bootloader";
-						reg = <0x00010000 0x000a0000>;
+						reg = <0x40000 0xc0000>;
 					};
 
-					bootloaderenv@000b0000 {
+					bootloaderenvred@100000 {
+						label = "bootloader env redundant";
+						reg = <0x100000 0x40000>;
+					};
+
+					bootloaderenv@140000 {
 						label = "bootloader env";
-						reg = <0x000b0000 0x00010000>;
+						reg = <0x140000 0x40000>;
 					};
 
-					dtb@000c0000 {
+					dtb@180000 {
 						label = "device tree";
-						reg = <0x000c0000 0x0020000>;
+						reg = <0x180000 0x80000>;
 					};
 
-					kernel@000e0000 {
+					kernel@200000 {
 						label = "kernel";
-						reg = <0x000e0000 0x0400000>;
+						reg = <0x200000 0x600000>;
 					};
 				};
-
 			};
 
 			spi0: spi@f8000000 {  /* mikrobus3 spi */