From cdcd5c93d733f6c0d6c2b21b98f5793310b867a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 9 Apr 2018 07:14:04 +0200 Subject: [PATCH] kernel: use accepted mtd patchset adding support for "compatible" string MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit These patches were finally accepted and are already present in the Linus's tree. This should be good enough to make is "backport" material. Signed-off-by: Rafał Miłecki --- ...ions-add-of_match_table-parser-matching-fo.patch} | 12 +++++++++--- ...-ofpart-parser-to-fixed-partitions-as-it-f.patch} | 12 +++++++++--- ...t-add-of_match_table-with-fixed-partitions.patch} | 10 +++++++--- ...ions-add-of_match_table-parser-matching-fo.patch} | 12 +++++++++--- ...-ofpart-parser-to-fixed-partitions-as-it-f.patch} | 12 +++++++++--- ...t-add-of_match_table-with-fixed-partitions.patch} | 10 +++++++--- 6 files changed, 50 insertions(+), 18 deletions(-) rename target/linux/generic/{pending-4.14/160-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch => backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch} (92%) rename target/linux/generic/{pending-4.14/160-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch => backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch} (83%) rename target/linux/generic/{pending-4.14/160-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch => backport-4.14/041-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch} (76%) rename target/linux/generic/{pending-4.9/160-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch => backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch} (92%) rename target/linux/generic/{pending-4.9/160-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch => backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch} (83%) rename target/linux/generic/{pending-4.9/160-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch => backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch} (76%) diff --git a/target/linux/generic/pending-4.14/160-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch similarity index 92% rename from target/linux/generic/pending-4.14/160-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch rename to target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch index 3334203d8a..bd39a2625e 100644 --- a/target/linux/generic/pending-4.14/160-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +++ b/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch @@ -1,7 +1,8 @@ +From 5b644aa012f67fd211138a067b9f351f30bdcc60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 30 Jan 2018 11:55:16 +0100 -Subject: [PATCH V10 1/3] mtd: partitions: add of_match_table parser matching - for the "ofpart" type +Date: Wed, 14 Mar 2018 13:10:42 +0100 +Subject: [PATCH] mtd: partitions: add of_match_table parser matching for the + "ofpart" type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -37,7 +38,12 @@ though as compiling parsers as modules isn't a common choice. Signed-off-by: Brian Norris Signed-off-by: Rafał Miłecki Tested-by: Peter Rosin +Reviewed-by: Richard Weinberger +Signed-off-by: Boris Brezillon --- + drivers/mtd/mtdpart.c | 116 +++++++++++++++++++++++++++++++++++++---- + include/linux/mtd/partitions.h | 1 + + 2 files changed, 108 insertions(+), 9 deletions(-) --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c diff --git a/target/linux/generic/pending-4.14/160-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch similarity index 83% rename from target/linux/generic/pending-4.14/160-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch rename to target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch index c380655635..66b67d7676 100644 --- a/target/linux/generic/pending-4.14/160-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +++ b/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch @@ -1,7 +1,8 @@ +From c0faf43482e7f7dfb6d61847cb93d17748560b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 30 Jan 2018 12:09:58 +0100 -Subject: [PATCH V10 2/3] mtd: rename "ofpart" parser to "fixed-partitions" as - it fits it better +Date: Wed, 14 Mar 2018 13:10:43 +0100 +Subject: [PATCH] mtd: rename "ofpart" parser to "fixed-partitions" as it fits + it better MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,7 +13,12 @@ lead to less confusion especially when parsers for new compatibility strings start to appear. Signed-off-by: Rafał Miłecki +Reviewed-by: Richard Weinberger +Signed-off-by: Boris Brezillon --- + drivers/mtd/mtdpart.c | 4 ++-- + drivers/mtd/ofpart.c | 11 ++++++----- + 2 files changed, 8 insertions(+), 7 deletions(-) --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c diff --git a/target/linux/generic/pending-4.14/160-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch b/target/linux/generic/backport-4.14/041-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch similarity index 76% rename from target/linux/generic/pending-4.14/160-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch rename to target/linux/generic/backport-4.14/041-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch index 08f048f42a..d6958c3eac 100644 --- a/target/linux/generic/pending-4.14/160-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch +++ b/target/linux/generic/backport-4.14/041-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch @@ -1,7 +1,7 @@ +From 97b0c7c0df3efd7048ed39d7e2dee34cafd55887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 4 Jan 2018 08:05:34 +0100 -Subject: [PATCH V10 3/3] mtd: ofpart: add of_match_table with - "fixed-partitions" +Date: Wed, 14 Mar 2018 13:10:44 +0100 +Subject: [PATCH] mtd: ofpart: add of_match_table with "fixed-partitions" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -17,7 +17,11 @@ This matches existing bindings documentation. Signed-off-by: Rafał Miłecki Reviewed-by: Brian Norris Tested-by: Brian Norris +Reviewed-by: Richard Weinberger +Signed-off-by: Boris Brezillon --- + drivers/mtd/ofpart.c | 7 +++++++ + 1 file changed, 7 insertions(+) --- a/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c diff --git a/target/linux/generic/pending-4.9/160-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch similarity index 92% rename from target/linux/generic/pending-4.9/160-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch rename to target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch index 3a0115d521..60eace2a34 100644 --- a/target/linux/generic/pending-4.9/160-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +++ b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch @@ -1,7 +1,8 @@ +From 5b644aa012f67fd211138a067b9f351f30bdcc60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 30 Jan 2018 11:55:16 +0100 -Subject: [PATCH V10 1/3] mtd: partitions: add of_match_table parser matching - for the "ofpart" type +Date: Wed, 14 Mar 2018 13:10:42 +0100 +Subject: [PATCH] mtd: partitions: add of_match_table parser matching for the + "ofpart" type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -37,7 +38,12 @@ though as compiling parsers as modules isn't a common choice. Signed-off-by: Brian Norris Signed-off-by: Rafał Miłecki Tested-by: Peter Rosin +Reviewed-by: Richard Weinberger +Signed-off-by: Boris Brezillon --- + drivers/mtd/mtdpart.c | 116 +++++++++++++++++++++++++++++++++++++---- + include/linux/mtd/partitions.h | 1 + + 2 files changed, 108 insertions(+), 9 deletions(-) --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c diff --git a/target/linux/generic/pending-4.9/160-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch similarity index 83% rename from target/linux/generic/pending-4.9/160-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch rename to target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch index 7b17b55bf5..59f53df101 100644 --- a/target/linux/generic/pending-4.9/160-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +++ b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch @@ -1,7 +1,8 @@ +From c0faf43482e7f7dfb6d61847cb93d17748560b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 30 Jan 2018 12:09:58 +0100 -Subject: [PATCH V10 2/3] mtd: rename "ofpart" parser to "fixed-partitions" as - it fits it better +Date: Wed, 14 Mar 2018 13:10:43 +0100 +Subject: [PATCH] mtd: rename "ofpart" parser to "fixed-partitions" as it fits + it better MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,7 +13,12 @@ lead to less confusion especially when parsers for new compatibility strings start to appear. Signed-off-by: Rafał Miłecki +Reviewed-by: Richard Weinberger +Signed-off-by: Boris Brezillon --- + drivers/mtd/mtdpart.c | 4 ++-- + drivers/mtd/ofpart.c | 11 ++++++----- + 2 files changed, 8 insertions(+), 7 deletions(-) --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c diff --git a/target/linux/generic/pending-4.9/160-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch b/target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch similarity index 76% rename from target/linux/generic/pending-4.9/160-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch rename to target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch index 08f048f42a..d6958c3eac 100644 --- a/target/linux/generic/pending-4.9/160-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch +++ b/target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch @@ -1,7 +1,7 @@ +From 97b0c7c0df3efd7048ed39d7e2dee34cafd55887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 4 Jan 2018 08:05:34 +0100 -Subject: [PATCH V10 3/3] mtd: ofpart: add of_match_table with - "fixed-partitions" +Date: Wed, 14 Mar 2018 13:10:44 +0100 +Subject: [PATCH] mtd: ofpart: add of_match_table with "fixed-partitions" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -17,7 +17,11 @@ This matches existing bindings documentation. Signed-off-by: Rafał Miłecki Reviewed-by: Brian Norris Tested-by: Brian Norris +Reviewed-by: Richard Weinberger +Signed-off-by: Boris Brezillon --- + drivers/mtd/ofpart.c | 7 +++++++ + 1 file changed, 7 insertions(+) --- a/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c -- 2.30.2