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

Commit 097b5334 authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers 



Direct access to USB host controller registers is considered to be not
portable, and is usually a bad sign for poorly abstracted interface.
Introduce .flags and .power_on_delay to "struct pxaohci_platform_data"
so that most platforms don't bother to write their own .init/.exit()
sequences.

Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 52358ba3

arch/arm/mach-pxa/cm-x270.c

+1 −10
Original line number Diff line number Diff line
@@ -257,18 +257,9 @@ static inline void cmx270_init_2700G(void) {} 


/* PXA27x OHCI controller setup */

#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

static int cmx270_ohci_init(struct device *dev)

{

	/* Set the Power Control Polarity Low */

	UHCHR = (UHCHR | UHCHR_PCPL) &

		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE);



	return 0;

}



static struct pxaohci_platform_data cmx270_ohci_platform_data = {

	.port_mode	= PMM_PERPORT_MODE,

	.init		= cmx270_ohci_init,

	.flags		= ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,

};



static void __init cmx270_init_ohci(void)

arch/arm/mach-pxa/cm-x300.c

+2 −10
Original line number Diff line number Diff line
@@ -365,19 +365,11 @@ static inline void cm_x300_init_mmc(void) {} 
#endif



#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

static int cm_x300_ohci_init(struct device *dev)

{

	/* Set the Power Control Polarity Low */

	UHCHR = (UHCHR | UHCHR_PCPL) &

		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE);



	return 0;

}



static struct pxaohci_platform_data cm_x300_ohci_platform_data = {

	.port_mode	= PMM_PERPORT_MODE,

	.init		= cm_x300_ohci_init,

	.flags		= ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,

};



static void __init cm_x300_init_ohci(void)

{

	pxa_set_ohci_info(&cm_x300_ohci_platform_data);

arch/arm/mach-pxa/em-x270.c

+1 −4
Original line number Diff line number Diff line
@@ -373,10 +373,6 @@ static inline void em_x270_init_nand(void) {} 
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

static int em_x270_ohci_init(struct device *dev)

{

	/* Set the Power Control Polarity Low */

	UHCHR = (UHCHR | UHCHR_PCPL) &

		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE);



	/* enable port 2 transiever */

	UP2OCR = UP2OCR_HXS | UP2OCR_HXOE;
@@ -385,6 +381,7 @@ static int em_x270_ohci_init(struct device *dev) 


static struct pxaohci_platform_data em_x270_ohci_platform_data = {

	.port_mode	= PMM_PERPORT_MODE,

	.flags		= ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,

	.init		= em_x270_ohci_init,

};

arch/arm/mach-pxa/include/mach/ohci.h

+16 −0
Original line number Diff line number Diff line
@@ -7,6 +7,22 @@ struct pxaohci_platform_data { 
	int (*init)(struct device *);

	void (*exit)(struct device *);



	unsigned long flags;

#define ENABLE_PORT1		(1 << 0)

#define ENABLE_PORT2		(1 << 1)

#define ENABLE_PORT3		(1 << 2)

#define ENABLE_PORT_ALL		(ENABLE_PORT1 | ENABLE_PORT2 | ENABLE_PORT3)



#define POWER_SENSE_LOW		(1 << 3)

#define POWER_CONTROL_LOW	(1 << 4)

#define NO_OC_PROTECTION	(1 << 5)

#define OC_MODE_GLOBAL		(0 << 6)

#define OC_MODE_PERPORT		(1 << 6)



	int power_on_delay;	/* Power On to Power Good time - in ms

				 * HCD must wait for this duration before

				 * accessing a powered on port

				 */

	int port_mode;

#define PMM_NPS_MODE           1

#define PMM_GLOBAL_MODE        2

arch/arm/mach-pxa/include/mach/pxa-regs.h

+3 −0
Original line number Diff line number Diff line
@@ -784,6 +784,9 @@ 


#define UHCRHDA		__REG(0x4C000048) /* UHC Root Hub Descriptor A */

#define UHCRHDA_NOCP	(1 << 12)	/* No over current protection */

#define UHCRHDA_OCPM	(1 << 11)	/* Over Current Protection Mode */

#define UHCRHDA_POTPGT(x) \

			(((x) & 0xff) << 24) /* Power On To Power Good Time */



#define UHCRHDB		__REG(0x4C00004C) /* UHC Root Hub Descriptor B */

#define UHCRHS		__REG(0x4C000050) /* UHC Root Hub Status */