summaryrefslogtreecommitdiffstats
path: root/kernel/arch/mips/txx9
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-11 10:41:07 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-13 08:17:18 +0300
commite09b41010ba33a20a87472ee821fa407a5b8da36 (patch)
treed10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/arch/mips/txx9
parentf93b97fd65072de626c074dbe099a1fff05ce060 (diff)
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page. During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/arch/mips/txx9')
-rw-r--r--kernel/arch/mips/txx9/Kconfig2
-rw-r--r--kernel/arch/mips/txx9/generic/setup.c16
-rw-r--r--kernel/arch/mips/txx9/generic/spi_eeprom.c1
3 files changed, 1 insertions, 18 deletions
diff --git a/kernel/arch/mips/txx9/Kconfig b/kernel/arch/mips/txx9/Kconfig
index 6d40bc783..8c337d60f 100644
--- a/kernel/arch/mips/txx9/Kconfig
+++ b/kernel/arch/mips/txx9/Kconfig
@@ -8,7 +8,7 @@ config MACH_TX49XX
select MACH_TXX9
select CEVT_R4K
select CSRC_R4K
- select IRQ_CPU
+ select IRQ_MIPS_CPU
select SYS_HAS_CPU_TX49XX
select SYS_SUPPORTS_64BIT_KERNEL
diff --git a/kernel/arch/mips/txx9/generic/setup.c b/kernel/arch/mips/txx9/generic/setup.c
index 2791b8641..9d9962ab7 100644
--- a/kernel/arch/mips/txx9/generic/setup.c
+++ b/kernel/arch/mips/txx9/generic/setup.c
@@ -117,22 +117,6 @@ void clk_put(struct clk *clk)
}
EXPORT_SYMBOL(clk_put);
-/* GPIO support */
-
-#ifdef CONFIG_GPIOLIB
-int gpio_to_irq(unsigned gpio)
-{
- return -EINVAL;
-}
-EXPORT_SYMBOL(gpio_to_irq);
-
-int irq_to_gpio(unsigned irq)
-{
- return -EINVAL;
-}
-EXPORT_SYMBOL(irq_to_gpio);
-#endif
-
#define BOARD_VEC(board) extern struct txx9_board_vec board;
#include <asm/txx9/boards.h>
#undef BOARD_VEC
diff --git a/kernel/arch/mips/txx9/generic/spi_eeprom.c b/kernel/arch/mips/txx9/generic/spi_eeprom.c
index 3dbad99d5..d833dd2c9 100644
--- a/kernel/arch/mips/txx9/generic/spi_eeprom.c
+++ b/kernel/arch/mips/txx9/generic/spi_eeprom.c
@@ -80,7 +80,6 @@ static int __init early_seeprom_probe(struct spi_device *spi)
static struct spi_driver early_seeprom_driver __initdata = {
.driver = {
.name = "at25",
- .owner = THIS_MODULE,
},
.probe = early_seeprom_probe,
};