From: Alpha Lin Date: Tue, 11 Aug 2015 08:00:48 +0000 (+0800) Subject: RK312x, VPU: add Reset resource. X-Git-Tag: firefly_0821_release~3855 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b2d4b9487579cff5fb92e11125bd2779c7259f09;p=firefly-linux-kernel-4.4.55.git RK312x, VPU: add Reset resource. support vpu combo cru reset for rk312x. Signed-off-by: Alpha Lin --- diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index f8610a3ebccc..0f989a07a8ed 100755 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -813,6 +813,9 @@ rockchip,sub = <&vpu>, <&hevc>; clocks = <&clk_vdpu>, <&hclk_vdpu>, <&clk_hevc_core>; clock-names = "aclk_vcodec", "hclk_vcodec", "clk_core"; + resets = <&reset RK3128_RST_VCODEC_H>, <&reset RK3128_RST_VCODEC_A>, + <&reset RK3128_RST_HEVC>; + reset-names = "video_h", "video_a", "video"; mode_bit = <15>; mode_ctrl = <0x144>; name = "vpu_combo";