5 files changed, 512 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
index cf945d55c27..acd2fc8cf49 100644
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -44,3 +44,9 @@ config PPC_MPC5200_BUGFIX
 
           It is safe to say 'Y' here
 
+config PPC_MPC5200_GPIO
+        bool "MPC5200 GPIO support"
+        depends on PPC_MPC52xx
+        select HAVE_GPIO_LIB
+        help
+          Enable gpiolib support for mpc5200 based boards
diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
index fe1b81bb522..daf0e1568d6 100644
--- a/arch/powerpc/platforms/52xx/Makefile
+++ b/arch/powerpc/platforms/52xx/Makefile
@@ -14,3 +14,5 @@ obj-$(CONFIG_PM)		+= mpc52xx_sleep.o mpc52xx_pm.o
 ifeq ($(CONFIG_PPC_LITE5200),y)
         obj-$(CONFIG_PM)        += lite5200_sleep.o lite5200_pm.o
 endif
+
+obj-$(CONFIG_PPC_MPC5200_GPIO)  += mpc52xx_gpio.o
\ No newline at end of file
diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index c48b82bc2aa..a3bda0b9f1f 100644
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -51,6 +51,7 @@ static void __init mpc5200_simple_setup_arch(void)
 /* list of the supported boards */
 static char *board[] __initdata = {
         "promess,motionpro",
+        "phytec,pcm030",
         "schindler,cm5200",
         "tqc,tqm5200",
         NULL
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
new file mode 100644
index 00000000000..48da5dfe485
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
@@ -0,0 +1,465 @@
+/*
+ * MPC52xx gpio driver
+ *
+ * Copyright (c) 2008 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/of.h>
+#include <linux/kernel.h>
+#include <linux/of_gpio.h>
+#include <linux/io.h>
+#include <linux/of_platform.h>
+
+#include <asm/gpio.h>
+#include <asm/mpc52xx.h>
+#include <sysdev/fsl_soc.h>
+
+static DEFINE_SPINLOCK(gpio_lock);
+
+struct mpc52xx_gpiochip {
+        struct of_mm_gpio_chip mmchip;
+        unsigned int shadow_dvo;
+        unsigned int shadow_gpioe;
+        unsigned int shadow_ddr;
+};
+
+/*
+ * GPIO LIB API implementation for wakeup GPIOs.
+ *
+ * There's a maximum of 8 wakeup GPIOs. Which of these are available
+ * for use depends on your board setup.
+ *
+ * 0 -> GPIO_WKUP_7
+ * 1 -> GPIO_WKUP_6
+ * 2 -> PSC6_1
+ * 3 -> PSC6_0
+ * 4 -> ETH_17
+ * 5 -> PSC3_9
+ * 6 -> PSC2_4
+ * 7 -> PSC1_4
+ *
+ */
+static int mpc52xx_wkup_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs;
+        unsigned int ret;
+
+        ret = (in_8(&regs->wkup_ival) >> (7 - gpio)) & 1;
+
+        pr_debug("%s: gpio: %d ret: %d\n", __func__, gpio, ret);
+
+        return ret;
+}
+
+static inline void
+__mpc52xx_wkup_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpiochip *chip = container_of(mm_gc,
+                        struct mpc52xx_gpiochip, mmchip);
+        struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs;
+
+        if (val)
+                chip->shadow_dvo |= 1 << (7 - gpio);
+        else
+                chip->shadow_dvo &= ~(1 << (7 - gpio));
+
+        out_8(&regs->wkup_dvo, chip->shadow_dvo);
+}
+
+static void
+mpc52xx_wkup_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&gpio_lock, flags);
+
+        __mpc52xx_wkup_gpio_set(gc, gpio, val);
+
+        spin_unlock_irqrestore(&gpio_lock, flags);
+
+        pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
+}
+
+static int mpc52xx_wkup_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpiochip *chip = container_of(mm_gc,
+                        struct mpc52xx_gpiochip, mmchip);
+        struct mpc52xx_gpio_wkup *regs = mm_gc->regs;
+        unsigned long flags;
+
+        spin_lock_irqsave(&gpio_lock, flags);
+
+        /* set the direction */
+        chip->shadow_ddr &= ~(1 << (7 - gpio));
+        out_8(&regs->wkup_ddr, chip->shadow_ddr);
+
+        /* and enable the pin */
+        chip->shadow_gpioe |= 1 << (7 - gpio);
+        out_8(&regs->wkup_gpioe, chip->shadow_gpioe);
+
+        spin_unlock_irqrestore(&gpio_lock, flags);
+
+        return 0;
+}
+
+static int
+mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpio_wkup *regs = mm_gc->regs;
+        struct mpc52xx_gpiochip *chip = container_of(mm_gc,
+                        struct mpc52xx_gpiochip, mmchip);
+        unsigned long flags;
+
+        spin_lock_irqsave(&gpio_lock, flags);
+
+        __mpc52xx_wkup_gpio_set(gc, gpio, val);
+
+        /* Then set direction */
+        chip->shadow_ddr |= 1 << (7 - gpio);
+        out_8(&regs->wkup_ddr, chip->shadow_ddr);
+
+        /* Finally enable the pin */
+        chip->shadow_gpioe |= 1 << (7 - gpio);
+        out_8(&regs->wkup_gpioe, chip->shadow_gpioe);
+
+        spin_unlock_irqrestore(&gpio_lock, flags);
+
+        pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
+
+        return 0;
+}
+
+static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev,
+                                        const struct of_device_id *match)
+{
+        struct mpc52xx_gpiochip *chip;
+        struct mpc52xx_gpio_wkup *regs;
+        struct of_gpio_chip *ofchip;
+        int ret;
+
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (!chip)
+                return -ENOMEM;
+
+        ofchip = &chip->mmchip.of_gc;
+
+        ofchip->gpio_cells          = 2;
+        ofchip->gc.ngpio            = 8;
+        ofchip->gc.direction_input  = mpc52xx_wkup_gpio_dir_in;
+        ofchip->gc.direction_output = mpc52xx_wkup_gpio_dir_out;
+        ofchip->gc.get              = mpc52xx_wkup_gpio_get;
+        ofchip->gc.set              = mpc52xx_wkup_gpio_set;
+
+        ret = of_mm_gpiochip_add(ofdev->node, &chip->mmchip);
+        if (ret)
+                return ret;
+
+        regs = chip->mmchip.regs;
+        chip->shadow_gpioe = in_8(&regs->wkup_gpioe);
+        chip->shadow_ddr = in_8(&regs->wkup_ddr);
+        chip->shadow_dvo = in_8(&regs->wkup_dvo);
+
+        return 0;
+}
+
+static int mpc52xx_gpiochip_remove(struct of_device *ofdev)
+{
+        return -EBUSY;
+}
+
+static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = {
+        {
+                .compatible = "fsl,mpc5200-gpio-wkup",
+        },
+        {}
+};
+
+static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = {
+        .name = "gpio_wkup",
+        .match_table = mpc52xx_wkup_gpiochip_match,
+        .probe = mpc52xx_wkup_gpiochip_probe,
+        .remove = mpc52xx_gpiochip_remove,
+};
+
+/*
+ * GPIO LIB API implementation for simple GPIOs
+ *
+ * There's a maximum of 32 simple GPIOs. Which of these are available
+ * for use depends on your board setup.
+ * The numbering reflects the bit numbering in the port registers:
+ *
+ *  0..1  > reserved
+ *  2..3  > IRDA
+ *  4..7  > ETHR
+ *  8..11 > reserved
+ * 12..15 > USB
+ * 16..17 > reserved
+ * 18..23 > PSC3
+ * 24..27 > PSC2
+ * 28..31 > PSC1
+ */
+static int mpc52xx_simple_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
+        unsigned int ret;
+
+        ret = (in_be32(&regs->simple_ival) >> (31 - gpio)) & 1;
+
+        return ret;
+}
+
+static inline void
+__mpc52xx_simple_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpiochip *chip = container_of(mm_gc,
+                        struct mpc52xx_gpiochip, mmchip);
+        struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
+
+        if (val)
+                chip->shadow_dvo |= 1 << (31 - gpio);
+        else
+                chip->shadow_dvo &= ~(1 << (31 - gpio));
+        out_be32(&regs->simple_dvo, chip->shadow_dvo);
+}
+
+static void
+mpc52xx_simple_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&gpio_lock, flags);
+
+        __mpc52xx_simple_gpio_set(gc, gpio, val);
+
+        spin_unlock_irqrestore(&gpio_lock, flags);
+
+        pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
+}
+
+static int mpc52xx_simple_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpiochip *chip = container_of(mm_gc,
+                        struct mpc52xx_gpiochip, mmchip);
+        struct mpc52xx_gpio *regs = mm_gc->regs;
+        unsigned long flags;
+
+        spin_lock_irqsave(&gpio_lock, flags);
+
+        /* set the direction */
+        chip->shadow_ddr &= ~(1 << (31 - gpio));
+        out_be32(&regs->simple_ddr, chip->shadow_ddr);
+
+        /* and enable the pin */
+        chip->shadow_gpioe |= 1 << (31 - gpio);
+        out_be32(&regs->simple_gpioe, chip->shadow_gpioe);
+
+        spin_unlock_irqrestore(&gpio_lock, flags);
+
+        return 0;
+}
+
+static int
+mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpiochip *chip = container_of(mm_gc,
+                        struct mpc52xx_gpiochip, mmchip);
+        struct mpc52xx_gpio *regs = mm_gc->regs;
+        unsigned long flags;
+
+        spin_lock_irqsave(&gpio_lock, flags);
+
+        /* First set initial value */
+        __mpc52xx_simple_gpio_set(gc, gpio, val);
+
+        /* Then set direction */
+        chip->shadow_ddr |= 1 << (31 - gpio);
+        out_be32(&regs->simple_ddr, chip->shadow_ddr);
+
+        /* Finally enable the pin */
+        chip->shadow_gpioe |= 1 << (31 - gpio);
+        out_be32(&regs->simple_gpioe, chip->shadow_gpioe);
+
+        spin_unlock_irqrestore(&gpio_lock, flags);
+
+        pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
+
+        return 0;
+}
+
+static int __devinit mpc52xx_simple_gpiochip_probe(struct of_device *ofdev,
+                                        const struct of_device_id *match)
+{
+        struct mpc52xx_gpiochip *chip;
+        struct of_gpio_chip *ofchip;
+        struct mpc52xx_gpio *regs;
+        int ret;
+
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (!chip)
+                return -ENOMEM;
+
+        ofchip = &chip->mmchip.of_gc;
+
+        ofchip->gpio_cells          = 2;
+        ofchip->gc.ngpio            = 32;
+        ofchip->gc.direction_input  = mpc52xx_simple_gpio_dir_in;
+        ofchip->gc.direction_output = mpc52xx_simple_gpio_dir_out;
+        ofchip->gc.get              = mpc52xx_simple_gpio_get;
+        ofchip->gc.set              = mpc52xx_simple_gpio_set;
+
+        ret = of_mm_gpiochip_add(ofdev->node, &chip->mmchip);
+        if (ret)
+                return ret;
+
+        regs = chip->mmchip.regs;
+        chip->shadow_gpioe = in_be32(&regs->simple_gpioe);
+        chip->shadow_ddr = in_be32(&regs->simple_ddr);
+        chip->shadow_dvo = in_be32(&regs->simple_dvo);
+
+        return 0;
+}
+
+static const struct of_device_id mpc52xx_simple_gpiochip_match[] = {
+        {
+                .compatible = "fsl,mpc5200-gpio",
+        },
+        {}
+};
+
+static struct of_platform_driver mpc52xx_simple_gpiochip_driver = {
+        .name = "gpio",
+        .match_table = mpc52xx_simple_gpiochip_match,
+        .probe = mpc52xx_simple_gpiochip_probe,
+        .remove = mpc52xx_gpiochip_remove,
+};
+
+/*
+ * GPIO LIB API implementation for gpt GPIOs.
+ *
+ * Each gpt only has a single GPIO.
+ */
+static int mpc52xx_gpt_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpt __iomem *regs = mm_gc->regs;
+        unsigned int ret;
+
+        return (in_be32(&regs->status) & (1 << (31 - 23))) ? 1 : 0;
+
+        return ret;
+}
+
+static void
+mpc52xx_gpt_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpt __iomem *regs = mm_gc->regs;
+
+        if (val)
+                out_be32(&regs->mode, 0x34);
+        else
+                out_be32(&regs->mode, 0x24);
+
+        pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
+}
+
+static int mpc52xx_gpt_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct mpc52xx_gpt *regs = mm_gc->regs;
+
+        out_be32(&regs->mode, 0x04);
+
+        return 0;
+}
+
+static int
+mpc52xx_gpt_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        mpc52xx_gpt_gpio_set(gc, gpio, val);
+        pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
+
+        return 0;
+}
+
+static int __devinit mpc52xx_gpt_gpiochip_probe(struct of_device *ofdev,
+                                        const struct of_device_id *match)
+{
+        struct of_mm_gpio_chip *mmchip;
+        struct of_gpio_chip *chip;
+
+        mmchip = kzalloc(sizeof(*mmchip), GFP_KERNEL);
+        if (!mmchip)
+                return -ENOMEM;
+
+        chip = &mmchip->of_gc;
+
+        chip->gpio_cells          = 2;
+        chip->gc.ngpio            = 1;
+        chip->gc.direction_input  = mpc52xx_gpt_gpio_dir_in;
+        chip->gc.direction_output = mpc52xx_gpt_gpio_dir_out;
+        chip->gc.get              = mpc52xx_gpt_gpio_get;
+        chip->gc.set              = mpc52xx_gpt_gpio_set;
+
+        return of_mm_gpiochip_add(ofdev->node, mmchip);
+}
+
+static const struct of_device_id mpc52xx_gpt_gpiochip_match[] = {
+        {
+                .compatible = "fsl,mpc5200-gpt-gpio",
+        },
+        {}
+};
+
+static struct of_platform_driver mpc52xx_gpt_gpiochip_driver = {
+        .name = "gpio_gpt",
+        .match_table = mpc52xx_gpt_gpiochip_match,
+        .probe = mpc52xx_gpt_gpiochip_probe,
+        .remove = mpc52xx_gpiochip_remove,
+};
+
+static int __init mpc52xx_gpio_init(void)
+{
+        if (of_register_platform_driver(&mpc52xx_wkup_gpiochip_driver))
+                printk(KERN_ERR "Unable to register wakeup GPIO driver\n");
+
+        if (of_register_platform_driver(&mpc52xx_simple_gpiochip_driver))
+                printk(KERN_ERR "Unable to register simple GPIO driver\n");
+
+        if (of_register_platform_driver(&mpc52xx_gpt_gpiochip_driver))
+                printk(KERN_ERR "Unable to register gpt GPIO driver\n");
+
+        return 0;
+}
+
+
+/* Make sure we get initialised before anyone else tries to use us */
+subsys_initcall(mpc52xx_gpio_init);
+
+/* No exit call at the moment as we cannot unregister of gpio chips */
+
+MODULE_DESCRIPTION("Freescale MPC52xx gpio driver");
+MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de");
+MODULE_LICENSE("GPL v2");
+
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index d0dead8b9a9..8479394e9ab 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -18,6 +18,7 @@
 
 #undef DEBUG
 
+#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/of.h>
 #include <asm/io.h>
@@ -109,11 +110,48 @@ static void mpc52xx_extirq_ack(unsigned int virq)
         io_be_setbit(&intr->ctrl, 27-l2irq);
 }
 
+static int mpc52xx_extirq_set_type(unsigned int virq, unsigned int flow_type)
+{
+        u32 ctrl_reg, type;
+        int irq;
+        int l2irq;
+
+        irq = irq_map[virq].hwirq;
+        l2irq = (irq & MPC52xx_IRQ_L2_MASK) >> MPC52xx_IRQ_L2_OFFSET;
+
+        pr_debug("%s: irq=%x. l2=%d flow_type=%d\n", __func__, irq, l2irq, flow_type);
+
+        switch (flow_type) {
+        case IRQF_TRIGGER_HIGH:
+                type = 0;
+                break;
+        case IRQF_TRIGGER_RISING:
+                type = 1;
+                break;
+        case IRQF_TRIGGER_FALLING:
+                type = 2;
+                break;
+        case IRQF_TRIGGER_LOW:
+                type = 3;
+                break;
+        default:
+                type = 0;
+        }
+
+        ctrl_reg = in_be32(&intr->ctrl);
+        ctrl_reg &= ~(0x3 << (22 - (l2irq * 2)));
+        ctrl_reg |= (type << (22 - (l2irq * 2)));
+        out_be32(&intr->ctrl, ctrl_reg);
+
+        return 0;
+}
+
 static struct irq_chip mpc52xx_extirq_irqchip = {
         .typename = " MPC52xx IRQ[0-3] ",
         .mask = mpc52xx_extirq_mask,
         .unmask = mpc52xx_extirq_unmask,
         .ack = mpc52xx_extirq_ack,
+        .set_type = mpc52xx_extirq_set_type,
 };
 
 /*