|
@@ -184,27 +184,6 @@ static const struct tegra_xtal_freq tegra_freq_table[] = {
|
|
|
},
|
|
|
};
|
|
|
|
|
|
-static struct tegra_utmip_config utmip_default[] = {
|
|
|
- [0] = {
|
|
|
- .hssync_start_delay = 9,
|
|
|
- .idle_wait_delay = 17,
|
|
|
- .elastic_limit = 16,
|
|
|
- .term_range_adj = 6,
|
|
|
- .xcvr_setup = 9,
|
|
|
- .xcvr_lsfslew = 1,
|
|
|
- .xcvr_lsrslew = 1,
|
|
|
- },
|
|
|
- [2] = {
|
|
|
- .hssync_start_delay = 9,
|
|
|
- .idle_wait_delay = 17,
|
|
|
- .elastic_limit = 16,
|
|
|
- .term_range_adj = 6,
|
|
|
- .xcvr_setup = 9,
|
|
|
- .xcvr_lsfslew = 2,
|
|
|
- .xcvr_lsrslew = 2,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
static void set_pts(struct tegra_usb_phy *phy, u8 pts_val)
|
|
|
{
|
|
|
void __iomem *base = phy->regs;
|
|
@@ -703,13 +682,6 @@ static int tegra_usb_phy_init(struct tegra_usb_phy *phy)
|
|
|
int i;
|
|
|
int err;
|
|
|
|
|
|
- if (!phy->is_ulpi_phy) {
|
|
|
- if (phy->is_legacy_phy)
|
|
|
- phy->config = &utmip_default[0];
|
|
|
- else
|
|
|
- phy->config = &utmip_default[2];
|
|
|
- }
|
|
|
-
|
|
|
phy->pll_u = devm_clk_get(phy->dev, "pll_u");
|
|
|
if (IS_ERR(phy->pll_u)) {
|
|
|
pr_err("Can't get pll_u clock\n");
|
|
@@ -784,6 +756,88 @@ void tegra_ehci_phy_restore_end(struct usb_phy *x)
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(tegra_ehci_phy_restore_end);
|
|
|
|
|
|
+static int read_utmi_param(struct platform_device *pdev, const char *param,
|
|
|
+ u8 *dest)
|
|
|
+{
|
|
|
+ u32 value;
|
|
|
+ int err = of_property_read_u32(pdev->dev.of_node, param, &value);
|
|
|
+ *dest = (u8)value;
|
|
|
+ if (err < 0)
|
|
|
+ dev_err(&pdev->dev, "Failed to read USB UTMI parameter %s: %d\n",
|
|
|
+ param, err);
|
|
|
+ return err;
|
|
|
+}
|
|
|
+
|
|
|
+static int utmi_phy_probe(struct tegra_usb_phy *tegra_phy,
|
|
|
+ struct platform_device *pdev)
|
|
|
+{
|
|
|
+ struct resource *res;
|
|
|
+ int err;
|
|
|
+ struct tegra_utmip_config *config;
|
|
|
+
|
|
|
+ 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");
|
|
|
+ return -ENXIO;
|
|
|
+ }
|
|
|
+
|
|
|
+ tegra_phy->pad_regs = devm_ioremap(&pdev->dev, res->start,
|
|
|
+ resource_size(res));
|
|
|
+ if (!tegra_phy->regs) {
|
|
|
+ dev_err(&pdev->dev, "Failed to remap UTMI Pad regs\n");
|
|
|
+ return -ENOMEM;
|
|
|
+ }
|
|
|
+
|
|
|
+ tegra_phy->config = devm_kzalloc(&pdev->dev,
|
|
|
+ sizeof(*tegra_phy->config), GFP_KERNEL);
|
|
|
+ if (!tegra_phy->config) {
|
|
|
+ dev_err(&pdev->dev,
|
|
|
+ "unable to allocate memory for USB UTMIP config\n");
|
|
|
+ return -ENOMEM;
|
|
|
+ }
|
|
|
+
|
|
|
+ config = tegra_phy->config;
|
|
|
+
|
|
|
+ err = read_utmi_param(pdev, "nvidia,hssync-start-delay",
|
|
|
+ &config->hssync_start_delay);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ err = read_utmi_param(pdev, "nvidia,elastic-limit",
|
|
|
+ &config->elastic_limit);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ err = read_utmi_param(pdev, "nvidia,idle-wait-delay",
|
|
|
+ &config->idle_wait_delay);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ err = read_utmi_param(pdev, "nvidia,term-range-adj",
|
|
|
+ &config->term_range_adj);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ err = read_utmi_param(pdev, "nvidia,xcvr-setup",
|
|
|
+ &config->xcvr_setup);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ err = read_utmi_param(pdev, "nvidia,xcvr-lsfslew",
|
|
|
+ &config->xcvr_lsfslew);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ err = read_utmi_param(pdev, "nvidia,xcvr-lsrslew",
|
|
|
+ &config->xcvr_lsrslew);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static int tegra_usb_phy_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct resource *res;
|
|
@@ -815,20 +869,9 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
|
|
|
|
|
|
err = of_property_match_string(np, "phy_type", "ulpi");
|
|
|
if (err < 0) {
|
|
|
- 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");
|
|
|
- return -ENXIO;
|
|
|
- }
|
|
|
-
|
|
|
- tegra_phy->pad_regs = devm_ioremap(&pdev->dev, res->start,
|
|
|
- resource_size(res));
|
|
|
- if (!tegra_phy->regs) {
|
|
|
- dev_err(&pdev->dev, "Failed to remap UTMI Pad regs\n");
|
|
|
- return -ENOMEM;
|
|
|
- }
|
|
|
+ err = utmi_phy_probe(tegra_phy, pdev);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
} else {
|
|
|
tegra_phy->is_ulpi_phy = true;
|
|
|
|
|
@@ -839,6 +882,8 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
|
|
|
tegra_phy->reset_gpio);
|
|
|
return tegra_phy->reset_gpio;
|
|
|
}
|
|
|
+
|
|
|
+ tegra_phy->config = NULL;
|
|
|
}
|
|
|
|
|
|
err = of_property_match_string(np, "dr_mode", "otg");
|