diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:43:30 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-29 18:58:16 +0300 |
| commit | 6f65bb40d3e8b7fe978698488c2ea93f077bfcd6 (patch) | |
| tree | 41861c8b837d122abac15f18dbdf99cbd4835507 /meta-openbmc-mods/meta-ast2500 | |
| parent | da710c8bb0dea17982efc20ab4ee226a86992e6f (diff) | |
| download | openbmc-6f65bb40d3e8b7fe978698488c2ea93f077bfcd6.tar.xz | |
Update to internal 10-28-19
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500')
3 files changed, 2 insertions, 26 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc index 5999dcb97..1889831c8 100644 --- a/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc +++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc @@ -1,5 +1,5 @@ KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-intel-purley.dtb" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-intel-ast2500.dtb" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-si-common.inc diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0007-gpio-aspeed-fix-check-for-pointer-return-value.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0007-gpio-aspeed-fix-check-for-pointer-return-value.patch deleted file mode 100644 index ef225bbf3..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0007-gpio-aspeed-fix-check-for-pointer-return-value.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f15444796465b2d1514933c20a44417f4a09a2fd Mon Sep 17 00:00:00 2001 -From: Loic Prylli <lprylli@netflix.com> -Date: Thu, 12 Sep 2019 14:16:07 -0700 -Subject: [PATCH] gpio: aspeed: fix check for pointer return value - -If dts does not have a pinctrl passthrough property, -the kernel would oops or misbehave before the fix. ---- - drivers/gpio/gpio-aspeed.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c -index d4aaf7fa8e4b..26f487296365 100644 ---- a/drivers/gpio/gpio-aspeed.c -+++ b/drivers/gpio/gpio-aspeed.c -@@ -1205,7 +1205,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) - * of the GPIO pins, so they can be requested at runtime. - */ - pinctrl = pinctrl_get_select(&pdev->dev, "pass-through"); -- if (pinctrl) -+ if (!IS_ERR(pinctrl)) - pinctrl_put(pinctrl); - - /* diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend index 18844957a..9cb4b4eb3 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" -SRC_URI += "file://intel-ast2500.cfg" +SRC_URI += "file://intel-ast2500.cfg"
\ No newline at end of file |