aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-09-15 15:27:45 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2016-10-24 20:25:14 +0300
commit2fc3680dd066419576cb0129d0c1bd7618b90f1a (patch)
treef5956c394aedc3bb3a6a5f45e1d1ddc658d3dc58 /target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch
parent06405df7a8da24b7d735b32454c7d3b1f2ebaabc (diff)
downloadupstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.tar.gz
upstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.tar.bz2
upstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.zip
kernel: update kernel 4.1 to version 4.1.34
Refresh patches for all targets supporting 4.1 and not marked broken. Compile-tested on all targets using 4.1 and not marked broken. Changes to generic/610-netfilter_match_bypass_default_checks.patch based on 84d489f64f3b382d5544e342f66d8806e94e85d3. Changes to generic/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch based on a90ee92337d60fd14b6431adcda9929b955f3408. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch')
-rw-r--r--target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch16
1 files changed, 9 insertions, 7 deletions
diff --git a/target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch
index 5b1dd51104..6f885997fc 100644
--- a/target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch
+++ b/target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch
@@ -2,7 +2,7 @@
+++ b/arch/mips/rb532/devices.c
@@ -140,6 +140,19 @@ static struct platform_device cf_slot0 =
};
-
+
/* Resources and device for NAND */
+
+/*
@@ -19,11 +19,11 @@
+
static int rb532_dev_ready(struct mtd_info *mtd)
{
- return gpio_get_value(GPIO_RDY);
+ return gpio_get_value(GPIO_RDY);
@@ -254,6 +267,16 @@ static struct platform_device *rb532_dev
/* NAND definitions */
#define NAND_CHIP_DELAY 25
-
+
+static int rb532_nand_fixup(struct mtd_info *mtd)
+{
+ struct nand_chip *chip = mtd->priv;
@@ -36,10 +36,12 @@
+
static void __init rb532_nand_setup(void)
{
- switch (mips_machtype) {
+ switch (mips_machtype) {
@@ -272,6 +295,7 @@ static void __init rb532_nand_setup(void
- rb532_nand_data.chip.nr_partitions = ARRAY_SIZE(rb532_partition_info);
- rb532_nand_data.chip.partitions = rb532_partition_info;
- rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
+ rb532_nand_data.chip.nr_partitions = ARRAY_SIZE(rb532_partition_info);
+ rb532_nand_data.chip.partitions = rb532_partition_info;
+ rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
+ rb532_nand_data.chip.chip_fixup = &rb532_nand_fixup;
}
+
+