From 9a1521b7af25d837cde8c32b5bb6558631339285 Mon Sep 17 00:00:00 2001 From: zwl Date: Thu, 21 Aug 2014 10:13:46 +0800 Subject: [PATCH] rk312x:lcdc: modify irq type and modify reg map for iommu --- arch/arm/boot/dts/rk312x.dtsi | 2 +- drivers/video/rockchip/lcdc/rk312x_lcdc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index ccb8300a445f..7d95fa207f69 100755 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -700,7 +700,7 @@ lcdc: lcdc@1010e000 { compatible = "rockchip,rk312x-lcdc"; rockchip,prop = ; - reg = <0x1010e000 0x2000>; + reg = <0x1010e000 0x0300>; interrupts = ; clocks = <&clk_gates6 0>, <&dclk_lcdc0>, <&clk_gates6 1>, <&sclk_lcdc0>, <&pd_vop>, <&clk_cpll>; clock-names = "aclk_lcdc", "dclk_lcdc", "hclk_lcdc", "sclk_lcdc", "pd_lcdc", "sclk_pll"; diff --git a/drivers/video/rockchip/lcdc/rk312x_lcdc.c b/drivers/video/rockchip/lcdc/rk312x_lcdc.c index 838d323b2d5e..f2b8be9e8512 100755 --- a/drivers/video/rockchip/lcdc/rk312x_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk312x_lcdc.c @@ -2077,7 +2077,7 @@ static int rk312x_lcdc_probe(struct platform_device *pdev) } ret = devm_request_irq(dev, lcdc_dev->irq, rk312x_lcdc_isr, - IRQF_DISABLED, dev_name(dev), lcdc_dev); + IRQF_DISABLED | IRQF_SHARED, dev_name(dev), lcdc_dev); if (ret) { dev_err(&pdev->dev, "cannot requeset irq %d - err %d\n", lcdc_dev->irq, ret); -- 2.34.1