Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / arch / arm / boot / dts / keystone.dtsi

diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 00cb314..02708ba 100644 (file)
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -70,14 +70,6 @@
                cpu_on          = <0x84000003>;
        };
 
-       psci {
-               compatible      = "arm,psci";
-               method          = "smc";
-               cpu_suspend     = <0x84000001>;
-               cpu_off         = <0x84000002>;
-               cpu_on          = <0x84000003>;
-       };
-
        soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -196,7 +188,7 @@
                        status = "disabled";
                };
 
-               usb: usb@2680000 {
+               keystone_usb0: usb@2680000 {
                        compatible = "ti,keystone-dwc3";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -209,7 +201,7 @@
                        dma-ranges;
                        status = "disabled";
 
-                       dwc3@2690000 {
+                       usb0: dwc3@2690000 {
                                compatible = "synopsys,dwc3";
                                reg = <0x2690000 0x70000>;
                                interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;