Merge branch 'hwspinlock-linux-4.19.y' of git://git.ti.com/rpmsg/hwspinlock into rpmsg-ti-linux-4.19.y

Pull in the hwspinlock feature tree that moves the AM65x HwSpinlock DT
node from cbass_main interconnect node to the more accurate main_navss
interconnect node.

* 'hwspinlock-linux-4.19.y' of git://git.ti.com/rpmsg/hwspinlock:
  arm64: dts: ti: k3-am65-main: Move hwspinlock node to main_navss interconnect

Signed-off-by: Suman Anna <s-anna@ti.com>

arch/arm64/boot/dts/ti/k3-am65-main.dtsi

@@ -113,6 +113,12 @@
 			ti,sci-rm-range-global-event = <0x1>;
 		};
 
+		hwspinlock: spinlock@30e00000 {
+			compatible = "ti,am654-hwspinlock";
+			reg = <0x00 0x30e00000 0x00 0x1000>;
+			#hwlock-cells = <1>;
+		};
+
 		ringacc: ringacc@3c000000 {
 			compatible = "ti,am654-navss-ringacc";
 			reg =	<0x0 0x3c000000 0x0 0x400000>,
@@ -338,12 +344,6 @@
 		clock-names = "gpio";
 	};
 
-	hwspinlock: spinlock@30e00000 {
-		compatible = "ti,am654-hwspinlock";
-		reg = <0x00 0x30e00000 0x00 0x1000>;
-		#hwlock-cells = <1>;
-	};
-
 	mailbox0_cluster0: mailbox@31f80000 {
 		compatible = "ti,am654-mailbox";
 		reg = <0x00 0x31f80000 0x00 0x200>;