kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: ohci-exynos: Remove non-DT support

Browse source 
The non-DT for EXYNOS SoCs is not supported from v3.11.
Thus, there is no need to support non-DT for Exynos OHCI driver.

The 'include/linux/platform_data/usb-ohci-exynos.h' file has been
used for non-DT support. Thus, the 'usb-ohci-exynos.h' file can
be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jingoo Han 2013-10-14 09:18:54 +09:00 committed by Greg Kroah-Hartman
parent 88ed9fd50e
commit c00809d330
2 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/usb/host/ohci-exynos.c
View file

@ -18,7 +18,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/platform_data/usb-ohci-exynos.h>
#include <linux/usb/phy.h> #include <linux/usb/phy.h>
#include <linux/usb/samsung_usb_phy.h> #include <linux/usb/samsung_usb_phy.h>
#include <linux/usb.h> #include <linux/usb.h>
@ -38,7 +37,6 @@ struct exynos_ohci_hcd {
struct clk *clk; struct clk *clk;
struct usb_phy *phy; struct usb_phy *phy;
struct usb_otg *otg; struct usb_otg *otg;
struct exynos4_ohci_platdata *pdata;
}; };
static void exynos_ohci_phy_enable(struct platform_device *pdev) 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) if (exynos_ohci->phy)
usb_phy_init(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) 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) if (exynos_ohci->phy)
usb_phy_shutdown(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) 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 exynos_ohci_hcd *exynos_ohci;
struct usb_hcd *hcd; struct usb_hcd *hcd;
struct resource *res; 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); phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
if (IS_ERR(phy)) { if (IS_ERR(phy)) {
/* Fallback to pdata */ usb_put_hcd(hcd);
if (!pdata) { dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
usb_put_hcd(hcd); return -EPROBE_DEFER;
dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
return -EPROBE_DEFER;
} else {
exynos_ohci->pdata = pdata;
}
} else { } else {
exynos_ohci->phy = phy; exynos_ohci->phy = phy;
exynos_ohci->otg = phy->otg; exynos_ohci->otg = phy->otg;

21
include/linux/platform_data/usb-ohci-exynos.h
View file

@ -1,21 +0,0 @@
/*
* Copyright (C) 2011 Samsung Electronics Co.Ltd
* http://www.samsung.com/
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
#ifndef __MACH_EXYNOS_OHCI_H
#define __MACH_EXYNOS_OHCI_H
struct exynos4_ohci_platdata {
int (*phy_init)(struct platform_device *pdev, int type);
int (*phy_exit)(struct platform_device *pdev, int type);
};
extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);
#endif /* __MACH_EXYNOS_OHCI_H */