rk312x:lcdc: modify irq type and modify reg map for iommu

diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index ccb8300a445fe0ee81053b532ce2a3a86f68a449..7d95fa207f69558ea183df5cfd5084362afb3999 100755 (executable)
--- 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 = <PRMRY>;
-               reg = <0x1010e000 0x2000>;
+               reg = <0x1010e000 0x0300>;
                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
                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 838d323b2d5e8f5d7172bf1d1d1da21af7a0588f..f2b8be9e8512c1dceba58ba6518f1af0fc0ddd94 100755 (executable)
--- 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);