History

Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next

fsl-dcu fixes. * 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu: drm/fsl-dcu: disable clock on error path drm/fsl-dcu: use PTR_ERR_OR_ZERO() to simplify the code drm/fsl-dcu: fix endian issue when using clk_register_divider

Dave Airlie committed 10 years ago

Commit 52f13a02 parents 26e34d2 e0dc7c82 files · +11 −6Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +10 −2
  2. drivers/gpu/drm/fsl-dcu/fsl_tcon.c +1 −4
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c+10−2
@@ -270,7 +270,7 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) · 269 unmodified lines
270 ret = clk_prepare_enable(fsl_dev->pix_clk);270 ret = clk_prepare_enable(fsl_dev->pix_clk);
271 if (ret < 0) {271 if (ret < 0) {
272 dev_err(dev, "failed to enable pix clk\n");272 dev_err(dev, "failed to enable pix clk\n");
273 return ret;273 goto disable_dcu_clk;
274 }274 }
275 275
276 fsl_dcu_drm_init_planes(fsl_dev->drm);276 fsl_dcu_drm_init_planes(fsl_dev->drm);
@@ -284,6 +284,10 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) · 7 unmodified lines
284 enable_irq(fsl_dev->irq);284 enable_irq(fsl_dev->irq);
285 285
286 return 0;286 return 0;
287
288disable_dcu_clk:
289 clk_disable_unprepare(fsl_dev->clk);
290 return ret;
287}291}
288#endif292#endif
289 293
@@ -330,6 +334,7 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev) · 40 unmodified lines
330 const char *pix_clk_in_name;334 const char *pix_clk_in_name;
331 const struct of_device_id *id;335 const struct of_device_id *id;
332 int ret;336 int ret;
337 u8 div_ratio_shift = 0;
333 338
334 fsl_dev = devm_kzalloc(dev, sizeof(*fsl_dev), GFP_KERNEL);339 fsl_dev = devm_kzalloc(dev, sizeof(*fsl_dev), GFP_KERNEL);
335 if (!fsl_dev)340 if (!fsl_dev)
@@ -382,11 +387,14 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev) · 46 unmodified lines
382 pix_clk_in = fsl_dev->clk;387 pix_clk_in = fsl_dev->clk;
383 }388 }
384 389
390 if (of_property_read_bool(dev->of_node, "big-endian"))
391 div_ratio_shift = 24;
392
385 pix_clk_in_name = __clk_get_name(pix_clk_in);393 pix_clk_in_name = __clk_get_name(pix_clk_in);
386 snprintf(pix_clk_name, sizeof(pix_clk_name), "%s_pix", pix_clk_in_name);394 snprintf(pix_clk_name, sizeof(pix_clk_name), "%s_pix", pix_clk_in_name);
387 fsl_dev->pix_clk = clk_register_divider(dev, pix_clk_name,395 fsl_dev->pix_clk = clk_register_divider(dev, pix_clk_name,
388 pix_clk_in_name, 0, base + DCU_DIV_RATIO,396 pix_clk_in_name, 0, base + DCU_DIV_RATIO,
389 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL);397 div_ratio_shift, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL);
390 if (IS_ERR(fsl_dev->pix_clk)) {398 if (IS_ERR(fsl_dev->pix_clk)) {
391 dev_err(dev, "failed to register pix clk\n");399 dev_err(dev, "failed to register pix clk\n");
392 ret = PTR_ERR(fsl_dev->pix_clk);400 ret = PTR_ERR(fsl_dev->pix_clk);
drivers/gpu/drm/fsl-dcu/fsl_tcon.c+1−4
@@ -57,10 +57,7 @@ static int fsl_tcon_init_regmap(struct device *dev, · 56 unmodified lines
57 57
58 tcon->regs = devm_regmap_init_mmio(dev, regs,58 tcon->regs = devm_regmap_init_mmio(dev, regs,
59 &fsl_tcon_regmap_config);59 &fsl_tcon_regmap_config);
60 if (IS_ERR(tcon->regs))60 return PTR_ERR_OR_ZERO(tcon->regs);
61 return PTR_ERR(tcon->regs);
62
63 return 0;
64}61}
65 62
66struct fsl_tcon *fsl_tcon_init(struct device *dev)63struct fsl_tcon *fsl_tcon_init(struct device *dev)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t