From: Shengqin.Zhang Date: Mon, 6 Jul 2015 05:59:24 +0000 (+0800) Subject: change RGA2 dtsi name for all platform X-Git-Tag: firefly_0821_release~3949 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=cd247b7fd43eaeeec69149bcb10692e7936b6181;p=firefly-linux-kernel-4.4.55.git change RGA2 dtsi name for all platform Signed-off-by: Shengqin.Zhang --- diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index c0b8da7956c6..71566843b858 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -790,7 +790,7 @@ }; rga@ff920000 { - compatible = "rockchip,rk3288-rga2"; + compatible = "rockchip,rga2"; reg = <0xff920000 0x1000>; interrupts = ; clocks = <&clk_gates15 1>, <&aclk_rga>, <&clk_rga>; diff --git a/arch/arm64/boot/dts/rk3368.dtsi b/arch/arm64/boot/dts/rk3368.dtsi index 0e17347faf11..e953d16f766a 100644 --- a/arch/arm64/boot/dts/rk3368.dtsi +++ b/arch/arm64/boot/dts/rk3368.dtsi @@ -882,7 +882,7 @@ }; rga@ff920000 { - compatible = "rockchip,rk3368-rga2"; + compatible = "rockchip,rga2"; reg = <0x0 0xff920000 0x0 0x1000>; interrupts = ; clocks = <&clk_gates16 1>, <&clk_gates16 0>, <&clk_rga>; diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c index 44267f11bd48..08fcc9cb573c 100755 --- a/drivers/video/rockchip/rga2/rga2_drv.c +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -1148,7 +1148,7 @@ static struct miscdevice rga2_dev ={ }; static const struct of_device_id rockchip_rga_dt_ids[] = { - { .compatible = "rockchip,rk3368-rga2", }, + { .compatible = "rockchip,rga2", }, {}, };