powerpc/QE: add support for QE USB clocks routing

This patch adds a function to the qe_lib to setup QE USB clocks routing.
To setup clocks safely, cmxgcr register needs locking, so I just reused
ucc_lock since it was used only to protect cmxgcr.

The idea behind placing clocks routing functions into the qe_lib is that
later we'll hopefully switch to the generic Linux Clock API, thus, for
example, FHCI driver may be used for QE and CPM chips without nasty #ifdefs.

This patch also fixes QE_USB_RESTART_TX command definition in the qe.h.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-By: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

4 files changed, 64 insertions, 3 deletions

diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig
index adc66212a419..76ffbc48d4b9 100644
--- a/arch/powerpc/sysdev/qe_lib/Kconfig
+++ b/arch/powerpc/sysdev/qe_lib/Kconfig
@@ -20,3 +20,7 @@ config UCC
         bool
         default y if UCC_FAST || UCC_SLOW
 
+config QE_USB
+        bool
+        help
+          QE USB Host Controller support
diff --git a/arch/powerpc/sysdev/qe_lib/Makefile b/arch/powerpc/sysdev/qe_lib/Makefile
index 874fe1a5b1cf..e9ff8884f74a 100644
--- a/arch/powerpc/sysdev/qe_lib/Makefile
+++ b/arch/powerpc/sysdev/qe_lib/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_ic.o qe_io.o
 obj-$(CONFIG_UCC)       += ucc.o
 obj-$(CONFIG_UCC_SLOW)  += ucc_slow.o
 obj-$(CONFIG_UCC_FAST)  += ucc_fast.o
+obj-$(CONFIG_QE_USB)    += usb.o
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c
index 0e348d9af8a6..d3c7f5af9bc8 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc.c
@@ -26,7 +26,8 @@
 #include <asm/qe.h>
 #include <asm/ucc.h>
 
-static DEFINE_SPINLOCK(ucc_lock);
+DEFINE_SPINLOCK(cmxgcr_lock);
+EXPORT_SYMBOL(cmxgcr_lock);
 
 int ucc_set_qe_mux_mii_mng(unsigned int ucc_num)
 {
@@ -35,10 +36,10 @@ int ucc_set_qe_mux_mii_mng(unsigned int ucc_num)
         if (ucc_num > UCC_MAX_NUM - 1)
                 return -EINVAL;
 
-        spin_lock_irqsave(&ucc_lock, flags);
+        spin_lock_irqsave(&cmxgcr_lock, flags);
         clrsetbits_be32(&qe_immr->qmx.cmxgcr, QE_CMXGCR_MII_ENET_MNG,
                 ucc_num << QE_CMXGCR_MII_ENET_MNG_SHIFT);
-        spin_unlock_irqrestore(&ucc_lock, flags);
+        spin_unlock_irqrestore(&cmxgcr_lock, flags);
 
         return 0;
 }
diff --git a/arch/powerpc/sysdev/qe_lib/usb.c b/arch/powerpc/sysdev/qe_lib/usb.c
new file mode 100644
index 000000000000..8105462078eb
--- /dev/null
+++ b/arch/powerpc/sysdev/qe_lib/usb.c
@@ -0,0 +1,55 @@
+/*
+ * QE USB routines
+ *
+ * Copyright (c) Freescale Semicondutor, Inc. 2006.
+ *               Shlomi Gridish <gridish@freescale.com>
+ *               Jerry Huang <Chang-Ming.Huang@freescale.com>
+ * Copyright (c) MontaVista Software, Inc. 2008.
+ *               Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/io.h>
+#include <asm/immap_qe.h>
+#include <asm/qe.h>
+
+int qe_usb_clock_set(enum qe_clock clk, int rate)
+{
+        struct qe_mux __iomem *mux = &qe_immr->qmx;
+        unsigned long flags;
+        u32 val;
+
+        switch (clk) {
+        case QE_CLK3:  val = QE_CMXGCR_USBCS_CLK3;  break;
+        case QE_CLK5:  val = QE_CMXGCR_USBCS_CLK5;  break;
+        case QE_CLK7:  val = QE_CMXGCR_USBCS_CLK7;  break;
+        case QE_CLK9:  val = QE_CMXGCR_USBCS_CLK9;  break;
+        case QE_CLK13: val = QE_CMXGCR_USBCS_CLK13; break;
+        case QE_CLK17: val = QE_CMXGCR_USBCS_CLK17; break;
+        case QE_CLK19: val = QE_CMXGCR_USBCS_CLK19; break;
+        case QE_CLK21: val = QE_CMXGCR_USBCS_CLK21; break;
+        case QE_BRG9:  val = QE_CMXGCR_USBCS_BRG9;  break;
+        case QE_BRG10: val = QE_CMXGCR_USBCS_BRG10; break;
+        default:
+                pr_err("%s: requested unknown clock %d\n", __func__, clk);
+                return -EINVAL;
+        }
+
+        if (qe_clock_is_brg(clk))
+                qe_setbrg(clk, rate, 1);
+
+        spin_lock_irqsave(&cmxgcr_lock, flags);
+
+        clrsetbits_be32(&mux->cmxgcr, QE_CMXGCR_USBCS, val);
+
+        spin_unlock_irqrestore(&cmxgcr_lock, flags);
+
+        return 0;
+}
+EXPORT_SYMBOL(qe_usb_clock_set);