From 3f2a1227634449f79155e17813ab9c699fdeb51b Mon Sep 17 00:00:00 2001 From: William Wu Date: Sat, 7 Jan 2017 13:33:57 +0800 Subject: [PATCH] phy: rockchip-inno-usb2: support tuning phy for rk3399 This patch adds a method to tuning phy with the following parameters to improve usb driver strength and increase usb2 compatibility. 1. Set max ODT compensation voltage and current tuning reference. 2. Set max pre-emphasis level. 3. Disable the pre-emphasize in eop state and chirp state to avoid mis-trigger the disconnect detection and also avoid hs handshake fail. We don't enable the phy tuning by default. If you want to tuning phy, you can add a property "rockchip,u2phy-tuning" in u2phy node, like this: &u2phy0 { rockchip,u2phy-tuning; }; &u2phy1 { rockchip,u2phy-tuning; }; Change-Id: Iaa70e2ad3d5d06662be6c05e4d20784e5bb85ae9 Signed-off-by: William Wu Signed-off-by: Frank Wang --- .../bindings/phy/phy-rockchip-inno-usb2.yaml | 4 + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 73 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml index 110c0d4681dc..ccb2ea1e31ef 100644 --- a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml +++ b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml @@ -59,6 +59,10 @@ properties: When set the driver will request its phandle as one companion-grf for some special SoCs (e.g rv1108). + rockchip,u2phy-tuning: + $ref: /schemas/types.yaml#/definitions/flag + description: when set, tuning u2phy to improve usb2 SI. + host-port: type: object additionalProperties: false diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index f122ea08bde2..498709c725c6 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -1251,6 +1251,77 @@ static int rk3366_usb2phy_tuning(struct rockchip_usb2phy *rphy) return ret; } +static int rk3399_usb2phy_tuning(struct rockchip_usb2phy *rphy) +{ + struct device_node *node = rphy->dev->of_node; + int ret = 0; + + if (rphy->phy_cfg->reg == 0xe450) { + /* + * Disable the pre-emphasize in eop state + * and chirp state to avoid mis-trigger the + * disconnect detection and also avoid hs + * handshake fail for PHY0. + */ + ret |= regmap_write(rphy->grf, 0x4480, + GENMASK(17, 16) | 0x0); + ret |= regmap_write(rphy->grf, 0x44b4, + GENMASK(17, 16) | 0x0); + } else { + /* + * Disable the pre-emphasize in eop state + * and chirp state to avoid mis-trigger the + * disconnect detection and also avoid hs + * handshake fail for PHY1. + */ + ret |= regmap_write(rphy->grf, 0x4500, + GENMASK(17, 16) | 0x0); + ret |= regmap_write(rphy->grf, 0x4534, + GENMASK(17, 16) | 0x0); + } + + if (!of_property_read_bool(node, "rockchip,u2phy-tuning")) + return ret; + + if (rphy->phy_cfg->reg == 0xe450) { + /* + * Set max ODT compensation voltage and + * current tuning reference for PHY0. + */ + ret |= regmap_write(rphy->grf, 0x448c, + GENMASK(23, 16) | 0xe3); + + /* Set max pre-emphasis level for PHY0 */ + ret |= regmap_write(rphy->grf, 0x44b0, + GENMASK(18, 16) | 0x07); + + /* + * Set PHY0 A port squelch trigger point to 125mv + */ + ret |= regmap_write(rphy->grf, 0x4480, + GENMASK(30, 30) | 0x4000); + } else { + /* + * Set max ODT compensation voltage and + * current tuning reference for PHY1. + */ + ret |= regmap_write(rphy->grf, 0x450c, + GENMASK(23, 16) | 0xe3); + + /* Set max pre-emphasis level for PHY1 */ + ret |= regmap_write(rphy->grf, 0x4530, + GENMASK(18, 16) | 0x07); + + /* + * Set PHY1 A port squelch trigger point to 125mv + */ + ret |= regmap_write(rphy->grf, 0x4500, + GENMASK(30, 30) | 0x4000); + } + + return ret; +} + #ifdef CONFIG_PM_SLEEP static int rockchip_usb2phy_pm_suspend(struct device *dev) { @@ -1418,6 +1489,7 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = { { .reg = 0xe450, .num_ports = 2, + .phy_tuning = rk3399_usb2phy_tuning, .clkout_ctl = { 0xe450, 4, 4, 1, 0 }, .port_cfgs = { [USB2PHY_PORT_OTG] = { @@ -1457,6 +1529,7 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = { { .reg = 0xe460, .num_ports = 2, + .phy_tuning = rk3399_usb2phy_tuning, .clkout_ctl = { 0xe460, 4, 4, 1, 0 }, .port_cfgs = { [USB2PHY_PORT_OTG] = {