4 files changed, 167 insertions, 4 deletions

diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 1d3bfb26080c..0f50ef38b87b 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
@@ -74,11 +75,13 @@ static void orion_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
 static int __init orion_nand_probe(struct platform_device *pdev)
 {
         struct mtd_info *mtd;
+        struct mtd_part_parser_data ppdata = {};
         struct nand_chip *nc;
         struct orion_nand_data *board;
         struct resource *res;
         void __iomem *io_base;
         int ret = 0;
+        u32 val = 0;
 
         nc = kzalloc(sizeof(struct nand_chip) + sizeof(struct mtd_info), GFP_KERNEL);
         if (!nc) {
@@ -101,7 +104,32 @@ static int __init orion_nand_probe(struct platform_device *pdev)
                 goto no_res;
         }
 
-        board = pdev->dev.platform_data;
+        if (pdev->dev.of_node) {
+                board = devm_kzalloc(&pdev->dev, sizeof(struct orion_nand_data),
+                                        GFP_KERNEL);
+                if (!board) {
+                        printk(KERN_ERR "orion_nand: failed to allocate board structure.\n");
+                        ret = -ENOMEM;
+                        goto no_res;
+                }
+                if (!of_property_read_u32(pdev->dev.of_node, "cle", &val))
+                        board->cle = (u8)val;
+                else
+                        board->cle = 0;
+                if (!of_property_read_u32(pdev->dev.of_node, "ale", &val))
+                        board->ale = (u8)val;
+                else
+                        board->ale = 1;
+                if (!of_property_read_u32(pdev->dev.of_node,
+                                                "bank-width", &val))
+                        board->width = (u8)val * 8;
+                else
+                        board->width = 8;
+                if (!of_property_read_u32(pdev->dev.of_node,
+                                                "chip-delay", &val))
+                        board->chip_delay = (u8)val;
+        } else
+                board = pdev->dev.platform_data;
 
         mtd->priv = nc;
         mtd->owner = THIS_MODULE;
@@ -115,6 +143,10 @@ static int __init orion_nand_probe(struct platform_device *pdev)
         if (board->chip_delay)
                 nc->chip_delay = board->chip_delay;
 
+        WARN(board->width > 16,
+                "%d bit bus width out of range",
+                board->width);
+
         if (board->width == 16)
                 nc->options |= NAND_BUSWIDTH_16;
 
@@ -129,8 +161,9 @@ static int __init orion_nand_probe(struct platform_device *pdev)
         }
 
         mtd->name = "orion_nand";
-        ret = mtd_device_parse_register(mtd, NULL, NULL, board->parts,
-                                        board->nr_parts);
+        ppdata.of_node = pdev->dev.of_node;
+        ret = mtd_device_parse_register(mtd, NULL, &ppdata,
+                        board->parts, board->nr_parts);
         if (ret) {
                 nand_release(mtd);
                 goto no_dev;
@@ -161,11 +194,19 @@ static int __devexit orion_nand_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id orion_nand_of_match_table[] = {
+        { .compatible = "mrvl,orion-nand", },
+        {},
+};
+#endif
+
 static struct platform_driver orion_nand_driver = {
         .remove         = __devexit_p(orion_nand_remove),
         .driver         = {
                 .name   = "orion_nand",
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(orion_nand_of_match_table),
         },
 };
 
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index bba3ab2066ee..8fd255f7ee40 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -217,7 +217,7 @@ config PCMCIA_PXA2XX
                     || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
                     || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
                     || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
-                    || MACH_COLIBRI320)
+                    || MACH_COLIBRI320 || MACH_H4700)
         select PCMCIA_SA1111 if ARCH_LUBBOCK && SA1111
         select PCMCIA_SOC_COMMON
         help
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 47525de6a631..7745b512a87c 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -69,6 +69,7 @@ pxa2xx-obj-$(CONFIG_MACH_VPAC270)		+= pxa2xx_vpac270.o
 pxa2xx-obj-$(CONFIG_MACH_BALLOON3)              += pxa2xx_balloon3.o
 pxa2xx-obj-$(CONFIG_MACH_COLIBRI)               += pxa2xx_colibri.o
 pxa2xx-obj-$(CONFIG_MACH_COLIBRI320)            += pxa2xx_colibri.o
+pxa2xx-obj-$(CONFIG_MACH_H4700)                 += pxa2xx_hx4700.o
 
 obj-$(CONFIG_PCMCIA_PXA2XX)                     += pxa2xx_base.o $(pxa2xx-obj-y)
 
diff --git a/drivers/pcmcia/pxa2xx_hx4700.c b/drivers/pcmcia/pxa2xx_hx4700.c
new file mode 100644
index 000000000000..7dfef3ee5b53
--- /dev/null
+++ b/drivers/pcmcia/pxa2xx_hx4700.c
@@ -0,0 +1,121 @@
+/*
+ *  Copyright (C) 2012 Paul Parsons <lost.distance@yahoo.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/irq.h>
+
+#include <asm/mach-types.h>
+#include <mach/hx4700.h>
+
+#include "soc_common.h"
+
+static struct gpio gpios[] = {
+        { GPIO114_HX4700_CF_RESET,    GPIOF_OUT_INIT_LOW,   "CF reset"        },
+        { EGPIO4_CF_3V3_ON,           GPIOF_OUT_INIT_LOW,   "CF 3.3V enable"  },
+};
+
+static int hx4700_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
+{
+        int ret;
+
+        ret = gpio_request_array(gpios, ARRAY_SIZE(gpios));
+        if (ret)
+                goto out;
+
+        /*
+         * IRQ type must be set before soc_pcmcia_hw_init() calls request_irq().
+         * The asic3 default IRQ type is level trigger low level detect, exactly
+         * the the signal present on GPIOD4_CF_nCD when a CF card is inserted.
+         * If the IRQ type is not changed, the asic3 interrupt handler will loop
+         * repeatedly because it is unable to clear the level trigger interrupt.
+         */
+        irq_set_irq_type(gpio_to_irq(GPIOD4_CF_nCD), IRQ_TYPE_EDGE_BOTH);
+
+        skt->stat[SOC_STAT_CD].gpio = GPIOD4_CF_nCD;
+        skt->stat[SOC_STAT_CD].name = "PCMCIA CD";
+        skt->stat[SOC_STAT_RDY].gpio = GPIO60_HX4700_CF_RNB;
+        skt->stat[SOC_STAT_RDY].name = "PCMCIA Ready";
+
+out:
+        return ret;
+}
+
+static void hx4700_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
+{
+        gpio_free_array(gpios, ARRAY_SIZE(gpios));
+}
+
+static void hx4700_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
+        struct pcmcia_state *state)
+{
+        state->vs_3v = 1;
+        state->vs_Xv = 0;
+}
+
+static int hx4700_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
+        const socket_state_t *state)
+{
+        switch (state->Vcc) {
+        case 0:
+                gpio_set_value(EGPIO4_CF_3V3_ON, 0);
+                break;
+        case 33:
+                gpio_set_value(EGPIO4_CF_3V3_ON, 1);
+                break;
+        default:
+                printk(KERN_ERR "pcmcia: Unsupported Vcc: %d\n", state->Vcc);
+                return -EINVAL;
+        }
+
+        gpio_set_value(GPIO114_HX4700_CF_RESET, (state->flags & SS_RESET) != 0);
+
+        return 0;
+}
+
+static struct pcmcia_low_level hx4700_pcmcia_ops = {
+        .owner          = THIS_MODULE,
+        .nr             = 1,
+        .hw_init        = hx4700_pcmcia_hw_init,
+        .hw_shutdown    = hx4700_pcmcia_hw_shutdown,
+        .socket_state   = hx4700_pcmcia_socket_state,
+        .configure_socket = hx4700_pcmcia_configure_socket,
+};
+
+static struct platform_device *hx4700_pcmcia_device;
+
+static int __init hx4700_pcmcia_init(void)
+{
+        struct platform_device *pdev;
+
+        if (!machine_is_h4700())
+                return -ENODEV;
+
+        pdev = platform_device_register_data(NULL, "pxa2xx-pcmcia", -1,
+                &hx4700_pcmcia_ops, sizeof(hx4700_pcmcia_ops));
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
+
+        hx4700_pcmcia_device = pdev;
+
+        return 0;
+}
+
+static void __exit hx4700_pcmcia_exit(void)
+{
+        platform_device_unregister(hx4700_pcmcia_device);
+}
+
+module_init(hx4700_pcmcia_init);
+module_exit(hx4700_pcmcia_exit);
+
+MODULE_AUTHOR("Paul Parsons <lost.distance@yahoo.com>");
+MODULE_DESCRIPTION("HP iPAQ hx4700 PCMCIA driver");
+MODULE_LICENSE("GPL");