From: Huang, Tao Date: Wed, 21 Dec 2016 11:04:57 +0000 (+0800) Subject: arm64: dts: rockchip: move vpu/rkvdec to rk3399.dtsi X-Git-Tag: firefly_0821_release~1008 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=541ba1412b081d964dca4613515d756eb7da8e8f;hp=e74a918a4746ae304f6afa7fe706fe331e239ba7;p=firefly-linux-kernel-4.4.55.git arm64: dts: rockchip: move vpu/rkvdec to rk3399.dtsi Right now only one driver support vpu and rkvdec, so move the nodes from rk3399-android[-next].dtsi to rk3399.dtsi. Change-Id: Id908843774ed8eede3aeddb24059ae92a35e5b98 Signed-off-by: Huang, Tao --- diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi index 9ddf724d145a..dd773cb7b4cd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi @@ -136,65 +136,6 @@ }; }; - vpu: vpu_service@ff650000 { - compatible = "rockchip,vpu_service"; - rockchip,grf = <&grf>; - iommus = <&vpu_mmu>; - iommu_enabled = <1>; - reg = <0x0 0xff650000 0x0 0x800>; - interrupts = , - ; - interrupt-names = "irq_dec", "irq_enc"; - 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"; - power-domains = <&power RK3399_PD_VCODEC>; - name = "vpu_service"; - dev_mode = <0>; - /* 0 means ion, 1 means drm */ - allocator = <1>; - status = "disabled"; - }; - - vpu_mmu: iommu@ff650800 { - dbgname = "vpu"; - compatible = "rockchip,iommu"; - reg = <0x0 0xff650800 0x0 0x40>; - interrupts = ; - interrupt-names = "vpu_mmu"; - #iommu-cells = <0>; - }; - - rkvdec: rkvdec@ff660000 { - compatible = "rockchip,rkvdec"; - rockchip,grf = <&grf>; - iommus = <&vdec_mmu>; - iommu_enabled = <1>; - reg = <0x0 0xff660000 0x0 0x400>; - interrupts = ; - interrupt-names = "irq_dec"; - clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>,<&cru SCLK_VDU_CA>,<&cru SCLK_VDU_CORE>; - clock-names = "aclk_vcodec", "hclk_vcodec", "clk_cabac", "clk_core"; - resets = <&cru SRST_H_VDU>, <&cru SRST_A_VDU>; - reset-names = "video_h", "video_a"; - power-domains = <&power RK3399_PD_VDU>; - dev_mode = <2>; - name = "rkvdec"; - /* 0 means ion, 1 means drm */ - allocator = <1>; - status = "disabled"; - }; - - vdec_mmu: iommu@ff660480 { - dbgname = "vdec"; - compatible = "rockchip,iommu"; - reg = <0x0 0xff660480 0x0 0x40>, <0x0 0xff6604c0 0x0 0x40>; - interrupts = ; - interrupt-names = "vdec_mmu"; - #iommu-cells = <0>; - }; - rga: rga@ff680000 { compatible = "rockchip,rga2"; dev_mode = <1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi index 720a902c1006..b2953c2896d0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -203,60 +203,6 @@ }; }; - vpu: vpu_service@ff650000 { - compatible = "rockchip,vpu_service"; - rockchip,grf = <&grf>; - iommu_enabled = <1>; - reg = <0x0 0xff650000 0x0 0x800>; - interrupts = , - ; - interrupt-names = "irq_dec", "irq_enc"; - 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"; - power-domains = <&power RK3399_PD_VCODEC>; - name = "vpu_service"; - dev_mode = <0>; - /* 0 means ion, 1 means drm */ - allocator = <0>; - }; - - vpu_mmu: vpu_mmu { - dbgname = "vpu"; - compatible = "rockchip,vpu_mmu"; - reg = <0x0 0xff650800 0x0 0x40>; - interrupts = ; - interrupt-names = "vpu_mmu"; - }; - - rkvdec: rkvdec@ff660000 { - compatible = "rockchip,rkvdec"; - rockchip,grf = <&grf>; - iommu_enabled = <1>; - reg = <0x0 0xff660000 0x0 0x400>; - interrupts = ; - interrupt-names = "irq_dec"; - clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>,<&cru SCLK_VDU_CA>,<&cru SCLK_VDU_CORE>; - clock-names = "aclk_vcodec", "hclk_vcodec", "clk_cabac", "clk_core"; - resets = <&cru SRST_H_VDU>, <&cru SRST_A_VDU>; - reset-names = "video_h", "video_a"; - power-domains = <&power RK3399_PD_VDU>; - dev_mode = <2>; - name = "rkvdec"; - /* 0 means ion, 1 means drm */ - allocator = <0>; - }; - - vdec_mmu: vdec_mmu { - dbgname = "vdec"; - compatible = "rockchip,vdec_mmu"; - reg = <0x0 0xff660480 0x0 0x40>, - <0x0 0xff6604c0 0x0 0x40>; - interrupts = ; - interrupt-names = "vdec_mmu"; - }; - iep: iep@ff670000 { compatible = "rockchip,iep"; iommu_enabled = <1>; @@ -534,6 +480,30 @@ }; }; +&vpu { + status = "okay"; + /delete-property/ iommus; + /* 0 means ion, 1 means drm */ + allocator = <0>; +}; + +&vpu_mmu { + dbgname = "vpu"; + compatible = "rockchip,vpu_mmu"; +}; + +&rkvdec { + status = "okay"; + /delete-property/ iommus; + /* 0 means ion, 1 means drm */ + allocator = <0>; +}; + +&vdec_mmu { + dbgname = "vdec"; + compatible = "rockchip,vdec_mmu"; +}; + &pinctrl { isp { cif_clkout: cif-clkout { diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 808c081377fe..4c56705547bc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1291,6 +1291,65 @@ status = "disabled"; }; + vpu: vpu_service@ff650000 { + compatible = "rockchip,vpu_service"; + rockchip,grf = <&grf>; + iommus = <&vpu_mmu>; + iommu_enabled = <1>; + reg = <0x0 0xff650000 0x0 0x800>; + interrupts = , + ; + interrupt-names = "irq_dec", "irq_enc"; + 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"; + power-domains = <&power RK3399_PD_VCODEC>; + name = "vpu_service"; + dev_mode = <0>; + /* 0 means ion, 1 means drm */ + allocator = <1>; + status = "disabled"; + }; + + vpu_mmu: iommu@ff650800 { + compatible = "rockchip,iommu"; + reg = <0x0 0xff650800 0x0 0x40>; + interrupts = ; + interrupt-names = "vpu_mmu"; + #iommu-cells = <0>; + }; + + rkvdec: rkvdec@ff660000 { + compatible = "rockchip,rkvdec"; + rockchip,grf = <&grf>; + iommus = <&vdec_mmu>; + iommu_enabled = <1>; + reg = <0x0 0xff660000 0x0 0x400>; + interrupts = ; + interrupt-names = "irq_dec"; + clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>, + <&cru SCLK_VDU_CA>, <&cru SCLK_VDU_CORE>; + clock-names = "aclk_vcodec", "hclk_vcodec", + "clk_cabac", "clk_core"; + resets = <&cru SRST_H_VDU>, <&cru SRST_A_VDU>; + reset-names = "video_h", "video_a"; + power-domains = <&power RK3399_PD_VDU>; + dev_mode = <2>; + name = "rkvdec"; + /* 0 means ion, 1 means drm */ + allocator = <1>; + status = "disabled"; + }; + + vdec_mmu: iommu@ff660480 { + compatible = "rockchip,iommu"; + reg = <0x0 0xff660480 0x0 0x40>, <0x0 0xff6604c0 0x0 0x40>; + interrupts = ; + interrupt-names = "vdec_mmu"; + #iommu-cells = <0>; + }; + rga: rga@ff680000 { compatible = "rockchip,rk3399-rga"; reg = <0x0 0xff680000 0x0 0x10000>;