mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-17 23:34:07 +00:00
core/linux-kirkwood to 4.4.162-1
This commit is contained in:
parent
70c4740a47
commit
56e2e94e80
3 changed files with 164 additions and 164 deletions
|
@ -6,7 +6,7 @@ buildarch=2
|
|||
pkgbase=linux-kirkwood
|
||||
_kernelname=${pkgbase#linux}
|
||||
_desc="Marvell Kirkwood"
|
||||
pkgver=4.4.97
|
||||
pkgver=4.4.162
|
||||
srcver=${pkgver%.0}
|
||||
pkgrel=1
|
||||
bfqver=v7r11
|
||||
|
@ -32,10 +32,10 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
|
|||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.0.patch"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for.patch"
|
||||
'linux.preset')
|
||||
md5sums=('d605faf16d4f448199be3227adf4a0c8'
|
||||
'b91129f87c799e7184c00257eeddd2f2'
|
||||
md5sums=('f78a5dad4bc339580267d6ed3f7caf5c'
|
||||
'3d14399c6859415d6ccc87f9a975a112'
|
||||
'3893da4aea24055b6826a1e451fd8bd7'
|
||||
'06366827466b5a2a5419f63aac032997'
|
||||
'187a5beff1471804806d56d615629cdd'
|
||||
'09d44b9f07abfaeaf4f688ee52034786'
|
||||
'SKIP'
|
||||
'c1d7fcfe88edb658375089c0a9cc1811'
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
|
||||
--- a/arch/arm/Kconfig 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/arch/arm/Kconfig 2015-11-27 18:42:18.297279720 +0000
|
||||
@@ -517,6 +517,21 @@
|
||||
--- a/arch/arm/Kconfig 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/arch/arm/Kconfig 2018-10-27 18:30:55.998359333 -0600
|
||||
@@ -519,6 +519,21 @@
|
||||
help
|
||||
Support for the Marvell Dove SoC 88AP510
|
||||
|
||||
|
@ -23,7 +23,7 @@ diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|||
config ARCH_MV78XX0
|
||||
bool "Marvell MV78xx0"
|
||||
select ARCH_REQUIRE_GPIOLIB
|
||||
@@ -874,6 +889,8 @@
|
||||
@@ -854,6 +869,8 @@
|
||||
|
||||
source "arch/arm/mach-keystone/Kconfig"
|
||||
|
||||
|
@ -33,9 +33,9 @@ diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|||
|
||||
source "arch/arm/mach-meson/Kconfig"
|
||||
diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
|
||||
--- a/arch/arm/Kconfig.debug 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/arch/arm/Kconfig.debug 2015-11-27 18:42:18.297279720 +0000
|
||||
@@ -1371,7 +1371,7 @@
|
||||
--- a/arch/arm/Kconfig.debug 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/arch/arm/Kconfig.debug 2018-10-27 18:30:56.002359313 -0600
|
||||
@@ -1360,7 +1360,7 @@
|
||||
def_bool ARCH_DOVE || ARCH_EBSA110 || \
|
||||
(FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
|
||||
ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
|
||||
|
@ -43,8 +43,8 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
|
|||
+ ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \
|
||||
ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
|
||||
|
||||
# Compatibility options for BCM63xx
|
||||
@@ -1454,7 +1454,7 @@
|
||||
config DEBUG_UART_PHYS
|
||||
@@ -1439,7 +1439,7 @@
|
||||
default 0xf040ab00 if DEBUG_BRCMSTB_UART
|
||||
default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
|
||||
default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
|
||||
|
@ -53,7 +53,7 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
|
|||
ARCH_ORION5X
|
||||
default 0xf7fc9000 if DEBUG_BERLIN_UART
|
||||
default 0xf8b00000 if DEBUG_HIX5HD2_UART
|
||||
@@ -1554,6 +1554,7 @@
|
||||
@@ -1540,6 +1540,7 @@
|
||||
default 0xfec90000 if DEBUG_RK32_UART2
|
||||
default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
|
||||
default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
|
||||
|
@ -62,8 +62,8 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
|
|||
default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
|
||||
default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
|
||||
diff -ruN a/arch/arm/Makefile b/arch/arm/Makefile
|
||||
--- a/arch/arm/Makefile 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/arch/arm/Makefile 2015-11-27 18:42:18.297279720 +0000
|
||||
--- a/arch/arm/Makefile 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/arch/arm/Makefile 2018-10-27 18:30:56.002359313 -0600
|
||||
@@ -178,6 +178,7 @@
|
||||
machine-$(CONFIG_ARCH_IOP33X) += iop33x
|
||||
machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx
|
||||
|
@ -73,8 +73,8 @@ diff -ruN a/arch/arm/Makefile b/arch/arm/Makefile
|
|||
machine-$(CONFIG_ARCH_LPC18XX) += lpc18xx
|
||||
machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx
|
||||
diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
|
||||
--- a/arch/arm/mach-kirkwood/Kconfig 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/Kconfig 2015-11-27 18:42:18.302279708 +0000
|
||||
--- a/arch/arm/mach-kirkwood/Kconfig 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/Kconfig 2018-10-27 18:30:56.002359313 -0600
|
||||
@@ -0,0 +1,258 @@
|
||||
+if ARCH_KIRKWOOD
|
||||
+
|
||||
|
@ -335,8 +335,8 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
|
|||
+
|
||||
+endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
|
||||
--- a/arch/arm/mach-kirkwood/Makefile 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/Makefile 2015-11-27 18:42:18.302279708 +0000
|
||||
--- a/arch/arm/mach-kirkwood/Makefile 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/Makefile 2018-10-27 18:30:56.002359313 -0600
|
||||
@@ -0,0 +1,35 @@
|
||||
+obj-$(CONFIG_KIRKWOOD_LEGACY) += irq.o mpp.o common.o pcie.o
|
||||
+obj-$(CONFIG_PM) += pm.o
|
||||
|
@ -374,15 +374,15 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
|
|||
+
|
||||
+obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o
|
||||
diff -ruN a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
|
||||
--- a/arch/arm/mach-kirkwood/Makefile.boot 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/Makefile.boot 2015-11-27 18:42:18.302279708 +0000
|
||||
--- a/arch/arm/mach-kirkwood/Makefile.boot 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/Makefile.boot 2018-10-27 18:30:56.002359313 -0600
|
||||
@@ -0,0 +1,3 @@
|
||||
+ zreladdr-y += 0x00008000
|
||||
+params_phys-y := 0x00000100
|
||||
+initrd_phys-y := 0x00800000
|
||||
diff -ruN a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
|
||||
--- a/arch/arm/mach-kirkwood/board-dt.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/board-dt.c 2015-11-27 18:42:18.302279708 +0000
|
||||
--- a/arch/arm/mach-kirkwood/board-dt.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/board-dt.c 2018-10-27 18:30:56.002359313 -0600
|
||||
@@ -0,0 +1,223 @@
|
||||
+/*
|
||||
+ * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
|
||||
|
@ -608,8 +608,8 @@ diff -ruN a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.
|
|||
+ .dt_compat = kirkwood_dt_board_compat,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3-gpio.c
|
||||
--- a/arch/arm/mach-kirkwood/bubba3-gpio.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c 2015-11-27 18:42:18.307279697 +0000
|
||||
--- a/arch/arm/mach-kirkwood/bubba3-gpio.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c 2018-10-27 18:30:56.006359292 -0600
|
||||
@@ -0,0 +1,392 @@
|
||||
+/*
|
||||
+ * Excito BUBBA|3 led driver.
|
||||
|
@ -1004,8 +1004,8 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3
|
|||
+module_init(bubba3_init);
|
||||
+module_exit(bubba3_cleanup);
|
||||
diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba3-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/bubba3-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/bubba3-setup.c 2015-11-27 18:42:18.307279697 +0000
|
||||
--- a/arch/arm/mach-kirkwood/bubba3-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/bubba3-setup.c 2018-10-27 18:30:56.006359292 -0600
|
||||
@@ -0,0 +1,234 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/bubba3-setup.c
|
||||
|
@ -1242,8 +1242,8 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
|
||||
--- a/arch/arm/mach-kirkwood/common.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/common.c 2015-11-27 19:04:15.639271904 +0000
|
||||
--- a/arch/arm/mach-kirkwood/common.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/common.c 2018-10-27 18:30:56.006359292 -0600
|
||||
@@ -0,0 +1,747 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/common.c
|
||||
|
@ -1993,8 +1993,8 @@ diff -ruN a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
|
|||
+ ;
|
||||
+}
|
||||
diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
|
||||
--- a/arch/arm/mach-kirkwood/common.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/common.h 2015-11-27 18:42:18.312279685 +0000
|
||||
--- a/arch/arm/mach-kirkwood/common.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/common.h 2018-10-27 18:30:56.006359292 -0600
|
||||
@@ -0,0 +1,74 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/common.h
|
||||
|
@ -2071,8 +2071,8 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
|
|||
+
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/d2net_v2-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c 2015-11-27 18:42:18.312279685 +0000
|
||||
--- a/arch/arm/mach-kirkwood/d2net_v2-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c 2018-10-27 18:30:56.006359292 -0600
|
||||
@@ -0,0 +1,231 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/d2net_v2-setup.c
|
||||
|
@ -2306,8 +2306,8 @@ diff -ruN a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2n
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/dockstar-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2015-11-27 18:42:18.312279685 +0000
|
||||
--- a/arch/arm/mach-kirkwood/dockstar-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2018-10-27 18:30:56.006359292 -0600
|
||||
@@ -0,0 +1,115 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/dockstar-setup.c
|
||||
|
@ -2425,8 +2425,8 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/goflexhome-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2015-11-27 18:42:18.312279685 +0000
|
||||
--- a/arch/arm/mach-kirkwood/goflexhome-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2018-10-27 18:30:56.006359292 -0600
|
||||
@@ -0,0 +1,124 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/goflexhome-setup.c
|
||||
|
@ -2553,8 +2553,8 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
|
|||
+MACHINE_END
|
||||
+
|
||||
diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/goflexnet-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2015-11-27 18:42:18.312279685 +0000
|
||||
--- a/arch/arm/mach-kirkwood/goflexnet-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2018-10-27 18:30:56.006359292 -0600
|
||||
@@ -0,0 +1,177 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/goflexnet-setup.c
|
||||
|
@ -2734,8 +2734,8 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
|
|||
+MACHINE_END
|
||||
+
|
||||
diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/guruplug-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2015-11-27 18:42:18.317279674 +0000
|
||||
--- a/arch/arm/mach-kirkwood/guruplug-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2018-10-27 18:30:56.006359292 -0600
|
||||
@@ -0,0 +1,228 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/guruplug-setup.c
|
||||
|
@ -2966,8 +2966,8 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
|
|||
+MACHINE_END
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/iconnect-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2015-11-27 18:42:18.317279674 +0000
|
||||
--- a/arch/arm/mach-kirkwood/iconnect-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,204 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/iconnect-setup.c
|
||||
|
@ -3174,8 +3174,8 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h 2015-11-27 18:42:18.317279674 +0000
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,86 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/include/mach/bridge-regs.h
|
||||
|
@ -3264,8 +3264,8 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-ki
|
|||
+
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/entry-macro.S 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S 2015-11-27 18:42:18.317279674 +0000
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/entry-macro.S 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,34 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/include/mach/entry-macro.S
|
||||
|
@ -3302,8 +3302,8 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-ki
|
|||
+ subne \irqnr, \irqnr, \irqstat
|
||||
+ .endm
|
||||
diff -ruN a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/hardware.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/hardware.h 2015-11-27 18:42:18.317279674 +0000
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/hardware.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/hardware.h 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,14 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/include/mach/hardware.h
|
||||
|
@ -3320,8 +3320,8 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkw
|
|||
+
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/irqs.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h 2015-11-27 18:42:18.317279674 +0000
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/irqs.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,65 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/include/mach/irqs.h
|
||||
|
@ -3389,8 +3389,8 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/
|
|||
+
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h 2015-11-27 18:42:18.322279662 +0000
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,142 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/include/mach/kirkwood.h
|
||||
|
@ -3535,8 +3535,8 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkw
|
|||
+#define MV88F6282_REV_A1 1
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/include/mach/uncompress.h b/arch/arm/mach-kirkwood/include/mach/uncompress.h
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/uncompress.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/uncompress.h 2015-11-27 18:42:18.322279662 +0000
|
||||
--- a/arch/arm/mach-kirkwood/include/mach/uncompress.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/include/mach/uncompress.h 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,46 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/include/mach/uncompress.h
|
||||
|
@ -3585,8 +3585,8 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/uncompress.h b/arch/arm/mach-kir
|
|||
+ */
|
||||
+#define arch_decomp_setup()
|
||||
diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2015-11-27 18:42:18.322279662 +0000
|
||||
--- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,137 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/ionics-stratus-setup.c
|
||||
|
@ -3726,8 +3726,8 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
|
||||
--- a/arch/arm/mach-kirkwood/irq.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/irq.c 2015-11-27 18:42:18.322279662 +0000
|
||||
--- a/arch/arm/mach-kirkwood/irq.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/irq.c 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,82 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/irq.c
|
||||
|
@ -3812,8 +3812,8 @@ diff -ruN a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
|
|||
+ IRQ_KIRKWOOD_GPIO_START + 32, gpio1_irqs);
|
||||
+}
|
||||
diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/lacie_v2-common.c
|
||||
--- a/arch/arm/mach-kirkwood/lacie_v2-common.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c 2015-11-27 18:42:18.322279662 +0000
|
||||
--- a/arch/arm/mach-kirkwood/lacie_v2-common.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,114 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/lacie_v2-common.c
|
||||
|
@ -3930,8 +3930,8 @@ diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/la
|
|||
+ }
|
||||
+}
|
||||
diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.h b/arch/arm/mach-kirkwood/lacie_v2-common.h
|
||||
--- a/arch/arm/mach-kirkwood/lacie_v2-common.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.h 2015-11-27 18:42:18.322279662 +0000
|
||||
--- a/arch/arm/mach-kirkwood/lacie_v2-common.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.h 2018-10-27 18:30:56.010359272 -0600
|
||||
@@ -0,0 +1,16 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/lacie_v2-common.h
|
||||
|
@ -3950,8 +3950,8 @@ diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.h b/arch/arm/mach-kirkwood/la
|
|||
+
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
|
||||
--- a/arch/arm/mach-kirkwood/mpp.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/mpp.c 2015-11-27 18:42:18.322279662 +0000
|
||||
--- a/arch/arm/mach-kirkwood/mpp.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/mpp.c 2018-10-27 18:30:56.014359252 -0600
|
||||
@@ -0,0 +1,43 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/mpp.c
|
||||
|
@ -3997,8 +3997,8 @@ diff -ruN a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
|
|||
+ MPP_MAX, DEV_BUS_VIRT_BASE);
|
||||
+}
|
||||
diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
|
||||
--- a/arch/arm/mach-kirkwood/mpp.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/mpp.h 2015-11-27 18:42:18.327279651 +0000
|
||||
--- a/arch/arm/mach-kirkwood/mpp.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/mpp.h 2018-10-27 18:30:56.014359252 -0600
|
||||
@@ -0,0 +1,348 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/mach-kirkwood/mpp.h -- Multi Purpose Pins
|
||||
|
@ -4349,8 +4349,8 @@ diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
|
|||
+
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c 2015-11-27 18:42:18.327279651 +0000
|
||||
--- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c 2018-10-27 18:30:56.014359252 -0600
|
||||
@@ -0,0 +1,172 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
|
||||
|
@ -4525,8 +4525,8 @@ diff -ruN a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkw
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/nas6210-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2015-11-27 18:42:18.327279651 +0000
|
||||
--- a/arch/arm/mach-kirkwood/nas6210-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2018-10-27 18:30:56.014359252 -0600
|
||||
@@ -0,0 +1,186 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/nas6210-setup.c
|
||||
|
@ -4715,8 +4715,8 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/netspace_v2-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c 2015-11-27 18:42:18.332279639 +0000
|
||||
--- a/arch/arm/mach-kirkwood/netspace_v2-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c 2018-10-27 18:30:56.014359252 -0600
|
||||
@@ -0,0 +1,293 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/netspace_v2-setup.c
|
||||
|
@ -5012,8 +5012,8 @@ diff -ruN a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/
|
|||
+MACHINE_END
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c 2015-11-27 18:42:18.332279639 +0000
|
||||
--- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c 2018-10-27 18:30:56.014359252 -0600
|
||||
@@ -0,0 +1,422 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/netxbig_v2-setup.c
|
||||
|
@ -5438,8 +5438,8 @@ diff -ruN a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/n
|
|||
+MACHINE_END
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/nsa310-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2015-11-27 18:42:18.332279639 +0000
|
||||
--- a/arch/arm/mach-kirkwood/nsa310-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2018-10-27 18:30:56.014359252 -0600
|
||||
@@ -0,0 +1,359 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/nsa310-setup.c
|
||||
|
@ -5801,8 +5801,8 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/nsa320-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2015-11-27 18:42:18.337279627 +0000
|
||||
--- a/arch/arm/mach-kirkwood/nsa320-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,305 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/nsa320-setup.c
|
||||
|
@ -6110,8 +6110,8 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa325-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/nsa325-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/nsa325-setup.c 2015-11-27 18:42:18.337279627 +0000
|
||||
--- a/arch/arm/mach-kirkwood/nsa325-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/nsa325-setup.c 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,359 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/nsa325-setup.c
|
||||
|
@ -6473,8 +6473,8 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa32
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/openrd-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/openrd-setup.c 2015-11-27 18:42:18.337279627 +0000
|
||||
--- a/arch/arm/mach-kirkwood/openrd-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/openrd-setup.c 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,255 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/openrd-setup.c
|
||||
|
@ -6732,8 +6732,8 @@ diff -ruN a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openr
|
|||
+MACHINE_END
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
|
||||
--- a/arch/arm/mach-kirkwood/pcie.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/pcie.c 2015-11-27 18:42:18.342279616 +0000
|
||||
--- a/arch/arm/mach-kirkwood/pcie.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/pcie.c 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,296 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/pcie.c
|
||||
|
@ -7032,8 +7032,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
|
|||
+ pci_common_init(&kirkwood_pci);
|
||||
+}
|
||||
diff -ruN a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c
|
||||
--- a/arch/arm/mach-kirkwood/pm.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/pm.c 2015-11-27 18:42:18.342279616 +0000
|
||||
--- a/arch/arm/mach-kirkwood/pm.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/pm.c 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,76 @@
|
||||
+/*
|
||||
+ * Power Management driver for Marvell Kirkwood SoCs
|
||||
|
@ -7112,8 +7112,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c
|
|||
+ suspend_set_ops(&kirkwood_suspend_ops);
|
||||
+}
|
||||
diff -ruN a/arch/arm/mach-kirkwood/pm.h b/arch/arm/mach-kirkwood/pm.h
|
||||
--- a/arch/arm/mach-kirkwood/pm.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/pm.h 2015-11-27 18:42:18.342279616 +0000
|
||||
--- a/arch/arm/mach-kirkwood/pm.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/pm.h 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,26 @@
|
||||
+/*
|
||||
+ * Power Management driver for Marvell Kirkwood SoCs
|
||||
|
@ -7142,8 +7142,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pm.h b/arch/arm/mach-kirkwood/pm.h
|
|||
+
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/pogo_e02-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2015-11-27 18:42:18.342279616 +0000
|
||||
--- a/arch/arm/mach-kirkwood/pogo_e02-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,115 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/pogo_e02-setup.c
|
||||
|
@ -7261,8 +7261,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2015-11-27 18:42:18.342279616 +0000
|
||||
--- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,195 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/pogoplugv4-setup.c
|
||||
|
@ -7460,8 +7460,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c 2015-11-27 18:42:18.342279616 +0000
|
||||
--- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,89 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
|
||||
|
@ -7553,8 +7553,8 @@ diff -ruN a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwoo
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c 2015-11-27 18:42:18.347279604 +0000
|
||||
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c 2018-10-27 18:30:56.018359231 -0600
|
||||
@@ -0,0 +1,128 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/rd88f6281-setup.c
|
||||
|
@ -7685,8 +7685,8 @@ diff -ruN a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2015-11-27 18:42:18.347279604 +0000
|
||||
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2018-10-27 18:30:56.022359211 -0600
|
||||
@@ -0,0 +1,170 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
|
@ -7859,8 +7859,8 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
|
|||
+MACHINE_END
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/t5325-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/t5325-setup.c 2015-11-27 18:42:18.347279604 +0000
|
||||
--- a/arch/arm/mach-kirkwood/t5325-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/t5325-setup.c 2018-10-27 18:30:56.022359211 -0600
|
||||
@@ -0,0 +1,216 @@
|
||||
+/*
|
||||
+ *
|
||||
|
@ -8079,8 +8079,8 @@ diff -ruN a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/topkick-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2015-11-27 18:42:18.347279604 +0000
|
||||
--- a/arch/arm/mach-kirkwood/topkick-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2018-10-27 18:30:56.022359211 -0600
|
||||
@@ -0,0 +1,165 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/topkick-setup.c
|
||||
|
@ -8248,8 +8248,8 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/ts219-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/ts219-setup.c 2015-11-27 18:42:18.347279604 +0000
|
||||
--- a/arch/arm/mach-kirkwood/ts219-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/ts219-setup.c 2018-10-27 18:30:56.022359211 -0600
|
||||
@@ -0,0 +1,142 @@
|
||||
+/*
|
||||
+ *
|
||||
|
@ -8394,8 +8394,8 @@ diff -ruN a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
|
||||
--- a/arch/arm/mach-kirkwood/ts41x-setup.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c 2015-11-27 18:42:18.352279593 +0000
|
||||
--- a/arch/arm/mach-kirkwood/ts41x-setup.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c 2018-10-27 18:30:56.022359211 -0600
|
||||
@@ -0,0 +1,186 @@
|
||||
+/*
|
||||
+ *
|
||||
|
@ -8584,8 +8584,8 @@ diff -ruN a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-
|
|||
+ .restart = kirkwood_restart,
|
||||
+MACHINE_END
|
||||
diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x-common.c
|
||||
--- a/arch/arm/mach-kirkwood/tsx1x-common.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/tsx1x-common.c 2015-11-27 18:42:18.352279593 +0000
|
||||
--- a/arch/arm/mach-kirkwood/tsx1x-common.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/tsx1x-common.c 2018-10-27 18:30:56.022359211 -0600
|
||||
@@ -0,0 +1,113 @@
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/pci.h>
|
||||
|
@ -8701,8 +8701,8 @@ diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x
|
|||
+}
|
||||
+
|
||||
diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x-common.h
|
||||
--- a/arch/arm/mach-kirkwood/tsx1x-common.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/arch/arm/mach-kirkwood/tsx1x-common.h 2015-11-27 18:42:18.352279593 +0000
|
||||
--- a/arch/arm/mach-kirkwood/tsx1x-common.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/arch/arm/mach-kirkwood/tsx1x-common.h 2018-10-27 18:30:56.022359211 -0600
|
||||
@@ -0,0 +1,7 @@
|
||||
+#ifndef __ARCH_KIRKWOOD_TSX1X_COMMON_H
|
||||
+#define __ARCH_KIRKWOOD_TSX1X_COMMON_H
|
||||
|
@ -8712,9 +8712,9 @@ diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x
|
|||
+
|
||||
+#endif
|
||||
diff -ruN a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
|
||||
--- a/arch/arm/mm/Kconfig 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/arch/arm/mm/Kconfig 2015-11-27 18:42:18.352279593 +0000
|
||||
@@ -890,7 +890,7 @@
|
||||
--- a/arch/arm/mm/Kconfig 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/arch/arm/mm/Kconfig 2018-10-27 18:30:56.022359211 -0600
|
||||
@@ -878,7 +878,7 @@
|
||||
|
||||
config CACHE_FEROCEON_L2
|
||||
bool "Enable the Feroceon L2 cache controller"
|
||||
|
@ -8724,20 +8724,20 @@ diff -ruN a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
|
|||
select OUTER_CACHE
|
||||
help
|
||||
diff -ruN a/drivers/ata/Kconfig b/drivers/ata/Kconfig
|
||||
--- a/drivers/ata/Kconfig 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/ata/Kconfig 2015-11-27 18:42:18.352279593 +0000
|
||||
@@ -318,7 +318,7 @@
|
||||
|
||||
--- a/drivers/ata/Kconfig 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/ata/Kconfig 2018-10-27 18:32:48.425790190 -0600
|
||||
@@ -330,7 +330,7 @@
|
||||
config SATA_MV
|
||||
tristate "Marvell SATA support"
|
||||
depends on HAS_DMA
|
||||
- depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
|
||||
+ depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
|
||||
ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
|
||||
select GENERIC_PHY
|
||||
help
|
||||
diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
|
||||
--- a/drivers/ata/sata_mv.c 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/ata/sata_mv.c 2015-11-27 18:42:18.357279581 +0000
|
||||
--- a/drivers/ata/sata_mv.c 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/ata/sata_mv.c 2018-10-27 18:30:56.030359171 -0600
|
||||
@@ -72,6 +72,7 @@
|
||||
#include <scsi/scsi_cmnd.h>
|
||||
#include <scsi/scsi_device.h>
|
||||
|
@ -8756,8 +8756,8 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
|
|||
int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
|
||||
if (want_ncq != using_ncq)
|
||||
diff -ruN a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
|
||||
--- a/drivers/cpufreq/Kconfig.arm 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/cpufreq/Kconfig.arm 2015-11-27 18:42:18.357279581 +0000
|
||||
--- a/drivers/cpufreq/Kconfig.arm 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/cpufreq/Kconfig.arm 2018-10-27 18:30:56.030359171 -0600
|
||||
@@ -76,7 +76,7 @@
|
||||
If in doubt, say Y.
|
||||
|
||||
|
@ -8768,8 +8768,8 @@ diff -ruN a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
|
|||
This adds the CPUFreq driver for Marvell Kirkwood
|
||||
SoCs.
|
||||
diff -ruN a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
|
||||
--- a/drivers/cpuidle/Kconfig.arm 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/cpuidle/Kconfig.arm 2015-11-27 18:42:18.362279570 +0000
|
||||
--- a/drivers/cpuidle/Kconfig.arm 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/cpuidle/Kconfig.arm 2018-10-27 18:30:56.030359171 -0600
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
config ARM_KIRKWOOD_CPUIDLE
|
||||
|
@ -8780,9 +8780,9 @@ diff -ruN a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
|
|||
This adds the CPU Idle driver for Marvell Kirkwood SoCs.
|
||||
|
||||
diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
|
||||
--- a/drivers/hwmon/Kconfig 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/hwmon/Kconfig 2015-11-27 18:42:18.362279570 +0000
|
||||
@@ -1736,6 +1736,19 @@
|
||||
--- a/drivers/hwmon/Kconfig 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/hwmon/Kconfig 2018-10-27 18:30:56.034359150 -0600
|
||||
@@ -1757,6 +1757,19 @@
|
||||
This driver provides support for the Ultra45 workstation environmental
|
||||
sensors.
|
||||
|
||||
|
@ -8803,19 +8803,19 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
|
|||
|
||||
comment "ACPI drivers"
|
||||
diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
|
||||
--- a/drivers/hwmon/Makefile 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/hwmon/Makefile 2015-11-27 18:42:18.362279570 +0000
|
||||
@@ -116,6 +116,7 @@
|
||||
obj-$(CONFIG_SENSORS_MAX6650) += max6650.o
|
||||
--- a/drivers/hwmon/Makefile 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/hwmon/Makefile 2018-10-27 18:30:56.034359150 -0600
|
||||
@@ -118,6 +118,7 @@
|
||||
obj-$(CONFIG_SENSORS_MAX6697) += max6697.o
|
||||
obj-$(CONFIG_SENSORS_MAX31790) += max31790.o
|
||||
obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
|
||||
+obj-$(CONFIG_SENSORS_NSA3XX) += nsa3xx-hwmon.o
|
||||
obj-$(CONFIG_SENSORS_MCP3021) += mcp3021.o
|
||||
obj-$(CONFIG_SENSORS_MENF21BMC_HWMON) += menf21bmc_hwmon.o
|
||||
obj-$(CONFIG_SENSORS_NCT6683) += nct6683.o
|
||||
diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
|
||||
--- a/drivers/hwmon/nsa3xx-hwmon.c 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2015-11-27 18:42:18.367279558 +0000
|
||||
--- a/drivers/hwmon/nsa3xx-hwmon.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2018-10-27 18:30:56.034359150 -0600
|
||||
@@ -0,0 +1,251 @@
|
||||
+/*
|
||||
+ * drivers/hwmon/nsa3xx-hwmon.c
|
||||
|
@ -9069,8 +9069,8 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
|
|||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS("platform:nsa3xx-hwmon");
|
||||
diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
||||
--- a/drivers/leds/Kconfig 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/leds/Kconfig 2015-11-27 18:45:00.646905222 +0000
|
||||
--- a/drivers/leds/Kconfig 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/leds/Kconfig 2018-10-27 18:30:56.034359150 -0600
|
||||
@@ -456,7 +456,7 @@
|
||||
config LEDS_NS2
|
||||
tristate "LED support for Network Space v2 GPIO LEDs"
|
||||
|
@ -9090,8 +9090,8 @@ diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
|||
help
|
||||
This option enable support for LEDs found on the LaCie 2Big
|
||||
diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
|
||||
--- a/drivers/leds/trigger/Kconfig 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/leds/trigger/Kconfig 2015-11-27 18:42:18.367279558 +0000
|
||||
--- a/drivers/leds/trigger/Kconfig 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/leds/trigger/Kconfig 2018-10-27 18:30:56.034359150 -0600
|
||||
@@ -35,7 +35,6 @@
|
||||
|
||||
config LEDS_TRIGGER_IDE_DISK
|
||||
|
@ -9101,8 +9101,8 @@ diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
|
|||
help
|
||||
This allows LEDs to be controlled by IDE disk activity.
|
||||
diff -ruN a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-ide-disk.c
|
||||
--- a/drivers/leds/trigger/ledtrig-ide-disk.c 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/leds/trigger/ledtrig-ide-disk.c 2015-11-27 18:42:18.367279558 +0000
|
||||
--- a/drivers/leds/trigger/ledtrig-ide-disk.c 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/leds/trigger/ledtrig-ide-disk.c 2018-10-27 18:30:56.038359130 -0600
|
||||
@@ -18,25 +18,36 @@
|
||||
|
||||
#define BLINK_DELAY 30
|
||||
|
@ -9147,9 +9147,9 @@ diff -ruN a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtr
|
|||
|
||||
module_init(ledtrig_ide_init);
|
||||
diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
|
||||
--- a/drivers/mmc/core/core.c 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/mmc/core/core.c 2015-11-27 18:42:18.372279547 +0000
|
||||
@@ -848,7 +848,7 @@
|
||||
--- a/drivers/mmc/core/core.c 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/mmc/core/core.c 2018-10-27 18:30:56.038359130 -0600
|
||||
@@ -856,7 +856,7 @@
|
||||
*/
|
||||
limit_us = 3000000;
|
||||
else
|
||||
|
@ -9159,9 +9159,9 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
|
|||
/*
|
||||
* SDHC cards always use these fixed values.
|
||||
diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
|
||||
--- a/drivers/mmc/core/sd.c 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/mmc/core/sd.c 2015-11-27 18:42:18.372279547 +0000
|
||||
@@ -366,6 +366,15 @@
|
||||
--- a/drivers/mmc/core/sd.c 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/mmc/core/sd.c 2018-10-27 18:30:56.038359130 -0600
|
||||
@@ -364,6 +364,15 @@
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
@ -9178,8 +9178,8 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
|
|||
if (err)
|
||||
goto out;
|
||||
diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
|
||||
--- a/drivers/mmc/host/mvsdio.c 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/mmc/host/mvsdio.c 2015-11-27 18:42:18.372279547 +0000
|
||||
--- a/drivers/mmc/host/mvsdio.c 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/mmc/host/mvsdio.c 2018-10-27 18:30:56.042359110 -0600
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/mmc/host.h>
|
||||
|
@ -9197,9 +9197,9 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
|
|||
cmdreg = MVSD_CMD_INDEX(cmd->opcode);
|
||||
|
||||
diff -ruN a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
|
||||
--- a/drivers/rtc/Kconfig 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/rtc/Kconfig 2015-11-27 18:42:18.397279489 +0000
|
||||
@@ -1369,7 +1369,7 @@
|
||||
--- a/drivers/rtc/Kconfig 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/rtc/Kconfig 2018-10-27 18:30:56.042359110 -0600
|
||||
@@ -1378,7 +1378,7 @@
|
||||
|
||||
config RTC_DRV_MV
|
||||
tristate "Marvell SoC RTC"
|
||||
|
@ -9209,9 +9209,9 @@ diff -ruN a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
|
|||
If you say yes here you will get support for the in-chip RTC
|
||||
that can be found in some of Marvell's SoC devices, such as
|
||||
diff -ruN a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
|
||||
--- a/drivers/thermal/Kconfig 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/thermal/Kconfig 2015-11-27 18:45:31.591831565 +0000
|
||||
@@ -208,7 +208,7 @@
|
||||
--- a/drivers/thermal/Kconfig 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/thermal/Kconfig 2018-10-27 18:30:56.042359110 -0600
|
||||
@@ -222,7 +222,7 @@
|
||||
|
||||
config KIRKWOOD_THERMAL
|
||||
tristate "Temperature sensor on Marvell Kirkwood SoCs"
|
||||
|
@ -9221,8 +9221,8 @@ diff -ruN a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
|
|||
help
|
||||
Support for the Kirkwood thermal sensor driver into the Linux thermal
|
||||
diff -ruN a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
|
||||
--- a/drivers/watchdog/Kconfig 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/drivers/watchdog/Kconfig 2015-11-27 18:42:18.397279489 +0000
|
||||
--- a/drivers/watchdog/Kconfig 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/drivers/watchdog/Kconfig 2018-10-27 18:30:56.046359090 -0600
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
config ORION_WATCHDOG
|
||||
|
@ -9233,8 +9233,8 @@ diff -ruN a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
|
|||
help
|
||||
Say Y here if to include support for the watchdog timer
|
||||
diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
|
||||
--- a/include/linux/bubba3.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/include/linux/bubba3.h 2015-11-27 18:42:18.402279478 +0000
|
||||
--- a/include/linux/bubba3.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/include/linux/bubba3.h 2018-10-27 18:30:56.046359090 -0600
|
||||
@@ -0,0 +1,41 @@
|
||||
+/*
|
||||
+ * (C) Copyright 2010
|
||||
|
@ -9278,9 +9278,9 @@ diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
|
|||
+
|
||||
+#endif
|
||||
diff -ruN a/include/linux/leds.h b/include/linux/leds.h
|
||||
--- a/include/linux/leds.h 2015-11-02 00:05:25.000000000 +0000
|
||||
+++ b/include/linux/leds.h 2015-11-27 18:42:18.402279478 +0000
|
||||
@@ -296,9 +296,9 @@
|
||||
--- a/include/linux/leds.h 2018-10-20 01:52:38.000000000 -0600
|
||||
+++ b/include/linux/leds.h 2018-10-27 18:30:56.046359090 -0600
|
||||
@@ -303,9 +303,9 @@
|
||||
|
||||
/* Trigger specific functions */
|
||||
#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
|
||||
|
@ -9293,8 +9293,8 @@ diff -ruN a/include/linux/leds.h b/include/linux/leds.h
|
|||
|
||||
#if defined(CONFIG_LEDS_TRIGGER_CAMERA) || defined(CONFIG_LEDS_TRIGGER_CAMERA_MODULE)
|
||||
diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
|
||||
--- a/include/linux/nsa3xx-hwmon.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ b/include/linux/nsa3xx-hwmon.h 2015-11-27 18:42:18.402279478 +0000
|
||||
--- a/include/linux/nsa3xx-hwmon.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ b/include/linux/nsa3xx-hwmon.h 2018-10-27 18:30:56.050359069 -0600
|
||||
@@ -0,0 +1,21 @@
|
||||
+/*
|
||||
+ * include/linux/nsa3xx.hwmon.h
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=-kirkwood
|
||||
KERNEL_VERSION=4.4.88-1-ARCH
|
||||
KERNEL_VERSION=4.4.162-1-ARCH
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
|
|
Loading…
Reference in a new issue