|
@@ -18,7 +18,6 @@
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/of.h>
|
|
|
#include <linux/platform_device.h>
|
|
|
-#include <linux/platform_data/usb-ohci-exynos.h>
|
|
|
#include <linux/usb/phy.h>
|
|
|
#include <linux/usb/samsung_usb_phy.h>
|
|
|
#include <linux/usb.h>
|
|
@@ -38,7 +37,6 @@ struct exynos_ohci_hcd {
|
|
|
struct clk *clk;
|
|
|
struct usb_phy *phy;
|
|
|
struct usb_otg *otg;
|
|
|
- struct exynos4_ohci_platdata *pdata;
|
|
|
};
|
|
|
|
|
|
static void exynos_ohci_phy_enable(struct platform_device *pdev)
|
|
@@ -48,8 +46,6 @@ static void exynos_ohci_phy_enable(struct platform_device *pdev)
|
|
|
|
|
|
if (exynos_ohci->phy)
|
|
|
usb_phy_init(exynos_ohci->phy);
|
|
|
- else if (exynos_ohci->pdata && exynos_ohci->pdata->phy_init)
|
|
|
- exynos_ohci->pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
|
|
|
}
|
|
|
|
|
|
static void exynos_ohci_phy_disable(struct platform_device *pdev)
|
|
@@ -59,13 +55,10 @@ static void exynos_ohci_phy_disable(struct platform_device *pdev)
|
|
|
|
|
|
if (exynos_ohci->phy)
|
|
|
usb_phy_shutdown(exynos_ohci->phy);
|
|
|
- else if (exynos_ohci->pdata && exynos_ohci->pdata->phy_exit)
|
|
|
- exynos_ohci->pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
|
|
|
}
|
|
|
|
|
|
static int exynos_ohci_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
- struct exynos4_ohci_platdata *pdata = dev_get_platdata(&pdev->dev);
|
|
|
struct exynos_ohci_hcd *exynos_ohci;
|
|
|
struct usb_hcd *hcd;
|
|
|
struct resource *res;
|
|
@@ -98,14 +91,9 @@ static int exynos_ohci_probe(struct platform_device *pdev)
|
|
|
|
|
|
phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
|
|
|
if (IS_ERR(phy)) {
|
|
|
- /* Fallback to pdata */
|
|
|
- if (!pdata) {
|
|
|
- usb_put_hcd(hcd);
|
|
|
- dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
|
|
|
- return -EPROBE_DEFER;
|
|
|
- } else {
|
|
|
- exynos_ohci->pdata = pdata;
|
|
|
- }
|
|
|
+ usb_put_hcd(hcd);
|
|
|
+ dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
|
|
|
+ return -EPROBE_DEFER;
|
|
|
} else {
|
|
|
exynos_ohci->phy = phy;
|
|
|
exynos_ohci->otg = phy->otg;
|