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

Author: cristibirsan

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

@@ -13,8 +13,8 @@
 #include <dt-bindings/mfd/atmel-flexcom.h>
 
 / {
-	model = "Atmel SAMA5D27 ICP EK";
-	compatible = "atmel,sama5d27-icp-ek", "atmel,sama5d27-icp", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5";
+	model = "Microchip SAMA5D2-ICP";
+	compatible = "microchip,sama5d2-icp", "atmel,sama5d2", "atmel,sama5";
 
 	aliases {
 		serial0 = &uart0;	/* DBGU */
@@ -101,12 +101,43 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_qspi1_default>;
 				status = "disabled"; /* Conflict with wilc_pwrseq, flx2 */
+
 				flash@0 {
-					reg = <0>;
+					#address-cells = <1>;
+					#size-cells = <1>;
 					compatible = "jedec,spi-nor";
-					spi-max-frequency = <20000000>;
+					reg = <0>;
+					spi-max-frequency = <80000000>;
+					spi-tx-bus-width = <4>;
+					spi-rx-bus-width = <4>;
 					m25p,fast-read;
+
+					at91bootstrap@00000000 {
+						label = "at91bootstrap";
+						reg = <0x00000000 0x00010000>;
+					};
+
+					bootloader@00010000 {
+						label = "bootloader";
+						reg = <0x00010000 0x000a0000>;
+					};
+
+					bootloaderenv@000b0000 {
+						label = "bootloader env";
+						reg = <0x000b0000 0x00010000>;
+					};
+
+					dtb@000c0000 {
+						label = "device tree";
+						reg = <0x000c0000 0x0020000>;
+					};
+
+					kernel@000e0000 {
+						label = "kernel";
+						reg = <0x000e0000 0x0400000>;
+					};
 				};
+
 			};
 
 			spi0: spi@f8000000 {  /* mikrobus3 spi */