Merge branch 'ti-dra7-dss' into 4.2/fbdev

Merge arch/ changes for TI's DRA7 SoC Display Subsystem.
This commit is contained in:
Tomi Valkeinen 2015-06-04 09:04:08 +03:00
commit 8dc0a56529
884 changed files with 9668 additions and 6659 deletions

View file

@ -274,6 +274,10 @@ static int pwm_backlight_probe(struct platform_device *pdev)
pb->pwm = devm_pwm_get(&pdev->dev, NULL);
if (IS_ERR(pb->pwm)) {
ret = PTR_ERR(pb->pwm);
if (ret == -EPROBE_DEFER)
goto err_alloc;
dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");
pb->legacy = true;
pb->pwm = pwm_request(data->pwm_id, "pwm-backlight");