diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi index 27bc88bf1fc0..655f941bc35c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -127,92 +127,6 @@ status = "okay"; }; - isp0: isp@ff910000 { - compatible = "rockchip,rk3399-isp", "rockchip,isp"; - reg = <0x0 0xff910000 0x0 0x4000>; - interrupts = ; - clocks = - <&cru SCLK_CIF_OUT>, <&cru SCLK_CIF_OUT>, - <&cru SCLK_DPHY_TX1RX1_CFG>, <&cru SCLK_MIPIDPHY_REF>, - <&cru ACLK_ISP0_NOC>, <&cru ACLK_ISP0_WRAPPER>, - <&cru HCLK_ISP0_NOC>, <&cru HCLK_ISP0_WRAPPER>, - <&cru SCLK_ISP0>, <&cru SCLK_DPHY_RX0_CFG>; - clock-names = - "clk_cif_out", "clk_cif_pll", - "pclk_dphytxrx", "pclk_dphy_ref", - "aclk_isp0_noc", "aclk_isp0_wrapper", - "hclk_isp0_noc", "hclk_isp0_wrapper", - "clk_isp0", "pclk_dphyrx"; - pinctrl-names = - "cif_clkout", "isp_dvp8bit0", "isp_mipi_fl", - "isp_mipi_fl_prefl", "isp_flash_as_gpio", - "isp_flash_as_trigger_out"; - pinctrl-0 = <&cif_clkout>; - pinctrl-1 = <&cif_clkout &isp_dvp_d0d7>; - pinctrl-2 = <&cif_clkout>; - pinctrl-3 = <&cif_clkout &isp_prelight>; - pinctrl-4 = <&isp_flash_trigger_as_gpio>; - pinctrl-5 = <&isp_flash_trigger>; - rockchip,isp,mipiphy = <2>; - rockchip,isp,cifphy = <1>; - rockchip,isp,dsiphy,reg = <0xff968000 0x8000>; - rockchip,grf = <&grf>; - rockchip,cru = <&cru>; - rockchip,gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; - rockchip,isp,iommu-enable = <1>; - power-domains = <&power RK3399_PD_ISP0>; - iommus = <&isp0_mmu>; - status = "disabled"; - }; - - isp1: isp@ff920000 { - compatible = "rockchip,rk3399-isp", "rockchip,isp"; - reg = <0x0 0xff920000 0x0 0x4000>; - interrupts = ; - clocks = - <&cru ACLK_ISP1_NOC>, <&cru ACLK_ISP1_WRAPPER>, - <&cru HCLK_ISP1_NOC>, <&cru HCLK_ISP1_WRAPPER>, - <&cru SCLK_ISP1>, <&cru SCLK_CIF_OUT>, - <&cru SCLK_CIF_OUT>, <&cru SCLK_DPHY_TX1RX1_CFG>, - <&cru SCLK_MIPIDPHY_REF>, <&cru PCLK_ISP1_WRAPPER>, - <&cru SCLK_DPHY_RX0_CFG>, <&cru PCLK_MIPI_DSI1>, - <&cru SCLK_MIPIDPHY_CFG>; - clock-names = - "aclk_isp1_noc", "aclk_isp1_wrapper", - "hclk_isp1_noc", "hclk_isp1_wrapper", - "clk_isp1", "clk_cif_out", - "clk_cif_pll", "pclk_dphytxrx", - "pclk_dphy_ref", "pclk_isp1", - "pclk_dphyrx", "pclk_mipi_dsi", - "mipi_dphy_cfg"; - pinctrl-names = - "cif_clkout", "isp_dvp8bit0", "isp_mipi_fl", - "isp_mipi_fl_prefl", "isp_flash_as_gpio", - "isp_flash_as_trigger_out"; - pinctrl-0 = <&cif_clkout>; - pinctrl-1 = <&cif_clkout &isp_dvp_d0d7>; - pinctrl-2 = <&cif_clkout>; - pinctrl-3 = <&isp_prelight>; - pinctrl-4 = <&isp_flash_trigger_as_gpio>; - pinctrl-5 = <&isp_flash_trigger>; - rockchip,isp,mipiphy = <2>; - rockchip,isp,cifphy = <1>; - rockchip,isp,dsiphy,reg = <0xff968000 0x8000>; - rockchip,grf = <&grf>; - rockchip,cru = <&cru>; - rockchip,gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; - rockchip,isp,iommu-enable = <1>; - power-domains = <&power RK3399_PD_ISP1>; - iommus = <&isp1_mmu>; - status = "disabled"; - }; - - uboot-charge { - compatible = "rockchip,uboot-charge"; - rockchip,uboot-charge-on = <1>; - rockchip,android-charge-on = <0>; - }; - hdmi_dp_sound: hdmi-dp-sound { status = "disabled"; compatible = "rockchip,rk3399-hdmi-dp"; @@ -381,30 +295,6 @@ /*cif_clkin*/ <2 10 RK_FUNC_3 &pcfg_pull_none>; }; - - isp_shutter: isp-shutter { - rockchip,pins = - /*SHUTTEREN*/ - <1 1 RK_FUNC_1 &pcfg_pull_none>, - /*SHUTTERTRIG*/ - <1 0 RK_FUNC_1 &pcfg_pull_none>; - }; - - isp_flash_trigger: isp-flash-trigger { - /*ISP_FLASHTRIGOU*/ - rockchip,pins = <1 3 RK_FUNC_1 &pcfg_pull_none>; - }; - - isp_prelight: isp-prelight { - /*ISP_PRELIGHTTRIG*/ - rockchip,pins = <1 4 RK_FUNC_1 &pcfg_pull_none>; - }; - - isp_flash_trigger_as_gpio: isp_flash_trigger_as_gpio { - /*ISP_FLASHTRIGOU*/ - rockchip,pins = - <1 3 RK_FUNC_GPIO &pcfg_pull_none>; - }; }; buttons { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi index 8b5c40d59da5..9d37f3c67b1b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi @@ -909,14 +909,6 @@ status = "okay"; }; -&isp0 { - status = "okay"; -}; - -&isp1 { - status = "okay"; -}; - &isp0_mmu { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts index 91a1fcec4534..cbac98d291b7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts @@ -806,14 +806,6 @@ gpio1830-supply = <&vcc_3v0>; }; -&isp0 { - status = "okay"; -}; - -&isp1 { - status = "okay"; -}; - &isp0_mmu { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts index 169a64a89124..dac75cdfded0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts @@ -765,14 +765,6 @@ gpio1830-supply = <&vcc_3v0>; }; -&isp0 { - status = "okay"; -}; - -&isp1 { - status = "okay"; -}; - &isp0_mmu { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts index 9ea034c40d08..882604c2970a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts @@ -751,14 +751,6 @@ gpio1830-supply = <&vcc_3v0>; }; -&isp0 { - status = "okay"; -}; - -&isp1 { - status = "okay"; -}; - &isp0_mmu { status = "okay"; };