diff --git a/kernel/arch/arm/boot/dts/firefly-mid.dts b/kernel/arch/arm/boot/dts/firefly-mid.dts index c26f651154..0ab24f9c5e 100755 --- a/kernel/arch/arm/boot/dts/firefly-mid.dts +++ b/kernel/arch/arm/boot/dts/firefly-mid.dts @@ -95,8 +95,8 @@ compatible = "hdmi-spdif"; }; + rockchip-hdmi-i2s { - status = "disabled"; compatible = "rockchip-hdmi-i2s"; dais { dai0 { @@ -111,9 +111,9 @@ }; }; }; - - rockchip-spdif-card { - compatible = "rockchip-spdif-card"; + + rockchip-hdmi-spdif { + compatible = "rockchip-hdmi-spdif"; dais { dai0 { audio-codec = <&codec_hdmi_spdif>; @@ -124,7 +124,6 @@ - rockchip-es8323 { compatible = "rockchip-es8323"; dais { @@ -931,6 +930,10 @@ }; }; +&vpu { + iommu_enabled = <1>; +}; + &lcdc_vdd_domain { regulator-name = "vcc30_lcd"; }; diff --git a/kernel/arch/arm/boot/dts/firefly-rk3288.dts b/kernel/arch/arm/boot/dts/firefly-rk3288.dts index 9e8c24f3ef..282a416ebc 100755 --- a/kernel/arch/arm/boot/dts/firefly-rk3288.dts +++ b/kernel/arch/arm/boot/dts/firefly-rk3288.dts @@ -94,7 +94,6 @@ }; rockchip-hdmi-i2s { - status = "disabled"; compatible = "rockchip-hdmi-i2s"; dais { dai0 { @@ -109,9 +108,9 @@ }; }; }; - - rockchip-spdif-card { - compatible = "rockchip-spdif-card"; + + rockchip-hdmi-spdif { + compatible = "rockchip-hdmi-spdif"; dais { dai0 { audio-codec = <&codec_hdmi_spdif>; @@ -120,6 +119,7 @@ }; }; + rockchip-rk1000 { compatible = "rockchip-rk1000"; dais { @@ -946,6 +946,10 @@ }; }; +&vpu { + iommu_enabled = <1>; +}; + &lcdc_vdd_domain { regulator-name = "vcc30_lcd"; };