microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

phy: renesas: rcar-gen3-usb2: Use pdev's device pointer on dev_vdbg() 

To implement multiple phy instances in the future, this patch uses
pdev's device pointer on dev_vdbg() instead of the phy's device
pointer.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
Yoshihiro Shimoda 2019-04-11 19:27:35 +09:00 коммит произвёл Kishon Vijay Abraham I
Родитель 233da2c9ec
Коммит 92fec1c27c
1 изменённых файлов: 6 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
drivers/phy/renesas/phy-rcar-gen3-usb2.c
Просмотреть файл

@ -80,6 +80,7 @@
struct rcar_gen3_chan { struct rcar_gen3_chan {
void __iomem *base; void __iomem *base;
struct device *dev; /* platform_device's device */
struct extcon_dev *extcon; struct extcon_dev *extcon;
struct phy *phy; struct phy *phy;
struct regulator *vbus; struct regulator *vbus;
@ -120,7 +121,7 @@ static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host)
void __iomem *usb2_base = ch->base; void __iomem *usb2_base = ch->base;
u32 val = readl(usb2_base + USB2_COMMCTRL); u32 val = readl(usb2_base + USB2_COMMCTRL);
dev_vdbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, val, host); dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, host);
if (host) if (host)
val &= ~USB2_COMMCTRL_OTG_PERI; val &= ~USB2_COMMCTRL_OTG_PERI;
else else
@ -133,7 +134,7 @@ static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm)
void __iomem *usb2_base = ch->base; void __iomem *usb2_base = ch->base;
u32 val = readl(usb2_base + USB2_LINECTRL1); u32 val = readl(usb2_base + USB2_LINECTRL1);
dev_vdbg(&ch->phy->dev, "%s: %08x, %d, %d\n", __func__, val, dp, dm); dev_vdbg(ch->dev, "%s: %08x, %d, %d\n", __func__, val, dp, dm);
val &= ~(USB2_LINECTRL1_DP_RPD | USB2_LINECTRL1_DM_RPD); val &= ~(USB2_LINECTRL1_DP_RPD | USB2_LINECTRL1_DM_RPD);
if (dp) if (dp)
val |= USB2_LINECTRL1_DP_RPD; val |= USB2_LINECTRL1_DP_RPD;
@ -147,7 +148,7 @@ 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 val = readl(usb2_base + USB2_ADPCTRL);
dev_vdbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, val, vbus); dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus);
if (vbus) if (vbus)
val |= USB2_ADPCTRL_DRVVBUS; val |= USB2_ADPCTRL_DRVVBUS;
else else
@ -407,7 +408,7 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
if (status & USB2_OBINT_BITS) { if (status & USB2_OBINT_BITS) {
dev_vdbg(&ch->phy->dev, "%s: %08x\n", __func__, status); dev_vdbg(ch->dev, "%s: %08x\n", __func__, status);
writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA); writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA);
rcar_gen3_device_recognition(ch); rcar_gen3_device_recognition(ch);
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
@ -526,6 +527,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, channel); platform_set_drvdata(pdev, channel);
phy_set_drvdata(channel->phy, channel); phy_set_drvdata(channel->phy, channel);
channel->dev = dev;
provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
if (IS_ERR(provider)) { if (IS_ERR(provider)) {