Skip to content

Commit f62c193

Browse files
committed
Merge tag 'tegra-for-5.7-usb-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into usb-next
Thierry writes: usb: tegra: Changes for v5.7-rc1 These changes add USB OTG support for the XUSB host and XUSB device controllers found on NVIDIA Tegra SoCs. * tag 'tegra-for-5.7-usb-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: usb: gadget: tegra-xudc: Support multiple device modes usb: gadget: tegra-xudc: Use phy_set_mode() to set/unset device mode usb: gadget: tegra-xudc: Add usb-phy support usb: gadget: tegra-xudc: Remove usb-role-switch support usb: xhci-tegra: Add OTG support phy: tegra: Select USB_PHY phy: tegra: Don't use device-managed API to allocate ports phy: tegra: Fix regulator leak phy: tegra: Print -EPROBE_DEFER error message at debug level phy: tegra: xusb: Don't warn on probe defer phy: tegra: xusb: Add Tegra194 support phy: tegra: xusb: Protect Tegra186 soc with config phy: tegra: xusb: Add set_mode support for UTMI phy on Tegra186 phy: tegra: xusb: Add set_mode support for USB 2 phy on Tegra210 phy: tegra: xusb: Add support to get companion USB 3 port phy: tegra: xusb: Add usb-phy support phy: tegra: xusb: Add usb-role-switch support
2 parents 23a7371 + b4e1993 commit f62c193

File tree

11 files changed

+1024
-180
lines changed

11 files changed

+1024
-180
lines changed

drivers/phy/tegra/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
config PHY_TEGRA_XUSB
33
tristate "NVIDIA Tegra XUSB pad controller driver"
44
depends on ARCH_TEGRA
5+
select USB_CONN_GPIO
6+
select USB_PHY
57
help
68
Choose this option if you have an NVIDIA Tegra SoC.
79

drivers/phy/tegra/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_124_SOC) += xusb-tegra124.o
66
phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_132_SOC) += xusb-tegra124.o
77
phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_210_SOC) += xusb-tegra210.o
88
phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_186_SOC) += xusb-tegra186.o
9+
phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_194_SOC) += xusb-tegra186.o
910
obj-$(CONFIG_PHY_TEGRA194_P2U) += phy-tegra194-p2u.o

drivers/phy/tegra/xusb-tegra124.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,6 +1422,8 @@ tegra124_usb2_port_map(struct tegra_xusb_port *port)
14221422
}
14231423

14241424
static const struct tegra_xusb_port_ops tegra124_usb2_port_ops = {
1425+
.release = tegra_xusb_usb2_port_release,
1426+
.remove = tegra_xusb_usb2_port_remove,
14251427
.enable = tegra124_usb2_port_enable,
14261428
.disable = tegra124_usb2_port_disable,
14271429
.map = tegra124_usb2_port_map,
@@ -1443,6 +1445,7 @@ tegra124_ulpi_port_map(struct tegra_xusb_port *port)
14431445
}
14441446

14451447
static const struct tegra_xusb_port_ops tegra124_ulpi_port_ops = {
1448+
.release = tegra_xusb_ulpi_port_release,
14461449
.enable = tegra124_ulpi_port_enable,
14471450
.disable = tegra124_ulpi_port_disable,
14481451
.map = tegra124_ulpi_port_map,
@@ -1464,6 +1467,7 @@ tegra124_hsic_port_map(struct tegra_xusb_port *port)
14641467
}
14651468

14661469
static const struct tegra_xusb_port_ops tegra124_hsic_port_ops = {
1470+
.release = tegra_xusb_hsic_port_release,
14671471
.enable = tegra124_hsic_port_enable,
14681472
.disable = tegra124_hsic_port_disable,
14691473
.map = tegra124_hsic_port_map,
@@ -1647,6 +1651,8 @@ tegra124_usb3_port_map(struct tegra_xusb_port *port)
16471651
}
16481652

16491653
static const struct tegra_xusb_port_ops tegra124_usb3_port_ops = {
1654+
.release = tegra_xusb_usb3_port_release,
1655+
.remove = tegra_xusb_usb3_port_remove,
16501656
.enable = tegra124_usb3_port_enable,
16511657
.disable = tegra124_usb3_port_disable,
16521658
.map = tegra124_usb3_port_map,

0 commit comments

Comments
 (0)