kernel: Update kernel 4.9 to 4.9.70
Runtime tested on lantiq. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
@@ -27,10 +27,10 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
|
||||
+ disable_irq(fsl_dev->irq);
|
||||
+
|
||||
clk_disable_unprepare(fsl_dev->pix_clk);
|
||||
clk_disable_unprepare(fsl_dev->clk);
|
||||
|
||||
@@ -263,6 +264,14 @@ static int fsl_dcu_drm_pm_resume(struct
|
||||
return 0;
|
||||
@@ -262,6 +263,12 @@ static int fsl_dcu_drm_pm_resume(struct
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -39,21 +39,11 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
+ dev_err(dev, "failed to enable dcu pix clk\n");
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ enable_irq(fsl_dev->irq);
|
||||
+
|
||||
if (fsl_dev->tcon)
|
||||
fsl_tcon_bypass_enable(fsl_dev->tcon);
|
||||
fsl_dcu_drm_init_planes(fsl_dev->drm);
|
||||
@@ -273,7 +282,6 @@ static int fsl_dcu_drm_pm_resume(struct
|
||||
console_unlock();
|
||||
|
||||
drm_kms_helper_poll_enable(fsl_dev->drm);
|
||||
- enable_irq(fsl_dev->irq);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -389,6 +397,12 @@ static int fsl_dcu_drm_probe(struct plat
|
||||
@@ -388,6 +395,12 @@ static int fsl_dcu_drm_probe(struct plat
|
||||
goto disable_clk;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user