Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-pxs2.dtsi,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-pxs2.dtsi,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1.1.6.2.2
retrieving revision 1.1.1.7
diff -u -p -r1.1.1.6.2.2 -r1.1.1.7
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-pxs2.dtsi	2020/04/08 14:08:36	1.1.1.6.2.2
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-pxs2.dtsi	2019/01/22 14:57:02	1.1.1.7
@@ -141,10 +141,8 @@
 			cooling-maps {
 				map {
 					trip = <&cpu_alert>;
-					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+					cooling-device = <&cpu0
+					    THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				};
 			};
 		};
@@ -766,11 +764,9 @@
 			status = "disabled";
 			reg-names = "nand_data", "denali_reg";
 			reg = <0x68000000 0x20>, <0x68100000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <0 65 4>;
 			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_nand>;
+			pinctrl-0 = <&pinctrl_nand2cs>;
 			clock-names = "nand", "nand_x", "ecc";
 			clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
 			resets = <&sys_rst 2>;