Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e41486c authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala
Browse files

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: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-By: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 83ff9dcf

arch/powerpc/sysdev/qe_lib/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -20,3 +20,7 @@ config UCC 
	bool

	default y if UCC_FAST || UCC_SLOW



config QE_USB

	bool

	help

	  QE USB Host Controller support

arch/powerpc/sysdev/qe_lib/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/sysdev/qe_lib/ucc.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

}

arch/powerpc/sysdev/qe_lib/usb.c

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

 * 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);

include/asm-powerpc/qe.h

+22 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#define _ASM_POWERPC_QE_H

#ifdef __KERNEL__



#include <linux/spinlock.h>

#include <asm/immap_qe.h>



#define QE_NUM_OF_SNUM	28
@@ -74,6 +75,13 @@ enum qe_clock { 
	QE_CLK_DUMMY

};



static inline bool qe_clock_is_brg(enum qe_clock clk)

{

	return clk >= QE_BRG1 && clk <= QE_BRG16;

}



extern spinlock_t cmxgcr_lock;



/* Export QE common operations */

extern void qe_reset(void);

extern int par_io_init(struct device_node *np);
@@ -156,6 +164,9 @@ int qe_upload_firmware(const struct qe_firmware *firmware); 
/* Obtain information on the uploaded firmware */

struct qe_firmware_info *qe_get_firmware_info(void);



/* QE USB */

int qe_usb_clock_set(enum qe_clock clk, int rate);



/* Buffer descriptors */

struct qe_bd {

	__be16 status;
@@ -254,6 +265,16 @@ enum comm_dir { 
#define QE_CMXGCR_MII_ENET_MNG		0x00007000

#define QE_CMXGCR_MII_ENET_MNG_SHIFT	12

#define QE_CMXGCR_USBCS			0x0000000f

#define QE_CMXGCR_USBCS_CLK3		0x1

#define QE_CMXGCR_USBCS_CLK5		0x2

#define QE_CMXGCR_USBCS_CLK7		0x3

#define QE_CMXGCR_USBCS_CLK9		0x4

#define QE_CMXGCR_USBCS_CLK13		0x5

#define QE_CMXGCR_USBCS_CLK17		0x6

#define QE_CMXGCR_USBCS_CLK19		0x7

#define QE_CMXGCR_USBCS_CLK21		0x8

#define QE_CMXGCR_USBCS_BRG9		0x9

#define QE_CMXGCR_USBCS_BRG10		0xa



/* QE CECR Commands.

*/
@@ -283,7 +304,7 @@ enum comm_dir { 
#define QE_HPAC_START_TX		0x0000060b

#define QE_HPAC_START_RX		0x0000070b

#define QE_USB_STOP_TX			0x0000000a

#define QE_USB_RESTART_TX		0x0000000b

#define QE_USB_RESTART_TX		0x0000000c

#define QE_QMC_STOP_TX			0x0000000c

#define QE_QMC_STOP_RX			0x0000000d

#define QE_SS7_SU_FIL_RESET		0x0000000e