From 3399763e20124132f07232e3f987a746e31bd464 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Wed, 2 Jan 2019 16:51:52 +0800 Subject: [PATCH] arm64: dts: rockchip: enable rga for rk3399-linux.dtsi Change-Id: I55389b59f54ba4195e9532d00d9a1f54a767f2fd Signed-off-by: Sandy Huang --- arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi | 12 ++++++++++++ .../boot/dts/rockchip/rk3399pro-evb-v10-linux.dts | 12 ------------ .../boot/dts/rockchip/rk3399pro-evb-v11-linux.dts | 12 ------------ 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi index ec45f89bddec..129e5a58aae3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -128,6 +128,18 @@ iommus = <&isp1_mmu>; status = "disabled"; }; + + rga: rga@ff680000 { + compatible = "rockchip,rga2"; + dev_mode = <1>; + reg = <0x0 0xff680000 0x0 0x1000>; + interrupts = ; + clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA_CORE>; + clock-names = "aclk_rga", "hclk_rga", "clk_rga"; + power-domains = <&power RK3399_PD_RGA>; + dma-coherent; + status = "okay"; + }; }; &display_subsystem { diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts index fe07e84c72cc..78c2d8521419 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts @@ -148,18 +148,6 @@ }; }; - rga: rga@ff680000 { - compatible = "rockchip,rga2"; - dev_mode = <1>; - reg = <0x0 0xff680000 0x0 0x1000>; - interrupts = ; - clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA_CORE>; - clock-names = "aclk_rga", "hclk_rga", "clk_rga"; - power-domains = <&power RK3399_PD_RGA>; - dma-coherent; - status = "okay"; - }; - rk809-sound { compatible = "simple-audio-card"; simple-audio-card,format = "i2s"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts index 5e200e0f67ba..ab985040c8a9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts @@ -148,18 +148,6 @@ }; }; - rga: rga@ff680000 { - compatible = "rockchip,rga2"; - dev_mode = <1>; - reg = <0x0 0xff680000 0x0 0x1000>; - interrupts = ; - clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA_CORE>; - clock-names = "aclk_rga", "hclk_rga", "clk_rga"; - power-domains = <&power RK3399_PD_RGA>; - dma-coherent; - status = "okay"; - }; - rk809-sound { compatible = "simple-audio-card"; simple-audio-card,format = "i2s";