diff options
| -rw-r--r-- | arch/arm/boot/dts/tegra124-apalis-eval.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-apalis-tk1.c | 13 |
3 files changed, 8 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts index 8b39ca0ad7bd..d5366be11ca9 100644 --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts +++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts @@ -224,8 +224,8 @@ /* nvidia,uses_external_pmic; nvidia,gpio_controls_muxed_ss_lanes; */ nvidia,gpio_ss1_sata = <0>; - nvidia,portmap = <0x0703>; /* SSP0, SSP1 USB2P0, USB2P1, USB2P2 */ - nvidia,ss_portmap = <0x72>; /* SSP0 on USB2P2, TBD: SSP1 on USB2P0 */ + nvidia,portmap = <0x0703>; /* SSP0, SSP1, USB2P0, USB2P1, USB2P2 */ + nvidia,ss_portmap = <0x10>; /* SSP0 on USB2P0, SSP1 on USB2P1 */ nvidia,lane_owner = <6>; /* USB3P0 USB3P1 */ nvidia,ulpicap = <0>; /* No ulpi support. can we remove */ /* nvidia,supply_utmi_vbuses = "usb_vbus0", "usb_vbus1", "usb_vbus2"; diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts index 10456e380a9c..ce78f2856160 100644 --- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts @@ -224,8 +224,8 @@ /* nvidia,uses_external_pmic; nvidia,gpio_controls_muxed_ss_lanes; */ nvidia,gpio_ss1_sata = <0>; - nvidia,portmap = <0x0703>; /* SSP0, SSP1 USB2P0, USB2P1, USB2P2 */ - nvidia,ss_portmap = <0x72>; /* SSP0 on USB2P2, TBD: SSP1 on USB2P0 */ + nvidia,portmap = <0x0703>; /* SSP0, SSP1, USB2P0, USB2P1, USB2P2 */ + nvidia,ss_portmap = <0x10>; /* SSP0 on USB2P0, SSP1 on USB2P1 */ nvidia,lane_owner = <6>; /* USB3P0 USB3P1 */ nvidia,ulpicap = <0>; /* No ulpi support. can we remove */ /* nvidia,supply_utmi_vbuses = "usb_vbus0", "usb_vbus1", "usb_vbus2"; diff --git a/arch/arm/mach-tegra/board-apalis-tk1.c b/arch/arm/mach-tegra/board-apalis-tk1.c index 5279da769eb0..fb098f519807 100644 --- a/arch/arm/mach-tegra/board-apalis-tk1.c +++ b/arch/arm/mach-tegra/board-apalis-tk1.c @@ -380,13 +380,9 @@ static void apalis_tk1_usb_init(void) tegra_udc_pdata.id_det_type = TEGRA_USB_ID; tegra_ehci1_utmi_pdata.id_det_type = TEGRA_USB_ID; - if (!(usb_port_owner_info & UTMI1_PORT_OWNER_XUSB)) { - tegra_otg_pdata.is_xhci = false; - tegra_udc_pdata.u_data.dev.is_xhci = false; - } else { - tegra_otg_pdata.is_xhci = true; - tegra_udc_pdata.u_data.dev.is_xhci = true; - } + tegra_otg_pdata.is_xhci = false; + tegra_udc_pdata.u_data.dev.is_xhci = false; + tegra_otg_device.dev.platform_data = &tegra_otg_pdata; platform_device_register(&tegra_otg_device); /* Setup the udc platform data */ @@ -416,11 +412,10 @@ static void apalis_tk1_xusb_init(void) xusb_pdata.lane_owner = (u8) tegra_get_lane_owner_info(); if (!(usb_port_owner_info & UTMI1_PORT_OWNER_XUSB)) - xusb_pdata.portmap &= ~(TEGRA_XUSB_USB2_P0); + xusb_pdata.portmap &= ~(TEGRA_XUSB_USB2_P0 | TEGRA_XUSB_SS_P1); if (!(usb_port_owner_info & UTMI2_PORT_OWNER_XUSB)) xusb_pdata.portmap &= ~(TEGRA_XUSB_USB2_P2 | TEGRA_XUSB_USB2_P1 | TEGRA_XUSB_SS_P0); - xusb_pdata.portmap &= ~(TEGRA_XUSB_SS_P1); //TBD: UTMI3 } |