4 files changed, 62 insertions, 1 deletions

diff --git a/include/linux/of.h b/include/linux/of.h
index d46a18ffbebb..ba5d8494f2e1 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -361,6 +361,22 @@ static inline int of_machine_is_compatible(const char *compat)
 #define of_match_node(_matches, _node)  NULL
 #endif /* CONFIG_OF */
 
+/**
+ * of_property_read_bool - Findfrom a property
+ * @np:         device node from which the property value is to be read.
+ * @propname:   name of the property to be searched.
+ *
+ * Search for a property in a device node.
+ * Returns true if the property exist false otherwise.
+ */
+static inline bool of_property_read_bool(const struct device_node *np,
+                                         const char *propname)
+{
+        struct property *prop = of_find_property(np, propname, NULL);
+
+        return prop ? true : false;
+}
+
 static inline int of_property_read_u32(const struct device_node *np,
                                        const char *propname,
                                        u32 *out_value)
diff --git a/include/linux/of_mtd.h b/include/linux/of_mtd.h
new file mode 100644
index 000000000000..bae1b6094c63
--- /dev/null
+++ b/include/linux/of_mtd.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * OF helpers for mtd.
+ *
+ * This file is released under the GPLv2
+ */
+
+#ifndef __LINUX_OF_MTD_H
+#define __LINUX_OF_NET_H
+
+#ifdef CONFIG_OF_MTD
+#include <linux/of.h>
+extern const int of_get_nand_ecc_mode(struct device_node *np);
+int of_get_nand_bus_width(struct device_node *np);
+bool of_get_nand_on_flash_bbt(struct device_node *np);
+#endif
+
+#endif /* __LINUX_OF_MTD_H */
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
new file mode 100644
index 000000000000..d056263545b1
--- /dev/null
+++ b/include/linux/platform_data/atmel.h
@@ -0,0 +1,27 @@
+/*
+ * atmel platform data
+ *
+ * GPL v2 Only
+ */
+
+#ifndef __ATMEL_NAND_H__
+#define __ATMEL_NAND_H__
+
+#include <linux/mtd/nand.h>
+
+ /* NAND / SmartMedia */
+struct atmel_nand_data {
+        int             enable_pin;             /* chip enable */
+        int             det_pin;                /* card detect */
+        int             rdy_pin;                /* ready/busy */
+        u8              rdy_pin_active_low;     /* rdy_pin value is inverted */
+        u8              ale;                    /* address line number connected to ALE */
+        u8              cle;                    /* address line number connected to CLE */
+        u8              bus_width_16;           /* buswidth is 16 bit */
+        u8              ecc_mode;               /* ecc mode */
+        u8              on_flash_bbt;           /* bbt on flash */
+        struct mtd_partition *parts;
+        unsigned int    num_parts;
+};
+
+#endif /* __ATMEL_NAND_H__ */
diff --git a/include/linux/spi/orion_spi.h b/include/linux/spi/orion_spi.h
index decf6d8c77b7..b4d9fa6f797c 100644
--- a/include/linux/spi/orion_spi.h
+++ b/include/linux/spi/orion_spi.h
@@ -11,7 +11,6 @@
 
 struct orion_spi_info {
         u32     tclk;           /* no <linux/clk.h> support yet */
-        u32     enable_clock_fix;
 };