Commit b506eebc authored by Vivek Gautam's avatar Vivek Gautam Committed by Felipe Balbi

ARM: EXYNOS: Update & move usb-phy types to generic include layer

Updating the names of usb-phy types to more generic names:
USB_PHY_TYPE_DEIVCE & USB_PHY_TYPE_HOST; and further update
its dependencies.
Signed-off-by: default avatarPraveen Paneri <p.paneri@samsung.com>
Signed-off-by: default avatarVivek Gautam <gautam.vivek@samsung.com>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 69f0946a
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/platform_data/usb-ehci-s5p.h> #include <linux/platform_data/usb-ehci-s5p.h>
#include <linux/usb/samsung_usb_phy.h>
#include <plat/usb-phy.h> #include <plat/usb-phy.h>
#define EHCI_INSNREG00(base) (base + 0x90) #define EHCI_INSNREG00(base) (base + 0x90)
...@@ -164,7 +165,7 @@ static int s5p_ehci_probe(struct platform_device *pdev) ...@@ -164,7 +165,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
} }
if (pdata->phy_init) if (pdata->phy_init)
pdata->phy_init(pdev, S5P_USB_PHY_HOST); pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
ehci = hcd_to_ehci(hcd); ehci = hcd_to_ehci(hcd);
ehci->caps = hcd->regs; ehci->caps = hcd->regs;
...@@ -198,7 +199,7 @@ static int s5p_ehci_remove(struct platform_device *pdev) ...@@ -198,7 +199,7 @@ static int s5p_ehci_remove(struct platform_device *pdev)
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
if (pdata && pdata->phy_exit) if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST); pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
clk_disable_unprepare(s5p_ehci->clk); clk_disable_unprepare(s5p_ehci->clk);
...@@ -229,7 +230,7 @@ static int s5p_ehci_suspend(struct device *dev) ...@@ -229,7 +230,7 @@ static int s5p_ehci_suspend(struct device *dev)
rc = ehci_suspend(hcd, do_wakeup); rc = ehci_suspend(hcd, do_wakeup);
if (pdata && pdata->phy_exit) if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST); pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
clk_disable_unprepare(s5p_ehci->clk); clk_disable_unprepare(s5p_ehci->clk);
...@@ -246,7 +247,7 @@ static int s5p_ehci_resume(struct device *dev) ...@@ -246,7 +247,7 @@ static int s5p_ehci_resume(struct device *dev)
clk_prepare_enable(s5p_ehci->clk); clk_prepare_enable(s5p_ehci->clk);
if (pdata && pdata->phy_init) if (pdata && pdata->phy_init)
pdata->phy_init(pdev, S5P_USB_PHY_HOST); pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
/* DMA burst Enable */ /* DMA burst Enable */
writel(EHCI_INSNREG00_ENABLE_DMA_BURST, EHCI_INSNREG00(hcd->regs)); writel(EHCI_INSNREG00_ENABLE_DMA_BURST, EHCI_INSNREG00(hcd->regs));
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/platform_data/usb-exynos.h> #include <linux/platform_data/usb-exynos.h>
#include <linux/usb/samsung_usb_phy.h>
#include <plat/usb-phy.h> #include <plat/usb-phy.h>
struct exynos_ohci_hcd { struct exynos_ohci_hcd {
...@@ -153,7 +154,7 @@ static int exynos_ohci_probe(struct platform_device *pdev) ...@@ -153,7 +154,7 @@ static int exynos_ohci_probe(struct platform_device *pdev)
} }
if (pdata->phy_init) if (pdata->phy_init)
pdata->phy_init(pdev, S5P_USB_PHY_HOST); pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
ohci = hcd_to_ohci(hcd); ohci = hcd_to_ohci(hcd);
ohci_hcd_init(ohci); ohci_hcd_init(ohci);
...@@ -184,7 +185,7 @@ static int exynos_ohci_remove(struct platform_device *pdev) ...@@ -184,7 +185,7 @@ static int exynos_ohci_remove(struct platform_device *pdev)
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
if (pdata && pdata->phy_exit) if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST); pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
clk_disable_unprepare(exynos_ohci->clk); clk_disable_unprepare(exynos_ohci->clk);
...@@ -229,7 +230,7 @@ static int exynos_ohci_suspend(struct device *dev) ...@@ -229,7 +230,7 @@ static int exynos_ohci_suspend(struct device *dev)
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
if (pdata && pdata->phy_exit) if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST); pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
clk_disable_unprepare(exynos_ohci->clk); clk_disable_unprepare(exynos_ohci->clk);
...@@ -249,7 +250,7 @@ static int exynos_ohci_resume(struct device *dev) ...@@ -249,7 +250,7 @@ static int exynos_ohci_resume(struct device *dev)
clk_prepare_enable(exynos_ohci->clk); clk_prepare_enable(exynos_ohci->clk);
if (pdata && pdata->phy_init) if (pdata && pdata->phy_init)
pdata->phy_init(pdev, S5P_USB_PHY_HOST); pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
ohci_resume(hcd, false); ohci_resume(hcd, false);
......
/*
* Copyright (C) 2012 Samsung Electronics Co.Ltd
* http://www.samsung.com/
*
* Defines phy types for samsung usb phy controllers - HOST or DEIVCE.
*
* 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.
*/
enum samsung_usb_phy_type {
USB_PHY_TYPE_DEVICE,
USB_PHY_TYPE_HOST,
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment