aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2018-01-11 13:59:32 +0100
committerRafał Miłecki <rafal@milecki.pl>2018-01-11 14:05:10 +0100
commit05cb6aa69f662fb27d1bfdb8d79b7448d058d1c6 (patch)
tree56ef5ce3677fe84ec5a78f9d9d1095eac64ee776 /target/linux
parentbde5e7a632ef06b16ea77af037c1442e10949666 (diff)
downloadupstream-05cb6aa69f662fb27d1bfdb8d79b7448d058d1c6.tar.gz
upstream-05cb6aa69f662fb27d1bfdb8d79b7448d058d1c6.tar.bz2
upstream-05cb6aa69f662fb27d1bfdb8d79b7448d058d1c6.zip
bcm53xx: replace linux,part-probe with a proper partitions subnode
This solution is more upstream compatible as it only requires specifying of_match_table in the parser code and doesn't depend on linux,part-probe which is solution made generic by a LEDE downstream patch that can't be upstreamed. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/bcm53xx/patches-4.14/101-use-part-parser.patch11
-rw-r--r--target/linux/bcm53xx/patches-4.14/390-Revert-ARM-dts-BCM5301X-convert-to-iProc-QSPI.patch (renamed from target/linux/bcm53xx/patches-4.14/980-Revert-ARM-dts-BCM5301X-convert-to-iProc-QSPI.patch)0
-rw-r--r--target/linux/bcm53xx/patches-4.14/410-Use-brcm-bcm947xx-cfe-partitions-binding-for-Broadco.patch53
-rw-r--r--target/linux/bcm53xx/patches-4.9/101-use-part-parser.patch11
-rw-r--r--target/linux/bcm53xx/patches-4.9/410-Use-brcm-bcm947xx-cfe-partitions-binding-for-Broadco.patch53
5 files changed, 106 insertions, 22 deletions
diff --git a/target/linux/bcm53xx/patches-4.14/101-use-part-parser.patch b/target/linux/bcm53xx/patches-4.14/101-use-part-parser.patch
deleted file mode 100644
index 4ecb8dc693..0000000000
--- a/target/linux/bcm53xx/patches-4.14/101-use-part-parser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
-@@ -13,6 +13,8 @@
- reg = <0>;
- #address-cells = <1>;
- #size-cells = <1>;
-+
-+ linux,part-probe = "ofpart", "bcm47xxpart";
- };
- };
- };
diff --git a/target/linux/bcm53xx/patches-4.14/980-Revert-ARM-dts-BCM5301X-convert-to-iProc-QSPI.patch b/target/linux/bcm53xx/patches-4.14/390-Revert-ARM-dts-BCM5301X-convert-to-iProc-QSPI.patch
index 6180c88e5e..6180c88e5e 100644
--- a/target/linux/bcm53xx/patches-4.14/980-Revert-ARM-dts-BCM5301X-convert-to-iProc-QSPI.patch
+++ b/target/linux/bcm53xx/patches-4.14/390-Revert-ARM-dts-BCM5301X-convert-to-iProc-QSPI.patch
diff --git a/target/linux/bcm53xx/patches-4.14/410-Use-brcm-bcm947xx-cfe-partitions-binding-for-Broadco.patch b/target/linux/bcm53xx/patches-4.14/410-Use-brcm-bcm947xx-cfe-partitions-binding-for-Broadco.patch
new file mode 100644
index 0000000000..0eae14ff98
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.14/410-Use-brcm-bcm947xx-cfe-partitions-binding-for-Broadco.patch
@@ -0,0 +1,53 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Subject: [PATCH] Use "brcm,bcm947xx-cfe-partitions" binding for Broadcom
+ partitions
+
+---
+
+--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+@@ -13,6 +13,10 @@
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <1>;
++
++ partitions {
++ compatible = "brcm,bcm947xx-cfe-partitions";
++ };
+ };
+ };
+ };
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -346,8 +346,11 @@
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <20000000>;
+- linux,part-probe = "ofpart", "bcm47xxpart";
+ status = "disabled";
++
++ partitions {
++ compatible = "brcm,bcm947xx-cfe-partitions";
++ };
+ };
+ };
+
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -300,9 +300,16 @@ static int bcm47xxpart_parse(struct mtd_
+ return curr_part;
+ };
+
++static const struct of_device_id bcm47xxpart_of_match_table[] = {
++ { .compatible = "brcm,bcm947xx-cfe-partitions" },
++ {},
++};
++MODULE_DEVICE_TABLE(of, bcm47xxpart_of_match_table);
++
+ static struct mtd_part_parser bcm47xxpart_mtd_parser = {
+ .parse_fn = bcm47xxpart_parse,
+ .name = "bcm47xxpart",
++ .of_match_table = bcm47xxpart_of_match_table,
+ };
+ module_mtd_part_parser(bcm47xxpart_mtd_parser);
+
diff --git a/target/linux/bcm53xx/patches-4.9/101-use-part-parser.patch b/target/linux/bcm53xx/patches-4.9/101-use-part-parser.patch
deleted file mode 100644
index 4ecb8dc693..0000000000
--- a/target/linux/bcm53xx/patches-4.9/101-use-part-parser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
-@@ -13,6 +13,8 @@
- reg = <0>;
- #address-cells = <1>;
- #size-cells = <1>;
-+
-+ linux,part-probe = "ofpart", "bcm47xxpart";
- };
- };
- };
diff --git a/target/linux/bcm53xx/patches-4.9/410-Use-brcm-bcm947xx-cfe-partitions-binding-for-Broadco.patch b/target/linux/bcm53xx/patches-4.9/410-Use-brcm-bcm947xx-cfe-partitions-binding-for-Broadco.patch
new file mode 100644
index 0000000000..0eae14ff98
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.9/410-Use-brcm-bcm947xx-cfe-partitions-binding-for-Broadco.patch
@@ -0,0 +1,53 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Subject: [PATCH] Use "brcm,bcm947xx-cfe-partitions" binding for Broadcom
+ partitions
+
+---
+
+--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+@@ -13,6 +13,10 @@
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <1>;
++
++ partitions {
++ compatible = "brcm,bcm947xx-cfe-partitions";
++ };
+ };
+ };
+ };
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -346,8 +346,11 @@
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <20000000>;
+- linux,part-probe = "ofpart", "bcm47xxpart";
+ status = "disabled";
++
++ partitions {
++ compatible = "brcm,bcm947xx-cfe-partitions";
++ };
+ };
+ };
+
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -300,9 +300,16 @@ static int bcm47xxpart_parse(struct mtd_
+ return curr_part;
+ };
+
++static const struct of_device_id bcm47xxpart_of_match_table[] = {
++ { .compatible = "brcm,bcm947xx-cfe-partitions" },
++ {},
++};
++MODULE_DEVICE_TABLE(of, bcm47xxpart_of_match_table);
++
+ static struct mtd_part_parser bcm47xxpart_mtd_parser = {
+ .parse_fn = bcm47xxpart_parse,
+ .name = "bcm47xxpart",
++ .of_match_table = bcm47xxpart_of_match_table,
+ };
+ module_mtd_part_parser(bcm47xxpart_mtd_parser);
+