Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 "The whole series has been sitting in -next for quite a while with no
  complaints.  The last change to the series was before the weekend the
  removal of an SPI patch which Grant - even though previously acked by
  himself - appeared to raise objections.  So I removed it until the
  situation is clarified.  Other than that all the patches have the acks
  from their respective maintainers, all MIPS and x86 defconfigs are
  building fine and I'm not aware of any problems introduced by this
  series.

  Among the key features for this patch series is a sizable patchset for
  Lantiq which among other things introduces support for Lantiq's
  flagship product, the FALCON SOC.  It also means that the opensource
  developers behind this patchset have overtaken Lantiq's competing
  inhouse development team that was working behind closed doors.

  Less noteworthy the ath79 patchset which adds support for a few more
  chip variants, cleanups and fixes.  Finally the usual dose of tweaking
  of generic code."

Fix up trivial conflicts in arch/mips/lantiq/xway/gpio_{ebu,stp}.c where
printk spelling fixes clashed with file move and eventual removal of the
printk.

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (81 commits)
  MIPS: lantiq: remove orphaned code
  MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.
  MIPS: lantiq: implement support for FALCON soc
  MTD: MIPS: lantiq: verify that the NOR interface is available on falcon soc
  MTD: MIPS: lantiq: implement OF support
  watchdog: MIPS: lantiq: implement OF support and minor fixes
  SERIAL: MIPS: lantiq: implement OF support
  GPIO: MIPS: lantiq: convert gpio-stp-xway to OF
  GPIO: MIPS: lantiq: convert gpio-mm-lantiq to OF and of_mm_gpio
  GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to the subsystem folder
  MIPS: pci: convert lantiq driver to OF
  MIPS: lantiq: convert dma to platform driver
  MIPS: lantiq: implement support for clkdev api
  MIPS: lantiq: drop ltq_gpio_request() and gpio_to_irq()
  OF: MIPS: lantiq: implement irq_domain support
  OF: MIPS: lantiq: implement OF support
  MIPS: lantiq: drop mips_machine support
  OF: PCI: const usage needed by MIPS
  MIPS: Cavium: Remove smp_reserve_lock.
  MIPS: Move cache setup to setup_arch().
  ...

4 files changed, 479 insertions, 0 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 0356099ae040..c4067d0141f7 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -114,6 +114,14 @@ config GPIO_EP93XX
         depends on ARCH_EP93XX
         select GPIO_GENERIC
 
+config GPIO_MM_LANTIQ
+        bool "Lantiq Memory mapped GPIOs"
+        depends on LANTIQ && SOC_XWAY
+        help
+          This enables support for memory mapped GPIOs on the External Bus Unit
+          (EBU) found on Lantiq SoCs. The gpios are output only as they are
+          created by attaching a 16bit latch to the bus.
+
 config GPIO_MPC5200
         def_bool y
         depends on PPC_MPC52xx
@@ -358,6 +366,16 @@ config GPIO_STMPE
           This enables support for the GPIOs found on the STMPE I/O
           Expanders.
 
+config GPIO_STP_XWAY
+        bool "XWAY STP GPIOs"
+        depends on SOC_XWAY
+        help
+          This enables support for the Serial To Parallel (STP) unit found on
+          XWAY SoC. The STP allows the SoC to drive a shift registers cascade,
+          that can be up to 24 bit. This peripheral is aimed at driving leds.
+          Some of the gpios/leds can be auto updated by the soc with dsl and
+          phy status.
+
 config GPIO_TC3589X
         bool "TC3589X GPIOs"
         depends on MFD_TC3589X
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index fde36e5e3537..0f55662002c3 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_GPIO_MC33880)	+= gpio-mc33880.o
 obj-$(CONFIG_GPIO_MC9S08DZ60)   += gpio-mc9s08dz60.o
 obj-$(CONFIG_GPIO_MCP23S08)     += gpio-mcp23s08.o
 obj-$(CONFIG_GPIO_ML_IOH)       += gpio-ml-ioh.o
+obj-$(CONFIG_GPIO_MM_LANTIQ)    += gpio-mm-lantiq.o
 obj-$(CONFIG_GPIO_MPC5200)      += gpio-mpc5200.o
 obj-$(CONFIG_GPIO_MPC8XXX)      += gpio-mpc8xxx.o
 obj-$(CONFIG_GPIO_MSIC)         += gpio-msic.o
@@ -54,6 +55,7 @@ obj-$(CONFIG_GPIO_SCH)		+= gpio-sch.o
 obj-$(CONFIG_GPIO_SODAVILLE)    += gpio-sodaville.o
 obj-$(CONFIG_GPIO_STA2X11)      += gpio-sta2x11.o
 obj-$(CONFIG_GPIO_STMPE)        += gpio-stmpe.o
+obj-$(CONFIG_GPIO_STP_XWAY)     += gpio-stp-xway.o
 obj-$(CONFIG_GPIO_SX150X)       += gpio-sx150x.o
 obj-$(CONFIG_GPIO_TC3589X)      += gpio-tc3589x.o
 obj-$(CONFIG_ARCH_TEGRA)        += gpio-tegra.o
diff --git a/drivers/gpio/gpio-mm-lantiq.c b/drivers/gpio/gpio-mm-lantiq.c
new file mode 100644
index 000000000000..2983dfbd0668
--- /dev/null
+++ b/drivers/gpio/gpio-mm-lantiq.c
@@ -0,0 +1,158 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2012 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/platform_device.h>
+#include <linux/mutex.h>
+#include <linux/gpio.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+
+#include <lantiq_soc.h>
+
+/*
+ * By attaching hardware latches to the EBU it is possible to create output
+ * only gpios. This driver configures a special memory address, which when
+ * written to outputs 16 bit to the latches.
+ */
+
+#define LTQ_EBU_BUSCON  0x1e7ff         /* 16 bit access, slowest timing */
+#define LTQ_EBU_WP      0x80000000      /* write protect bit */
+
+struct ltq_mm {
+        struct of_mm_gpio_chip mmchip;
+        u16 shadow;     /* shadow the latches state */
+};
+
+/**
+ * ltq_mm_apply() - write the shadow value to the ebu address.
+ * @chip:     Pointer to our private data structure.
+ *
+ * Write the shadow value to the EBU to set the gpios. We need to set the
+ * global EBU lock to make sure that PCI/MTD dont break.
+ */
+static void ltq_mm_apply(struct ltq_mm *chip)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&ebu_lock, flags);
+        ltq_ebu_w32(LTQ_EBU_BUSCON, LTQ_EBU_BUSCON1);
+        __raw_writew(chip->shadow, chip->mmchip.regs);
+        ltq_ebu_w32(LTQ_EBU_BUSCON | LTQ_EBU_WP, LTQ_EBU_BUSCON1);
+        spin_unlock_irqrestore(&ebu_lock, flags);
+}
+
+/**
+ * ltq_mm_set() - gpio_chip->set - set gpios.
+ * @gc:     Pointer to gpio_chip device structure.
+ * @gpio:   GPIO signal number.
+ * @val:    Value to be written to specified signal.
+ *
+ * Set the shadow value and call ltq_mm_apply.
+ */
+static void ltq_mm_set(struct gpio_chip *gc, unsigned offset, int value)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct ltq_mm *chip =
+                container_of(mm_gc, struct ltq_mm, mmchip);
+
+        if (value)
+                chip->shadow |= (1 << offset);
+        else
+                chip->shadow &= ~(1 << offset);
+        ltq_mm_apply(chip);
+}
+
+/**
+ * ltq_mm_dir_out() - gpio_chip->dir_out - set gpio direction.
+ * @gc:     Pointer to gpio_chip device structure.
+ * @gpio:   GPIO signal number.
+ * @val:    Value to be written to specified signal.
+ *
+ * Same as ltq_mm_set, always returns 0.
+ */
+static int ltq_mm_dir_out(struct gpio_chip *gc, unsigned offset, int value)
+{
+        ltq_mm_set(gc, offset, value);
+
+        return 0;
+}
+
+/**
+ * ltq_mm_save_regs() - Set initial values of GPIO pins
+ * @mm_gc: pointer to memory mapped GPIO chip structure
+ */
+static void ltq_mm_save_regs(struct of_mm_gpio_chip *mm_gc)
+{
+        struct ltq_mm *chip =
+                container_of(mm_gc, struct ltq_mm, mmchip);
+
+        /* tell the ebu controller which memory address we will be using */
+        ltq_ebu_w32(CPHYSADDR(chip->mmchip.regs) | 0x1, LTQ_EBU_ADDRSEL1);
+
+        ltq_mm_apply(chip);
+}
+
+static int ltq_mm_probe(struct platform_device *pdev)
+{
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        struct ltq_mm *chip;
+        const __be32 *shadow;
+        int ret = 0;
+
+        if (!res) {
+                dev_err(&pdev->dev, "failed to get memory resource\n");
+                return -ENOENT;
+        }
+
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (!chip)
+                return -ENOMEM;
+
+        chip->mmchip.gc.ngpio = 16;
+        chip->mmchip.gc.label = "gpio-mm-ltq";
+        chip->mmchip.gc.direction_output = ltq_mm_dir_out;
+        chip->mmchip.gc.set = ltq_mm_set;
+        chip->mmchip.save_regs = ltq_mm_save_regs;
+
+        /* store the shadow value if one was passed by the devicetree */
+        shadow = of_get_property(pdev->dev.of_node, "lantiq,shadow", NULL);
+        if (shadow)
+                chip->shadow = be32_to_cpu(*shadow);
+
+        ret = of_mm_gpiochip_add(pdev->dev.of_node, &chip->mmchip);
+        if (ret)
+                kfree(chip);
+        return ret;
+}
+
+static const struct of_device_id ltq_mm_match[] = {
+        { .compatible = "lantiq,gpio-mm" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, ltq_mm_match);
+
+static struct platform_driver ltq_mm_driver = {
+        .probe = ltq_mm_probe,
+        .driver = {
+                .name = "gpio-mm-ltq",
+                .owner = THIS_MODULE,
+                .of_match_table = ltq_mm_match,
+        },
+};
+
+static int __init ltq_mm_init(void)
+{
+        return platform_driver_register(&ltq_mm_driver);
+}
+
+subsys_initcall(ltq_mm_init);
diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c
new file mode 100644
index 000000000000..e35096bf3cfb
--- /dev/null
+++ b/drivers/gpio/gpio-stp-xway.c
@@ -0,0 +1,301 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2012 John Crispin <blogic@openwrt.org>
+ *
+ */
+
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/of_platform.h>
+#include <linux/mutex.h>
+#include <linux/gpio.h>
+#include <linux/io.h>
+#include <linux/of_gpio.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+
+#include <lantiq_soc.h>
+
+/*
+ * The Serial To Parallel (STP) is found on MIPS based Lantiq socs. It is a
+ * peripheral controller used to drive external shift register cascades. At most
+ * 3 groups of 8 bits can be driven. The hardware is able to allow the DSL modem
+ * to drive the 2 LSBs of the cascade automatically.
+ */
+
+/* control register 0 */
+#define XWAY_STP_CON0           0x00
+/* control register 1 */
+#define XWAY_STP_CON1           0x04
+/* data register 0 */
+#define XWAY_STP_CPU0           0x08
+/* data register 1 */
+#define XWAY_STP_CPU1           0x0C
+/* access register */
+#define XWAY_STP_AR             0x10
+
+/* software or hardware update select bit */
+#define XWAY_STP_CON_SWU        BIT(31)
+
+/* automatic update rates */
+#define XWAY_STP_2HZ            0
+#define XWAY_STP_4HZ            BIT(23)
+#define XWAY_STP_8HZ            BIT(24)
+#define XWAY_STP_10HZ           (BIT(24) | BIT(23))
+#define XWAY_STP_SPEED_MASK     (0xf << 23)
+
+/* clock source for automatic update */
+#define XWAY_STP_UPD_FPI        BIT(31)
+#define XWAY_STP_UPD_MASK       (BIT(31) | BIT(30))
+
+/* let the adsl core drive the 2 LSBs */
+#define XWAY_STP_ADSL_SHIFT     24
+#define XWAY_STP_ADSL_MASK      0x3
+
+/* 2 groups of 3 bits can be driven by the phys */
+#define XWAY_STP_PHY_MASK       0x3
+#define XWAY_STP_PHY1_SHIFT     27
+#define XWAY_STP_PHY2_SHIFT     15
+
+/* STP has 3 groups of 8 bits */
+#define XWAY_STP_GROUP0         BIT(0)
+#define XWAY_STP_GROUP1         BIT(1)
+#define XWAY_STP_GROUP2         BIT(2)
+#define XWAY_STP_GROUP_MASK     (0x7)
+
+/* Edge configuration bits */
+#define XWAY_STP_FALLING        BIT(26)
+#define XWAY_STP_EDGE_MASK      BIT(26)
+
+#define xway_stp_r32(m, reg)            __raw_readl(m + reg)
+#define xway_stp_w32(m, val, reg)       __raw_writel(val, m + reg)
+#define xway_stp_w32_mask(m, clear, set, reg) \
+                ltq_w32((ltq_r32(m + reg) & ~(clear)) | (set), \
+                m + reg)
+
+struct xway_stp {
+        struct gpio_chip gc;
+        void __iomem *virt;
+        u32 edge;       /* rising or falling edge triggered shift register */
+        u16 shadow;     /* shadow the shift registers state */
+        u8 groups;      /* we can drive 1-3 groups of 8bit each */
+        u8 dsl;         /* the 2 LSBs can be driven by the dsl core */
+        u8 phy1;        /* 3 bits can be driven by phy1 */
+        u8 phy2;        /* 3 bits can be driven by phy2 */
+        u8 reserved;    /* mask out the hw driven bits in gpio_request */
+};
+
+/**
+ * xway_stp_set() - gpio_chip->set - set gpios.
+ * @gc:     Pointer to gpio_chip device structure.
+ * @gpio:   GPIO signal number.
+ * @val:    Value to be written to specified signal.
+ *
+ * Set the shadow value and call ltq_ebu_apply.
+ */
+static void xway_stp_set(struct gpio_chip *gc, unsigned gpio, int val)
+{
+        struct xway_stp *chip =
+                container_of(gc, struct xway_stp, gc);
+
+        if (val)
+                chip->shadow |= BIT(gpio);
+        else
+                chip->shadow &= ~BIT(gpio);
+        xway_stp_w32(chip->virt, chip->shadow, XWAY_STP_CPU0);
+        xway_stp_w32_mask(chip->virt, 0, XWAY_STP_CON_SWU, XWAY_STP_CON0);
+}
+
+/**
+ * xway_stp_dir_out() - gpio_chip->dir_out - set gpio direction.
+ * @gc:     Pointer to gpio_chip device structure.
+ * @gpio:   GPIO signal number.
+ * @val:    Value to be written to specified signal.
+ *
+ * Same as xway_stp_set, always returns 0.
+ */
+static int xway_stp_dir_out(struct gpio_chip *gc, unsigned gpio, int val)
+{
+        xway_stp_set(gc, gpio, val);
+
+        return 0;
+}
+
+/**
+ * xway_stp_request() - gpio_chip->request
+ * @gc:     Pointer to gpio_chip device structure.
+ * @gpio:   GPIO signal number.
+ *
+ * We mask out the HW driven pins
+ */
+static int xway_stp_request(struct gpio_chip *gc, unsigned gpio)
+{
+        struct xway_stp *chip =
+                container_of(gc, struct xway_stp, gc);
+
+        if ((gpio < 8) && (chip->reserved & BIT(gpio))) {
+                dev_err(gc->dev, "GPIO %d is driven by hardware\n", gpio);
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+/**
+ * xway_stp_hw_init() - Configure the STP unit and enable the clock gate
+ * @virt: pointer to the remapped register range
+ */
+static int xway_stp_hw_init(struct xway_stp *chip)
+{
+        /* sane defaults */
+        xway_stp_w32(chip->virt, 0, XWAY_STP_AR);
+        xway_stp_w32(chip->virt, 0, XWAY_STP_CPU0);
+        xway_stp_w32(chip->virt, 0, XWAY_STP_CPU1);
+        xway_stp_w32(chip->virt, XWAY_STP_CON_SWU, XWAY_STP_CON0);
+        xway_stp_w32(chip->virt, 0, XWAY_STP_CON1);
+
+        /* apply edge trigger settings for the shift register */
+        xway_stp_w32_mask(chip->virt, XWAY_STP_EDGE_MASK,
+                                chip->edge, XWAY_STP_CON0);
+
+        /* apply led group settings */
+        xway_stp_w32_mask(chip->virt, XWAY_STP_GROUP_MASK,
+                                chip->groups, XWAY_STP_CON1);
+
+        /* tell the hardware which pins are controlled by the dsl modem */
+        xway_stp_w32_mask(chip->virt,
+                        XWAY_STP_ADSL_MASK << XWAY_STP_ADSL_SHIFT,
+                        chip->dsl << XWAY_STP_ADSL_SHIFT,
+                        XWAY_STP_CON0);
+
+        /* tell the hardware which pins are controlled by the phys */
+        xway_stp_w32_mask(chip->virt,
+                        XWAY_STP_PHY_MASK << XWAY_STP_PHY1_SHIFT,
+                        chip->phy1 << XWAY_STP_PHY1_SHIFT,
+                        XWAY_STP_CON0);
+        xway_stp_w32_mask(chip->virt,
+                        XWAY_STP_PHY_MASK << XWAY_STP_PHY2_SHIFT,
+                        chip->phy2 << XWAY_STP_PHY2_SHIFT,
+                        XWAY_STP_CON1);
+
+        /* mask out the hw driven bits in gpio_request */
+        chip->reserved = (chip->phy2 << 5) | (chip->phy1 << 2) | chip->dsl;
+
+        /*
+         * if we have pins that are driven by hw, we need to tell the stp what
+         * clock to use as a timer.
+         */
+        if (chip->reserved)
+                xway_stp_w32_mask(chip->virt, XWAY_STP_UPD_MASK,
+                        XWAY_STP_UPD_FPI, XWAY_STP_CON1);
+
+        return 0;
+}
+
+static int __devinit xway_stp_probe(struct platform_device *pdev)
+{
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        const __be32 *shadow, *groups, *dsl, *phy;
+        struct xway_stp *chip;
+        struct clk *clk;
+        int ret = 0;
+
+        if (!res) {
+                dev_err(&pdev->dev, "failed to request STP resource\n");
+                return -ENOENT;
+        }
+
+        chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
+        if (!chip)
+                return -ENOMEM;
+
+        chip->virt = devm_request_and_ioremap(&pdev->dev, res);
+        if (!chip->virt) {
+                dev_err(&pdev->dev, "failed to remap STP memory\n");
+                return -ENOMEM;
+        }
+        chip->gc.dev = &pdev->dev;
+        chip->gc.label = "stp-xway";
+        chip->gc.direction_output = xway_stp_dir_out;
+        chip->gc.set = xway_stp_set;
+        chip->gc.request = xway_stp_request;
+        chip->gc.base = -1;
+        chip->gc.owner = THIS_MODULE;
+
+        /* store the shadow value if one was passed by the devicetree */
+        shadow = of_get_property(pdev->dev.of_node, "lantiq,shadow", NULL);
+        if (shadow)
+                chip->shadow = be32_to_cpu(*shadow);
+
+        /* find out which gpio groups should be enabled */
+        groups = of_get_property(pdev->dev.of_node, "lantiq,groups", NULL);
+        if (groups)
+                chip->groups = be32_to_cpu(*groups) & XWAY_STP_GROUP_MASK;
+        else
+                chip->groups = XWAY_STP_GROUP0;
+        chip->gc.ngpio = fls(chip->groups) * 8;
+
+        /* find out which gpios are controlled by the dsl core */
+        dsl = of_get_property(pdev->dev.of_node, "lantiq,dsl", NULL);
+        if (dsl)
+                chip->dsl = be32_to_cpu(*dsl) & XWAY_STP_ADSL_MASK;
+
+        /* find out which gpios are controlled by the phys */
+        if (of_machine_is_compatible("lantiq,ar9") ||
+                        of_machine_is_compatible("lantiq,gr9") ||
+                        of_machine_is_compatible("lantiq,vr9")) {
+                phy = of_get_property(pdev->dev.of_node, "lantiq,phy1", NULL);
+                if (phy)
+                        chip->phy1 = be32_to_cpu(*phy) & XWAY_STP_PHY_MASK;
+                phy = of_get_property(pdev->dev.of_node, "lantiq,phy2", NULL);
+                if (phy)
+                        chip->phy2 = be32_to_cpu(*phy) & XWAY_STP_PHY_MASK;
+        }
+
+        /* check which edge trigger we should use, default to a falling edge */
+        if (!of_find_property(pdev->dev.of_node, "lantiq,rising", NULL))
+                chip->edge = XWAY_STP_FALLING;
+
+        clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(clk)) {
+                dev_err(&pdev->dev, "Failed to get clock\n");
+                return PTR_ERR(clk);
+        }
+        clk_enable(clk);
+
+        ret = xway_stp_hw_init(chip);
+        if (!ret)
+                ret = gpiochip_add(&chip->gc);
+
+        if (!ret)
+                dev_info(&pdev->dev, "Init done\n");
+
+        return ret;
+}
+
+static const struct of_device_id xway_stp_match[] = {
+        { .compatible = "lantiq,gpio-stp-xway" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, xway_stp_match);
+
+static struct platform_driver xway_stp_driver = {
+        .probe = xway_stp_probe,
+        .driver = {
+                .name = "gpio-stp-xway",
+                .owner = THIS_MODULE,
+                .of_match_table = xway_stp_match,
+        },
+};
+
+int __init xway_stp_init(void)
+{
+        return platform_driver_register(&xway_stp_driver);
+}
+
+subsys_initcall(xway_stp_init);