diff --git a/Documentation/devicetree/bindings/media/rockchip-isp1.txt b/Documentation/devicetree/bindings/media/rockchip-isp1.txt index 4d8ef2fcc4df..03651e08790f 100644 --- a/Documentation/devicetree/bindings/media/rockchip-isp1.txt +++ b/Documentation/devicetree/bindings/media/rockchip-isp1.txt @@ -38,7 +38,7 @@ Device node example ------------------- isp0: isp0@ff910000 { - compatible = "rockchip,rk3399-cif-isp"; + compatible = "rockchip,rk3399-rkisp1"; reg = <0x0 0xff910000 0x0 0x4000>; interrupts = ; clocks = <&cru SCLK_ISP0>, diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index e5cd7c9e902c..32821b8e11b2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1558,6 +1558,16 @@ }; }; + mipi_dphy_rx0: mipi-dphy-rx0 { + compatible = "rockchip,rk3399-mipi-dphy"; + clocks = <&cru SCLK_MIPIDPHY_REF>, + <&cru SCLK_DPHY_RX0_CFG>, + <&cru PCLK_VIO_GRF>; + clock-names = "dphy-ref", "dphy-cfg", "grf"; + power-domains = <&power RK3399_PD_VIO>; + status = "disabled"; + }; + pvtm: pvtm { compatible = "rockchip,rk3399-pvtm"; clocks = <&cru SCLK_PVTM_CORE_L>, @@ -1879,6 +1889,22 @@ status = "disabled"; }; + rkisp1_0: rkisp1@ff910000 { + compatible = "rockchip,rk3399-rkisp1"; + reg = <0x0 0xff910000 0x0 0x4000>; + interrupts = ; + clocks = <&cru SCLK_ISP0>, + <&cru ACLK_ISP0>, <&cru HCLK_ISP0>, + <&cru ACLK_ISP0_WRAPPER>, <&cru HCLK_ISP0_WRAPPER>; + clock-names = "clk_isp", + "aclk_isp", "hclk_isp", + "aclk_isp_wrap", "hclk_isp_wrap"; + devfreq = <&dmc>; + power-domains = <&power RK3399_PD_ISP0>; + iommus = <&isp0_mmu>; + status = "disabled"; + }; + isp0_mmu: iommu@ff914000 { compatible = "rockchip,iommu"; reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>; @@ -1892,6 +1918,22 @@ status = "disabled"; }; + rkisp1_1: rkisp1@ff920000 { + compatible = "rockchip,rk3399-rkisp1"; + reg = <0x0 0xff920000 0x0 0x4000>; + interrupts = ; + clocks = <&cru SCLK_ISP1>, + <&cru ACLK_ISP1>, <&cru HCLK_ISP1>, + <&cru ACLK_ISP1_WRAPPER>, <&cru HCLK_ISP1_WRAPPER>; + clock-names = "clk_isp", + "aclk_isp", "hclk_isp", + "aclk_isp_wrap", "hclk_isp_wrap"; + devfreq = <&dmc>; + power-domains = <&power RK3399_PD_ISP1>; + iommus = <&isp1_mmu>; + status = "disabled"; + }; + isp1_mmu: iommu@ff924000 { compatible = "rockchip,iommu"; reg = <0x0 0xff924000 0x0 0x100>, <0x0 0xff925000 0x0 0x100>;