--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c

@@ -535,6 +555,11 @@ static const struct phy_ops rz_g1c_phy_usb2_ops = {
        .owner          = THIS_MODULE,
 };

+static const struct soc_device_attribute soc_no_adp_ctrl[] = {
+       { .soc_id = "r9a07g044", .data = (void *)true },
+       { /* Sentinel */ }
+};
+
 static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = {
        {
                .compatible = "renesas,usb2-phy-r8a77470",

@@ -613,6 +638,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
        struct phy_provider *provider;
        const struct phy_ops *phy_usb2_ops;
        int ret = 0, i;
+       const struct soc_device_attribute *attr;

        if (!dev->of_node) {
                dev_err(dev, "This driver needs device tree\n");

@@ -627,6 +653,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
        if (IS_ERR(channel->base))
                return PTR_ERR(channel->base);

+       channel->obint_enable_bits = USB2_OBINT_SESSVLDCHG | USB2_OBINT_IDDIGCHG;
        /* get irq number here and request_irq for OTG in phy_init */
        channel->irq = platform_get_irq_optional(pdev, 0);
        channel->dr_mode = rcar_gen3_get_dr_mode(dev->of_node);

@@ -634,6 +661,12 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
                int ret;

                channel->is_otg_channel = true;
+               attr = soc_device_match(soc_no_adp_ctrl);
+               if (attr) {
+                       channel->soc_no_adp_ctrl = attr->data;
+                       channel->obint_enable_bits = USB2_OBINT_IDCHG_EN;
+               }