Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cd9384c authored by Venu Byravarasu's avatar Venu Byravarasu Committed by Felipe Balbi
Browse files

usb: phy: tegra: Get PHY mode using DT 



Added a new PHY mode to support OTG.
Obtained Tegra USB PHY mode using DT property.

Signed-off-by: default avatarVenu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 9e69fae1

drivers/usb/host/ehci-tegra.c

+0 −1
Original line number Diff line number Diff line
@@ -736,7 +736,6 @@ static int tegra_ehci_probe(struct platform_device *pdev) 


	tegra->phy = tegra_usb_phy_open(&pdev->dev, instance, hcd->regs,

					pdata->phy_config,

					TEGRA_USB_PHY_MODE_HOST,

					tegra_ehci_set_pts,

					tegra_ehci_set_phcd);

	if (IS_ERR(tegra->phy)) {

drivers/usb/phy/phy-tegra-usb.c

+11 −2
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static int tegra_usb_phy_suspend(struct usb_phy *x, int suspend) 
}



struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,

	void __iomem *regs, void *config, enum tegra_usb_phy_mode phy_mode,

	void __iomem *regs, void *config,

	void (*set_pts)(struct usb_phy *x, u8 pts_val),

	void (*set_phcd)(struct usb_phy *x, bool enable))
@@ -705,7 +705,6 @@ struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance, 
	phy->instance = instance;

	phy->regs = regs;

	phy->config = config;

	phy->mode = phy_mode;

	phy->dev = dev;

	phy->is_legacy_phy =

		of_property_read_bool(np, "nvidia,has-legacy-mode");
@@ -717,6 +716,16 @@ struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance, 
	else

		phy->is_ulpi_phy = true;



	err = of_property_match_string(np, "dr_mode", "otg");

	if (err < 0) {

		err = of_property_match_string(np, "dr_mode", "peripheral");

		if (err < 0)

			phy->mode = TEGRA_USB_PHY_MODE_HOST;

		else

			phy->mode = TEGRA_USB_PHY_MODE_DEVICE;

	} else

		phy->mode = TEGRA_USB_PHY_MODE_OTG;



	if (!phy->config) {

		if (phy->is_ulpi_phy) {

			pr_err("%s: ulpi phy configuration missing", __func__);

include/linux/usb/tegra_usb_phy.h

+2 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum tegra_usb_phy_port_speed { 
enum tegra_usb_phy_mode {

	TEGRA_USB_PHY_MODE_DEVICE,

	TEGRA_USB_PHY_MODE_HOST,

	TEGRA_USB_PHY_MODE_OTG,

};



struct tegra_xtal_freq;
@@ -66,7 +67,7 @@ struct tegra_usb_phy { 
};



struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,

	void __iomem *regs, void *config, enum tegra_usb_phy_mode phy_mode,

	void __iomem *regs, void *config,

	void (*set_pts)(struct usb_phy *x, u8 pts_val),

	void (*set_phcd)(struct usb_phy *x, bool enable));