From 3186064dd9ddaeaff77d6be5cd42544f38a04ba4 Mon Sep 17 00:00:00 2001 From: CMY Date: Mon, 13 Apr 2015 09:26:48 +0800 Subject: [PATCH] rk: iommu: enable iommu by default on rk33xx platform Signed-off-by: CMY --- arch/arm64/boot/dts/rk3368-box.dts | 21 +-------------------- arch/arm64/boot/dts/rk3368-p9_818.dts | 2 +- arch/arm64/boot/dts/rk3368-tb_8846.dts | 2 +- arch/arm64/boot/dts/rk3368.dtsi | 17 +++++++++-------- 4 files changed, 12 insertions(+), 30 deletions(-) diff --git a/arch/arm64/boot/dts/rk3368-box.dts b/arch/arm64/boot/dts/rk3368-box.dts index ddf88f5fb315..d09b0b0ae583 100755 --- a/arch/arm64/boot/dts/rk3368-box.dts +++ b/arch/arm64/boot/dts/rk3368-box.dts @@ -621,7 +621,6 @@ pinctrl-names = "default", "gpio"; pinctrl-0 = <&lcdc_lcdc>; pinctrl-1 = <&lcdc_gpio>; - rockchip,iommu-enabled = <1>; power_ctr: power_ctr { rockchip,debug = <0>; /*lcd_en:lcd_en { @@ -644,23 +643,6 @@ }; }; - -&vpu { - iommu_enabled = <1>; -}; - -&hevc { - iommu_enabled = <1>; -}; - -&iep { - iommu_enabled = <1>; -}; - -&isp { - rockchip,isp,iommu_enable = <1>; -}; - &hdmi { status = "okay"; rockchips,hdmi_audio_source = <0>; @@ -941,8 +923,7 @@ }; &ion_cma { - //reg = <0x00000000 0x28000000>; /* 640MB */ - reg = <0x00000000 0x0>; + reg = <0x00000000 0x00000000>; /* 0MB */ }; /* diff --git a/arch/arm64/boot/dts/rk3368-p9_818.dts b/arch/arm64/boot/dts/rk3368-p9_818.dts index 01d62ac0c2b6..ca029907778d 100755 --- a/arch/arm64/boot/dts/rk3368-p9_818.dts +++ b/arch/arm64/boot/dts/rk3368-p9_818.dts @@ -729,6 +729,6 @@ }; &ion_cma { - reg = <0x00000000 0x28000000>; /* 640MB */ + reg = <0x00000000 0x00000000>; /* 0MB */ }; diff --git a/arch/arm64/boot/dts/rk3368-tb_8846.dts b/arch/arm64/boot/dts/rk3368-tb_8846.dts index 9e6b5c589a15..8f3eb6fd52c4 100755 --- a/arch/arm64/boot/dts/rk3368-tb_8846.dts +++ b/arch/arm64/boot/dts/rk3368-tb_8846.dts @@ -1051,7 +1051,7 @@ rk818,support_dc_chg = <1>;/*1:dc chg; 0:usb chg*/ &ion_cma { - reg = <0x00000000 0x28000000>; /* 640MB */ + reg = <0x00000000 0x00000000>; /* 0MB */ }; &rk3368_cif_sensor{ diff --git a/arch/arm64/boot/dts/rk3368.dtsi b/arch/arm64/boot/dts/rk3368.dtsi index 6725dea8102b..f9e36c5eaab8 100755 --- a/arch/arm64/boot/dts/rk3368.dtsi +++ b/arch/arm64/boot/dts/rk3368.dtsi @@ -838,7 +838,7 @@ rockchip,cru = <&cru>; rockchip,prop = ; rockchip,pwr18 = <0>; - rockchip,iommu-enabled = <0>; + rockchip,iommu-enabled = <1>; reg = <0x0 0xff930000 0x0 0x10000>; interrupts = ; /*pinctrl-names = "default", "gpio"; @@ -1096,7 +1096,7 @@ ion_cma: rockchip,ion-heap@4 { /* CMA HEAP */ compatible = "rockchip,ion-heap"; rockchip,ion_heap = <4>; - reg = <0x00000000 0x08000000>; /* 512MB */ + reg = <0x00000000 0x00000000>; /* 0MB */ }; rockchip,ion-heap@0 { /* VMALLOC HEAP */ compatible = "rockchip,ion-heap"; @@ -1106,7 +1106,7 @@ vpu: vpu_service { compatible = "rockchip,vpu_sub"; - iommu_enabled = <0>; + iommu_enabled = <1>; interrupts = , ; interrupt-names = "irq_enc", "irq_dec"; @@ -1116,7 +1116,7 @@ hevc: hevc_service { compatible = "rockchip,hevc_sub"; - iommu_enabled = <0>; + iommu_enabled = <1>; interrupts = ; interrupt-names = "irq_dec"; dev_mode = <1>; @@ -1139,7 +1139,7 @@ iep: iep@ff900000 { compatible = "rockchip,iep"; - iommu_enabled = <0>; + iommu_enabled = <1>; reg = <0x0 0xff900000 0x0 0x800>; interrupts = ; clocks = <&clk_gates16 2>, <&clk_gates16 3>; @@ -1230,8 +1230,9 @@ dbgname = "vpu"; compatible = "rockchip,vpu_mmu"; reg = <0x0 0xff9a0800 0x0 0x100>; /*need to fix*/ - interrupts = ; /*need to fix*/ - interrupt-names = "vpu_mmu"; + interrupts = , /*need to fix*/ + ; + interrupt-names = "vepu_mmu", "vdpu_mmu"; }; rockchip_suspend { @@ -1280,7 +1281,7 @@ rockchip,grf = <&grf>; rockchip,cru = <&cru>; rockchip,gpios = <&gpio3 GPIO_C4 GPIO_ACTIVE_HIGH>; - rockchip,isp,iommu_enable = <0>; + rockchip,isp,iommu_enable = <1>; status = "okay"; }; -- 2.34.1