merge: top of linux

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

src/arm64/ti/k3-am62x-sk-common.dtsi

@@ -51,8 +51,8 @@
 		/* global cma region */
 		linux,cma {
 			compatible = "shared-dma-pool";
-			size = <0x00 0x8000000>;
 			reusable;
+			size = <0x00 0x8000000>;
 			linux,cma-default;
 		};
 
@@ -348,15 +348,9 @@
 			self-powered;
 			data-role = "dual";
 			power-role = "sink";
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@0 {
-					reg = <0>;
-					usb_con_hs: endpoint {
-						remote-endpoint = <&usb0_hs_ep>;
-					};
+			port {
+				usb_con_hs: endpoint {
+					remote-endpoint = <&usb0_hs_ep>;
 				};
 			};
 		};
@@ -483,12 +477,9 @@
 
 &usb0 {
 	bootph-all;
-	#address-cells = <1>;
-	#size-cells = <0>;
 	usb-role-switch;
 
-	port@0 {
-		reg = <0>;
+	port {
 		usb0_hs_ep: endpoint {
 		    remote-endpoint = <&usb_con_hs>;
 	       };