1. Patchew
  2. linux
  3. [PATCH v3 0/2] usb: phy: tegra: add support for HSIC mode
  4. View patch

[PATCH v3 1/2] usb: phy: tegra: use phy type directly

Svyatoslav Ryhel posted 2 patches 2 weeks, 3 days ago
[PATCH v3 1/2] usb: phy: tegra: use phy type directly
Posted by Svyatoslav Ryhel 2 weeks, 3 days ago 
Refactor to directly use enum usb_phy_interface to determine the PHY mode.
This change is in preparation for adding support for HSIC mode.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
---
 drivers/usb/phy/phy-tegra-usb.c   | 51 +++++++++++++++++++------------
 include/linux/usb/tegra_usb_phy.h |  2 +-
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index 1f527fcb42f6..afa5b5535f92 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -814,15 +814,24 @@ static int ulpi_phy_power_off(struct tegra_usb_phy *phy)
 
 static int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)
 {
-	int err;
+	int err = 0;
 
 	if (phy->powered_on)
 		return 0;
 
-	if (phy->is_ulpi_phy)
-		err = ulpi_phy_power_on(phy);
-	else
+	switch (phy->phy_type) {
+	case USBPHY_INTERFACE_MODE_UTMI:
 		err = utmi_phy_power_on(phy);
+		break;
+
+	case USBPHY_INTERFACE_MODE_ULPI:
+		err = ulpi_phy_power_on(phy);
+		break;
+
+	default:
+		break;
+	}
+
 	if (err)
 		return err;
 
@@ -836,15 +845,24 @@ static int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)
 
 static int tegra_usb_phy_power_off(struct tegra_usb_phy *phy)
 {
-	int err;
+	int err = 0;
 
 	if (!phy->powered_on)
 		return 0;
 
-	if (phy->is_ulpi_phy)
-		err = ulpi_phy_power_off(phy);
-	else
+	switch (phy->phy_type) {
+	case USBPHY_INTERFACE_MODE_UTMI:
 		err = utmi_phy_power_off(phy);
+		break;
+
+	case USBPHY_INTERFACE_MODE_ULPI:
+		err = ulpi_phy_power_off(phy);
+		break;
+
+	default:
+		break;
+	}
+
 	if (err)
 		return err;
 
@@ -863,7 +881,7 @@ static void tegra_usb_phy_shutdown(struct usb_phy *u_phy)
 	usb_phy_set_wakeup(u_phy, false);
 	tegra_usb_phy_power_off(phy);
 
-	if (!phy->is_ulpi_phy)
+	if (phy->phy_type == USBPHY_INTERFACE_MODE_UTMI)
 		utmip_pad_close(phy);
 
 	regulator_disable(phy->vbus);
@@ -1049,7 +1067,7 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
 		goto disable_clk;
 	}
 
-	if (!phy->is_ulpi_phy) {
+	if (phy->phy_type == USBPHY_INTERFACE_MODE_UTMI) {
 		err = utmip_pad_open(phy);
 		if (err)
 			goto disable_vbus;
@@ -1066,7 +1084,7 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
 	return 0;
 
 close_phy:
-	if (!phy->is_ulpi_phy)
+	if (phy->phy_type == USBPHY_INTERFACE_MODE_UTMI)
 		utmip_pad_close(phy);
 
 disable_vbus:
@@ -1104,8 +1122,6 @@ static int utmi_phy_probe(struct tegra_usb_phy *tegra_phy,
 	struct resource *res;
 	int err;
 
-	tegra_phy->is_ulpi_phy = false;
-
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 	if (!res) {
 		dev_err(&pdev->dev, "Failed to get UTMI pad regs\n");
@@ -1280,7 +1296,6 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
 	struct tegra_usb_phy *tegra_phy;
-	enum usb_phy_interface phy_type;
 	struct reset_control *reset;
 	struct gpio_desc *gpiod;
 	struct resource *res;
@@ -1342,8 +1357,8 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
 		return err;
 	}
 
-	phy_type = of_usb_get_phy_mode(np);
-	switch (phy_type) {
+	tegra_phy->phy_type = of_usb_get_phy_mode(np);
+	switch (tegra_phy->phy_type) {
 	case USBPHY_INTERFACE_MODE_UTMI:
 		err = utmi_phy_probe(tegra_phy, pdev);
 		if (err)
@@ -1369,8 +1384,6 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
 		break;
 
 	case USBPHY_INTERFACE_MODE_ULPI:
-		tegra_phy->is_ulpi_phy = true;
-
 		tegra_phy->clk = devm_clk_get(&pdev->dev, "ulpi-link");
 		err = PTR_ERR_OR_ZERO(tegra_phy->clk);
 		if (err) {
@@ -1410,7 +1423,7 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
 
 	default:
 		dev_err(&pdev->dev, "phy_type %u is invalid or unsupported\n",
-			phy_type);
+			tegra_phy->phy_type);
 		return -EINVAL;
 	}
 
diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
index c314fad5e375..e394f4880b7e 100644
--- a/include/linux/usb/tegra_usb_phy.h
+++ b/include/linux/usb/tegra_usb_phy.h
@@ -73,7 +73,7 @@ struct tegra_usb_phy {
 	struct usb_phy *ulpi;
 	struct usb_phy u_phy;
 	bool is_legacy_phy;
-	bool is_ulpi_phy;
+	enum usb_phy_interface phy_type;
 	struct gpio_desc *reset_gpio;
 	struct reset_control *pad_rst;
 	bool wakeup_enabled;
-- 
2.51.0
Re: [PATCH v3 1/2] usb: phy: tegra: use phy type directly
Posted by Mikko Perttunen 6 days, 16 hours ago 
On Friday, January 23, 2026 12:11 AM Svyatoslav Ryhel wrote:
> Refactor to directly use enum usb_phy_interface to determine the PHY mode.
> This change is in preparation for adding support for HSIC mode.
> 
> Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
> ---
>  drivers/usb/phy/phy-tegra-usb.c   | 51 +++++++++++++++++++------------
>  include/linux/usb/tegra_usb_phy.h |  2 +-
>  2 files changed, 33 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
> index 1f527fcb42f6..afa5b5535f92 100644
> --- a/drivers/usb/phy/phy-tegra-usb.c
> +++ b/drivers/usb/phy/phy-tegra-usb.c
> @@ -814,15 +814,24 @@ static int ulpi_phy_power_off(struct tegra_usb_phy *phy)
>  
>  static int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)
>  {
> -	int err;
> +	int err = 0;
>  
>  	if (phy->powered_on)
>  		return 0;
>  
> -	if (phy->is_ulpi_phy)
> -		err = ulpi_phy_power_on(phy);
> -	else
> +	switch (phy->phy_type) {
> +	case USBPHY_INTERFACE_MODE_UTMI:
>  		err = utmi_phy_power_on(phy);
> +		break;
> +
> +	case USBPHY_INTERFACE_MODE_ULPI:
> +		err = ulpi_phy_power_on(phy);
> +		break;
> +
> +	default:
> +		break;
> +	}
> +
>  	if (err)
>  		return err;
>  
> @@ -836,15 +845,24 @@ static int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)
>  
>  static int tegra_usb_phy_power_off(struct tegra_usb_phy *phy)
>  {
> -	int err;
> +	int err = 0;
>  
>  	if (!phy->powered_on)
>  		return 0;
>  
> -	if (phy->is_ulpi_phy)
> -		err = ulpi_phy_power_off(phy);
> -	else
> +	switch (phy->phy_type) {
> +	case USBPHY_INTERFACE_MODE_UTMI:
>  		err = utmi_phy_power_off(phy);
> +		break;
> +
> +	case USBPHY_INTERFACE_MODE_ULPI:
> +		err = ulpi_phy_power_off(phy);
> +		break;
> +
> +	default:
> +		break;
> +	}
> +
>  	if (err)
>  		return err;
>  
> @@ -863,7 +881,7 @@ static void tegra_usb_phy_shutdown(struct usb_phy *u_phy)
>  	usb_phy_set_wakeup(u_phy, false);
>  	tegra_usb_phy_power_off(phy);
>  
> -	if (!phy->is_ulpi_phy)
> +	if (phy->phy_type == USBPHY_INTERFACE_MODE_UTMI)
>  		utmip_pad_close(phy);
>  
>  	regulator_disable(phy->vbus);
> @@ -1049,7 +1067,7 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
>  		goto disable_clk;
>  	}
>  
> -	if (!phy->is_ulpi_phy) {
> +	if (phy->phy_type == USBPHY_INTERFACE_MODE_UTMI) {
>  		err = utmip_pad_open(phy);
>  		if (err)
>  			goto disable_vbus;
> @@ -1066,7 +1084,7 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
>  	return 0;
>  
>  close_phy:
> -	if (!phy->is_ulpi_phy)
> +	if (phy->phy_type == USBPHY_INTERFACE_MODE_UTMI)
>  		utmip_pad_close(phy);
>  
>  disable_vbus:
> @@ -1104,8 +1122,6 @@ static int utmi_phy_probe(struct tegra_usb_phy *tegra_phy,
>  	struct resource *res;
>  	int err;
>  
> -	tegra_phy->is_ulpi_phy = false;
> -
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>  	if (!res) {
>  		dev_err(&pdev->dev, "Failed to get UTMI pad regs\n");
> @@ -1280,7 +1296,6 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
>  {
>  	struct device_node *np = pdev->dev.of_node;
>  	struct tegra_usb_phy *tegra_phy;
> -	enum usb_phy_interface phy_type;
>  	struct reset_control *reset;
>  	struct gpio_desc *gpiod;
>  	struct resource *res;
> @@ -1342,8 +1357,8 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
>  		return err;
>  	}
>  
> -	phy_type = of_usb_get_phy_mode(np);
> -	switch (phy_type) {
> +	tegra_phy->phy_type = of_usb_get_phy_mode(np);
> +	switch (tegra_phy->phy_type) {
>  	case USBPHY_INTERFACE_MODE_UTMI:
>  		err = utmi_phy_probe(tegra_phy, pdev);
>  		if (err)
> @@ -1369,8 +1384,6 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
>  		break;
>  
>  	case USBPHY_INTERFACE_MODE_ULPI:
> -		tegra_phy->is_ulpi_phy = true;
> -
>  		tegra_phy->clk = devm_clk_get(&pdev->dev, "ulpi-link");
>  		err = PTR_ERR_OR_ZERO(tegra_phy->clk);
>  		if (err) {
> @@ -1410,7 +1423,7 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
>  
>  	default:
>  		dev_err(&pdev->dev, "phy_type %u is invalid or unsupported\n",
> -			phy_type);
> +			tegra_phy->phy_type);
>  		return -EINVAL;
>  	}
>  
> diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
> index c314fad5e375..e394f4880b7e 100644
> --- a/include/linux/usb/tegra_usb_phy.h
> +++ b/include/linux/usb/tegra_usb_phy.h
> @@ -73,7 +73,7 @@ struct tegra_usb_phy {
>  	struct usb_phy *ulpi;
>  	struct usb_phy u_phy;
>  	bool is_legacy_phy;
> -	bool is_ulpi_phy;
> +	enum usb_phy_interface phy_type;
>  	struct gpio_desc *reset_gpio;
>  	struct reset_control *pad_rst;
>  	bool wakeup_enabled;
> 

I would consider putting a WARN() inside the default: cases which should never run -- primarily just as an indicator to the reader that those code paths should never be taken. In any case,

Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.