Patchwork mtd: fsmc-nand: Update compatible property

login
register
mail settings
Submitter Viresh KUMAR
Date March 23, 2012, 8:45 a.m.
Message ID <2667979af077daa0f1bff81db7e25f5c8157b4bc.1332492218.git.viresh.kumar@st.com>
Download mbox | patch
Permalink /patch/148399/
State New
Headers show

Comments

Viresh KUMAR - March 23, 2012, 8:45 a.m.
FSMC NAND driver can verify device version by itself and so we wouldn't be
required to have separate .compatible entries for different SPEAr SoCs.

Thus this patch updates compatible entry to: "st,spear-fsmc-nand", so that it
works for all SPEAr machines.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
---
 .../devicetree/bindings/mtd/fsmc-nand.txt          |    4 ++--
 drivers/mtd/nand/fsmc_nand.c                       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/Documentation/devicetree/bindings/mtd/fsmc-nand.txt b/Documentation/devicetree/bindings/mtd/fsmc-nand.txt
index e2c663b..7551600 100644
--- a/Documentation/devicetree/bindings/mtd/fsmc-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/fsmc-nand.txt
@@ -1,7 +1,7 @@ 
 * FSMC NAND
 
 Required properties:
-- compatible : "st,spear600-fsmc-nand"
+- compatible : "st,spear-fsmc-nand"
 - reg : Address range of the mtd chip
 - reg-names: Should contain the reg names "fsmc_regs" and "nand_data"
 - st,ale-off : Chip specific offset to ALE
@@ -15,7 +15,7 @@  Optional properties:
 Example:
 
 	fsmc: flash@d1800000 {
-		compatible = "st,spear600-fsmc-nand";
+		compatible = "st,spear-fsmc-nand";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		reg = <0xd1800000 0x1000	/* FSMC Register */
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 1b8330e..ecb103e 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -1231,7 +1231,7 @@  static SIMPLE_DEV_PM_OPS(fsmc_nand_pm_ops, fsmc_nand_suspend, fsmc_nand_resume);
 
 #ifdef CONFIG_OF
 static const struct of_device_id fsmc_nand_id_table[] = {
-	{ .compatible = "st,spear600-fsmc-nand" },
+	{ .compatible = "st,spear-fsmc-nand" },
 	{}
 };
 MODULE_DEVICE_TABLE(of, fsmc_nand_id_table);