diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-05-23 22:08:42 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:44:43 -0800 |
| commit | 69c2df073054f4b76530cc7bb206fb6e7d22f51c (patch) | |
| tree | 41851ae02faef6b750a8618f93d42b13471e8d9e /drivers/usb/gadget | |
| parent | f8531a4fe5c0fb2aef8ff56debc1464f20d17cb3 (diff) | |
arm: tegra: Clean up SOC conditionals
Change SOC conditionals to make them more forward-looking.
Original-Change-Id: Ib60db4e690c2f396afdec962616d735548b5a8a9
Reviewed-on: http://git-master/r/32706
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>
Rebase-Id: R6b5fc7c5110e02d29a98043492416569cc959969
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/fsl_udc_core.c | 14 | ||||
| -rw-r--r-- | drivers/usb/gadget/fsl_usb2_udc.h | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index 8f0eca5650df..6afd0954e6f7 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -2230,7 +2230,7 @@ static irqreturn_t fsl_udc_irq(int irq, void *_udc) spin_unlock_irqrestore(&udc->lock, flags); return IRQ_NONE; } -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#ifndef CONFIG_ARCH_TEGRA_2x_SOC { u32 temp = fsl_readl(&usb_sys_regs->vbus_sensors); udc->vbus_active = (temp & USB_SYS_VBUS_ASESSION) ? true : false; @@ -2520,12 +2520,12 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count, next += t; tmp_reg = fsl_readl(&dr_regs->portsc1); -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#ifdef CONFIG_ARCH_TEGRA_2x_SOC + tmp_reg2 = tmp_reg; +#else /* In Tegra3 the Phy Type Select(PTS) and Port Speed fields are specified in * hostpc1devlc register instead of portsc1 register. */ tmp_reg2 = fsl_readl(&dr_regs->hostpc1devlc); -#else - tmp_reg2 = tmp_reg; #endif t = scnprintf(next, size, "USB Port Status&Control Reg:\n" @@ -2898,10 +2898,10 @@ static int __init fsl_udc_probe(struct platform_device *pdev) } #endif -#ifdef CONFIG_ARCH_TEGRA_3x_SOC - control_reg = &dr_regs->hostpc1devlc; -#else +#ifdef CONFIG_ARCH_TEGRA_2x_SOC control_reg = &dr_regs->portsc1; +#else + control_reg = &dr_regs->hostpc1devlc; #endif #if !defined(CONFIG_ARCH_MXC) && !defined(CONFIG_ARCH_TEGRA) if (pdata->have_sysif_regs) diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h index 8ce0da7ed6c6..a605e111e432 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.h +++ b/drivers/usb/gadget/fsl_usb2_udc.h @@ -9,7 +9,7 @@ #define USB_MAX_CTRL_PAYLOAD 64 #define USB_DR_SYS_OFFSET 0x400 -#if !defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifdef CONFIG_ARCH_TEGRA_2x_SOC /* USB DR device mode registers (Little Endian) */ struct usb_dr_device { /* Capability register */ @@ -171,7 +171,7 @@ struct usb_dr_host { u32 endptcomplete; /* Endpoint Complete Register */ u32 endptctrl[6]; /* Endpoint Control Registers */ }; -#endif // if !defined(CONFIG_ARCH_TEGRA_3x_SOC) +#endif // ifdef CONFIG_ARCH_TEGRA_2x_SOC /* non-EHCI USB system interface registers (Big Endian) */ #ifdef CONFIG_ARCH_TEGRA @@ -299,7 +299,7 @@ struct usb_sys_interface { #define PORTSCX_WAKE_ON_OVER_CURRENT 0x00400000 #define PORTSCX_PHY_LOW_POWER_SPD 0x00800000 -#if !defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifdef CONFIG_ARCH_TEGRA_2x_SOC #define PORTSCX_PORT_FORCE_FULL_SPEED 0x01000000 #define PORTSCX_PORT_SPEED_MASK 0x0C000000 #define PORTSCX_PORT_WIDTH 0x10000000 |