aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2017-11-20 10:51:09 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-11-22 20:45:52 +0100
commit62ede4f78389c313a8004e79330a7d055eda2f7d (patch)
tree5f1ded01402b53ccbc43ab9ac86eb917f669f806 /target/linux/ar7
parent9052dd6534d1b10e7b0d6c182a03eb9abed85a69 (diff)
downloadupstream-62ede4f78389c313a8004e79330a7d055eda2f7d.tar.gz
upstream-62ede4f78389c313a8004e79330a7d055eda2f7d.tar.bz2
upstream-62ede4f78389c313a8004e79330a7d055eda2f7d.zip
kernel: bump 4.9 to 4.9.63
Refreshed all patches. Removed upstreamed parts. Compile-tested: cns3xxx, imx6, mvebu, layerscape Run-tested: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar7')
-rw-r--r--target/linux/ar7/patches-4.9/001-mips-ar7-fix-serial.patch23
-rw-r--r--target/linux/ar7/patches-4.9/003-MIPS-AR7-defer-registration-of-GPIO.patch45
2 files changed, 0 insertions, 68 deletions
diff --git a/target/linux/ar7/patches-4.9/001-mips-ar7-fix-serial.patch b/target/linux/ar7/patches-4.9/001-mips-ar7-fix-serial.patch
deleted file mode 100644
index 7567b848e0..0000000000
--- a/target/linux/ar7/patches-4.9/001-mips-ar7-fix-serial.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 443ab715a40881d6c9ba11b027ba154bac904cb0 Mon Sep 17 00:00:00 2001
-From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
-Date: Sat, 10 May 2014 23:19:08 +0200
-Subject: [PATCH] MIPS/AR7: ensure that serial ports are properly set up
-
-without UPF_FIXED_TYPE, the data from the PORT_AR7 uart_config entry is
-never copied, resulting in a dead port.
-
-Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
----
- arch/mips/ar7/platform.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -576,6 +576,7 @@ static int __init ar7_register_uarts(voi
- uart_port.type = PORT_AR7;
- uart_port.uartclk = clk_get_rate(bus_clk) / 2;
- uart_port.iotype = UPIO_MEM32;
-+ uart_port.flags = UPF_FIXED_TYPE;
- uart_port.regshift = 2;
-
- uart_port.line = 0;
diff --git a/target/linux/ar7/patches-4.9/003-MIPS-AR7-defer-registration-of-GPIO.patch b/target/linux/ar7/patches-4.9/003-MIPS-AR7-defer-registration-of-GPIO.patch
deleted file mode 100644
index f256665baf..0000000000
--- a/target/linux/ar7/patches-4.9/003-MIPS-AR7-defer-registration-of-GPIO.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3a8d54573f9d187779d36d6b45e8e0288b82c31a Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Thu, 26 Oct 2017 23:25:44 +0200
-Subject: [PATCH 1/3] MIPS: AR7: defer registration of GPIO
-
-When called from prom init code, ar7_gpio_init() will fail as it will
-call gpiochip_add() which relies on a working kmalloc() to alloc
-the gpio_desc array and kmalloc is not useable yet at prom init time.
-
-Move ar7_gpio_init() to ar7_register_devices() (a device_initcall)
-where kmalloc works.
-
-Fixes: 14e85c0e69d5 ("gpio: remove gpio_descs global array")
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
-Text shamelessy stolen from commit 2ec459f2a77b8.
-
- arch/mips/ar7/platform.c | 4 ++++
- arch/mips/ar7/prom.c | 2 --
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -655,6 +655,10 @@ static int __init ar7_register_devices(v
- u32 val;
- int res;
-
-+ res = ar7_gpio_init();
-+ if (res)
-+ pr_warn("unable to register gpios: %d\n", res);
-+
- res = ar7_register_uarts();
- if (res)
- pr_err("unable to setup uart(s): %d\n", res);
---- a/arch/mips/ar7/prom.c
-+++ b/arch/mips/ar7/prom.c
-@@ -246,8 +246,6 @@ void __init prom_init(void)
- ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
- ar7_init_env((struct env_var *)fw_arg2);
- console_config();
--
-- ar7_gpio_init();
- }
-
- #define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))