mtd: physmap_of: Add non-obsolete map_rom probe

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=e5bffb59cfbb3371ff00a165a5a48c1f3fdf125a
Commit:     e5bffb59cfbb3371ff00a165a5a48c1f3fdf125a
Parent:     9b07a8d1ab85ccacaceb9f704c361119348aabab
Author:     Aaron Sierra <asierra at xes-inc.com>
AuthorDate: Wed Sep 17 13:08:28 2014 -0500
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon Sep 22 10:13:13 2014 -0700

    mtd: physmap_of: Add non-obsolete map_rom probe
    
    Previously, the only way to map a NOR device as a simple ROM was to
    use the obsolete "direct-mapped" compatible binding (which further
    requires device_type = "nor" and probe-type = "NOR" properties).
    
    This patch adds an "mtd-rom" compatible binding to the "map_rom"
    probe type.
    
    Signed-off-by: Aaron Sierra <asierra at xes-inc.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 Documentation/devicetree/bindings/mtd/mtd-physmap.txt | 4 ++--
 drivers/mtd/maps/physmap_of.c                         | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/mtd/mtd-physmap.txt b/Documentation/devicetree/bindings/mtd/mtd-physmap.txt
index 61c5ec8..6b9f680 100644
--- a/Documentation/devicetree/bindings/mtd/mtd-physmap.txt
+++ b/Documentation/devicetree/bindings/mtd/mtd-physmap.txt
@@ -4,8 +4,8 @@ Flash chips (Memory Technology Devices) are often used for solid state
 file systems on embedded devices.
 
  - compatible : should contain the specific model of mtd chip(s)
-   used, if known, followed by either "cfi-flash", "jedec-flash"
-   or "mtd-ram".
+   used, if known, followed by either "cfi-flash", "jedec-flash",
+   "mtd-ram" or "mtd-rom".
  - reg : Address range(s) of the mtd chip(s)
    It's possible to (optionally) define multiple "reg" tuples so that
    non-identical chips can be described in one node.
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 63d82da..c1d21cb 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -340,6 +340,10 @@ static struct of_device_id of_flash_match[] = {
 		.data           = (void *)"map_ram",
 	},
 	{
+		.compatible     = "mtd-rom",
+		.data           = (void *)"map_rom",
+	},
+	{
 		.type		= "rom",
 		.compatible	= "direct-mapped"
 	},