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

Commit f1a9fa23 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 

By Paul Parsons (5) and others
via Haojian Zhuang
* 'board-specific' of git://github.com/hzhuang1/linux

:
  pcmcia: add driver for hx4700
  ARM: pxa: Add standard UART to hx4700_pin_config[]
  ARM: mmp: add usb host support for aspen
  ARM: mmp: add usb host support for PXA168
  ARM: mmp: add usb device support for ttc dkb
  ARM: mmp: add usb device support for PXA910
  ARM: pxa: hx4700: Add PCMCIA/CF support
  ARM: pxa: hx4700: Enable ASIC3 GPIO as a wakeup source
  ARM: pxa: hx4700: Initialize DS1WM clock_rate
  ARM: pxa: mioa701 add camera output enable gpio
  ARM: pxa: use ioremap to access CPLD

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fd273d44 95244306

arch/arm/mach-mmp/Kconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -113,4 +113,11 @@ config CPU_MMP2 
	select CPU_PJ4

	select CPU_PJ4

	help

	help

	  Select code specific to MMP2. MMP2 is ARMv7 compatible.

	  Select code specific to MMP2. MMP2 is ARMv7 compatible.



config USB_EHCI_MV_U2O

        bool "EHCI support for PXA USB OTG controller"

	depends on USB_EHCI_MV

	help

	  Enables support for OTG controller which can be switched to host mode.



endif
 
endif

arch/arm/mach-mmp/aspenite.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/nand.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/platform_data/mv_usb.h>





#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -221,6 +222,21 @@ static struct pxa27x_keypad_platform_data aspenite_keypad_info __initdata = { 
	.debounce_interval	= 30,

	.debounce_interval	= 30,

};

};





#if defined(CONFIG_USB_EHCI_MV)

static char *pxa168_sph_clock_name[] = {

	[0] = "PXA168-USBCLK",

};



static struct mv_usb_platform_data pxa168_sph_pdata = {

	.clknum         = 1,

	.clkname        = pxa168_sph_clock_name,

	.mode           = MV_USB_MODE_HOST,

	.phy_init	= pxa_usb_phy_init,

	.phy_deinit	= pxa_usb_phy_deinit,

	.set_vbus	= NULL,

};

#endif



static void __init common_init(void)

static void __init common_init(void)

{

{

	mfp_config(ARRAY_AND_SIZE(common_pin_config));

	mfp_config(ARRAY_AND_SIZE(common_pin_config));
@@ -236,6 +252,10 @@ static void __init common_init(void) 




	/* off-chip devices */

	/* off-chip devices */

	platform_device_register(&smc91x_device);

	platform_device_register(&smc91x_device);



#if defined(CONFIG_USB_EHCI_MV)

	pxa168_add_usb_host(&pxa168_sph_pdata);

#endif

}

}





MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")

MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")

arch/arm/mach-mmp/devices.c

+282 −0
Original line number Original line Diff line number Diff line
@@ -9,9 +9,13 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/delay.h>





#include <asm/irq.h>

#include <asm/irq.h>

#include <mach/irqs.h>

#include <mach/devices.h>

#include <mach/devices.h>

#include <mach/cputype.h>

#include <mach/regs-usb.h>





int __init pxa_register_device(struct pxa_device_desc *desc,

int __init pxa_register_device(struct pxa_device_desc *desc,

				void *data, size_t size)

				void *data, size_t size)
@@ -67,3 +71,281 @@ int __init pxa_register_device(struct pxa_device_desc *desc, 




	return platform_device_add(pdev);

	return platform_device_add(pdev);

}

}



#if defined(CONFIG_USB) || defined(CONFIG_USB_GADGET)



/*****************************************************************************

 * The registers read/write routines

 *****************************************************************************/



static unsigned int u2o_get(void __iomem *base, unsigned int offset)

{

	return readl_relaxed(base + offset);

}



static void u2o_set(void __iomem *base, unsigned int offset,

		unsigned int value)

{

	u32 reg;



	reg = readl_relaxed(base + offset);

	reg |= value;

	writel_relaxed(reg, base + offset);

	readl_relaxed(base + offset);

}



static void u2o_clear(void __iomem *base, unsigned int offset,

		unsigned int value)

{

	u32 reg;



	reg = readl_relaxed(base + offset);

	reg &= ~value;

	writel_relaxed(reg, base + offset);

	readl_relaxed(base + offset);

}



static void u2o_write(void __iomem *base, unsigned int offset,

		unsigned int value)

{

	writel_relaxed(value, base + offset);

	readl_relaxed(base + offset);

}



#if defined(CONFIG_USB_MV_UDC) || defined(CONFIG_USB_EHCI_MV)



#if defined(CONFIG_CPU_PXA910) || defined(CONFIG_CPU_PXA168)



static DEFINE_MUTEX(phy_lock);

static int phy_init_cnt;



static int usb_phy_init_internal(void __iomem *base)

{

	int loops;



	pr_info("Init usb phy!!!\n");



	/* Initialize the USB PHY power */

	if (cpu_is_pxa910()) {

		u2o_set(base, UTMI_CTRL, (1<<UTMI_CTRL_INPKT_DELAY_SOF_SHIFT)

			| (1<<UTMI_CTRL_PU_REF_SHIFT));

	}



	u2o_set(base, UTMI_CTRL, 1<<UTMI_CTRL_PLL_PWR_UP_SHIFT);

	u2o_set(base, UTMI_CTRL, 1<<UTMI_CTRL_PWR_UP_SHIFT);



	/* UTMI_PLL settings */

	u2o_clear(base, UTMI_PLL, UTMI_PLL_PLLVDD18_MASK

		| UTMI_PLL_PLLVDD12_MASK | UTMI_PLL_PLLCALI12_MASK

		| UTMI_PLL_FBDIV_MASK | UTMI_PLL_REFDIV_MASK

		| UTMI_PLL_ICP_MASK | UTMI_PLL_KVCO_MASK);



	u2o_set(base, UTMI_PLL, 0xee<<UTMI_PLL_FBDIV_SHIFT

		| 0xb<<UTMI_PLL_REFDIV_SHIFT | 3<<UTMI_PLL_PLLVDD18_SHIFT

		| 3<<UTMI_PLL_PLLVDD12_SHIFT | 3<<UTMI_PLL_PLLCALI12_SHIFT

		| 1<<UTMI_PLL_ICP_SHIFT | 3<<UTMI_PLL_KVCO_SHIFT);



	/* UTMI_TX */

	u2o_clear(base, UTMI_TX, UTMI_TX_REG_EXT_FS_RCAL_EN_MASK

		| UTMI_TX_TXVDD12_MASK | UTMI_TX_CK60_PHSEL_MASK

		| UTMI_TX_IMPCAL_VTH_MASK | UTMI_TX_REG_EXT_FS_RCAL_MASK

		| UTMI_TX_AMP_MASK);

	u2o_set(base, UTMI_TX, 3<<UTMI_TX_TXVDD12_SHIFT

		| 4<<UTMI_TX_CK60_PHSEL_SHIFT | 4<<UTMI_TX_IMPCAL_VTH_SHIFT

		| 8<<UTMI_TX_REG_EXT_FS_RCAL_SHIFT | 3<<UTMI_TX_AMP_SHIFT);



	/* UTMI_RX */

	u2o_clear(base, UTMI_RX, UTMI_RX_SQ_THRESH_MASK

		| UTMI_REG_SQ_LENGTH_MASK);

	u2o_set(base, UTMI_RX, 7<<UTMI_RX_SQ_THRESH_SHIFT

		| 2<<UTMI_REG_SQ_LENGTH_SHIFT);



	/* UTMI_IVREF */

	if (cpu_is_pxa168())

		/* fixing Microsoft Altair board interface with NEC hub issue -

		 * Set UTMI_IVREF from 0x4a3 to 0x4bf */

		u2o_write(base, UTMI_IVREF, 0x4bf);



	/* toggle VCOCAL_START bit of UTMI_PLL */

	udelay(200);

	u2o_set(base, UTMI_PLL, VCOCAL_START);

	udelay(40);

	u2o_clear(base, UTMI_PLL, VCOCAL_START);



	/* toggle REG_RCAL_START bit of UTMI_TX */

	udelay(400);

	u2o_set(base, UTMI_TX, REG_RCAL_START);

	udelay(40);

	u2o_clear(base, UTMI_TX, REG_RCAL_START);

	udelay(400);



	/* Make sure PHY PLL is ready */

	loops = 0;

	while ((u2o_get(base, UTMI_PLL) & PLL_READY) == 0) {

		mdelay(1);

		loops++;

		if (loops > 100) {

			printk(KERN_WARNING "calibrate timeout, UTMI_PLL %x\n",

				u2o_get(base, UTMI_PLL));

			break;

		}

	}



	if (cpu_is_pxa168()) {

		u2o_set(base, UTMI_RESERVE, 1 << 5);

		/* Turn on UTMI PHY OTG extension */

		u2o_write(base, UTMI_OTG_ADDON, 1);

	}



	return 0;

}



static int usb_phy_deinit_internal(void __iomem *base)

{

	pr_info("Deinit usb phy!!!\n");



	if (cpu_is_pxa168())

		u2o_clear(base, UTMI_OTG_ADDON, UTMI_OTG_ADDON_OTG_ON);



	u2o_clear(base, UTMI_CTRL, UTMI_CTRL_RXBUF_PDWN);

	u2o_clear(base, UTMI_CTRL, UTMI_CTRL_TXBUF_PDWN);

	u2o_clear(base, UTMI_CTRL, UTMI_CTRL_USB_CLK_EN);

	u2o_clear(base, UTMI_CTRL, 1<<UTMI_CTRL_PWR_UP_SHIFT);

	u2o_clear(base, UTMI_CTRL, 1<<UTMI_CTRL_PLL_PWR_UP_SHIFT);



	return 0;

}



int pxa_usb_phy_init(void __iomem *phy_reg)

{

	mutex_lock(&phy_lock);

	if (phy_init_cnt++ == 0)

		usb_phy_init_internal(phy_reg);

	mutex_unlock(&phy_lock);

	return 0;

}



void pxa_usb_phy_deinit(void __iomem *phy_reg)

{

	WARN_ON(phy_init_cnt == 0);



	mutex_lock(&phy_lock);

	if (--phy_init_cnt == 0)

		usb_phy_deinit_internal(phy_reg);

	mutex_unlock(&phy_lock);

}

#endif

#endif

#endif



#ifdef CONFIG_USB_SUPPORT

static u64 usb_dma_mask = ~(u32)0;



#ifdef CONFIG_USB_MV_UDC

struct resource pxa168_u2o_resources[] = {

	/* regbase */

	[0] = {

		.start	= PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET,

		.end	= PXA168_U2O_REGBASE + USB_REG_RANGE,

		.flags	= IORESOURCE_MEM,

		.name	= "capregs",

	},

	/* phybase */

	[1] = {

		.start	= PXA168_U2O_PHYBASE,

		.end	= PXA168_U2O_PHYBASE + USB_PHY_RANGE,

		.flags	= IORESOURCE_MEM,

		.name	= "phyregs",

	},

	[2] = {

		.start	= IRQ_PXA168_USB1,

		.end	= IRQ_PXA168_USB1,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device pxa168_device_u2o = {

	.name		= "mv-udc",

	.id		= -1,

	.resource	= pxa168_u2o_resources,

	.num_resources	= ARRAY_SIZE(pxa168_u2o_resources),

	.dev		=  {

		.dma_mask	= &usb_dma_mask,

		.coherent_dma_mask = 0xffffffff,

	}

};

#endif /* CONFIG_USB_MV_UDC */



#ifdef CONFIG_USB_EHCI_MV_U2O

struct resource pxa168_u2oehci_resources[] = {

	/* regbase */

	[0] = {

		.start	= PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET,

		.end	= PXA168_U2O_REGBASE + USB_REG_RANGE,

		.flags	= IORESOURCE_MEM,

		.name	= "capregs",

	},

	/* phybase */

	[1] = {

		.start	= PXA168_U2O_PHYBASE,

		.end	= PXA168_U2O_PHYBASE + USB_PHY_RANGE,

		.flags	= IORESOURCE_MEM,

		.name	= "phyregs",

	},

	[2] = {

		.start	= IRQ_PXA168_USB1,

		.end	= IRQ_PXA168_USB1,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device pxa168_device_u2oehci = {

	.name		= "pxa-u2oehci",

	.id		= -1,

	.dev		= {

		.dma_mask		= &usb_dma_mask,

		.coherent_dma_mask	= 0xffffffff,

	},



	.num_resources	= ARRAY_SIZE(pxa168_u2oehci_resources),

	.resource	= pxa168_u2oehci_resources,

};

#endif



#if defined(CONFIG_USB_MV_OTG)

struct resource pxa168_u2ootg_resources[] = {

	/* regbase */

	[0] = {

		.start	= PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET,

		.end	= PXA168_U2O_REGBASE + USB_REG_RANGE,

		.flags	= IORESOURCE_MEM,

		.name	= "capregs",

	},

	/* phybase */

	[1] = {

		.start	= PXA168_U2O_PHYBASE,

		.end	= PXA168_U2O_PHYBASE + USB_PHY_RANGE,

		.flags	= IORESOURCE_MEM,

		.name	= "phyregs",

	},

	[2] = {

		.start	= IRQ_PXA168_USB1,

		.end	= IRQ_PXA168_USB1,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device pxa168_device_u2ootg = {

	.name		= "mv-otg",

	.id		= -1,

	.dev  = {

		.dma_mask          = &usb_dma_mask,

		.coherent_dma_mask = 0xffffffff,

	},



	.num_resources	= ARRAY_SIZE(pxa168_u2ootg_resources),

	.resource      = pxa168_u2ootg_resources,

};

#endif /* CONFIG_USB_MV_OTG */



#endif

arch/arm/mach-mmp/include/mach/devices.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -50,4 +50,7 @@ struct pxa_device_desc mmp2_device_##_name __initdata = { \ 
}

}





extern int pxa_register_device(struct pxa_device_desc *, void *, size_t);

extern int pxa_register_device(struct pxa_device_desc *, void *, size_t);

extern int pxa_usb_phy_init(void __iomem *phy_reg);

extern void pxa_usb_phy_deinit(void __iomem *phy_reg);



#endif /* __MACH_DEVICE_H */
 
#endif /* __MACH_DEVICE_H */

arch/arm/mach-mmp/include/mach/pxa168.h

+3 −5
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ extern void pxa168_clear_keypad_wakeup(void); 
#include <plat/pxa27x_keypad.h>

#include <plat/pxa27x_keypad.h>

#include <mach/cputype.h>

#include <mach/cputype.h>

#include <linux/pxa168_eth.h>

#include <linux/pxa168_eth.h>

#include <linux/platform_data/mv_usb.h>





extern struct pxa_device_desc pxa168_device_uart1;

extern struct pxa_device_desc pxa168_device_uart1;

extern struct pxa_device_desc pxa168_device_uart2;

extern struct pxa_device_desc pxa168_device_uart2;
@@ -36,12 +37,9 @@ extern struct pxa_device_desc pxa168_device_fb; 
extern struct pxa_device_desc pxa168_device_keypad;

extern struct pxa_device_desc pxa168_device_keypad;

extern struct pxa_device_desc pxa168_device_eth;

extern struct pxa_device_desc pxa168_device_eth;





struct pxa168_usb_pdata {

	/* If NULL, default phy init routine for PXA168 would be called */

	int (*phy_init)(void __iomem *usb_phy_reg_base);

};

/* pdata can be NULL */

/* pdata can be NULL */

int __init pxa168_add_usb_host(struct pxa168_usb_pdata *pdata);

extern int __init pxa168_add_usb_host(struct mv_usb_platform_data *pdata);







extern struct platform_device pxa168_device_gpio;

extern struct platform_device pxa168_device_gpio;