Commit 88bc4cda authored by Peter Chen's avatar Peter Chen Committed by Vinod Koul

phy: cadence: salvo: add access for USB2PHY

There is an offset for USB2PHY in SALVO phy, add offset parameter for read
and write API to cover both USB2 and USB3 PHY control.
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20230517161646.3418250-2-Frank.Li@nxp.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 1178c93c
...@@ -15,7 +15,9 @@ ...@@ -15,7 +15,9 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
/* PHY register definition */ #define USB3_PHY_OFFSET 0x0
#define USB2_PHY_OFFSET 0x38000
/* USB3 PHY register definition */
#define PHY_PMA_CMN_CTRL1 0xC800 #define PHY_PMA_CMN_CTRL1 0xC800
#define TB_ADDR_CMN_DIAG_HSCLK_SEL 0x01e0 #define TB_ADDR_CMN_DIAG_HSCLK_SEL 0x01e0
#define TB_ADDR_CMN_PLL0_VCOCAL_INIT_TMR 0x0084 #define TB_ADDR_CMN_PLL0_VCOCAL_INIT_TMR 0x0084
...@@ -109,16 +111,16 @@ struct cdns_salvo_phy { ...@@ -109,16 +111,16 @@ struct cdns_salvo_phy {
}; };
static const struct of_device_id cdns_salvo_phy_of_match[]; static const struct of_device_id cdns_salvo_phy_of_match[];
static u16 cdns_salvo_read(struct cdns_salvo_phy *salvo_phy, u32 reg) static u16 cdns_salvo_read(struct cdns_salvo_phy *salvo_phy, u32 offset, u32 reg)
{ {
return (u16)readl(salvo_phy->base + return (u16)readl(salvo_phy->base + offset +
reg * (1 << salvo_phy->data->reg_offset_shift)); reg * (1 << salvo_phy->data->reg_offset_shift));
} }
static void cdns_salvo_write(struct cdns_salvo_phy *salvo_phy, static void cdns_salvo_write(struct cdns_salvo_phy *salvo_phy, u32 offset,
u32 reg, u16 val) u32 reg, u16 val)
{ {
writel(val, salvo_phy->base + writel(val, salvo_phy->base + offset +
reg * (1 << salvo_phy->data->reg_offset_shift)); reg * (1 << salvo_phy->data->reg_offset_shift));
} }
...@@ -219,13 +221,13 @@ static int cdns_salvo_phy_init(struct phy *phy) ...@@ -219,13 +221,13 @@ static int cdns_salvo_phy_init(struct phy *phy)
for (i = 0; i < data->init_sequence_length; i++) { for (i = 0; i < data->init_sequence_length; i++) {
const struct cdns_reg_pairs *reg_pair = data->init_sequence_val + i; const struct cdns_reg_pairs *reg_pair = data->init_sequence_val + i;
cdns_salvo_write(salvo_phy, reg_pair->off, reg_pair->val); cdns_salvo_write(salvo_phy, USB3_PHY_OFFSET, reg_pair->off, reg_pair->val);
} }
/* RXDET_IN_P3_32KHZ, Receiver detect slow clock enable */ /* RXDET_IN_P3_32KHZ, Receiver detect slow clock enable */
value = cdns_salvo_read(salvo_phy, TB_ADDR_TX_RCVDETSC_CTRL); value = cdns_salvo_read(salvo_phy, USB3_PHY_OFFSET, TB_ADDR_TX_RCVDETSC_CTRL);
value |= RXDET_IN_P3_32KHZ; value |= RXDET_IN_P3_32KHZ;
cdns_salvo_write(salvo_phy, TB_ADDR_TX_RCVDETSC_CTRL, cdns_salvo_write(salvo_phy, USB3_PHY_OFFSET, TB_ADDR_TX_RCVDETSC_CTRL,
RXDET_IN_P3_32KHZ); RXDET_IN_P3_32KHZ);
udelay(10); udelay(10);
......
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