rk: restore file mode

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3188.dtsi

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
old mode 100755 (executable)
new mode 100644 (file)
index 5191fad..e718928
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -501,24 +501,24 @@
                        <&clk_gpu 200000000>, <&aclk_lcdc0 300000000>,
                        <&aclk_lcdc1 300000000>;
        };
-       rockchip_suspend {     
+
+       rockchip_suspend: rockchip_suspend {
                 //compatible = "rockchip,rkpm_suspend";
                 // define value is in dt-bindint/suspend/rockchip-pm.h
-                rockchip,ctrbits = <   
+                rockchip,ctrbits = <
                                                (
                                                RKPM_CTR_PWR_DMNS
                                                |RKPM_CTR_GTCLKS
                                                |RKPM_CTR_PLLS
                                                |RKPM_CTR_SYSCLK_DIV
-                                               |RKPM_CTR_NORIDLE_MD
                                                )
-                                       >;              
+                                       >;
               rockchip,pmic-gpios=<
-                                                RKPM_PINGPIO_BITS_OUTPUT(GPIO0_A0,RKPM_GPIO_OUT_L) 
-                                                RKPM_PINGPIO_BITS_INTPUT(GPIO0_A1,RKPM_GPIO_PULL_UP)                           
+                                                RKPM_PINGPIO_BITS_OUTPUT(GPIO0_A0,RKPM_GPIO_OUT_L)
+                                                RKPM_PINGPIO_BITS_INTPUT(GPIO0_A1,RKPM_GPIO_PULL_UP)
                                                 >;
-       
         };
+
        fb: fb{
                compatible = "rockchip,rk-fb";
                rockchip,disp-mode = <DUAL>;
@@ -740,6 +740,7 @@
                usb_bc{
                        compatible = "rockchip,ctrl";
                        rk_usb,bvalid   = <0xac 10 1>;
+                       rk_usb,iddig    = <0xac 13 1>;
                        rk_usb,line     = <0xac 11 2>;
                        rk_usb,softctrl = <0x114 2 1>;
                        rk_usb,opmode   = <0x118 1 2>;
@@ -767,14 +768,14 @@
                clock-names = "clk_usbphy1", "hclk_usb1";
        };
 
-       hsic: hsic@10240000 {
-               compatible = "rockchip,rk3188_rk_hsic_host";
+       usb2: usb@10240000 {
+               compatible = "rockchip,rk3188_rk_ehci_host";
                reg = <0x10240000 0x40000>;
                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&clk_hsicphy480m>, <&clk_gates7 4>,
-                 <&clk_hsicphy12m>, <&otgphy1_480m>;
-               clock-names = "hsicphy_480m", "hclk_hsic",
-                      "hsicphy_12m", "hsic_usbphy1";
+               clocks = <&clk_ehci1phy480m>, <&clk_gates7 4>,
+                 <&clk_ehci1phy12m>, <&otgphy1_480m>;
+               clock-names = "ehci1phy_480m", "hclk_ehci1",
+                      "ehci1phy_12m", "ehci1_usbphy1";
        };
 
        vmac@10204000 {