projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7f242a5
)
RK312x, VPU: add Reset resource.
author
Alpha Lin
<alpha.lin@rock-chips.com>
Tue, 11 Aug 2015 08:00:48 +0000
(16:00 +0800)
committer
Alpha Lin
<alpha.lin@rock-chips.com>
Tue, 11 Aug 2015 08:13:14 +0000
(16:13 +0800)
support vpu combo cru reset for rk312x.
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
arch/arm/boot/dts/rk312x.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/rk312x.dtsi
b/arch/arm/boot/dts/rk312x.dtsi
index f8610a3ebcccc3dcb94a127f867186033b793946..0f989a07a8edc50ad2bf55c2a2c4ecf4e5a34895 100755
(executable)
--- 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";