moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phy: renesas: phy-rcar-gen3-usb2: Add USB2.0 PHY support for RZ/G2L

Browse Source 
This patch adds USB2.0 PHY support for RZ/G2L SoC.

We need to use a different compatible string due to some differences
with R-Car Gen3 USB2.0 PHY. It uses line ctrl register for OTG_ID
pin changes and different OTG-BC interrupt bit for device recognition.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> # on R-Car
Link: https://lore.kernel.org/r/20210727185527.19907-4-biju.das.jz@bp.renesas.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Biju Das
2021-07-27 19:55:24 +01:00
committed by Vinod Koul
parent 5711af410c
commit b0512a6ec0
1 changed files with 73 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
drivers/phy/renesas/phy-rcar-gen3-usb2.c
View File

@@ -64,6 +64,7 @@
/* VBCTRL */ /* VBCTRL */
#define USB2_VBCTRL_OCCLREN BIT(16) #define USB2_VBCTRL_OCCLREN BIT(16)
#define USB2_VBCTRL_DRVVBUSSEL BIT(8) #define USB2_VBCTRL_DRVVBUSSEL BIT(8)
#define USB2_VBCTRL_VBOUT BIT(0)
/* LINECTRL1 */ /* LINECTRL1 */
#define USB2_LINECTRL1_DPRPD_EN BIT(19) #define USB2_LINECTRL1_DPRPD_EN BIT(19)
@@ -78,6 +79,10 @@
#define USB2_ADPCTRL_IDPULLUP BIT(5) /* 1 = ID sampling is enabled */ #define USB2_ADPCTRL_IDPULLUP BIT(5) /* 1 = ID sampling is enabled */
#define USB2_ADPCTRL_DRVVBUS BIT(4) #define USB2_ADPCTRL_DRVVBUS BIT(4)
/* RZ/G2L specific */
#define USB2_OBINT_IDCHG_EN BIT(0)
#define USB2_LINECTRL1_USB2_IDMON BIT(0)
#define NUM_OF_PHYS 4 #define NUM_OF_PHYS 4
enum rcar_gen3_phy_index { enum rcar_gen3_phy_index {
PHY_INDEX_BOTH_HC, PHY_INDEX_BOTH_HC,
@@ -112,9 +117,16 @@ struct rcar_gen3_chan {
struct mutex lock; /* protects rphys[...].powered */ struct mutex lock; /* protects rphys[...].powered */
enum usb_dr_mode dr_mode; enum usb_dr_mode dr_mode;
int irq; int irq;
u32 obint_enable_bits;
bool extcon_host; bool extcon_host;
bool is_otg_channel; bool is_otg_channel;
bool uses_otg_pins; bool uses_otg_pins;
bool soc_no_adp_ctrl;
};
struct rcar_gen3_phy_drv_data {
const struct phy_ops *phy_usb2_ops;
bool no_adp_ctrl;
}; };
/* /*
@@ -172,14 +184,22 @@ static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm)
static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus) static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
{ {
void __iomem *usb2_base = ch->base; void __iomem *usb2_base = ch->base;
u32 val = readl(usb2_base + USB2_ADPCTRL); u32 vbus_ctrl_reg = USB2_ADPCTRL;
u32 vbus_ctrl_val = USB2_ADPCTRL_DRVVBUS;
u32 val;
dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus); dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus);
if (ch->soc_no_adp_ctrl) {
vbus_ctrl_reg = USB2_VBCTRL;
vbus_ctrl_val = USB2_VBCTRL_VBOUT;
}
val = readl(usb2_base + vbus_ctrl_reg);
if (vbus) if (vbus)
val |= USB2_ADPCTRL_DRVVBUS; val |= vbus_ctrl_val;
else else
val &= ~USB2_ADPCTRL_DRVVBUS; val &= ~vbus_ctrl_val;
writel(val, usb2_base + USB2_ADPCTRL); writel(val, usb2_base + vbus_ctrl_reg);
} }
static void rcar_gen3_control_otg_irq(struct rcar_gen3_chan *ch, int enable) static void rcar_gen3_control_otg_irq(struct rcar_gen3_chan *ch, int enable)
@@ -188,9 +208,9 @@ static void rcar_gen3_control_otg_irq(struct rcar_gen3_chan *ch, int enable)
u32 val = readl(usb2_base + USB2_OBINTEN); u32 val = readl(usb2_base + USB2_OBINTEN);
if (ch->uses_otg_pins && enable) if (ch->uses_otg_pins && enable)
val |= USB2_OBINT_BITS; val |= ch->obint_enable_bits;
else else
val &= ~USB2_OBINT_BITS; val &= ~ch->obint_enable_bits;
writel(val, usb2_base + USB2_OBINTEN); writel(val, usb2_base + USB2_OBINTEN);
} }
@@ -252,6 +272,9 @@ static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
if (!ch->uses_otg_pins) if (!ch->uses_otg_pins)
return (ch->dr_mode == USB_DR_MODE_HOST) ? false : true; return (ch->dr_mode == USB_DR_MODE_HOST) ? false : true;
if (ch->soc_no_adp_ctrl)
return !!(readl(ch->base + USB2_LINECTRL1) & USB2_LINECTRL1_USB2_IDMON);
return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG); return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
} }
@@ -376,16 +399,17 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
USB2_LINECTRL1_DMRPD_EN | USB2_LINECTRL1_DM_RPD; USB2_LINECTRL1_DMRPD_EN | USB2_LINECTRL1_DM_RPD;
writel(val, usb2_base + USB2_LINECTRL1); writel(val, usb2_base + USB2_LINECTRL1);
val = readl(usb2_base + USB2_VBCTRL); if (!ch->soc_no_adp_ctrl) {
val &= ~USB2_VBCTRL_OCCLREN; val = readl(usb2_base + USB2_VBCTRL);
writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL); val &= ~USB2_VBCTRL_OCCLREN;
val = readl(usb2_base + USB2_ADPCTRL); writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);
writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL); val = readl(usb2_base + USB2_ADPCTRL);
writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL);
}
msleep(20); msleep(20);
writel(0xffffffff, usb2_base + USB2_OBINTSTA); writel(0xffffffff, usb2_base + USB2_OBINTSTA);
writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTEN); writel(ch->obint_enable_bits, usb2_base + USB2_OBINTEN);
rcar_gen3_device_recognition(ch); rcar_gen3_device_recognition(ch);
} }
@@ -397,9 +421,9 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)
u32 status = readl(usb2_base + USB2_OBINTSTA); u32 status = readl(usb2_base + USB2_OBINTSTA);
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
if (status & USB2_OBINT_BITS) { if (status & ch->obint_enable_bits) {
dev_vdbg(ch->dev, "%s: %08x\n", __func__, status); dev_vdbg(ch->dev, "%s: %08x\n", __func__, status);
writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA); writel(ch->obint_enable_bits, usb2_base + USB2_OBINTSTA);
rcar_gen3_device_recognition(ch); rcar_gen3_device_recognition(ch);
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
} }
@@ -535,26 +559,45 @@ static const struct phy_ops rz_g1c_phy_usb2_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static const struct rcar_gen3_phy_drv_data rcar_gen3_phy_usb2_data = {
.phy_usb2_ops = &rcar_gen3_phy_usb2_ops,
.no_adp_ctrl = false,
};
static const struct rcar_gen3_phy_drv_data rz_g1c_phy_usb2_data = {
.phy_usb2_ops = &rz_g1c_phy_usb2_ops,
.no_adp_ctrl = false,
};
static const struct rcar_gen3_phy_drv_data rz_g2l_phy_usb2_data = {
.phy_usb2_ops = &rcar_gen3_phy_usb2_ops,
.no_adp_ctrl = true,
};
static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = { static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = {
{ {
.compatible = "renesas,usb2-phy-r8a77470", .compatible = "renesas,usb2-phy-r8a77470",
.data = &rz_g1c_phy_usb2_ops, .data = &rz_g1c_phy_usb2_data,
}, },
{ {
.compatible = "renesas,usb2-phy-r8a7795", .compatible = "renesas,usb2-phy-r8a7795",
.data = &rcar_gen3_phy_usb2_ops, .data = &rcar_gen3_phy_usb2_data,
}, },
{ {
.compatible = "renesas,usb2-phy-r8a7796", .compatible = "renesas,usb2-phy-r8a7796",
.data = &rcar_gen3_phy_usb2_ops, .data = &rcar_gen3_phy_usb2_data,
}, },
{ {
.compatible = "renesas,usb2-phy-r8a77965", .compatible = "renesas,usb2-phy-r8a77965",
.data = &rcar_gen3_phy_usb2_ops, .data = &rcar_gen3_phy_usb2_data,
},
{
.compatible = "renesas,rzg2l-usb2-phy",
.data = &rz_g2l_phy_usb2_data,
}, },
{ {
.compatible = "renesas,rcar-gen3-usb2-phy", .compatible = "renesas,rcar-gen3-usb2-phy",
.data = &rcar_gen3_phy_usb2_ops, .data = &rcar_gen3_phy_usb2_data,
}, },
{ /* sentinel */ }, { /* sentinel */ },
}; };
@@ -608,10 +651,10 @@ static enum usb_dr_mode rcar_gen3_get_dr_mode(struct device_node *np)
static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
{ {
const struct rcar_gen3_phy_drv_data *phy_data;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct rcar_gen3_chan *channel; struct rcar_gen3_chan *channel;
struct phy_provider *provider; struct phy_provider *provider;
const struct phy_ops *phy_usb2_ops;
int ret = 0, i; int ret = 0, i;
if (!dev->of_node) { if (!dev->of_node) {
@@ -627,6 +670,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
if (IS_ERR(channel->base)) if (IS_ERR(channel->base))
return PTR_ERR(channel->base); return PTR_ERR(channel->base);
channel->obint_enable_bits = USB2_OBINT_BITS;
/* get irq number here and request_irq for OTG in phy_init */ /* get irq number here and request_irq for OTG in phy_init */
channel->irq = platform_get_irq_optional(pdev, 0); channel->irq = platform_get_irq_optional(pdev, 0);
channel->dr_mode = rcar_gen3_get_dr_mode(dev->of_node); channel->dr_mode = rcar_gen3_get_dr_mode(dev->of_node);
@@ -653,16 +697,21 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
* And then, phy-core will manage runtime pm for this device. * And then, phy-core will manage runtime pm for this device.
*/ */
pm_runtime_enable(dev); pm_runtime_enable(dev);
phy_usb2_ops = of_device_get_match_data(dev);
if (!phy_usb2_ops) { phy_data = of_device_get_match_data(dev);
if (!phy_data) {
ret = -EINVAL; ret = -EINVAL;
goto error; goto error;
} }
channel->soc_no_adp_ctrl = phy_data->no_adp_ctrl;
if (phy_data->no_adp_ctrl)
channel->obint_enable_bits = USB2_OBINT_IDCHG_EN;
mutex_init(&channel->lock); mutex_init(&channel->lock);
for (i = 0; i < NUM_OF_PHYS; i++) { for (i = 0; i < NUM_OF_PHYS; i++) {
channel->rphys[i].phy = devm_phy_create(dev, NULL, channel->rphys[i].phy = devm_phy_create(dev, NULL,
phy_usb2_ops); phy_data->phy_usb2_ops);
if (IS_ERR(channel->rphys[i].phy)) { if (IS_ERR(channel->rphys[i].phy)) {
dev_err(dev, "Failed to create USB2 PHY\n"); dev_err(dev, "Failed to create USB2 PHY\n");
ret = PTR_ERR(channel->rphys[i].phy); ret = PTR_ERR(channel->rphys[i].phy);