From 39944a035fb7763d453bb630da5e8debeed27af3 Mon Sep 17 00:00:00 2001 From: Grey Li Date: Mon, 9 Dec 2019 15:38:58 +0800 Subject: [PATCH] dt-bindings: video: mpp: add reset group Change-Id: Ibffc586265f2cfc390d9fe4941d7cb91bc46bec4 Signed-off-by: Grey Li --- .../devicetree/bindings/video/rockchip_codec.txt | 16 +++++++++++++--- .../devicetree/bindings/video/rockchip_mpp.txt | 4 ++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/video/rockchip_codec.txt b/Documentation/devicetree/bindings/video/rockchip_codec.txt index e62fb4f9fb47..13ee9d38f2d9 100644 --- a/Documentation/devicetree/bindings/video/rockchip_codec.txt +++ b/Documentation/devicetree/bindings/video/rockchip_codec.txt @@ -18,12 +18,20 @@ Required properties: "rockchip,rkv-encoder-rv1108", "rockchip,hevc-encoder-v22", --rockchip,srv: The pointer of service device node. +- rockchip,srv: The pointer of service device node. the value must be the name of service device, like <&mpp_srv>. - rockchip,taskqueue-node: The taskqueue node number of current device working. the value must between 0 and rockchip,taskqueue-count +- rockchip,resetgroup-node: The resetgroup node number of current reset group. + If two devices have the same reset clk, they should in the same reset group. + the value must between 0 and rockchip,resetgroup-count + +- reset-name: The name of reset clk. + If two devices have the same reset clk, the reset-name should stay the same + and add "shared_" prefix. + Example: DT entry: @@ -36,11 +44,12 @@ DT entry: clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; clock-names = "aclk_vcodec", "hclk_vcodec"; resets = <&cru SRST_H_VCODEC>, <&cru SRST_A_VCODEC>; - reset-names = "video_h", "video_a"; + reset-names = "shared_video_h", "shared_video_a"; iommus = <&vpu_mmu>; power-domains = <&power RK3399_PD_VCODEC>; rockchip,srv = <&mpp_srv>; rockchip,taskqueue-node = <0>; + rockchip,resetgroup-node = <0>; status = "disabled"; }; @@ -52,10 +61,11 @@ DT entry: clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; clock-names = "aclk_vcodec", "hclk_vcodec"; resets = <&cru SRST_H_VCODEC>, <&cru SRST_A_VCODEC>; - reset-names = "video_h", "video_a"; + reset-names = "shared_video_h", "shared_video_a"; iommus = <&vpu_mmu>; rockchip,srv = <&mpp_srv>; rockchip,taskqueue-node = <0>; + rockchip,resetgroup-node = <0>; power-domains = <&power RK3399_PD_VCODEC>; status = "disabled"; }; diff --git a/Documentation/devicetree/bindings/video/rockchip_mpp.txt b/Documentation/devicetree/bindings/video/rockchip_mpp.txt index dd22251c3547..9baa06ab14a7 100644 --- a/Documentation/devicetree/bindings/video/rockchip_mpp.txt +++ b/Documentation/devicetree/bindings/video/rockchip_mpp.txt @@ -6,9 +6,13 @@ Required properties: - rockchip,taskqueue-count: the value of queue nodes for task running the value must be between 1 and 8 +- rockchip,resetgroup-count: the value of reset clk groups for device reset + the value must be between 1 and 8 + Example: mpp_srv: mpp_srv { compatible = "rockchip,mpp-service"; rockchip,taskqueue-count = <1>; + rockchip,resetgroup-count = <1>; status = "disabled"; };