Skip to contentSkip to conversation

Patch "MIPS: Fix the build on jz4740 after removing the custom gpio.h" has been added to the 3.18-stable tree

PATCH [email protected] 1 participant 1 message Apr 27, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: Fix the build on jz4740 after removing the custom gpio.h

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-fix-the-build-on-jz4740-after-removing-the-custom-gpio.h.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 5b235dc2647e4977b17b5c41d959d0f455831c3f Mon Sep 17 00:00:00 2001

From: Alban Bedel <[email protected]>
Date: Fri, 4 Sep 2015 14:29:16 +0200
Subject: MIPS: Fix the build on jz4740 after removing the custom gpio.h

From: Alban Bedel <[email protected]>

commit 5b235dc2647e4977b17b5c41d959d0f455831c3f upstream.

Somehow the wrong version of the patch to remove the use of custom gpio.h on mips has been merged. This patch add the missing fixes for a build error on jz4740 because linux/gpio.h doesn't provide any machine specfics definitions anymore.

Cc Paul Burton <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Brian Norris <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Linus Walleij <[email protected]>

Patchwork: https://patchwork.linux-mips.org/patch/11089/

---
 arch/mips/jz4740/board-qi_lb60.c |    1 +
 arch/mips/jz4740/gpio.c          |    1 +
 2 files changed, 2 insertions(+)
arch/mips/jz4740/board-qi_lb60.c +1 -0
@@ -26,6 +26,7 @@
 #include <linux/power/jz4740-battery.h>
 #include <linux/power/gpio-charger.h>
 
+#include <asm/mach-jz4740/gpio.h>
 #include <asm/mach-jz4740/jz4740_fb.h>
 #include <asm/mach-jz4740/jz4740_mmc.h>
 #include <asm/mach-jz4740/jz4740_nand.h>
arch/mips/jz4740/gpio.c +1 -0
@@ -27,6 +27,7 @@
 #include <linux/seq_file.h>
 
 #include <asm/mach-jz4740/base.h>
+#include <asm/mach-jz4740/gpio.h>
 
 #include "irq.h"
 

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/mips-fix-the-build-on-jz4740-after-removing-the-custom-gpio.h.patch