.. | .. |
---|
24 | 24 | unsigned long flags; |
---|
25 | 25 | }; |
---|
26 | 26 | |
---|
27 | | -static const struct tegra_udc_soc_info tegra20_udc_soc_info = { |
---|
28 | | - .flags = CI_HDRC_REQUIRES_ALIGNED_DMA, |
---|
29 | | -}; |
---|
30 | | - |
---|
31 | | -static const struct tegra_udc_soc_info tegra30_udc_soc_info = { |
---|
32 | | - .flags = CI_HDRC_REQUIRES_ALIGNED_DMA, |
---|
33 | | -}; |
---|
34 | | - |
---|
35 | | -static const struct tegra_udc_soc_info tegra114_udc_soc_info = { |
---|
36 | | - .flags = CI_HDRC_REQUIRES_ALIGNED_DMA, |
---|
37 | | -}; |
---|
38 | | - |
---|
39 | | -static const struct tegra_udc_soc_info tegra124_udc_soc_info = { |
---|
| 27 | +static const struct tegra_udc_soc_info tegra_udc_soc_info = { |
---|
40 | 28 | .flags = CI_HDRC_REQUIRES_ALIGNED_DMA, |
---|
41 | 29 | }; |
---|
42 | 30 | |
---|
43 | 31 | static const struct of_device_id tegra_udc_of_match[] = { |
---|
44 | 32 | { |
---|
45 | 33 | .compatible = "nvidia,tegra20-udc", |
---|
46 | | - .data = &tegra20_udc_soc_info, |
---|
| 34 | + .data = &tegra_udc_soc_info, |
---|
47 | 35 | }, { |
---|
48 | 36 | .compatible = "nvidia,tegra30-udc", |
---|
49 | | - .data = &tegra30_udc_soc_info, |
---|
| 37 | + .data = &tegra_udc_soc_info, |
---|
50 | 38 | }, { |
---|
51 | 39 | .compatible = "nvidia,tegra114-udc", |
---|
52 | | - .data = &tegra114_udc_soc_info, |
---|
| 40 | + .data = &tegra_udc_soc_info, |
---|
53 | 41 | }, { |
---|
54 | 42 | .compatible = "nvidia,tegra124-udc", |
---|
55 | | - .data = &tegra124_udc_soc_info, |
---|
| 43 | + .data = &tegra_udc_soc_info, |
---|
56 | 44 | }, { |
---|
57 | 45 | /* sentinel */ |
---|
58 | 46 | } |
---|
.. | .. |
---|
95 | 83 | return err; |
---|
96 | 84 | } |
---|
97 | 85 | |
---|
98 | | - /* |
---|
99 | | - * Tegra's USB PHY driver doesn't implement optional phy_init() |
---|
100 | | - * hook, so we have to power on UDC controller before ChipIdea |
---|
101 | | - * driver initialization kicks in. |
---|
102 | | - */ |
---|
103 | | - usb_phy_set_suspend(udc->phy, 0); |
---|
104 | | - |
---|
105 | 86 | /* setup and register ChipIdea HDRC device */ |
---|
106 | 87 | udc->data.name = "tegra-udc"; |
---|
107 | 88 | udc->data.flags = soc->flags; |
---|
.. | .. |
---|
121 | 102 | return 0; |
---|
122 | 103 | |
---|
123 | 104 | fail_power_off: |
---|
124 | | - usb_phy_set_suspend(udc->phy, 1); |
---|
125 | 105 | clk_disable_unprepare(udc->clk); |
---|
126 | 106 | return err; |
---|
127 | 107 | } |
---|
.. | .. |
---|
131 | 111 | struct tegra_udc *udc = platform_get_drvdata(pdev); |
---|
132 | 112 | |
---|
133 | 113 | ci_hdrc_remove_device(udc->dev); |
---|
134 | | - usb_phy_set_suspend(udc->phy, 1); |
---|
135 | 114 | clk_disable_unprepare(udc->clk); |
---|
136 | 115 | |
---|
137 | 116 | return 0; |
---|