summaryrefslogtreecommitdiff
path: root/target/linux/brcm2708
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-09 17:17:50 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-10 18:43:59 +0200
commite4a57509311e5805810da50852a7d48569952146 (patch)
treee8171f5d2327a84ced47581eafe56a991db1090d /target/linux/brcm2708
parent433c94f296883d4733c8aa16bd5137f34af03c71 (diff)
downloadmtk-20170518-e4a57509311e5805810da50852a7d48569952146.zip
mtk-20170518-e4a57509311e5805810da50852a7d48569952146.tar.gz
mtk-20170518-e4a57509311e5805810da50852a7d48569952146.tar.bz2
kernel: bump 4.9 to 4.9.119
Refreshed all patches. Delete upstreamed patch: - 100-tcp-add-tcp_ooo_try_coalesce-helper.patch Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r--target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch30
1 files changed, 10 insertions, 20 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch b/target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
index 5a324dd..4c3d2b1 100644
--- a/target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0058-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
@@ -28,10 +28,8 @@ w1-gpio: Sort out the pullup/parasitic power tangle
include/linux/w1-gpio.h | 1 +
5 files changed, 99 insertions(+), 9 deletions(-)
-Index: linux-4.9.111/drivers/w1/masters/w1-gpio.c
-===================================================================
---- linux-4.9.111.orig/drivers/w1/masters/w1-gpio.c
-+++ linux-4.9.111/drivers/w1/masters/w1-gpio.c
+--- a/drivers/w1/masters/w1-gpio.c
++++ b/drivers/w1/masters/w1-gpio.c
@@ -23,6 +23,19 @@
#include "../w1.h"
#include "../w1_int.h"
@@ -145,10 +143,8 @@ Index: linux-4.9.111/drivers/w1/masters/w1-gpio.c
return 0;
}
-Index: linux-4.9.111/drivers/w1/w1.h
-===================================================================
---- linux-4.9.111.orig/drivers/w1/w1.h
-+++ linux-4.9.111/drivers/w1/w1.h
+--- a/drivers/w1/w1.h
++++ b/drivers/w1/w1.h
@@ -173,6 +173,12 @@ struct w1_bus_master
u8 (*set_pullup)(void *, int);
@@ -162,10 +158,8 @@ Index: linux-4.9.111/drivers/w1/w1.h
void (*search)(void *, struct w1_master *,
u8, w1_slave_found_callback);
};
-Index: linux-4.9.111/drivers/w1/w1_int.c
-===================================================================
---- linux-4.9.111.orig/drivers/w1/w1_int.c
-+++ linux-4.9.111/drivers/w1/w1_int.c
+--- a/drivers/w1/w1_int.c
++++ b/drivers/w1/w1_int.c
@@ -122,6 +122,20 @@ int w1_add_master_device(struct w1_bus_m
return(-EINVAL);
}
@@ -187,10 +181,8 @@ Index: linux-4.9.111/drivers/w1/w1_int.c
/* Lock until the device is added (or not) to w1_masters. */
mutex_lock(&w1_mlock);
/* Search for the first available id (starting at 1). */
-Index: linux-4.9.111/drivers/w1/w1_io.c
-===================================================================
---- linux-4.9.111.orig/drivers/w1/w1_io.c
-+++ linux-4.9.111/drivers/w1/w1_io.c
+--- a/drivers/w1/w1_io.c
++++ b/drivers/w1/w1_io.c
@@ -134,10 +134,22 @@ static void w1_pre_write(struct w1_maste
static void w1_post_write(struct w1_master *dev)
{
@@ -217,10 +209,8 @@ Index: linux-4.9.111/drivers/w1/w1_io.c
dev->pullup_duration = 0;
}
}
-Index: linux-4.9.111/include/linux/w1-gpio.h
-===================================================================
---- linux-4.9.111.orig/include/linux/w1-gpio.h
-+++ linux-4.9.111/include/linux/w1-gpio.h
+--- a/include/linux/w1-gpio.h
++++ b/include/linux/w1-gpio.h
@@ -18,6 +18,7 @@
struct w1_gpio_platform_data {
unsigned int pin;