shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

[ARM] tegra: add EHCI and UDC controllers to devices.c

Browse Source 
update harmony and ventana to use the common UDC definition, rather
than using the current duplicated definitions

Change-Id: I2e3aca674ab35305a0c516bd22e044382280d05e
Signed-off-by: Gary King <gking@nvidia.com>
This commit is contained in:
Gary King
2010-07-28 16:22:31 -07:00
committed by Colin Cross
parent ce3a041d2e
commit 36564623b4
4 changed files with 101 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
arch/arm/mach-tegra/board-harmony.c
View File

@@ -22,7 +22,6 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/dma-mapping.h>
#include <linux/fsl_devices.h>
#include <linux/pda_power.h>
#include <linux/io.h>
#include <linux/delay.h>
@@ -153,40 +152,6 @@ static struct platform_device debug_uart = {
},
};
/* OTG gadget device */
static u64 tegra_otg_dmamask = DMA_BIT_MASK(32);
static struct resource tegra_otg_resources[] = {
[0] = {
.start = TEGRA_USB_BASE,
.end = TEGRA_USB_BASE + TEGRA_USB_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = INT_USB,
.end = INT_USB,
.flags = IORESOURCE_IRQ,
},
};
static struct fsl_usb2_platform_data tegra_otg_pdata = {
.operating_mode = FSL_USB2_DR_DEVICE,
.phy_mode = FSL_USB2_PHY_UTMI,
};
static struct platform_device tegra_otg = {
.name = "fsl-tegra-udc",
.id = -1,
.dev = {
.dma_mask = &tegra_otg_dmamask,
.coherent_dma_mask = 0xffffffff,
.platform_data = &tegra_otg_pdata,
},
.resource = tegra_otg_resources,
.num_resources = ARRAY_SIZE(tegra_otg_resources),
};
/* PDA power */
static struct pda_power_pdata pda_power_pdata = {
};
@@ -224,7 +189,7 @@ static struct platform_device tegra_gart_dev = {
static struct platform_device *harmony_devices[] __initdata = {
&debug_uart,
&tegra_nand_device,
&tegra_otg,
&tegra_udc_device,
&pda_power_device,
&tegra_i2c_device1,
&tegra_i2c_device2,

37
arch/arm/mach-tegra/board-ventana.c
View File

@@ -28,7 +28,6 @@
#include <linux/i2c.h>
#include <linux/pda_power.h>
#include <linux/dma-mapping.h>
#include <linux/fsl_devices.h>
#include <linux/delay.h>
#include <mach/iomap.h>
@@ -73,40 +72,6 @@ static __initdata struct tegra_clk_init_table ventana_clk_init_table[] = {
{ NULL, NULL, 0, 0},
};
/* OTG gadget device */
static u64 tegra_otg_dmamask = DMA_BIT_MASK(32);
static struct resource tegra_otg_resources[] = {
[0] = {
.start = TEGRA_USB_BASE,
.end = TEGRA_USB_BASE + TEGRA_USB_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = INT_USB,
.end = INT_USB,
.flags = IORESOURCE_IRQ,
},
};
static struct fsl_usb2_platform_data tegra_otg_pdata = {
.operating_mode = FSL_USB2_DR_DEVICE,
.phy_mode = FSL_USB2_PHY_UTMI,
};
static struct platform_device tegra_otg = {
.name = "fsl-tegra-udc",
.id = -1,
.dev = {
.dma_mask = &tegra_otg_dmamask,
.coherent_dma_mask = 0xffffffff,
.platform_data = &tegra_otg_pdata,
},
.resource = tegra_otg_resources,
.num_resources = ARRAY_SIZE(tegra_otg_resources),
};
/* PDA power */
static struct pda_power_pdata pda_power_pdata = {
};
@@ -143,7 +108,7 @@ static struct platform_device tegra_gart_dev = {
static struct platform_device *ventana_devices[] __initdata = {
&debug_uart,
&tegra_otg,
&tegra_udc_device,
&pda_power_device,
&tegra_gart_dev,
};

95
arch/arm/mach-tegra/devices.c
View File

@@ -21,6 +21,8 @@
#include <linux/resource.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/fsl_devices.h>
#include <mach/irqs.h>
#include <mach/iomap.h>
@@ -311,3 +313,96 @@ struct platform_device tegra_w1_device = {
.resource = w1_resources,
.num_resources = ARRAY_SIZE(w1_resources),
};
static struct resource tegra_usb1_resources[] = {
[0] = {
.start = TEGRA_USB_BASE,
.end = TEGRA_USB_BASE + TEGRA_USB_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = INT_USB,
.end = INT_USB,
.flags = IORESOURCE_IRQ,
},
};
static struct resource tegra_usb2_resources[] = {
[0] = {
.start = TEGRA_USB2_BASE,
.end = TEGRA_USB2_BASE + TEGRA_USB2_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = INT_USB2,
.end = INT_USB2,
.flags = IORESOURCE_IRQ,
},
};
static struct resource tegra_usb3_resources[] = {
[0] = {
.start = TEGRA_USB3_BASE,
.end = TEGRA_USB3_BASE + TEGRA_USB3_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = INT_USB3,
.end = INT_USB3,
.flags = IORESOURCE_IRQ,
},
};
static u64 tegra_udc_dmamask = DMA_BIT_MASK(32);
static struct fsl_usb2_platform_data tegra_udc_pdata = {
.operating_mode = FSL_USB2_DR_DEVICE,
.phy_mode = FSL_USB2_PHY_UTMI,
};
struct platform_device tegra_udc_device = {
.name = "fsl-tegra-udc",
.id = -1,
.dev = {
.dma_mask = &tegra_udc_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &tegra_udc_pdata,
},
.resource = tegra_usb1_resources,
.num_resources = ARRAY_SIZE(tegra_usb1_resources),
};
static u64 tegra_ehci_dmamask = DMA_BIT_MASK(32);
struct platform_device tegra_ehci1_device = {
.name = "tegra-ehci",
.id = 0,
.dev = {
.dma_mask = &tegra_ehci_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
.resource = tegra_usb1_resources,
.num_resources = ARRAY_SIZE(tegra_usb1_resources),
};
struct platform_device tegra_ehci2_device = {
.name = "tegra-ehci",
.id = 1,
.dev = {
.dma_mask = &tegra_ehci_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
.resource = tegra_usb2_resources,
.num_resources = ARRAY_SIZE(tegra_usb2_resources),
};
struct platform_device tegra_ehci3_device = {
.name = "tegra-ehci",
.id = 2,
.dev = {
.dma_mask = &tegra_ehci_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
.resource = tegra_usb3_resources,
.num_resources = ARRAY_SIZE(tegra_usb3_resources),
};

4
arch/arm/mach-tegra/devices.h
View File

@@ -36,5 +36,9 @@ extern struct platform_device tegra_spi_device2;
extern struct platform_device tegra_spi_device3;
extern struct platform_device tegra_spi_device4;
extern struct platform_device tegra_w1_device;
extern struct platform_device tegra_udc_device;
extern struct platform_device tegra_ehci1_device;
extern struct platform_device tegra_ehci2_device;
extern struct platform_device tegra_ehci3_device;
#endif