From aed6b2643147d55d2c976ee6a127ffcec0e473f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 8 Dec 2014 17:39:07 +0000 Subject: [PATCH] bcm53xx: bcm_nand: switch from cmdlinepart to ofpart MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki SVN-Revision: 43580 --- .../bcm53xx/patches-3.14/420-mtd-bcm5301x_nand.patch | 9 ++++++--- .../bcm53xx/patches-3.18/420-mtd-bcm5301x_nand.patch | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/target/linux/bcm53xx/patches-3.14/420-mtd-bcm5301x_nand.patch b/target/linux/bcm53xx/patches-3.14/420-mtd-bcm5301x_nand.patch index 53840f3c4b..7571eef8a0 100644 --- a/target/linux/bcm53xx/patches-3.14/420-mtd-bcm5301x_nand.patch +++ b/target/linux/bcm53xx/patches-3.14/420-mtd-bcm5301x_nand.patch @@ -22,7 +22,7 @@ nand-objs := nand_base.o nand_bbt.o --- /dev/null +++ b/drivers/mtd/nand/bcm_nand.c -@@ -0,0 +1,1580 @@ +@@ -0,0 +1,1583 @@ +/* + * Nortstar NAND controller driver + * @@ -64,6 +64,7 @@ + +#include +#include ++#include + +#define NANDC_MAX_CHIPS 2 /* Only 2 CSn supported in NorthStar */ + @@ -1515,13 +1516,14 @@ + return 0; +} + -+static const char * const part_probes[] = { "bcm47xxpart", "cmdlinepart", NULL }; ++static const char * const part_probes[] = { "ofpart", "bcm47xxpart", NULL }; + +/* + * Top-level init function + */ +static int bcmnand_probe(struct bcma_device *core) +{ ++ struct mtd_part_parser_data parser_data; + struct device *dev = &core->dev; + struct bcmnand_ctrl *ctrl; + int res, i, irq; @@ -1559,7 +1561,8 @@ + if (res) + return res; + -+ res = mtd_device_parse_register(&ctrl->mtd, part_probes, NULL, NULL, 0); ++ parser_data.of_node = np; ++ res = mtd_device_parse_register(&ctrl->mtd, part_probes, &parser_data, NULL, 0); + if (res) { + dev_err(dev, "Failed to register MTD device: %d\n", res); + return res; diff --git a/target/linux/bcm53xx/patches-3.18/420-mtd-bcm5301x_nand.patch b/target/linux/bcm53xx/patches-3.18/420-mtd-bcm5301x_nand.patch index 1b2ed8edb2..c4bc51fe9b 100644 --- a/target/linux/bcm53xx/patches-3.18/420-mtd-bcm5301x_nand.patch +++ b/target/linux/bcm53xx/patches-3.18/420-mtd-bcm5301x_nand.patch @@ -22,7 +22,7 @@ nand-objs := nand_base.o nand_bbt.o nand_timings.o --- /dev/null +++ b/drivers/mtd/nand/bcm_nand.c -@@ -0,0 +1,1580 @@ +@@ -0,0 +1,1583 @@ +/* + * Nortstar NAND controller driver + * @@ -64,6 +64,7 @@ + +#include +#include ++#include + +#define NANDC_MAX_CHIPS 2 /* Only 2 CSn supported in NorthStar */ + @@ -1515,13 +1516,14 @@ + return 0; +} + -+static const char * const part_probes[] = { "bcm47xxpart", "cmdlinepart", NULL }; ++static const char * const part_probes[] = { "ofpart", "bcm47xxpart", NULL }; + +/* + * Top-level init function + */ +static int bcmnand_probe(struct bcma_device *core) +{ ++ struct mtd_part_parser_data parser_data; + struct device *dev = &core->dev; + struct bcmnand_ctrl *ctrl; + int res, i, irq; @@ -1559,7 +1561,8 @@ + if (res) + return res; + -+ res = mtd_device_parse_register(&ctrl->mtd, part_probes, NULL, NULL, 0); ++ parser_data.of_node = np; ++ res = mtd_device_parse_register(&ctrl->mtd, part_probes, &parser_data, NULL, 0); + if (res) { + dev_err(dev, "Failed to register MTD device: %d\n", res); + return res; -- 2.25.1