Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / ti / k3-am65-wakeup.dtsi

diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index a1ffe88..7cb864b 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -6,24 +6,24 @@
  */
 
 &cbass_wakeup {
-       dmsc: dmsc {
+       dmsc: system-controller@44083000 {
                compatible = "ti,am654-sci";
                ti,host-id = <12>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
 
                mbox-names = "rx", "tx";
 
                mboxes= <&secure_proxy_main 11>,
                        <&secure_proxy_main 13>;
 
+               reg-names = "debug_messages";
+               reg = <0x44083000 0x1000>;
+
                k3_pds: power-controller {
                        compatible = "ti,sci-pm-domain";
                        #power-domain-cells = <2>;
                };
 
-               k3_clks: clocks {
+               k3_clks: clock-controller {
                        compatible = "ti,k2g-sci-clk";
                        #clock-cells = <2>;
                };
@@ -39,7 +39,7 @@
                reg = <0x43000014 0x4>;
        };
 
-       wkup_pmx0: pinmux@4301c000 {
+       wkup_pmx0: pinctrl@4301c000 {
                compatible = "pinctrl-single";
                reg = <0x4301c000 0x118>;
                #pinctrl-cells = <1>;
@@ -69,8 +69,9 @@
                power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;
        };
 
-       intr_wkup_gpio: interrupt-controller2 {
+       intr_wkup_gpio: interrupt-controller@42200000 {
                compatible = "ti,sci-intr";
+               reg = <0x42200000 0x200>;
                ti,intr-trigger-type = <1>;
                interrupt-controller;
                interrupt-parent = <&gic500>;
@@ -80,7 +81,7 @@
                ti,interrupt-ranges = <0 712 16>;
        };
 
-       wkup_gpio0: wkup_gpio0@42110000 {
+       wkup_gpio0: gpio@42110000 {
                compatible = "ti,am654-gpio", "ti,keystone-gpio";
                reg = <0x42110000 0x100>;
                gpio-controller;
@@ -95,7 +96,7 @@
                clock-names = "gpio";
        };
 
-       wkup_vtm0: thermal@42050000 {
+       wkup_vtm0: temperature-sensor@42050000 {
                compatible = "ti,am654-vtm";
                reg = <0x42050000 0x25c>;
                power-domains = <&k3_pds 80 TI_SCI_PD_EXCLUSIVE>;