Skip to content

L
linux
Commit 521703d6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman
Browse files
Options

staging: hikey9xx: phy-hi3670-usb3: use a consistent namespace 

Rename hikey970 to hi3670, in order to use a namespace
similar to hi3660 driver.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/0a2b7d1d1779551be604532a9959237fd3513971.1600338981.git.mchehab+huawei@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9e1814a
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 49 deletions
drivers/staging/hikey9xx/phy-hi3670-usb3.c
View file @ 521703d6
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
#define TX_VBOOST_LVL_START (6) #define TX_VBOOST_LVL_START (6)
#define TX_VBOOST_LVL_ENABLE BIT(9) #define TX_VBOOST_LVL_ENABLE BIT(9)
struct kirin970_priv { struct hi3670_priv {
struct device *dev; struct device *dev;
struct regmap *peri_crg; struct regmap *peri_crg;
struct regmap *pctrl; struct regmap *pctrl;
...@@ -145,7 +145,7 @@ struct kirin970_priv { ...@@ -145,7 +145,7 @@ struct kirin970_priv {
u32 usb31misc_offset; u32 usb31misc_offset;
}; };
static int kirin970_phy_cr_clk(struct regmap *usb31misc) static int hi3670_phy_cr_clk(struct regmap *usb31misc)
{ {
int ret; int ret;
...@@ -162,13 +162,13 @@ static int kirin970_phy_cr_clk(struct regmap *usb31misc) ...@@ -162,13 +162,13 @@ static int kirin970_phy_cr_clk(struct regmap *usb31misc)
return ret; return ret;
} }
static int kirin970_phy_cr_set_sel(struct regmap *usb31misc) static int hi3670_phy_cr_set_sel(struct regmap *usb31misc)
{ {
return regmap_update_bits(usb31misc, USB_MISC_CFG54, return regmap_update_bits(usb31misc, USB_MISC_CFG54,
CFG54_USB31PHY_CR_SEL, CFG54_USB31PHY_CR_SEL); CFG54_USB31PHY_CR_SEL, CFG54_USB31PHY_CR_SEL);
} }
static int kirin970_phy_cr_start(struct regmap *usb31misc, int direction) static int hi3670_phy_cr_start(struct regmap *usb31misc, int direction)
{ {
int ret; int ret;
...@@ -182,7 +182,7 @@ static int kirin970_phy_cr_start(struct regmap *usb31misc, int direction) ...@@ -182,7 +182,7 @@ static int kirin970_phy_cr_start(struct regmap *usb31misc, int direction)
if (ret) if (ret)
return ret; return ret;
ret = kirin970_phy_cr_clk(usb31misc); ret = hi3670_phy_cr_clk(usb31misc);
if (ret) if (ret)
return ret; return ret;
...@@ -192,7 +192,7 @@ static int kirin970_phy_cr_start(struct regmap *usb31misc, int direction) ...@@ -192,7 +192,7 @@ static int kirin970_phy_cr_start(struct regmap *usb31misc, int direction)
return ret; return ret;
} }
static int kirin970_phy_cr_wait_ack(struct regmap *usb31misc) static int hi3670_phy_cr_wait_ack(struct regmap *usb31misc)
{ {
u32 reg; u32 reg;
int retry = 100000; int retry = 100000;
...@@ -205,7 +205,7 @@ static int kirin970_phy_cr_wait_ack(struct regmap *usb31misc) ...@@ -205,7 +205,7 @@ static int kirin970_phy_cr_wait_ack(struct regmap *usb31misc)
if ((reg & CFG54_USB31PHY_CR_ACK) == CFG54_USB31PHY_CR_ACK) if ((reg & CFG54_USB31PHY_CR_ACK) == CFG54_USB31PHY_CR_ACK)
return 0; return 0;
ret = kirin970_phy_cr_clk(usb31misc); ret = hi3670_phy_cr_clk(usb31misc);
if (ret) if (ret)
return ret; return ret;
} }
...@@ -213,7 +213,7 @@ static int kirin970_phy_cr_wait_ack(struct regmap *usb31misc) ...@@ -213,7 +213,7 @@ static int kirin970_phy_cr_wait_ack(struct regmap *usb31misc)
return -ETIMEDOUT; return -ETIMEDOUT;
} }
static int kirin970_phy_cr_set_addr(struct regmap *usb31misc, u32 addr) static int hi3670_phy_cr_set_addr(struct regmap *usb31misc, u32 addr)
{ {
u32 reg; u32 reg;
int ret; int ret;
...@@ -230,31 +230,31 @@ static int kirin970_phy_cr_set_addr(struct regmap *usb31misc, u32 addr) ...@@ -230,31 +230,31 @@ static int kirin970_phy_cr_set_addr(struct regmap *usb31misc, u32 addr)
return ret; return ret;
} }
static int kirin970_phy_cr_read(struct regmap *usb31misc, u32 addr, u32 *val) static int hi3670_phy_cr_read(struct regmap *usb31misc, u32 addr, u32 *val)
{ {
int reg; int reg;
int i; int i;
int ret; int ret;
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
ret = kirin970_phy_cr_clk(usb31misc); ret = hi3670_phy_cr_clk(usb31misc);
if (ret) if (ret)
return ret; return ret;
} }
ret = kirin970_phy_cr_set_sel(usb31misc); ret = hi3670_phy_cr_set_sel(usb31misc);
if (ret) if (ret)
return ret; return ret;
ret = kirin970_phy_cr_set_addr(usb31misc, addr); ret = hi3670_phy_cr_set_addr(usb31misc, addr);
if (ret) if (ret)
return ret; return ret;
ret = kirin970_phy_cr_start(usb31misc, 0); ret = hi3670_phy_cr_start(usb31misc, 0);
if (ret) if (ret)
return ret; return ret;
ret = kirin970_phy_cr_wait_ack(usb31misc); ret = hi3670_phy_cr_wait_ack(usb31misc);
if (ret) if (ret)
return ret; return ret;
...@@ -268,22 +268,22 @@ static int kirin970_phy_cr_read(struct regmap *usb31misc, u32 addr, u32 *val) ...@@ -268,22 +268,22 @@ static int kirin970_phy_cr_read(struct regmap *usb31misc, u32 addr, u32 *val)
return 0; return 0;
} }
static int kirin970_phy_cr_write(struct regmap *usb31misc, u32 addr, u32 val) static int hi3670_phy_cr_write(struct regmap *usb31misc, u32 addr, u32 val)
{ {
int i; int i;
int ret; int ret;
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
ret = kirin970_phy_cr_clk(usb31misc); ret = hi3670_phy_cr_clk(usb31misc);
if (ret) if (ret)
return ret; return ret;
} }
ret = kirin970_phy_cr_set_sel(usb31misc); ret = hi3670_phy_cr_set_sel(usb31misc);
if (ret) if (ret)
return ret; return ret;
ret = kirin970_phy_cr_set_addr(usb31misc, addr); ret = hi3670_phy_cr_set_addr(usb31misc, addr);
if (ret) if (ret)
return ret; return ret;
...@@ -292,16 +292,16 @@ static int kirin970_phy_cr_write(struct regmap *usb31misc, u32 addr, u32 val) ...@@ -292,16 +292,16 @@ static int kirin970_phy_cr_write(struct regmap *usb31misc, u32 addr, u32 val)
if (ret) if (ret)
return ret; return ret;
ret = kirin970_phy_cr_start(usb31misc, 1); ret = hi3670_phy_cr_start(usb31misc, 1);
if (ret) if (ret)
return ret; return ret;
ret = kirin970_phy_cr_wait_ack(usb31misc); ret = hi3670_phy_cr_wait_ack(usb31misc);
return ret; return ret;
} }
static int kirin970_phy_set_params(struct kirin970_priv *priv) static int hi3670_phy_set_params(struct hi3670_priv *priv)
{ {
u32 reg; u32 reg;
int ret; int ret;
...@@ -315,7 +315,7 @@ static int kirin970_phy_set_params(struct kirin970_priv *priv) ...@@ -315,7 +315,7 @@ static int kirin970_phy_set_params(struct kirin970_priv *priv)
} }
while (retry-- > 0) { while (retry-- > 0) {
ret = kirin970_phy_cr_read(priv->usb31misc, ret = hi3670_phy_cr_read(priv->usb31misc,
TX_VBOOST_LVL_REG, &reg); TX_VBOOST_LVL_REG, &reg);
if (!ret) if (!ret)
break; break;
...@@ -329,14 +329,14 @@ static int kirin970_phy_set_params(struct kirin970_priv *priv) ...@@ -329,14 +329,14 @@ static int kirin970_phy_set_params(struct kirin970_priv *priv)
reg |= (TX_VBOOST_LVL_ENABLE | reg |= (TX_VBOOST_LVL_ENABLE |
(priv->tx_vboost_lvl << TX_VBOOST_LVL_START)); (priv->tx_vboost_lvl << TX_VBOOST_LVL_START));
ret = kirin970_phy_cr_write(priv->usb31misc, TX_VBOOST_LVL_REG, reg); ret = hi3670_phy_cr_write(priv->usb31misc, TX_VBOOST_LVL_REG, reg);
if (ret) if (ret)
dev_err(priv->dev, "write TX_VBOOST_LVL_REG failed\n"); dev_err(priv->dev, "write TX_VBOOST_LVL_REG failed\n");
return ret; return ret;
} }
static int kirin970_is_abbclk_seleted(struct kirin970_priv *priv) static int hi3670_is_abbclk_seleted(struct hi3670_priv *priv)
{ {
u32 reg; u32 reg;
...@@ -356,12 +356,12 @@ static int kirin970_is_abbclk_seleted(struct kirin970_priv *priv) ...@@ -356,12 +356,12 @@ static int kirin970_is_abbclk_seleted(struct kirin970_priv *priv)
return 0; return 0;
} }
static int kirin970_config_phy_clock(struct kirin970_priv *priv) static int hi3670_config_phy_clock(struct hi3670_priv *priv)
{ {
u32 val, mask; u32 val, mask;
int ret; int ret;
if (kirin970_is_abbclk_seleted(priv)) { if (hi3670_is_abbclk_seleted(priv)) {
/* usb refclk iso disable */ /* usb refclk iso disable */
ret = regmap_write(priv->peri_crg, PERI_CRG_ISODIS, ret = regmap_write(priv->peri_crg, PERI_CRG_ISODIS,
USB_REFCLK_ISO_EN); USB_REFCLK_ISO_EN);
...@@ -427,7 +427,7 @@ static int kirin970_config_phy_clock(struct kirin970_priv *priv) ...@@ -427,7 +427,7 @@ static int kirin970_config_phy_clock(struct kirin970_priv *priv)
return ret; return ret;
} }
static int kirin970_config_tca(struct kirin970_priv *priv) static int hi3670_config_tca(struct hi3670_priv *priv)
{ {
u32 val, mask; u32 val, mask;
int ret; int ret;
...@@ -477,9 +477,9 @@ static int kirin970_config_tca(struct kirin970_priv *priv) ...@@ -477,9 +477,9 @@ static int kirin970_config_tca(struct kirin970_priv *priv)
return ret; return ret;
} }
static int kirin970_phy_init(struct phy *phy) static int hi3670_phy_init(struct phy *phy)
{ {
struct kirin970_priv *priv = phy_get_drvdata(phy); struct hi3670_priv *priv = phy_get_drvdata(phy);
u32 val; u32 val;
int ret; int ret;
...@@ -490,7 +490,7 @@ static int kirin970_phy_init(struct phy *phy) ...@@ -490,7 +490,7 @@ static int kirin970_phy_init(struct phy *phy)
if (ret) if (ret)
goto out; goto out;
ret = kirin970_config_phy_clock(priv); ret = hi3670_config_phy_clock(priv);
if (ret) if (ret)
goto out; goto out;
...@@ -522,7 +522,7 @@ static int kirin970_phy_init(struct phy *phy) ...@@ -522,7 +522,7 @@ static int kirin970_phy_init(struct phy *phy)
if (ret) if (ret)
goto out; goto out;
ret = kirin970_config_tca(priv); ret = hi3670_config_tca(priv);
if (ret) if (ret)
goto out; goto out;
...@@ -554,7 +554,7 @@ static int kirin970_phy_init(struct phy *phy) ...@@ -554,7 +554,7 @@ static int kirin970_phy_init(struct phy *phy)
udelay(100); udelay(100);
ret = kirin970_phy_set_params(priv); ret = hi3670_phy_set_params(priv);
if (ret) if (ret)
goto out; goto out;
...@@ -564,9 +564,9 @@ static int kirin970_phy_init(struct phy *phy) ...@@ -564,9 +564,9 @@ static int kirin970_phy_init(struct phy *phy)
return ret; return ret;
} }
static int kirin970_phy_exit(struct phy *phy) static int hi3670_phy_exit(struct phy *phy)
{ {
struct kirin970_priv *priv = phy_get_drvdata(phy); struct hi3670_priv *priv = phy_get_drvdata(phy);
u32 mask; u32 mask;
int ret; int ret;
...@@ -576,7 +576,7 @@ static int kirin970_phy_exit(struct phy *phy) ...@@ -576,7 +576,7 @@ static int kirin970_phy_exit(struct phy *phy)
if (ret) if (ret)
goto out; goto out;
if (kirin970_is_abbclk_seleted(priv)) { if (hi3670_is_abbclk_seleted(priv)) {
/* disable usb_tcxo_en */ /* disable usb_tcxo_en */
ret = regmap_write(priv->pctrl, PCTRL_PERI_CTRL3, ret = regmap_write(priv->pctrl, PCTRL_PERI_CTRL3,
USB_TCXO_EN << PCTRL_PERI_CTRL3_MSK_START); USB_TCXO_EN << PCTRL_PERI_CTRL3_MSK_START);
...@@ -593,18 +593,18 @@ static int kirin970_phy_exit(struct phy *phy) ...@@ -593,18 +593,18 @@ static int kirin970_phy_exit(struct phy *phy)
return ret; return ret;
} }
static struct phy_ops kirin970_phy_ops = { static struct phy_ops hi3670_phy_ops = {
.init = kirin970_phy_init, .init = hi3670_phy_init,
.exit = kirin970_phy_exit, .exit = hi3670_phy_exit,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int kirin970_phy_probe(struct platform_device *pdev) static int hi3670_phy_probe(struct platform_device *pdev)
{ {
struct phy_provider *phy_provider; struct phy_provider *phy_provider;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct phy *phy; struct phy *phy;
struct kirin970_priv *priv; struct hi3670_priv *priv;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
...@@ -647,7 +647,7 @@ static int kirin970_phy_probe(struct platform_device *pdev) ...@@ -647,7 +647,7 @@ static int kirin970_phy_probe(struct platform_device *pdev)
&(priv->tx_vboost_lvl))) &(priv->tx_vboost_lvl)))
priv->eye_diagram_param = KIRIN970_USB_DEFAULT_PHY_VBOOST; priv->eye_diagram_param = KIRIN970_USB_DEFAULT_PHY_VBOOST;
phy = devm_phy_create(dev, NULL, &kirin970_phy_ops); phy = devm_phy_create(dev, NULL, &hi3670_phy_ops);
if (IS_ERR(phy)) if (IS_ERR(phy))
return PTR_ERR(phy); return PTR_ERR(phy);
...@@ -656,20 +656,20 @@ static int kirin970_phy_probe(struct platform_device *pdev) ...@@ -656,20 +656,20 @@ static int kirin970_phy_probe(struct platform_device *pdev)
return PTR_ERR_OR_ZERO(phy_provider); return PTR_ERR_OR_ZERO(phy_provider);
} }
static const struct of_device_id kirin970_phy_of_match[] = { static const struct of_device_id hi3670_phy_of_match[] = {
{.compatible = "hisilicon,kirin970-usb-phy",}, {.compatible = "hisilicon,hi3670-usb-phy",},
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, kirin970_phy_of_match); MODULE_DEVICE_TABLE(of, hi3670_phy_of_match);
static struct platform_driver kirin970_phy_driver = { static struct platform_driver hi3670_phy_driver = {
.probe = kirin970_phy_probe, .probe = hi3670_phy_probe,
.driver = { .driver = {
.name = "kirin970-usb-phy", .name = "hi3670-usb-phy",
.of_match_table = kirin970_phy_of_match, .of_match_table = hi3670_phy_of_match,
} }
}; };
module_platform_driver(kirin970_phy_driver); module_platform_driver(hi3670_phy_driver);
MODULE_AUTHOR("Yu Chen <chenyu56@huawei.com>"); MODULE_AUTHOR("Yu Chen <chenyu56@huawei.com>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7