From dca4f6ab3ce95870901121bc9a0afc795e6c6955 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 8 Jan 2021 19:11:02 -0800 Subject: [PATCH] mvebu: refresh patches based on 5.10.5 Signed-off-by: Rosen Penev --- .../92-mvebu-gpio-add_wake_on_gpio_support.patch | 10 +++++----- ...ncreasing_DMA_block_memory_allocation_to_2048.patch | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patch/kernel/mvebu-dev/92-mvebu-gpio-add_wake_on_gpio_support.patch b/patch/kernel/mvebu-dev/92-mvebu-gpio-add_wake_on_gpio_support.patch index a06b7973b5..9274f2b1a1 100644 --- a/patch/kernel/mvebu-dev/92-mvebu-gpio-add_wake_on_gpio_support.patch +++ b/patch/kernel/mvebu-dev/92-mvebu-gpio-add_wake_on_gpio_support.patch @@ -51,7 +51,7 @@ * Functions implementing the pwm_chip methods */ static struct mvebu_pwm *to_mvebu_pwm(struct pwm_chip *chip) -@@ -1211,7 +1239,7 @@ static int mvebu_gpio_probe(struct platf +@@ -1219,7 +1247,7 @@ static int mvebu_gpio_probe(struct platf err = irq_alloc_domain_generic_chips( mvchip->domain, ngpios, 2, np->name, handle_level_irq, @@ -60,7 +60,7 @@ if (err) { dev_err(&pdev->dev, "couldn't allocate irq chips %s (DT).\n", mvchip->chip.label); -@@ -1229,6 +1257,8 @@ static int mvebu_gpio_probe(struct platf +@@ -1237,6 +1265,8 @@ static int mvebu_gpio_probe(struct platf ct->chip.irq_mask = mvebu_gpio_level_irq_mask; ct->chip.irq_unmask = mvebu_gpio_level_irq_unmask; ct->chip.irq_set_type = mvebu_gpio_irq_set_type; @@ -69,7 +69,7 @@ ct->chip.name = mvchip->chip.label; ct = &gc->chip_types[1]; -@@ -1237,6 +1267,8 @@ static int mvebu_gpio_probe(struct platf +@@ -1245,6 +1275,8 @@ static int mvebu_gpio_probe(struct platf ct->chip.irq_mask = mvebu_gpio_edge_irq_mask; ct->chip.irq_unmask = mvebu_gpio_edge_irq_unmask; ct->chip.irq_set_type = mvebu_gpio_irq_set_type; @@ -78,11 +78,11 @@ ct->handler = handle_edge_irq; ct->chip.name = mvchip->chip.label; -@@ -1252,6 +1284,7 @@ static int mvebu_gpio_probe(struct platf +@@ -1260,6 +1292,7 @@ static int mvebu_gpio_probe(struct platf continue; irq_set_chained_handler_and_data(irq, mvebu_gpio_irq_handler, mvchip); + mvchip->bank_irq[i] = irq; } - /* Some MVEBU SoCs have simple PWM support for GPIO lines */ + return 0; diff --git a/patch/kernel/mvebu-dev/general-increasing_DMA_block_memory_allocation_to_2048.patch b/patch/kernel/mvebu-dev/general-increasing_DMA_block_memory_allocation_to_2048.patch index ff11b4d98c..eef7296e75 100644 --- a/patch/kernel/mvebu-dev/general-increasing_DMA_block_memory_allocation_to_2048.patch +++ b/patch/kernel/mvebu-dev/general-increasing_DMA_block_memory_allocation_to_2048.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c -@@ -314,7 +314,7 @@ static void *__alloc_remap_buffer(struct +@@ -315,7 +315,7 @@ static void *__alloc_remap_buffer(struct pgprot_t prot, struct page **ret_page, const void *caller, bool want_vaddr);