From d41c23e51b66b0929b5849b9e2207c80647cc3a8 Mon Sep 17 00:00:00 2001 From: Jannis Date: Fri, 17 Jul 2020 22:37:58 +0200 Subject: [PATCH] [ mvebu-dev ] Push to 5.7 for first testing --- config/sources/families/mvebu.conf | 1 + patch/kernel/mvebu-dev/91-01-libata-add-ledtrig-support.patch | 2 +- .../92-mvebu-gpio-remove-hardcoded-timer-assignment.patch | 4 ++-- .../402-sfp-display-SFP-module-information.patch | 0 .../kernel/mvebu-dev/{ => disabled}/450-reprobe_sfp_phy.patch | 0 5 files changed, 4 insertions(+), 3 deletions(-) rename patch/kernel/mvebu-dev/{ => disabled}/402-sfp-display-SFP-module-information.patch (100%) rename patch/kernel/mvebu-dev/{ => disabled}/450-reprobe_sfp_phy.patch (100%) diff --git a/config/sources/families/mvebu.conf b/config/sources/families/mvebu.conf index 510bbea88..ddb3b2f4a 100644 --- a/config/sources/families/mvebu.conf +++ b/config/sources/families/mvebu.conf @@ -29,6 +29,7 @@ case $BRANCH in ;spi;u-boot-spl.kwb:u-boot.flash ;uart;u-boot-spl.kwb:u-boot.uart" + KERNELBRANCH='branch:linux-5.7.y' LINUXCONFIG='linux-mvebu-dev' KERNELPATCHDIR="mvebu-dev" diff --git a/patch/kernel/mvebu-dev/91-01-libata-add-ledtrig-support.patch b/patch/kernel/mvebu-dev/91-01-libata-add-ledtrig-support.patch index 272964ec1..aec3fc7e9 100644 --- a/patch/kernel/mvebu-dev/91-01-libata-add-ledtrig-support.patch +++ b/patch/kernel/mvebu-dev/91-01-libata-add-ledtrig-support.patch @@ -154,9 +154,9 @@ index b20a275..50eeee3 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -38,6 +38,7 @@ - #include #include #include + #include +#include /* diff --git a/patch/kernel/mvebu-dev/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch b/patch/kernel/mvebu-dev/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch index 1dccbae6b..e40470565 100644 --- a/patch/kernel/mvebu-dev/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch +++ b/patch/kernel/mvebu-dev/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch @@ -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); diff --git a/patch/kernel/mvebu-dev/402-sfp-display-SFP-module-information.patch b/patch/kernel/mvebu-dev/disabled/402-sfp-display-SFP-module-information.patch similarity index 100% rename from patch/kernel/mvebu-dev/402-sfp-display-SFP-module-information.patch rename to patch/kernel/mvebu-dev/disabled/402-sfp-display-SFP-module-information.patch diff --git a/patch/kernel/mvebu-dev/450-reprobe_sfp_phy.patch b/patch/kernel/mvebu-dev/disabled/450-reprobe_sfp_phy.patch similarity index 100% rename from patch/kernel/mvebu-dev/450-reprobe_sfp_phy.patch rename to patch/kernel/mvebu-dev/disabled/450-reprobe_sfp_phy.patch