These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / phy / phy-rcar-gen2.c

diff --git a/kernel/drivers/phy/phy-rcar-gen2.c b/kernel/drivers/phy/phy-rcar-gen2.c
index 97d45f4..c7a0599 100644 (file)
--- a/kernel/drivers/phy/phy-rcar-gen2.c
+++ b/kernel/drivers/phy/phy-rcar-gen2.c
@@ -17,8 +17,7 @@
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
-
-#include <asm/cmpxchg.h>
+#include <linux/atomic.h>
 
 #define USBHS_LPSTS                    0x02
 #define USBHS_UGCTRL                   0x80
@@ -184,7 +183,7 @@ static int rcar_gen2_phy_power_off(struct phy *p)
        return 0;
 }
 
-static struct phy_ops rcar_gen2_phy_ops = {
+static const struct phy_ops rcar_gen2_phy_ops = {
        .init           = rcar_gen2_phy_init,
        .exit           = rcar_gen2_phy_exit,
        .power_on       = rcar_gen2_phy_power_on,
@@ -195,6 +194,7 @@ static struct phy_ops rcar_gen2_phy_ops = {
 static const struct of_device_id rcar_gen2_phy_match_table[] = {
        { .compatible = "renesas,usb-phy-r8a7790" },
        { .compatible = "renesas,usb-phy-r8a7791" },
+       { .compatible = "renesas,usb-phy-r8a7794" },
        { }
 };
 MODULE_DEVICE_TABLE(of, rcar_gen2_phy_match_table);
@@ -206,11 +206,6 @@ static struct phy *rcar_gen2_phy_xlate(struct device *dev,
        struct device_node *np = args->np;
        int i;
 
-       if (!of_device_is_available(np)) {
-               dev_warn(dev, "Requested PHY is disabled\n");
-               return ERR_PTR(-ENODEV);
-       }
-
        drv = dev_get_drvdata(dev);
        if (!drv)
                return ERR_PTR(-EINVAL);