From: xxm Date: Wed, 19 Mar 2014 06:36:05 +0000 (+0800) Subject: rk3288.dtsi : fix error in commit ca55a92fcb X-Git-Tag: firefly_0821_release~6005 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4aaa6182b7218e01fd8ca38dec0205e84c56a4a6;p=firefly-linux-kernel-4.4.55.git rk3288.dtsi : fix error in commit ca55a92fcb --- diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 9de1b7558271..424499669f23 100755 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -831,16 +831,16 @@ pinctrl-0 = <&mac_clk &mac_txpins &mac_rxpins &mac_mdpins>; }; gpu{ - compatible = "arm,malit764", - "arm,malit76x", - "arm,malit7xx", - "arm,mali-midgard"; + compatible = "arm,malit764", + "arm,malit76x", + "arm,malit7xx", + "arm,mali-midgard"; reg = <0xffa40000 0x1000>; - interrupts = , - , - ; - interrupt-names = "JOB", - "MMU", + interrupts = , + , + ; + interrupt-names = "JOB", + "MMU", "GPU"; }; @@ -848,7 +848,7 @@ dbgname = "iep"; compatible = "iommu,iep_mmu"; reg = <0xffa40000 0x10000>; - interrupts = ; + interrupts = ; interrupt-names = "iep_mmu"; }; @@ -856,7 +856,7 @@ dbgname = "vip"; compatible = "iommu,vip_mmu"; reg = <0xffa40000 0x10000>; - interrupts = ; + interrupts = ; interrupt-names = "vip_mmu"; }; @@ -864,7 +864,7 @@ dbgname = "isp0"; compatible = "iommu,isp0_mmu"; reg = <0xffa40000 0x10000>; - interrupts = ; + interrupts = ; interrupt-names = "isp0_mmu"; }; @@ -872,7 +872,7 @@ dbgname = "isp1"; compatible = "iommu,isp1_mmu"; reg = <0xffa40000 0x10000>; - interrupts = ; + interrupts = ; interrupt-names = "isp1_mmu"; }; @@ -880,7 +880,7 @@ dbgname = "vopb"; compatible = "iommu,vopb_mmu"; reg = <0xffa40000 0x10000>; - interrupts = ; + interrupts = ; interrupt-names = "vopb_mmu"; }; @@ -888,8 +888,10 @@ dbgname = "vopl"; compatible = "iommu,vopl_mmu"; reg = <0xffa40000 0x10000>; - interrupts = ; - interrupt-names = "vopl_mmu";}; + interrupts = ; + interrupt-names = "vopl_mmu"; + }; + rockchip_suspend { rockchip,ctrbits = < (0