Am 18.09.19 um 04:15 schrieb Weijie Gao:
> This patch adds slew rate calibration for mt76x8-usb-phy, removes code
> which belongs to mt7620, and gets rid of using syscon and regmap by using
> clock driver and reset controller.
>
> Signed-off-by: Weijie Gao <weijie....@mediatek.com>
> ---
> drivers/phy/Kconfig | 2 +
> drivers/phy/mt76x8-usb-phy.c | 225 ++++++++++++++++++++++++-----------
> 2 files changed, 159 insertions(+), 68 deletions(-)
>
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index 02312273e2..5c7b221431 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -200,6 +200,8 @@ config KEYSTONE_USB_PHY
> config MT76X8_USB_PHY
> bool "MediaTek MT76x8 (7628/88) USB PHY support"
> depends on PHY
> + select CLK
> + select DM_RESET
in patch 27/28 you select those unconditionally for ARCH_MTMIPS. Thus
it's superfluous here. Maybe the depends on should be changed to PHY &&
ARCH_MTMIPS instead?
> help
> Support the USB PHY in MT76x8 SoCs
>
> diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c
> index 268da8ef6c..1e7c5f334b 100644
> --- a/drivers/phy/mt76x8-usb-phy.c
> +++ b/drivers/phy/mt76x8-usb-phy.c
> @@ -6,93 +6,185 @@
> * Copyright (C) 2017 John Crispin <j...@phrozen.org>
> */
>
> +#include <clk.h>
> #include <common.h>
> #include <dm.h>
> #include <generic-phy.h>
> -#include <regmap.h>
> -#include <reset-uclass.h>
> -#include <syscon.h>
> +#include <reset.h>
> #include <asm/io.h>
> -
> -#define RT_SYSC_REG_SYSCFG1 0x014
> -#define RT_SYSC_REG_CLKCFG1 0x030
> -#define RT_SYSC_REG_USB_PHY_CFG 0x05c
> +#include <linux/bitops.h>
>
> #define OFS_U2_PHY_AC0 0x800
> +#define USBPLL_FBDIV_S 16
> +#define USBPLL_FBDIV_M GENMASK(22, 16)
> +#define BG_TRIM_S 8
> +#define BG_TRIM_M GENMASK(11, 8)
> +#define BG_RBSEL_S 6
> +#define BG_RBSEL_M GENMASK(7, 6)
> +#define BG_RASEL_S 4
> +#define BG_RASEL_M GENMASK(5, 4)
> +#define BGR_DIV_S 2
> +#define BGR_DIV_M GENMASK(3, 2)
> +#define CHP_EN BIT(1)
> +
> #define OFS_U2_PHY_AC1 0x804
> +#define VRT_VREF_SEL_S 28
> +#define VRT_VREF_SEL_M GENMASK(30, 28)
> +#define TERM_VREF_SEL_S 24
> +#define TERM_VREF_SEL_M GENMASK(26, 24)
> +#define USBPLL_RSVD BIT(4)
> +#define USBPLL_ACCEN BIT(3)
> +#define USBPLL_LF BIT(2)
> +
> #define OFS_U2_PHY_AC2 0x808
> +
> #define OFS_U2_PHY_ACR0 0x810
> -#define OFS_U2_PHY_ACR1 0x814
> -#define OFS_U2_PHY_ACR2 0x818
> +#define HSTX_SRCAL_EN BIT(23)
> +#define HSTX_SRCTRL_S 16
> +#define HSTX_SRCTRL_M GENMASK(18, 16)
> +
> #define OFS_U2_PHY_ACR3 0x81C
> -#define OFS_U2_PHY_ACR4 0x820
> -#define OFS_U2_PHY_AMON0 0x824
> +#define HSTX_DBIST_S 28
> +#define HSTX_DBIST_M GENMASK(31, 28)
> +#define HSRX_BIAS_EN_SEL_S 20
> +#define HSRX_BIAS_EN_SEL_M GENMASK(21, 20)
> +
> #define OFS_U2_PHY_DCR0 0x860
> -#define OFS_U2_PHY_DCR1 0x864
> +#define PHYD_RESERVE_S 8
> +#define PHYD_RESERVE_M GENMASK(23, 8)
> +#define CDR_FILT_S 0
> +#define CDR_FILT_M GENMASK(3, 0)
> +
> #define OFS_U2_PHY_DTM0 0x868
> -#define OFS_U2_PHY_DTM1 0x86C
> +#define FORCE_USB_CLKEN BIT(25)
> +
> +#define OFS_FM_CR0 0xf00
> +#define FREQDET_EN BIT(24)
> +#define CYCLECNT_S 0
> +#define CYCLECNT_M GENMASK(23, 0)
>
> -#define RT_RSTCTRL_UDEV BIT(25)
> -#define RT_RSTCTRL_UHST BIT(22)
> -#define RT_SYSCFG1_USB0_HOST_MODE BIT(10)
> +#define OFS_FM_MONR0 0xf0c
>
> -#define MT7620_CLKCFG1_UPHY0_CLK_EN BIT(25)
> -#define MT7620_CLKCFG1_UPHY1_CLK_EN BIT(22)
> -#define RT_CLKCFG1_UPHY1_CLK_EN BIT(20)
> -#define RT_CLKCFG1_UPHY0_CLK_EN BIT(18)
> +#define OFS_FM_MONR1 0xf10
> +#define FRCK_EN BIT(8)
>
> -#define USB_PHY_UTMI_8B60M BIT(1)
> -#define UDEV_WAKEUP BIT(0)
> +#define U2_SR_COEF_7628 32
>
> struct mt76x8_usb_phy {
> - u32 clk;
> void __iomem *base;
> - struct regmap *sysctl;
> + struct clk cg; /* for clock gating */
> + struct reset_ctl rst_phy;
> };
>
> -static void u2_phy_w32(struct mt76x8_usb_phy *phy, u32 val, u32 reg)
> +static void phy_w32(struct mt76x8_usb_phy *phy, u32 reg, u32 val)
> {
> writel(val, phy->base + reg);
> }
>
> -static u32 u2_phy_r32(struct mt76x8_usb_phy *phy, u32 reg)
> +static u32 phy_r32(struct mt76x8_usb_phy *phy, u32 reg)
> {
> return readl(phy->base + reg);
> }
>
> +static void phy_rmw32(struct mt76x8_usb_phy *phy, u32 reg, u32 clr, u32 set)
> +{
> + clrsetbits_32(phy->base + reg, clr, set);
> +}
> +
> static void mt76x8_usb_phy_init(struct mt76x8_usb_phy *phy)
> {
> - u2_phy_r32(phy, OFS_U2_PHY_AC2);
> - u2_phy_r32(phy, OFS_U2_PHY_ACR0);
> - u2_phy_r32(phy, OFS_U2_PHY_DCR0);
> -
> - u2_phy_w32(phy, 0x00ffff02, OFS_U2_PHY_DCR0);
> - u2_phy_r32(phy, OFS_U2_PHY_DCR0);
> - u2_phy_w32(phy, 0x00555502, OFS_U2_PHY_DCR0);
> - u2_phy_r32(phy, OFS_U2_PHY_DCR0);
> - u2_phy_w32(phy, 0x00aaaa02, OFS_U2_PHY_DCR0);
> - u2_phy_r32(phy, OFS_U2_PHY_DCR0);
> - u2_phy_w32(phy, 0x00000402, OFS_U2_PHY_DCR0);
> - u2_phy_r32(phy, OFS_U2_PHY_DCR0);
> - u2_phy_w32(phy, 0x0048086a, OFS_U2_PHY_AC0);
> - u2_phy_w32(phy, 0x4400001c, OFS_U2_PHY_AC1);
> - u2_phy_w32(phy, 0xc0200000, OFS_U2_PHY_ACR3);
> - u2_phy_w32(phy, 0x02000000, OFS_U2_PHY_DTM0);
> + phy_r32(phy, OFS_U2_PHY_AC2);
> + phy_r32(phy, OFS_U2_PHY_ACR0);
> + phy_r32(phy, OFS_U2_PHY_DCR0);
> +
> + phy_w32(phy, OFS_U2_PHY_DCR0,
> + (0xffff << PHYD_RESERVE_S) | (2 << CDR_FILT_S));
> + phy_r32(phy, OFS_U2_PHY_DCR0);
> +
> + phy_w32(phy, OFS_U2_PHY_DCR0,
> + (0x5555 << PHYD_RESERVE_S) | (2 << CDR_FILT_S));
> + phy_r32(phy, OFS_U2_PHY_DCR0);
> +
> + phy_w32(phy, OFS_U2_PHY_DCR0,
> + (0xaaaa << PHYD_RESERVE_S) | (2 << CDR_FILT_S));
> + phy_r32(phy, OFS_U2_PHY_DCR0);
> +
> + phy_w32(phy, OFS_U2_PHY_DCR0,
> + (4 << PHYD_RESERVE_S) | (2 << CDR_FILT_S));
> + phy_r32(phy, OFS_U2_PHY_DCR0);
> +
> + phy_w32(phy, OFS_U2_PHY_AC0,
> + (0x48 << USBPLL_FBDIV_S) | (8 << BG_TRIM_S) |
> + (1 << BG_RBSEL_S) | (2 << BG_RASEL_S) | (2 << BGR_DIV_S) |
> + CHP_EN);
> +
> + phy_w32(phy, OFS_U2_PHY_AC1,
> + (4 << VRT_VREF_SEL_S) | (4 << TERM_VREF_SEL_S) | USBPLL_RSVD |
> + USBPLL_ACCEN | USBPLL_LF);
> +
> + phy_w32(phy, OFS_U2_PHY_ACR3,
> + (12 << HSTX_DBIST_S) | (2 << HSRX_BIAS_EN_SEL_S));
> +
> + phy_w32(phy, OFS_U2_PHY_DTM0, FORCE_USB_CLKEN);
> +}
> +
> +static void mt76x8_usb_phy_sr_calibrate(struct mt76x8_usb_phy *phy)
> +{
> + u32 fmout, tmp = 4;
> + int i;
> +
> + /* Enable HS TX SR calibration */
> + phy_rmw32(phy, OFS_U2_PHY_ACR0, 0, HSTX_SRCAL_EN);
> + mdelay(1);
> +
> + /* Enable free run clock */
> + phy_rmw32(phy, OFS_FM_MONR1, 0, FRCK_EN);
> +
> + /* Set cycle count = 0x400 */
> + phy_rmw32(phy, OFS_FM_CR0, CYCLECNT_M, 0x400 << CYCLECNT_S);
> +
> + /* Enable frequency meter */
> + phy_rmw32(phy, OFS_FM_CR0, 0, FREQDET_EN);
> +
> + /* Wait for FM detection done, set timeout to 10ms */
> + for (i = 0; i < 10; i++) {
> + fmout = phy_r32(phy, OFS_FM_MONR0);
> +
> + if (fmout)
> + break;
> +
> + mdelay(1);
> + }
> +
> + /* Disable frequency meter */
> + phy_rmw32(phy, OFS_FM_CR0, FREQDET_EN, 0);
> +
> + /* Disable free run clock */
> + phy_rmw32(phy, OFS_FM_MONR1, FRCK_EN, 0);
> +
> + /* Disable HS TX SR calibration */
> + phy_rmw32(phy, OFS_U2_PHY_ACR0, HSTX_SRCAL_EN, 0);
> + mdelay(1);
> +
> + if (fmout) {
> + /*
> + * set reg = (1024 / FM_OUT) * 25 * 0.028
> + * (round to the nearest digits)
> + */
> + tmp = (((1024 * 25 * U2_SR_COEF_7628) / fmout) + 500) / 1000;
> + }
> +
> + phy_rmw32(phy, OFS_U2_PHY_ACR0, HSTX_SRCTRL_M,
> + (tmp << HSTX_SRCTRL_S) & HSTX_SRCTRL_M);
> }
>
> static int mt76x8_usb_phy_power_on(struct phy *_phy)
> {
> struct mt76x8_usb_phy *phy = dev_get_priv(_phy->dev);
> - u32 t;
>
> - /* enable the phy */
> - regmap_update_bits(phy->sysctl, RT_SYSC_REG_CLKCFG1,
> - phy->clk, phy->clk);
> + clk_enable(&phy->cg);
>
> - /* setup host mode */
> - regmap_update_bits(phy->sysctl, RT_SYSC_REG_SYSCFG1,
> - RT_SYSCFG1_USB0_HOST_MODE,
> - RT_SYSCFG1_USB0_HOST_MODE);
> + reset_deassert(&phy->rst_phy);
>
> /*
> * The SDK kernel had a delay of 100ms. however on device
> @@ -100,17 +192,8 @@ static int mt76x8_usb_phy_power_on(struct phy *_phy)
> */
> mdelay(10);
>
> - if (phy->base)
> - mt76x8_usb_phy_init(phy);
> -
> - /* print some status info */
> - regmap_read(phy->sysctl, RT_SYSC_REG_USB_PHY_CFG, &t);
> - printf("remote usb device wakeup %s\n",
> - (t & UDEV_WAKEUP) ? "enabled" : "disabled");
> - if (t & USB_PHY_UTMI_8B60M)
> - printf("UTMI 8bit 60MHz\n");
> - else
> - printf("UTMI 16bit 30MHz\n");
> + mt76x8_usb_phy_init(phy);
> + mt76x8_usb_phy_sr_calibrate(phy);
>
> return 0;
> }
> @@ -119,9 +202,9 @@ static int mt76x8_usb_phy_power_off(struct phy *_phy)
> {
> struct mt76x8_usb_phy *phy = dev_get_priv(_phy->dev);
>
> - /* disable the phy */
> - regmap_update_bits(phy->sysctl, RT_SYSC_REG_CLKCFG1,
> - phy->clk, 0);
> + clk_disable(&phy->cg);
> +
> + reset_assert(&phy->rst_phy);
>
> return 0;
> }
> @@ -129,15 +212,21 @@ static int mt76x8_usb_phy_power_off(struct phy *_phy)
> static int mt76x8_usb_phy_probe(struct udevice *dev)
> {
> struct mt76x8_usb_phy *phy = dev_get_priv(dev);
> -
> - phy->sysctl = syscon_regmap_lookup_by_phandle(dev, "ralink,sysctl");
> - if (IS_ERR(phy->sysctl))
> - return PTR_ERR(phy->sysctl);
> + int ret;
>
> phy->base = dev_read_addr_ptr(dev);
> if (!phy->base)
> return -EINVAL;
>
> + /* clock gate */
> + ret = clk_get_by_name(dev, "cg", &phy->cg);
> + if (ret)
> + return ret;
> +
> + ret = reset_get_by_name(dev, "phy", &phy->rst_phy);
> + if (ret)
> + return ret;
> +
> return 0;
> }
>
>
--
- Daniel
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
