Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[u-boot] / arch / arm / mach-exynos / power.c

diff --git a/arch/arm/mach-exynos/power.c b/arch/arm/mach-exynos/power.c
index 1b12051656e26405667e21aa65e499a559eba23c..c923460275ec70cc93d80c1ebcab97a9365fe848 100644 (file)
--- a/arch/arm/mach-exynos/power.c
+++ b/arch/arm/mach-exynos/power.c
@@ -125,7 +125,7 @@ static void exynos5420_set_usbdev_phy_ctrl(unsigned int enable)
 void set_usbdrd_phy_ctrl(unsigned int enable)
 {
        if (cpu_is_exynos5()) {
-               if (proid_is_exynos5420() || proid_is_exynos5800())
+               if (proid_is_exynos5420() || proid_is_exynos5422())
                        exynos5420_set_usbdev_phy_ctrl(enable);
                else
                        exynos5_set_usbdrd_phy_ctrl(enable);
@@ -147,7 +147,7 @@ static void exynos5_dp_phy_control(unsigned int enable)
        writel(cfg, &power->dptx_phy_control);
 }
 
-void set_dp_phy_ctrl(unsigned int enable)
+void exynos_dp_phy_ctrl(unsigned int enable)
 {
        if (cpu_is_exynos5())
                exynos5_dp_phy_control(enable);