diff options
| author | Krishna Yarlagadda <kyarlagadda@nvidia.com> | 2013-10-21 18:03:31 +0530 |
|---|---|---|
| committer | Krishna Yarlagadda <kyarlagadda@nvidia.com> | 2013-11-06 22:50:06 -0800 |
| commit | 751a502243a19551abbfcc973074b1bd5e244f4b (patch) | |
| tree | d97ac3b0aeae3da2beb5d11e9ba0d4c47e42754d /arch/arm/mach-tegra/board-loki.c | |
| parent | 67133e743adc1f3d24b86c7724b8029238b49927 (diff) | |
ARM: xhci: tegra: dt support for xhci
Modify board files to support dt entries for xusb
Bug 1357627
Change-Id: I23c3cbbb3390de198ffcbf4c89c85383a2139cf8
Signed-off-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Reviewed-on: http://git-master/r/302832
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-loki.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-loki.c | 45 |
1 files changed, 10 insertions, 35 deletions
diff --git a/arch/arm/mach-tegra/board-loki.c b/arch/arm/mach-tegra/board-loki.c index f9521f1dd354..01a31e9c0d24 100644 --- a/arch/arm/mach-tegra/board-loki.c +++ b/arch/arm/mach-tegra/board-loki.c @@ -499,83 +499,56 @@ static void loki_usb_init(void) } } -static struct tegra_xusb_board_data xusb_bdata = { +static struct tegra_xusb_platform_data xusb_pdata = { .portmap = TEGRA_XUSB_SS_P0 | TEGRA_XUSB_USB2_P0 | TEGRA_XUSB_SS_P1 | TEGRA_XUSB_USB2_P1 | TEGRA_XUSB_USB2_P2, - .supply = { - .utmi_vbuses = { - NULL, NULL, NULL - }, - .s3p3v = "hvdd_usb", - .s1p8v = "avdd_pll_utmip", - .vddio_hsic = "vddio_hsic", - .s1p05v = "avddio_usb", - }, - .uses_external_pmic = false, }; static void loki_xusb_init(void) { int usb_port_owner_info = tegra_get_usb_port_owner_info(); - xusb_bdata.lane_owner = (u8) tegra_get_lane_owner_info(); + xusb_pdata.lane_owner = (u8) tegra_get_lane_owner_info(); if (board_info.board_id == BOARD_PM359 || board_info.board_id == BOARD_PM358 || board_info.board_id == BOARD_PM363) { /* Laguna */ - xusb_bdata.gpio_controls_muxed_ss_lanes = true; - /* D[0:15] = gpio number and D[16:31] = output value*/ - xusb_bdata.gpio_ss1_sata = PMU_TCA6416_GPIO(11) | (0 << 16); - xusb_bdata.ss_portmap = (TEGRA_XUSB_SS_PORT_MAP_USB2_P0 << 0) | - (TEGRA_XUSB_SS_PORT_MAP_USB2_P1 << 4); - if (!(usb_port_owner_info & UTMI1_PORT_OWNER_XUSB)) - xusb_bdata.portmap &= ~(TEGRA_XUSB_USB2_P0 | + xusb_pdata.portmap &= ~(TEGRA_XUSB_USB2_P0 | TEGRA_XUSB_SS_P0); if (!(usb_port_owner_info & UTMI2_PORT_OWNER_XUSB)) - xusb_bdata.portmap &= ~(TEGRA_XUSB_USB2_P1 | + xusb_pdata.portmap &= ~(TEGRA_XUSB_USB2_P1 | TEGRA_XUSB_SS_P1); /* FIXME Add for UTMIP2 when have odmdata assigend */ } else { /* Loki */ - xusb_bdata.gpio_controls_muxed_ss_lanes = false; - if (board_info.board_id == BOARD_E1781) { pr_info("Shield ERS-S. 0x%x\n", board_info.board_id); /* Shield ERS-S */ - xusb_bdata.ss_portmap = - (TEGRA_XUSB_SS_PORT_MAP_USB2_P1 << 0) | - (TEGRA_XUSB_SS_PORT_MAP_USB2_P2 << 4); - if (!(usb_port_owner_info & UTMI1_PORT_OWNER_XUSB)) - xusb_bdata.portmap &= ~(TEGRA_XUSB_USB2_P0); + xusb_pdata.portmap &= ~(TEGRA_XUSB_USB2_P0); if (!(usb_port_owner_info & UTMI2_PORT_OWNER_XUSB)) - xusb_bdata.portmap &= ~( + xusb_pdata.portmap &= ~( TEGRA_XUSB_USB2_P1 | TEGRA_XUSB_SS_P0 | TEGRA_XUSB_USB2_P2 | TEGRA_XUSB_SS_P1); } else { pr_info("Shield ERS 0x%x\n", board_info.board_id); /* Shield ERS */ - xusb_bdata.ss_portmap = - (TEGRA_XUSB_SS_PORT_MAP_USB2_P0 << 0) | - (TEGRA_XUSB_SS_PORT_MAP_USB2_P2 << 4); if (!(usb_port_owner_info & UTMI1_PORT_OWNER_XUSB)) - xusb_bdata.portmap &= ~(TEGRA_XUSB_USB2_P0 | + xusb_pdata.portmap &= ~(TEGRA_XUSB_USB2_P0 | TEGRA_XUSB_SS_P0); if (!(usb_port_owner_info & UTMI2_PORT_OWNER_XUSB)) - xusb_bdata.portmap &= ~(TEGRA_XUSB_USB2_P1 | + xusb_pdata.portmap &= ~(TEGRA_XUSB_USB2_P1 | TEGRA_XUSB_USB2_P2 | TEGRA_XUSB_SS_P1); } /* FIXME Add for UTMIP2 when have odmdata assigend */ } - if (xusb_bdata.portmap) - tegra_xusb_init(&xusb_bdata); } static int baseband_init(void) @@ -790,6 +763,8 @@ struct of_dev_auxdata loki_auxdata_lookup[] __initdata = { NULL), OF_DEV_AUXDATA("nvidia,tegra124-i2c", 0x7000d100, "tegra12-i2c.5", NULL), + OF_DEV_AUXDATA("nvidia,tegra124-xhci", 0x70090000, "tegra-xhci", + &xusb_pdata), {} }; #endif |