[ mvebu-dev ] Push to 5.7 for first testing

This commit is contained in:
Jannis 2020-07-17 22:37:58 +02:00
parent 09b6ff3a7b
commit d41c23e51b
5 changed files with 4 additions and 3 deletions

View file

@ -154,9 +154,9 @@ index b20a275..50eeee3 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -38,6 +38,7 @@
#include <linux/acpi.h>
#include <linux/cdrom.h>
#include <linux/sched.h>
#include <linux/async.h>
+#include <linux/leds.h>
/*

View file

@ -194,10 +194,10 @@ index adc768f908f1..a2bd264ee92c 100644
mvchip->mvpwm = mvpwm;
mvpwm->mvchip = mvchip;
- mvpwm->membase = devm_ioremap_resource(dev, res);
- mvpwm->membase = devm_platform_ioremap_resource_byname(pdev, "pwm");
- if (IS_ERR(mvpwm->membase))
- return PTR_ERR(mvpwm->membase);
+ mvpwm->controller.membase = devm_ioremap_resource(dev, res);
+ mvpwm->controller.membase = devm_platform_ioremap_resource_byname(pdev, "pwm");
+ if (IS_ERR(mvpwm->controller.membase))
+ return PTR_ERR(mvpwm->controller.membase);