linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver
@ 2020-06-03 13:22 Ansuel Smith
  2020-06-03 13:22 ` [PATCH v6 2/2] devicetree: bindings: phy: Document ipq806x dwc3 qcom phy Ansuel Smith
  2020-06-04 16:19 ` [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver Jonathan McDowell
  0 siblings, 2 replies; 7+ messages in thread
From: Ansuel Smith @ 2020-06-03 13:22 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: Ansuel Smith, Andy Gross, Andy Gross, Kishon Vijay Abraham I,
	Rob Herring, Mark Rutland, linux-arm-msm, linux-kernel,
	devicetree

This has lost in the original push for the dwc3 qcom driver.
This is needed for ipq806x SoC as without this the usb ports
doesn't work at all.

Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
v6:
* Use GENMASK instead of hex value
v4:
* Add qcom to specific bindings
v3:
* Use reg instead of regmap phandle
v2:
* Renamed config from PHY_QCOM_DWC3 to PHY_QCOM_IPQ806X_USB
* Rename inline function to generic name to reduce length
* Fix check reported by checkpatch --strict
* Rename compatible to qcom,ipq806x-usb-phy-(hs/ss)

 drivers/phy/qualcomm/Kconfig                |  12 +
 drivers/phy/qualcomm/Makefile               |   1 +
 drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 593 ++++++++++++++++++++
 3 files changed, 606 insertions(+)
 create mode 100644 drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c

diff --git a/drivers/phy/qualcomm/Kconfig b/drivers/phy/qualcomm/Kconfig
index e46824da29f6..9d41c3d12800 100644
--- a/drivers/phy/qualcomm/Kconfig
+++ b/drivers/phy/qualcomm/Kconfig
@@ -91,3 +91,15 @@ config PHY_QCOM_USB_HSIC
 	select GENERIC_PHY
 	help
 	  Support for the USB HSIC ULPI compliant PHY on QCOM chipsets.
+
+config PHY_QCOM_IPQ806X_USB
+	tristate "Qualcomm IPQ806x DWC3 USB PHY driver"
+	depends on ARCH_QCOM
+	depends on HAS_IOMEM
+	depends on OF
+	select GENERIC_PHY
+	help
+	  This option enables support for the Synopsis PHYs present inside the
+	  Qualcomm USB3.0 DWC3 controller on ipq806x SoC. This driver supports
+	  both HS and SS PHY controllers.
+
diff --git a/drivers/phy/qualcomm/Makefile b/drivers/phy/qualcomm/Makefile
index 283251d6a5d9..8629299c1495 100644
--- a/drivers/phy/qualcomm/Makefile
+++ b/drivers/phy/qualcomm/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_PHY_QCOM_UFS_14NM)		+= phy-qcom-ufs-qmp-14nm.o
 obj-$(CONFIG_PHY_QCOM_UFS_20NM)		+= phy-qcom-ufs-qmp-20nm.o
 obj-$(CONFIG_PHY_QCOM_USB_HS) 		+= phy-qcom-usb-hs.o
 obj-$(CONFIG_PHY_QCOM_USB_HSIC) 	+= phy-qcom-usb-hsic.o
+obj-$(CONFIG_PHY_QCOM_IPQ806X_USB)		+= phy-qcom-ipq806x-usb.o
diff --git a/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
new file mode 100644
index 000000000000..f37cd8760118
--- /dev/null
+++ b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
@@ -0,0 +1,593 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright (c) 2014-2015, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
+
+/* USB QSCRATCH Hardware registers */
+#define QSCRATCH_GENERAL_CFG		(0x08)
+#define HSUSB_PHY_CTRL_REG		(0x10)
+
+/* PHY_CTRL_REG */
+#define HSUSB_CTRL_DMSEHV_CLAMP		BIT(24)
+#define HSUSB_CTRL_USB2_SUSPEND		BIT(23)
+#define HSUSB_CTRL_UTMI_CLK_EN		BIT(21)
+#define HSUSB_CTRL_UTMI_OTG_VBUS_VALID	BIT(20)
+#define HSUSB_CTRL_USE_CLKCORE		BIT(18)
+#define HSUSB_CTRL_DPSEHV_CLAMP		BIT(17)
+#define HSUSB_CTRL_COMMONONN		BIT(11)
+#define HSUSB_CTRL_ID_HV_CLAMP		BIT(9)
+#define HSUSB_CTRL_OTGSESSVLD_CLAMP	BIT(8)
+#define HSUSB_CTRL_CLAMP_EN		BIT(7)
+#define HSUSB_CTRL_RETENABLEN		BIT(1)
+#define HSUSB_CTRL_POR			BIT(0)
+
+/* QSCRATCH_GENERAL_CFG */
+#define HSUSB_GCFG_XHCI_REV		BIT(2)
+
+/* USB QSCRATCH Hardware registers */
+#define SSUSB_PHY_CTRL_REG		(0x00)
+#define SSUSB_PHY_PARAM_CTRL_1		(0x04)
+#define SSUSB_PHY_PARAM_CTRL_2		(0x08)
+#define CR_PROTOCOL_DATA_IN_REG		(0x0c)
+#define CR_PROTOCOL_DATA_OUT_REG	(0x10)
+#define CR_PROTOCOL_CAP_ADDR_REG	(0x14)
+#define CR_PROTOCOL_CAP_DATA_REG	(0x18)
+#define CR_PROTOCOL_READ_REG		(0x1c)
+#define CR_PROTOCOL_WRITE_REG		(0x20)
+
+/* PHY_CTRL_REG */
+#define SSUSB_CTRL_REF_USE_PAD		BIT(28)
+#define SSUSB_CTRL_TEST_POWERDOWN	BIT(27)
+#define SSUSB_CTRL_LANE0_PWR_PRESENT	BIT(24)
+#define SSUSB_CTRL_SS_PHY_EN		BIT(8)
+#define SSUSB_CTRL_SS_PHY_RESET		BIT(7)
+
+/* SSPHY control registers - Does this need 0x30? */
+#define SSPHY_CTRL_RX_OVRD_IN_HI(lane)	(0x1006 + 0x100 * (lane))
+#define SSPHY_CTRL_TX_OVRD_DRV_LO(lane)	(0x1002 + 0x100 * (lane))
+
+/* SSPHY SoC version specific values */
+#define SSPHY_RX_EQ_VALUE		4 /* Override value for rx_eq */
+/* Override value for transmit preemphasis */
+#define SSPHY_TX_DEEMPH_3_5DB		23
+/* Override value for mpll */
+#define SSPHY_MPLL_VALUE		0
+
+/* QSCRATCH PHY_PARAM_CTRL1 fields */
+#define PHY_PARAM_CTRL1_TX_FULL_SWING_MASK	GENMASK(26, 19)
+#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK	GENMASK(19, 13)
+#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK	GENMASK(13, 7)
+#define PHY_PARAM_CTRL1_LOS_BIAS_MASK		GENMASK(7, 2)
+
+#define PHY_PARAM_CTRL1_MASK				\
+		(PHY_PARAM_CTRL1_TX_FULL_SWING_MASK |	\
+		 PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK |	\
+		 PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK |	\
+		 PHY_PARAM_CTRL1_LOS_BIAS_MASK)
+
+#define PHY_PARAM_CTRL1_TX_FULL_SWING(x)	\
+		(((x) << 20) & PHY_PARAM_CTRL1_TX_FULL_SWING_MASK)
+#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB(x)	\
+		(((x) << 14) & PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK)
+#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(x)	\
+		(((x) <<  8) & PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK)
+#define PHY_PARAM_CTRL1_LOS_BIAS(x)	\
+		(((x) <<  3) & PHY_PARAM_CTRL1_LOS_BIAS_MASK)
+
+/* RX OVRD IN HI bits */
+#define RX_OVRD_IN_HI_RX_RESET_OVRD		BIT(13)
+#define RX_OVRD_IN_HI_RX_RX_RESET		BIT(12)
+#define RX_OVRD_IN_HI_RX_EQ_OVRD		BIT(11)
+#define RX_OVRD_IN_HI_RX_EQ_MASK		GENMASK(10, 7)
+#define RX_OVRD_IN_HI_RX_EQ(x)			((x) << 8)
+#define RX_OVRD_IN_HI_RX_EQ_EN_OVRD		BIT(7)
+#define RX_OVRD_IN_HI_RX_EQ_EN			BIT(6)
+#define RX_OVRD_IN_HI_RX_LOS_FILTER_OVRD	BIT(5)
+#define RX_OVRD_IN_HI_RX_LOS_FILTER_MASK	GENMASK(4, 2)
+#define RX_OVRD_IN_HI_RX_RATE_OVRD		BIT(2)
+#define RX_OVRD_IN_HI_RX_RATE_MASK		GENMASK(2, 0)
+
+/* TX OVRD DRV LO register bits */
+#define TX_OVRD_DRV_LO_AMPLITUDE_MASK		GENMASK(6, 0)
+#define TX_OVRD_DRV_LO_PREEMPH_MASK		GENMASK(13, 6)
+#define TX_OVRD_DRV_LO_PREEMPH(x)		((x) << 7)
+#define TX_OVRD_DRV_LO_EN			BIT(14)
+
+/* MPLL bits */
+#define SSPHY_MPLL_MASK				GENMASK(8, 5)
+#define SSPHY_MPLL(x)				((x) << 5)
+
+/* SS CAP register bits */
+#define SS_CR_CAP_ADDR_REG			BIT(0)
+#define SS_CR_CAP_DATA_REG			BIT(0)
+#define SS_CR_READ_REG				BIT(0)
+#define SS_CR_WRITE_REG				BIT(0)
+
+struct usb_phy {
+	void __iomem		*base;
+	struct device		*dev;
+	struct clk		*xo_clk;
+	struct clk		*ref_clk;
+	u32			rx_eq;
+	u32			tx_deamp_3_5db;
+	u32			mpll;
+};
+
+struct phy_drvdata {
+	struct phy_ops	ops;
+	u32		clk_rate;
+};
+
+/**
+ * Write register and read back masked value to confirm it is written
+ *
+ * @base - QCOM DWC3 PHY base virtual address.
+ * @offset - register offset.
+ * @mask - register bitmask specifying what should be updated
+ * @val - value to write.
+ */
+static inline void usb_phy_write_readback(struct usb_phy *phy_dwc3,
+					  u32 offset,
+					  const u32 mask, u32 val)
+{
+	u32 write_val, tmp = readl(phy_dwc3->base + offset);
+
+	tmp &= ~mask;		/* retain other bits */
+	write_val = tmp | val;
+
+	writel(write_val, phy_dwc3->base + offset);
+
+	/* Read back to see if val was written */
+	tmp = readl(phy_dwc3->base + offset);
+	tmp &= mask;		/* clear other bits */
+
+	if (tmp != val)
+		dev_err(phy_dwc3->dev, "write: %x to QSCRATCH: %x FAILED\n",
+			val, offset);
+}
+
+static int wait_for_latch(void __iomem *addr)
+{
+	u32 retry = 10;
+
+	while (true) {
+		if (!readl(addr))
+			break;
+
+		if (--retry == 0)
+			return -ETIMEDOUT;
+
+		usleep_range(10, 20);
+	}
+
+	return 0;
+}
+
+/**
+ * Write SSPHY register
+ *
+ * @base - QCOM DWC3 PHY base virtual address.
+ * @addr - SSPHY address to write.
+ * @val - value to write.
+ */
+static int usb_ss_write_phycreg(struct usb_phy *phy_dwc3,
+				u32 addr, u32 val)
+{
+	int ret;
+
+	writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
+	writel(SS_CR_CAP_ADDR_REG,
+	       phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
+
+	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
+	if (ret)
+		goto err_wait;
+
+	writel(val, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
+	writel(SS_CR_CAP_DATA_REG,
+	       phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG);
+
+	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG);
+	if (ret)
+		goto err_wait;
+
+	writel(SS_CR_WRITE_REG, phy_dwc3->base + CR_PROTOCOL_WRITE_REG);
+
+	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_WRITE_REG);
+
+err_wait:
+	if (ret)
+		dev_err(phy_dwc3->dev, "timeout waiting for latch\n");
+	return ret;
+}
+
+/**
+ * Read SSPHY register.
+ *
+ * @base - QCOM DWC3 PHY base virtual address.
+ * @addr - SSPHY address to read.
+ */
+static int usb_ss_read_phycreg(struct usb_phy *phy_dwc3,
+			       u32 addr, u32 *val)
+{
+	int ret;
+
+	writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
+	writel(SS_CR_CAP_ADDR_REG,
+	       phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
+
+	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
+	if (ret)
+		goto err_wait;
+
+	/*
+	 * Due to hardware bug, first read of SSPHY register might be
+	 * incorrect. Hence as workaround, SW should perform SSPHY register
+	 * read twice, but use only second read and ignore first read.
+	 */
+	writel(SS_CR_READ_REG, phy_dwc3->base + CR_PROTOCOL_READ_REG);
+
+	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_READ_REG);
+	if (ret)
+		goto err_wait;
+
+	/* throwaway read */
+	readl(phy_dwc3->base + CR_PROTOCOL_DATA_OUT_REG);
+
+	writel(SS_CR_READ_REG, phy_dwc3->base + CR_PROTOCOL_READ_REG);
+
+	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_READ_REG);
+	if (ret)
+		goto err_wait;
+
+	*val = readl(phy_dwc3->base + CR_PROTOCOL_DATA_OUT_REG);
+
+err_wait:
+	return ret;
+}
+
+static int qcom_ipq806x_usb_hs_phy_init(struct phy *phy)
+{
+	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
+	int ret;
+	u32 val;
+
+	ret = clk_prepare_enable(phy_dwc3->xo_clk);
+	if (ret)
+		return ret;
+
+	ret = clk_prepare_enable(phy_dwc3->ref_clk);
+	if (ret) {
+		clk_disable_unprepare(phy_dwc3->xo_clk);
+		return ret;
+	}
+
+	/*
+	 * HSPHY Initialization: Enable UTMI clock, select 19.2MHz fsel
+	 * enable clamping, and disable RETENTION (power-on default is ENABLED)
+	 */
+	val = HSUSB_CTRL_DPSEHV_CLAMP | HSUSB_CTRL_DMSEHV_CLAMP |
+		HSUSB_CTRL_RETENABLEN  | HSUSB_CTRL_COMMONONN |
+		HSUSB_CTRL_OTGSESSVLD_CLAMP | HSUSB_CTRL_ID_HV_CLAMP |
+		HSUSB_CTRL_DPSEHV_CLAMP | HSUSB_CTRL_UTMI_OTG_VBUS_VALID |
+		HSUSB_CTRL_UTMI_CLK_EN | HSUSB_CTRL_CLAMP_EN | 0x70;
+
+	/* use core clock if external reference is not present */
+	if (!phy_dwc3->xo_clk)
+		val |= HSUSB_CTRL_USE_CLKCORE;
+
+	writel(val, phy_dwc3->base + HSUSB_PHY_CTRL_REG);
+	usleep_range(2000, 2200);
+
+	/* Disable (bypass) VBUS and ID filters */
+	writel(HSUSB_GCFG_XHCI_REV, phy_dwc3->base + QSCRATCH_GENERAL_CFG);
+
+	return 0;
+}
+
+static int qcom_ipq806x_usb_hs_phy_exit(struct phy *phy)
+{
+	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
+
+	clk_disable_unprepare(phy_dwc3->ref_clk);
+	clk_disable_unprepare(phy_dwc3->xo_clk);
+
+	return 0;
+}
+
+static int qcom_ipq806x_usb_ss_phy_init(struct phy *phy)
+{
+	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
+	int ret;
+	u32 data = 0;
+
+	ret = clk_prepare_enable(phy_dwc3->xo_clk);
+	if (ret)
+		return ret;
+
+	ret = clk_prepare_enable(phy_dwc3->ref_clk);
+	if (ret) {
+		clk_disable_unprepare(phy_dwc3->xo_clk);
+		return ret;
+	}
+
+	/* reset phy */
+	data = readl(phy_dwc3->base + SSUSB_PHY_CTRL_REG);
+	writel(data | SSUSB_CTRL_SS_PHY_RESET,
+	       phy_dwc3->base + SSUSB_PHY_CTRL_REG);
+	usleep_range(2000, 2200);
+	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
+
+	/* clear REF_PAD if we don't have XO clk */
+	if (!phy_dwc3->xo_clk)
+		data &= ~SSUSB_CTRL_REF_USE_PAD;
+	else
+		data |= SSUSB_CTRL_REF_USE_PAD;
+
+	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
+
+	/* wait for ref clk to become stable, this can take up to 30ms */
+	msleep(30);
+
+	data |= SSUSB_CTRL_SS_PHY_EN | SSUSB_CTRL_LANE0_PWR_PRESENT;
+	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
+
+	/*
+	 * WORKAROUND: There is SSPHY suspend bug due to which USB enumerates
+	 * in HS mode instead of SS mode. Workaround it by asserting
+	 * LANE0.TX_ALT_BLOCK.EN_ALT_BUS to enable TX to use alt bus mode
+	 */
+	ret = usb_ss_read_phycreg(phy_dwc3, 0x102D, &data);
+	if (ret)
+		goto err_phy_trans;
+
+	data |= (1 << 7);
+	ret = usb_ss_write_phycreg(phy_dwc3, 0x102D, data);
+	if (ret)
+		goto err_phy_trans;
+
+	ret = usb_ss_read_phycreg(phy_dwc3, 0x1010, &data);
+	if (ret)
+		goto err_phy_trans;
+
+	data &= ~0xff0;
+	data |= 0x20;
+	ret = usb_ss_write_phycreg(phy_dwc3, 0x1010, data);
+	if (ret)
+		goto err_phy_trans;
+
+	/*
+	 * Fix RX Equalization setting as follows
+	 * LANE0.RX_OVRD_IN_HI. RX_EQ_EN set to 0
+	 * LANE0.RX_OVRD_IN_HI.RX_EQ_EN_OVRD set to 1
+	 * LANE0.RX_OVRD_IN_HI.RX_EQ set based on SoC version
+	 * LANE0.RX_OVRD_IN_HI.RX_EQ_OVRD set to 1
+	 */
+	ret = usb_ss_read_phycreg(phy_dwc3,
+				  SSPHY_CTRL_RX_OVRD_IN_HI(0), &data);
+	if (ret)
+		goto err_phy_trans;
+
+	data &= ~RX_OVRD_IN_HI_RX_EQ_EN;
+	data |= RX_OVRD_IN_HI_RX_EQ_EN_OVRD;
+	data &= ~RX_OVRD_IN_HI_RX_EQ_MASK;
+	data |= RX_OVRD_IN_HI_RX_EQ(phy_dwc3->rx_eq);
+	data |= RX_OVRD_IN_HI_RX_EQ_OVRD;
+	ret = usb_ss_write_phycreg(phy_dwc3,
+				   SSPHY_CTRL_RX_OVRD_IN_HI(0), data);
+	if (ret)
+		goto err_phy_trans;
+
+	/*
+	 * Set EQ and TX launch amplitudes as follows
+	 * LANE0.TX_OVRD_DRV_LO.PREEMPH set based on SoC version
+	 * LANE0.TX_OVRD_DRV_LO.AMPLITUDE set to 110
+	 * LANE0.TX_OVRD_DRV_LO.EN set to 1.
+	 */
+	ret = usb_ss_read_phycreg(phy_dwc3,
+				  SSPHY_CTRL_TX_OVRD_DRV_LO(0), &data);
+	if (ret)
+		goto err_phy_trans;
+
+	data &= ~TX_OVRD_DRV_LO_PREEMPH_MASK;
+	data |= TX_OVRD_DRV_LO_PREEMPH(phy_dwc3->tx_deamp_3_5db);
+	data &= ~TX_OVRD_DRV_LO_AMPLITUDE_MASK;
+	data |= 0x6E;
+	data |= TX_OVRD_DRV_LO_EN;
+	ret = usb_ss_write_phycreg(phy_dwc3,
+				   SSPHY_CTRL_TX_OVRD_DRV_LO(0), data);
+	if (ret)
+		goto err_phy_trans;
+
+	data = 0;
+	data &= ~SSPHY_MPLL_MASK;
+	data |= SSPHY_MPLL(phy_dwc3->mpll);
+	usb_ss_write_phycreg(phy_dwc3, 0x30, data);
+
+	/*
+	 * Set the QSCRATCH PHY_PARAM_CTRL1 parameters as follows
+	 * TX_FULL_SWING [26:20] amplitude to 110
+	 * TX_DEEMPH_6DB [19:14] to 32
+	 * TX_DEEMPH_3_5DB [13:8] set based on SoC version
+	 * LOS_BIAS [7:3] to 9
+	 */
+	data = readl(phy_dwc3->base + SSUSB_PHY_PARAM_CTRL_1);
+
+	data &= ~PHY_PARAM_CTRL1_MASK;
+
+	data |= PHY_PARAM_CTRL1_TX_FULL_SWING(0x6e) |
+		PHY_PARAM_CTRL1_TX_DEEMPH_6DB(0x20) |
+		PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(phy_dwc3->tx_deamp_3_5db) |
+		PHY_PARAM_CTRL1_LOS_BIAS(0x9);
+
+	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_PARAM_CTRL_1,
+			       PHY_PARAM_CTRL1_MASK, data);
+
+err_phy_trans:
+	return ret;
+}
+
+static int qcom_ipq806x_usb_ss_phy_exit(struct phy *phy)
+{
+	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
+
+	/* Sequence to put SSPHY in low power state:
+	 * 1. Clear REF_PHY_EN in PHY_CTRL_REG
+	 * 2. Clear REF_USE_PAD in PHY_CTRL_REG
+	 * 3. Set TEST_POWERED_DOWN in PHY_CTRL_REG to enable PHY retention
+	 */
+	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
+			       SSUSB_CTRL_SS_PHY_EN, 0x0);
+	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
+			       SSUSB_CTRL_REF_USE_PAD, 0x0);
+	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
+			       SSUSB_CTRL_TEST_POWERDOWN, 0x0);
+
+	clk_disable_unprepare(phy_dwc3->ref_clk);
+	clk_disable_unprepare(phy_dwc3->xo_clk);
+
+	return 0;
+}
+
+static const struct phy_drvdata qcom_ipq806x_usb_hs_drvdata = {
+	.ops = {
+		.init		= qcom_ipq806x_usb_hs_phy_init,
+		.exit		= qcom_ipq806x_usb_hs_phy_exit,
+		.owner		= THIS_MODULE,
+	},
+	.clk_rate = 60000000,
+};
+
+static const struct phy_drvdata qcom_ipq806x_usb_ss_drvdata = {
+	.ops = {
+		.init		= qcom_ipq806x_usb_ss_phy_init,
+		.exit		= qcom_ipq806x_usb_ss_phy_exit,
+		.owner		= THIS_MODULE,
+	},
+	.clk_rate = 125000000,
+};
+
+static const struct of_device_id qcom_ipq806x_usb_phy_table[] = {
+	{ .compatible = "qcom,ipq806x-usb-phy-hs",
+	  .data = &qcom_ipq806x_usb_hs_drvdata },
+	{ .compatible = "qcom,ipq806x-usb-phy-ss",
+	  .data = &qcom_ipq806x_usb_ss_drvdata },
+	{ /* Sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, qcom_ipq806x_usb_phy_table);
+
+static int qcom_ipq806x_usb_phy_probe(struct platform_device *pdev)
+{
+	struct usb_phy	*phy_dwc3;
+	struct phy_provider		*phy_provider;
+	struct phy			*generic_phy;
+	const struct of_device_id *match;
+	const struct phy_drvdata *data;
+	struct resource			*res;
+	resource_size_t			size;
+	struct device_node *np;
+
+	phy_dwc3 = devm_kzalloc(&pdev->dev, sizeof(*phy_dwc3), GFP_KERNEL);
+	if (!phy_dwc3)
+		return -ENOMEM;
+
+	match = of_match_node(qcom_ipq806x_usb_phy_table, pdev->dev.of_node);
+	data = match->data;
+
+	phy_dwc3->dev = &pdev->dev;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res)
+		return -EINVAL;
+	size = resource_size(res);
+	phy_dwc3->base = devm_ioremap(phy_dwc3->dev, res->start, size);
+
+	if (IS_ERR(phy_dwc3->base)) {
+		dev_err(phy_dwc3->dev, "failed to map reg\n");
+		return PTR_ERR(phy_dwc3->base);
+	}
+
+	phy_dwc3->ref_clk = devm_clk_get(phy_dwc3->dev, "ref");
+	if (IS_ERR(phy_dwc3->ref_clk)) {
+		dev_dbg(phy_dwc3->dev, "cannot get reference clock\n");
+		return PTR_ERR(phy_dwc3->ref_clk);
+	}
+
+	clk_set_rate(phy_dwc3->ref_clk, data->clk_rate);
+
+	phy_dwc3->xo_clk = devm_clk_get(phy_dwc3->dev, "xo");
+	if (IS_ERR(phy_dwc3->xo_clk)) {
+		dev_dbg(phy_dwc3->dev, "cannot get TCXO clock\n");
+		phy_dwc3->xo_clk = NULL;
+	}
+
+	/* Parse device node to probe HSIO settings */
+	np = of_node_get(pdev->dev.of_node);
+	if (!of_compat_cmp(match->compatible, "qcom,ipq806x-usb-phy-ss",
+			   strlen(match->compatible))) {
+		if (of_property_read_u32(np, "qcom,rx-eq", &phy_dwc3->rx_eq) ||
+		    of_property_read_u32(np, "qcom,tx-deamp_3_5db",
+					 &phy_dwc3->tx_deamp_3_5db) ||
+		    of_property_read_u32(np, "qcom,mpll", &phy_dwc3->mpll)) {
+			dev_err(phy_dwc3->dev, "cannot get HSIO settings from device node, using default values\n");
+
+			/* Default HSIO settings */
+			phy_dwc3->rx_eq = SSPHY_RX_EQ_VALUE;
+			phy_dwc3->tx_deamp_3_5db = SSPHY_TX_DEEMPH_3_5DB;
+			phy_dwc3->mpll = SSPHY_MPLL_VALUE;
+		}
+	}
+
+	generic_phy = devm_phy_create(phy_dwc3->dev, pdev->dev.of_node,
+				      &data->ops);
+
+	if (IS_ERR(generic_phy))
+		return PTR_ERR(generic_phy);
+
+	phy_set_drvdata(generic_phy, phy_dwc3);
+	platform_set_drvdata(pdev, phy_dwc3);
+
+	phy_provider = devm_of_phy_provider_register(phy_dwc3->dev,
+						     of_phy_simple_xlate);
+
+	if (IS_ERR(phy_provider))
+		return PTR_ERR(phy_provider);
+
+	return 0;
+}
+
+static struct platform_driver qcom_ipq806x_usb_phy_driver = {
+	.probe		= qcom_ipq806x_usb_phy_probe,
+	.driver		= {
+		.name	= "qcom-ipq806x-usb-phy",
+		.owner	= THIS_MODULE,
+		.of_match_table = qcom_ipq806x_usb_phy_table,
+	},
+};
+
+module_platform_driver(qcom_ipq806x_usb_phy_driver);
+
+MODULE_ALIAS("platform:phy-qcom-ipq806x-usb");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
+MODULE_AUTHOR("Ivan T. Ivanov <iivanov@mm-sol.com>");
+MODULE_DESCRIPTION("DesignWare USB3 QCOM PHY driver");
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH v6 2/2] devicetree: bindings: phy: Document ipq806x dwc3 qcom phy
  2020-06-03 13:22 [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver Ansuel Smith
@ 2020-06-03 13:22 ` Ansuel Smith
  2020-06-10 20:26   ` Rob Herring
  2020-06-04 16:19 ` [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver Jonathan McDowell
  1 sibling, 1 reply; 7+ messages in thread
From: Ansuel Smith @ 2020-06-03 13:22 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: Ansuel Smith, Andy Gross, Kishon Vijay Abraham I, Rob Herring,
	Mark Rutland, linux-arm-msm, linux-kernel, devicetree

Document dwc3 qcom phy hs and ss phy bindings needed to correctly
inizialize and use usb on ipq806x SoC.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
v6:
* Add maximum value
v5:
* Fix dt_binding_check error
v4:
* Add qcom to specific bindings
v3:
* Use explicit reg instead of regmap

 .../bindings/phy/qcom,ipq806x-usb-phy-hs.yaml | 58 ++++++++++++++
 .../bindings/phy/qcom,ipq806x-usb-phy-ss.yaml | 76 +++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml
 create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml

diff --git a/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml b/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml
new file mode 100644
index 000000000000..c019de7478e3
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml
@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/phy/qcom,ipq806x-usb-phy-hs.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm ipq806x usb DWC3 HS PHY CONTROLLER
+
+maintainers:
+  - Ansuel Smith <ansuelsmth@gmail.com>
+
+description:
+  DWC3 PHY nodes are defined to describe on-chip Synopsis Physical layer
+  controllers used in ipq806x. Each DWC3 PHY controller should have its
+  own node.
+
+properties:
+  compatible:
+    const: qcom,ipq806x-usb-phy-hs
+
+  "#phy-cells":
+    const: 0
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    minItems: 1
+    maxItems: 2
+
+  clock-names:
+    minItems: 1
+    maxItems: 2
+    description: |
+      - "ref" Is required
+      - "xo"	Optional external reference clock
+    items:
+      - const: ref
+      - const: xo
+
+required:
+  - compatible
+  - "#phy-cells"
+  - reg
+  - clocks
+  - clock-names
+
+examples:
+  - |
+    #include <dt-bindings/clock/qcom,gcc-ipq806x.h>
+
+    hs_phy_0: phy@110f8800 {
+      compatible = "qcom,ipq806x-usb-phy-hs";
+      reg = <0x110f8800 0x30>;
+      clocks = <&gcc USB30_0_UTMI_CLK>;
+      clock-names = "ref";
+      #phy-cells = <0>;
+    };
diff --git a/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml b/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml
new file mode 100644
index 000000000000..3696a8d7a5c7
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml
@@ -0,0 +1,76 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/phy/qcom,ipq806x-usb-phy-ss.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm ipq806x usb DWC3 SS PHY CONTROLLER
+
+maintainers:
+  - Ansuel Smith <ansuelsmth@gmail.com>
+
+description:
+  DWC3 PHY nodes are defined to describe on-chip Synopsis Physical layer
+  controllers used in ipq806x. Each DWC3 PHY controller should have its
+  own node.
+
+properties:
+  compatible:
+    const: qcom,ipq806x-usb-phy-ss
+
+  "#phy-cells":
+    const: 0
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    minItems: 1
+    maxItems: 2
+
+  clock-names:
+    minItems: 1
+    maxItems: 2
+    items:
+      - const: ref
+      - const: xo
+
+  qcom,rx-eq:
+    description: Override value for rx_eq.
+    default: 4
+    maximum: 7
+    allOf:
+      - $ref: /schemas/types.yaml#/definitions/uint32
+
+  qcom,tx-deamp-3_5db:
+    description: Override value for transmit preemphasis.
+    default: 23
+    maximum: 63
+    allOf:
+      - $ref: /schemas/types.yaml#/definitions/uint32
+
+  qcom,mpll:
+    description: Override value for mpll.
+    default: 0
+    maximum: 7
+    allOf:
+      - $ref: /schemas/types.yaml#/definitions/uint32
+
+required:
+  - compatible
+  - "#phy-cells"
+  - reg
+  - clocks
+  - clock-names
+
+examples:
+  - |
+    #include <dt-bindings/clock/qcom,gcc-ipq806x.h>
+
+    ss_phy_0: phy@110f8830 {
+      compatible = "qcom,ipq806x-usb-phy-ss";
+      reg = <0x110f8830 0x30>;
+      clocks = <&gcc USB30_0_MASTER_CLK>;
+      clock-names = "ref";
+      #phy-cells = <0>;
+    };
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver
  2020-06-03 13:22 [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver Ansuel Smith
  2020-06-03 13:22 ` [PATCH v6 2/2] devicetree: bindings: phy: Document ipq806x dwc3 qcom phy Ansuel Smith
@ 2020-06-04 16:19 ` Jonathan McDowell
  2020-06-05 17:00   ` R: " ansuelsmth
  1 sibling, 1 reply; 7+ messages in thread
From: Jonathan McDowell @ 2020-06-04 16:19 UTC (permalink / raw)
  To: Ansuel Smith
  Cc: Bjorn Andersson, Andy Gross, Andy Gross, Kishon Vijay Abraham I,
	Rob Herring, Mark Rutland, linux-arm-msm, linux-kernel,
	devicetree

On Wed, Jun 03, 2020 at 03:22:34PM +0200, Ansuel Smith wrote:
> This has lost in the original push for the dwc3 qcom driver.
> This is needed for ipq806x SoC as without this the usb ports
> doesn't work at all.

FWIW I tested this on my RB3011 so feel free to add:

Tested-by: Jonathan McDowell <noodles@earth.li>

One minor comment; would PHY_QCOM_USB_IPQ806X not be a better choice
than PHY_QCOM_IPQ806X_USB given the existing naming?

> Signed-off-by: Andy Gross <agross@codeaurora.org>
> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> ---
> v6:
> * Use GENMASK instead of hex value
> v4:
> * Add qcom to specific bindings
> v3:
> * Use reg instead of regmap phandle
> v2:
> * Renamed config from PHY_QCOM_DWC3 to PHY_QCOM_IPQ806X_USB
> * Rename inline function to generic name to reduce length
> * Fix check reported by checkpatch --strict
> * Rename compatible to qcom,ipq806x-usb-phy-(hs/ss)
> 
>  drivers/phy/qualcomm/Kconfig                |  12 +
>  drivers/phy/qualcomm/Makefile               |   1 +
>  drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 593 ++++++++++++++++++++
>  3 files changed, 606 insertions(+)
>  create mode 100644 drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> 
> diff --git a/drivers/phy/qualcomm/Kconfig b/drivers/phy/qualcomm/Kconfig
> index e46824da29f6..9d41c3d12800 100644
> --- a/drivers/phy/qualcomm/Kconfig
> +++ b/drivers/phy/qualcomm/Kconfig
> @@ -91,3 +91,15 @@ config PHY_QCOM_USB_HSIC
>  	select GENERIC_PHY
>  	help
>  	  Support for the USB HSIC ULPI compliant PHY on QCOM chipsets.
> +
> +config PHY_QCOM_IPQ806X_USB
> +	tristate "Qualcomm IPQ806x DWC3 USB PHY driver"
> +	depends on ARCH_QCOM
> +	depends on HAS_IOMEM
> +	depends on OF
> +	select GENERIC_PHY
> +	help
> +	  This option enables support for the Synopsis PHYs present inside the
> +	  Qualcomm USB3.0 DWC3 controller on ipq806x SoC. This driver supports
> +	  both HS and SS PHY controllers.
> +
> diff --git a/drivers/phy/qualcomm/Makefile b/drivers/phy/qualcomm/Makefile
> index 283251d6a5d9..8629299c1495 100644
> --- a/drivers/phy/qualcomm/Makefile
> +++ b/drivers/phy/qualcomm/Makefile
> @@ -10,3 +10,4 @@ obj-$(CONFIG_PHY_QCOM_UFS_14NM)		+= phy-qcom-ufs-qmp-14nm.o
>  obj-$(CONFIG_PHY_QCOM_UFS_20NM)		+= phy-qcom-ufs-qmp-20nm.o
>  obj-$(CONFIG_PHY_QCOM_USB_HS) 		+= phy-qcom-usb-hs.o
>  obj-$(CONFIG_PHY_QCOM_USB_HSIC) 	+= phy-qcom-usb-hsic.o
> +obj-$(CONFIG_PHY_QCOM_IPQ806X_USB)		+= phy-qcom-ipq806x-usb.o
> diff --git a/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> new file mode 100644
> index 000000000000..f37cd8760118
> --- /dev/null
> +++ b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> @@ -0,0 +1,593 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/* Copyright (c) 2014-2015, Code Aurora Forum. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/err.h>
> +#include <linux/io.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/phy/phy.h>
> +#include <linux/platform_device.h>
> +#include <linux/delay.h>
> +#include <linux/regmap.h>
> +#include <linux/mfd/syscon.h>
> +
> +/* USB QSCRATCH Hardware registers */
> +#define QSCRATCH_GENERAL_CFG		(0x08)
> +#define HSUSB_PHY_CTRL_REG		(0x10)
> +
> +/* PHY_CTRL_REG */
> +#define HSUSB_CTRL_DMSEHV_CLAMP		BIT(24)
> +#define HSUSB_CTRL_USB2_SUSPEND		BIT(23)
> +#define HSUSB_CTRL_UTMI_CLK_EN		BIT(21)
> +#define HSUSB_CTRL_UTMI_OTG_VBUS_VALID	BIT(20)
> +#define HSUSB_CTRL_USE_CLKCORE		BIT(18)
> +#define HSUSB_CTRL_DPSEHV_CLAMP		BIT(17)
> +#define HSUSB_CTRL_COMMONONN		BIT(11)
> +#define HSUSB_CTRL_ID_HV_CLAMP		BIT(9)
> +#define HSUSB_CTRL_OTGSESSVLD_CLAMP	BIT(8)
> +#define HSUSB_CTRL_CLAMP_EN		BIT(7)
> +#define HSUSB_CTRL_RETENABLEN		BIT(1)
> +#define HSUSB_CTRL_POR			BIT(0)
> +
> +/* QSCRATCH_GENERAL_CFG */
> +#define HSUSB_GCFG_XHCI_REV		BIT(2)
> +
> +/* USB QSCRATCH Hardware registers */
> +#define SSUSB_PHY_CTRL_REG		(0x00)
> +#define SSUSB_PHY_PARAM_CTRL_1		(0x04)
> +#define SSUSB_PHY_PARAM_CTRL_2		(0x08)
> +#define CR_PROTOCOL_DATA_IN_REG		(0x0c)
> +#define CR_PROTOCOL_DATA_OUT_REG	(0x10)
> +#define CR_PROTOCOL_CAP_ADDR_REG	(0x14)
> +#define CR_PROTOCOL_CAP_DATA_REG	(0x18)
> +#define CR_PROTOCOL_READ_REG		(0x1c)
> +#define CR_PROTOCOL_WRITE_REG		(0x20)
> +
> +/* PHY_CTRL_REG */
> +#define SSUSB_CTRL_REF_USE_PAD		BIT(28)
> +#define SSUSB_CTRL_TEST_POWERDOWN	BIT(27)
> +#define SSUSB_CTRL_LANE0_PWR_PRESENT	BIT(24)
> +#define SSUSB_CTRL_SS_PHY_EN		BIT(8)
> +#define SSUSB_CTRL_SS_PHY_RESET		BIT(7)
> +
> +/* SSPHY control registers - Does this need 0x30? */
> +#define SSPHY_CTRL_RX_OVRD_IN_HI(lane)	(0x1006 + 0x100 * (lane))
> +#define SSPHY_CTRL_TX_OVRD_DRV_LO(lane)	(0x1002 + 0x100 * (lane))
> +
> +/* SSPHY SoC version specific values */
> +#define SSPHY_RX_EQ_VALUE		4 /* Override value for rx_eq */
> +/* Override value for transmit preemphasis */
> +#define SSPHY_TX_DEEMPH_3_5DB		23
> +/* Override value for mpll */
> +#define SSPHY_MPLL_VALUE		0
> +
> +/* QSCRATCH PHY_PARAM_CTRL1 fields */
> +#define PHY_PARAM_CTRL1_TX_FULL_SWING_MASK	GENMASK(26, 19)
> +#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK	GENMASK(19, 13)
> +#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK	GENMASK(13, 7)
> +#define PHY_PARAM_CTRL1_LOS_BIAS_MASK		GENMASK(7, 2)
> +
> +#define PHY_PARAM_CTRL1_MASK				\
> +		(PHY_PARAM_CTRL1_TX_FULL_SWING_MASK |	\
> +		 PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK |	\
> +		 PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK |	\
> +		 PHY_PARAM_CTRL1_LOS_BIAS_MASK)
> +
> +#define PHY_PARAM_CTRL1_TX_FULL_SWING(x)	\
> +		(((x) << 20) & PHY_PARAM_CTRL1_TX_FULL_SWING_MASK)
> +#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB(x)	\
> +		(((x) << 14) & PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK)
> +#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(x)	\
> +		(((x) <<  8) & PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK)
> +#define PHY_PARAM_CTRL1_LOS_BIAS(x)	\
> +		(((x) <<  3) & PHY_PARAM_CTRL1_LOS_BIAS_MASK)
> +
> +/* RX OVRD IN HI bits */
> +#define RX_OVRD_IN_HI_RX_RESET_OVRD		BIT(13)
> +#define RX_OVRD_IN_HI_RX_RX_RESET		BIT(12)
> +#define RX_OVRD_IN_HI_RX_EQ_OVRD		BIT(11)
> +#define RX_OVRD_IN_HI_RX_EQ_MASK		GENMASK(10, 7)
> +#define RX_OVRD_IN_HI_RX_EQ(x)			((x) << 8)
> +#define RX_OVRD_IN_HI_RX_EQ_EN_OVRD		BIT(7)
> +#define RX_OVRD_IN_HI_RX_EQ_EN			BIT(6)
> +#define RX_OVRD_IN_HI_RX_LOS_FILTER_OVRD	BIT(5)
> +#define RX_OVRD_IN_HI_RX_LOS_FILTER_MASK	GENMASK(4, 2)
> +#define RX_OVRD_IN_HI_RX_RATE_OVRD		BIT(2)
> +#define RX_OVRD_IN_HI_RX_RATE_MASK		GENMASK(2, 0)
> +
> +/* TX OVRD DRV LO register bits */
> +#define TX_OVRD_DRV_LO_AMPLITUDE_MASK		GENMASK(6, 0)
> +#define TX_OVRD_DRV_LO_PREEMPH_MASK		GENMASK(13, 6)
> +#define TX_OVRD_DRV_LO_PREEMPH(x)		((x) << 7)
> +#define TX_OVRD_DRV_LO_EN			BIT(14)
> +
> +/* MPLL bits */
> +#define SSPHY_MPLL_MASK				GENMASK(8, 5)
> +#define SSPHY_MPLL(x)				((x) << 5)
> +
> +/* SS CAP register bits */
> +#define SS_CR_CAP_ADDR_REG			BIT(0)
> +#define SS_CR_CAP_DATA_REG			BIT(0)
> +#define SS_CR_READ_REG				BIT(0)
> +#define SS_CR_WRITE_REG				BIT(0)
> +
> +struct usb_phy {
> +	void __iomem		*base;
> +	struct device		*dev;
> +	struct clk		*xo_clk;
> +	struct clk		*ref_clk;
> +	u32			rx_eq;
> +	u32			tx_deamp_3_5db;
> +	u32			mpll;
> +};
> +
> +struct phy_drvdata {
> +	struct phy_ops	ops;
> +	u32		clk_rate;
> +};
> +
> +/**
> + * Write register and read back masked value to confirm it is written
> + *
> + * @base - QCOM DWC3 PHY base virtual address.
> + * @offset - register offset.
> + * @mask - register bitmask specifying what should be updated
> + * @val - value to write.
> + */
> +static inline void usb_phy_write_readback(struct usb_phy *phy_dwc3,
> +					  u32 offset,
> +					  const u32 mask, u32 val)
> +{
> +	u32 write_val, tmp = readl(phy_dwc3->base + offset);
> +
> +	tmp &= ~mask;		/* retain other bits */
> +	write_val = tmp | val;
> +
> +	writel(write_val, phy_dwc3->base + offset);
> +
> +	/* Read back to see if val was written */
> +	tmp = readl(phy_dwc3->base + offset);
> +	tmp &= mask;		/* clear other bits */
> +
> +	if (tmp != val)
> +		dev_err(phy_dwc3->dev, "write: %x to QSCRATCH: %x FAILED\n",
> +			val, offset);
> +}
> +
> +static int wait_for_latch(void __iomem *addr)
> +{
> +	u32 retry = 10;
> +
> +	while (true) {
> +		if (!readl(addr))
> +			break;
> +
> +		if (--retry == 0)
> +			return -ETIMEDOUT;
> +
> +		usleep_range(10, 20);
> +	}
> +
> +	return 0;
> +}
> +
> +/**
> + * Write SSPHY register
> + *
> + * @base - QCOM DWC3 PHY base virtual address.
> + * @addr - SSPHY address to write.
> + * @val - value to write.
> + */
> +static int usb_ss_write_phycreg(struct usb_phy *phy_dwc3,
> +				u32 addr, u32 val)
> +{
> +	int ret;
> +
> +	writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
> +	writel(SS_CR_CAP_ADDR_REG,
> +	       phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
> +
> +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
> +	if (ret)
> +		goto err_wait;
> +
> +	writel(val, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
> +	writel(SS_CR_CAP_DATA_REG,
> +	       phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG);
> +
> +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG);
> +	if (ret)
> +		goto err_wait;
> +
> +	writel(SS_CR_WRITE_REG, phy_dwc3->base + CR_PROTOCOL_WRITE_REG);
> +
> +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_WRITE_REG);
> +
> +err_wait:
> +	if (ret)
> +		dev_err(phy_dwc3->dev, "timeout waiting for latch\n");
> +	return ret;
> +}
> +
> +/**
> + * Read SSPHY register.
> + *
> + * @base - QCOM DWC3 PHY base virtual address.
> + * @addr - SSPHY address to read.
> + */
> +static int usb_ss_read_phycreg(struct usb_phy *phy_dwc3,
> +			       u32 addr, u32 *val)
> +{
> +	int ret;
> +
> +	writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
> +	writel(SS_CR_CAP_ADDR_REG,
> +	       phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
> +
> +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
> +	if (ret)
> +		goto err_wait;
> +
> +	/*
> +	 * Due to hardware bug, first read of SSPHY register might be
> +	 * incorrect. Hence as workaround, SW should perform SSPHY register
> +	 * read twice, but use only second read and ignore first read.
> +	 */
> +	writel(SS_CR_READ_REG, phy_dwc3->base + CR_PROTOCOL_READ_REG);
> +
> +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_READ_REG);
> +	if (ret)
> +		goto err_wait;
> +
> +	/* throwaway read */
> +	readl(phy_dwc3->base + CR_PROTOCOL_DATA_OUT_REG);
> +
> +	writel(SS_CR_READ_REG, phy_dwc3->base + CR_PROTOCOL_READ_REG);
> +
> +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_READ_REG);
> +	if (ret)
> +		goto err_wait;
> +
> +	*val = readl(phy_dwc3->base + CR_PROTOCOL_DATA_OUT_REG);
> +
> +err_wait:
> +	return ret;
> +}
> +
> +static int qcom_ipq806x_usb_hs_phy_init(struct phy *phy)
> +{
> +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> +	int ret;
> +	u32 val;
> +
> +	ret = clk_prepare_enable(phy_dwc3->xo_clk);
> +	if (ret)
> +		return ret;
> +
> +	ret = clk_prepare_enable(phy_dwc3->ref_clk);
> +	if (ret) {
> +		clk_disable_unprepare(phy_dwc3->xo_clk);
> +		return ret;
> +	}
> +
> +	/*
> +	 * HSPHY Initialization: Enable UTMI clock, select 19.2MHz fsel
> +	 * enable clamping, and disable RETENTION (power-on default is ENABLED)
> +	 */
> +	val = HSUSB_CTRL_DPSEHV_CLAMP | HSUSB_CTRL_DMSEHV_CLAMP |
> +		HSUSB_CTRL_RETENABLEN  | HSUSB_CTRL_COMMONONN |
> +		HSUSB_CTRL_OTGSESSVLD_CLAMP | HSUSB_CTRL_ID_HV_CLAMP |
> +		HSUSB_CTRL_DPSEHV_CLAMP | HSUSB_CTRL_UTMI_OTG_VBUS_VALID |
> +		HSUSB_CTRL_UTMI_CLK_EN | HSUSB_CTRL_CLAMP_EN | 0x70;
> +
> +	/* use core clock if external reference is not present */
> +	if (!phy_dwc3->xo_clk)
> +		val |= HSUSB_CTRL_USE_CLKCORE;
> +
> +	writel(val, phy_dwc3->base + HSUSB_PHY_CTRL_REG);
> +	usleep_range(2000, 2200);
> +
> +	/* Disable (bypass) VBUS and ID filters */
> +	writel(HSUSB_GCFG_XHCI_REV, phy_dwc3->base + QSCRATCH_GENERAL_CFG);
> +
> +	return 0;
> +}
> +
> +static int qcom_ipq806x_usb_hs_phy_exit(struct phy *phy)
> +{
> +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> +
> +	clk_disable_unprepare(phy_dwc3->ref_clk);
> +	clk_disable_unprepare(phy_dwc3->xo_clk);
> +
> +	return 0;
> +}
> +
> +static int qcom_ipq806x_usb_ss_phy_init(struct phy *phy)
> +{
> +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> +	int ret;
> +	u32 data = 0;
> +
> +	ret = clk_prepare_enable(phy_dwc3->xo_clk);
> +	if (ret)
> +		return ret;
> +
> +	ret = clk_prepare_enable(phy_dwc3->ref_clk);
> +	if (ret) {
> +		clk_disable_unprepare(phy_dwc3->xo_clk);
> +		return ret;
> +	}
> +
> +	/* reset phy */
> +	data = readl(phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> +	writel(data | SSUSB_CTRL_SS_PHY_RESET,
> +	       phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> +	usleep_range(2000, 2200);
> +	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> +
> +	/* clear REF_PAD if we don't have XO clk */
> +	if (!phy_dwc3->xo_clk)
> +		data &= ~SSUSB_CTRL_REF_USE_PAD;
> +	else
> +		data |= SSUSB_CTRL_REF_USE_PAD;
> +
> +	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> +
> +	/* wait for ref clk to become stable, this can take up to 30ms */
> +	msleep(30);
> +
> +	data |= SSUSB_CTRL_SS_PHY_EN | SSUSB_CTRL_LANE0_PWR_PRESENT;
> +	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> +
> +	/*
> +	 * WORKAROUND: There is SSPHY suspend bug due to which USB enumerates
> +	 * in HS mode instead of SS mode. Workaround it by asserting
> +	 * LANE0.TX_ALT_BLOCK.EN_ALT_BUS to enable TX to use alt bus mode
> +	 */
> +	ret = usb_ss_read_phycreg(phy_dwc3, 0x102D, &data);
> +	if (ret)
> +		goto err_phy_trans;
> +
> +	data |= (1 << 7);
> +	ret = usb_ss_write_phycreg(phy_dwc3, 0x102D, data);
> +	if (ret)
> +		goto err_phy_trans;
> +
> +	ret = usb_ss_read_phycreg(phy_dwc3, 0x1010, &data);
> +	if (ret)
> +		goto err_phy_trans;
> +
> +	data &= ~0xff0;
> +	data |= 0x20;
> +	ret = usb_ss_write_phycreg(phy_dwc3, 0x1010, data);
> +	if (ret)
> +		goto err_phy_trans;
> +
> +	/*
> +	 * Fix RX Equalization setting as follows
> +	 * LANE0.RX_OVRD_IN_HI. RX_EQ_EN set to 0
> +	 * LANE0.RX_OVRD_IN_HI.RX_EQ_EN_OVRD set to 1
> +	 * LANE0.RX_OVRD_IN_HI.RX_EQ set based on SoC version
> +	 * LANE0.RX_OVRD_IN_HI.RX_EQ_OVRD set to 1
> +	 */
> +	ret = usb_ss_read_phycreg(phy_dwc3,
> +				  SSPHY_CTRL_RX_OVRD_IN_HI(0), &data);
> +	if (ret)
> +		goto err_phy_trans;
> +
> +	data &= ~RX_OVRD_IN_HI_RX_EQ_EN;
> +	data |= RX_OVRD_IN_HI_RX_EQ_EN_OVRD;
> +	data &= ~RX_OVRD_IN_HI_RX_EQ_MASK;
> +	data |= RX_OVRD_IN_HI_RX_EQ(phy_dwc3->rx_eq);
> +	data |= RX_OVRD_IN_HI_RX_EQ_OVRD;
> +	ret = usb_ss_write_phycreg(phy_dwc3,
> +				   SSPHY_CTRL_RX_OVRD_IN_HI(0), data);
> +	if (ret)
> +		goto err_phy_trans;
> +
> +	/*
> +	 * Set EQ and TX launch amplitudes as follows
> +	 * LANE0.TX_OVRD_DRV_LO.PREEMPH set based on SoC version
> +	 * LANE0.TX_OVRD_DRV_LO.AMPLITUDE set to 110
> +	 * LANE0.TX_OVRD_DRV_LO.EN set to 1.
> +	 */
> +	ret = usb_ss_read_phycreg(phy_dwc3,
> +				  SSPHY_CTRL_TX_OVRD_DRV_LO(0), &data);
> +	if (ret)
> +		goto err_phy_trans;
> +
> +	data &= ~TX_OVRD_DRV_LO_PREEMPH_MASK;
> +	data |= TX_OVRD_DRV_LO_PREEMPH(phy_dwc3->tx_deamp_3_5db);
> +	data &= ~TX_OVRD_DRV_LO_AMPLITUDE_MASK;
> +	data |= 0x6E;
> +	data |= TX_OVRD_DRV_LO_EN;
> +	ret = usb_ss_write_phycreg(phy_dwc3,
> +				   SSPHY_CTRL_TX_OVRD_DRV_LO(0), data);
> +	if (ret)
> +		goto err_phy_trans;
> +
> +	data = 0;
> +	data &= ~SSPHY_MPLL_MASK;
> +	data |= SSPHY_MPLL(phy_dwc3->mpll);
> +	usb_ss_write_phycreg(phy_dwc3, 0x30, data);
> +
> +	/*
> +	 * Set the QSCRATCH PHY_PARAM_CTRL1 parameters as follows
> +	 * TX_FULL_SWING [26:20] amplitude to 110
> +	 * TX_DEEMPH_6DB [19:14] to 32
> +	 * TX_DEEMPH_3_5DB [13:8] set based on SoC version
> +	 * LOS_BIAS [7:3] to 9
> +	 */
> +	data = readl(phy_dwc3->base + SSUSB_PHY_PARAM_CTRL_1);
> +
> +	data &= ~PHY_PARAM_CTRL1_MASK;
> +
> +	data |= PHY_PARAM_CTRL1_TX_FULL_SWING(0x6e) |
> +		PHY_PARAM_CTRL1_TX_DEEMPH_6DB(0x20) |
> +		PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(phy_dwc3->tx_deamp_3_5db) |
> +		PHY_PARAM_CTRL1_LOS_BIAS(0x9);
> +
> +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_PARAM_CTRL_1,
> +			       PHY_PARAM_CTRL1_MASK, data);
> +
> +err_phy_trans:
> +	return ret;
> +}
> +
> +static int qcom_ipq806x_usb_ss_phy_exit(struct phy *phy)
> +{
> +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> +
> +	/* Sequence to put SSPHY in low power state:
> +	 * 1. Clear REF_PHY_EN in PHY_CTRL_REG
> +	 * 2. Clear REF_USE_PAD in PHY_CTRL_REG
> +	 * 3. Set TEST_POWERED_DOWN in PHY_CTRL_REG to enable PHY retention
> +	 */
> +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
> +			       SSUSB_CTRL_SS_PHY_EN, 0x0);
> +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
> +			       SSUSB_CTRL_REF_USE_PAD, 0x0);
> +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
> +			       SSUSB_CTRL_TEST_POWERDOWN, 0x0);
> +
> +	clk_disable_unprepare(phy_dwc3->ref_clk);
> +	clk_disable_unprepare(phy_dwc3->xo_clk);
> +
> +	return 0;
> +}
> +
> +static const struct phy_drvdata qcom_ipq806x_usb_hs_drvdata = {
> +	.ops = {
> +		.init		= qcom_ipq806x_usb_hs_phy_init,
> +		.exit		= qcom_ipq806x_usb_hs_phy_exit,
> +		.owner		= THIS_MODULE,
> +	},
> +	.clk_rate = 60000000,
> +};
> +
> +static const struct phy_drvdata qcom_ipq806x_usb_ss_drvdata = {
> +	.ops = {
> +		.init		= qcom_ipq806x_usb_ss_phy_init,
> +		.exit		= qcom_ipq806x_usb_ss_phy_exit,
> +		.owner		= THIS_MODULE,
> +	},
> +	.clk_rate = 125000000,
> +};
> +
> +static const struct of_device_id qcom_ipq806x_usb_phy_table[] = {
> +	{ .compatible = "qcom,ipq806x-usb-phy-hs",
> +	  .data = &qcom_ipq806x_usb_hs_drvdata },
> +	{ .compatible = "qcom,ipq806x-usb-phy-ss",
> +	  .data = &qcom_ipq806x_usb_ss_drvdata },
> +	{ /* Sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, qcom_ipq806x_usb_phy_table);
> +
> +static int qcom_ipq806x_usb_phy_probe(struct platform_device *pdev)
> +{
> +	struct usb_phy	*phy_dwc3;
> +	struct phy_provider		*phy_provider;
> +	struct phy			*generic_phy;
> +	const struct of_device_id *match;
> +	const struct phy_drvdata *data;
> +	struct resource			*res;
> +	resource_size_t			size;
> +	struct device_node *np;
> +
> +	phy_dwc3 = devm_kzalloc(&pdev->dev, sizeof(*phy_dwc3), GFP_KERNEL);
> +	if (!phy_dwc3)
> +		return -ENOMEM;
> +
> +	match = of_match_node(qcom_ipq806x_usb_phy_table, pdev->dev.of_node);
> +	data = match->data;
> +
> +	phy_dwc3->dev = &pdev->dev;
> +
> +	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> +	if (!res)
> +		return -EINVAL;
> +	size = resource_size(res);
> +	phy_dwc3->base = devm_ioremap(phy_dwc3->dev, res->start, size);
> +
> +	if (IS_ERR(phy_dwc3->base)) {
> +		dev_err(phy_dwc3->dev, "failed to map reg\n");
> +		return PTR_ERR(phy_dwc3->base);
> +	}
> +
> +	phy_dwc3->ref_clk = devm_clk_get(phy_dwc3->dev, "ref");
> +	if (IS_ERR(phy_dwc3->ref_clk)) {
> +		dev_dbg(phy_dwc3->dev, "cannot get reference clock\n");
> +		return PTR_ERR(phy_dwc3->ref_clk);
> +	}
> +
> +	clk_set_rate(phy_dwc3->ref_clk, data->clk_rate);
> +
> +	phy_dwc3->xo_clk = devm_clk_get(phy_dwc3->dev, "xo");
> +	if (IS_ERR(phy_dwc3->xo_clk)) {
> +		dev_dbg(phy_dwc3->dev, "cannot get TCXO clock\n");
> +		phy_dwc3->xo_clk = NULL;
> +	}
> +
> +	/* Parse device node to probe HSIO settings */
> +	np = of_node_get(pdev->dev.of_node);
> +	if (!of_compat_cmp(match->compatible, "qcom,ipq806x-usb-phy-ss",
> +			   strlen(match->compatible))) {
> +		if (of_property_read_u32(np, "qcom,rx-eq", &phy_dwc3->rx_eq) ||
> +		    of_property_read_u32(np, "qcom,tx-deamp_3_5db",
> +					 &phy_dwc3->tx_deamp_3_5db) ||
> +		    of_property_read_u32(np, "qcom,mpll", &phy_dwc3->mpll)) {
> +			dev_err(phy_dwc3->dev, "cannot get HSIO settings from device node, using default values\n");
> +
> +			/* Default HSIO settings */
> +			phy_dwc3->rx_eq = SSPHY_RX_EQ_VALUE;
> +			phy_dwc3->tx_deamp_3_5db = SSPHY_TX_DEEMPH_3_5DB;
> +			phy_dwc3->mpll = SSPHY_MPLL_VALUE;
> +		}
> +	}
> +
> +	generic_phy = devm_phy_create(phy_dwc3->dev, pdev->dev.of_node,
> +				      &data->ops);
> +
> +	if (IS_ERR(generic_phy))
> +		return PTR_ERR(generic_phy);
> +
> +	phy_set_drvdata(generic_phy, phy_dwc3);
> +	platform_set_drvdata(pdev, phy_dwc3);
> +
> +	phy_provider = devm_of_phy_provider_register(phy_dwc3->dev,
> +						     of_phy_simple_xlate);
> +
> +	if (IS_ERR(phy_provider))
> +		return PTR_ERR(phy_provider);
> +
> +	return 0;
> +}
> +
> +static struct platform_driver qcom_ipq806x_usb_phy_driver = {
> +	.probe		= qcom_ipq806x_usb_phy_probe,
> +	.driver		= {
> +		.name	= "qcom-ipq806x-usb-phy",
> +		.owner	= THIS_MODULE,
> +		.of_match_table = qcom_ipq806x_usb_phy_table,
> +	},
> +};
> +
> +module_platform_driver(qcom_ipq806x_usb_phy_driver);
> +
> +MODULE_ALIAS("platform:phy-qcom-ipq806x-usb");
> +MODULE_LICENSE("GPL v2");
> +MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
> +MODULE_AUTHOR("Ivan T. Ivanov <iivanov@mm-sol.com>");
> +MODULE_DESCRIPTION("DesignWare USB3 QCOM PHY driver");
> -- 
> 2.25.1

J.

-- 
Hell is other people.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* R: [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver
  2020-06-04 16:19 ` [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver Jonathan McDowell
@ 2020-06-05 17:00   ` ansuelsmth
  2020-06-09 11:41     ` Jonathan McDowell
  0 siblings, 1 reply; 7+ messages in thread
From: ansuelsmth @ 2020-06-05 17:00 UTC (permalink / raw)
  To: 'Jonathan McDowell'
  Cc: 'Bjorn Andersson', 'Andy Gross',
	'Andy Gross', 'Kishon Vijay Abraham I',
	'Rob Herring', 'Mark Rutland',
	linux-arm-msm, linux-kernel, devicetree

> On Wed, Jun 03, 2020 at 03:22:34PM +0200, Ansuel Smith wrote:
> > This has lost in the original push for the dwc3 qcom driver.
> > This is needed for ipq806x SoC as without this the usb ports
> > doesn't work at all.
> 
> FWIW I tested this on my RB3011 so feel free to add:
> 
> Tested-by: Jonathan McDowell <noodles@earth.li>
> 
> One minor comment; would PHY_QCOM_USB_IPQ806X not be a better
> choice
> than PHY_QCOM_IPQ806X_USB given the existing naming?
> 

Thanks for the feedback. About naming I'm following the sata ipq806x naming.
I really hope someone gets this and reviews it since usb is broken for a
long time
now.

> > Signed-off-by: Andy Gross <agross@codeaurora.org>
> > Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> > ---
> > v6:
> > * Use GENMASK instead of hex value
> > v4:
> > * Add qcom to specific bindings
> > v3:
> > * Use reg instead of regmap phandle
> > v2:
> > * Renamed config from PHY_QCOM_DWC3 to PHY_QCOM_IPQ806X_USB
> > * Rename inline function to generic name to reduce length
> > * Fix check reported by checkpatch --strict
> > * Rename compatible to qcom,ipq806x-usb-phy-(hs/ss)
> >
> >  drivers/phy/qualcomm/Kconfig                |  12 +
> >  drivers/phy/qualcomm/Makefile               |   1 +
> >  drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 593
> ++++++++++++++++++++
> >  3 files changed, 606 insertions(+)
> >  create mode 100644 drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> >
> > diff --git a/drivers/phy/qualcomm/Kconfig
> b/drivers/phy/qualcomm/Kconfig
> > index e46824da29f6..9d41c3d12800 100644
> > --- a/drivers/phy/qualcomm/Kconfig
> > +++ b/drivers/phy/qualcomm/Kconfig
> > @@ -91,3 +91,15 @@ config PHY_QCOM_USB_HSIC
> >  	select GENERIC_PHY
> >  	help
> >  	  Support for the USB HSIC ULPI compliant PHY on QCOM chipsets.
> > +
> > +config PHY_QCOM_IPQ806X_USB
> > +	tristate "Qualcomm IPQ806x DWC3 USB PHY driver"
> > +	depends on ARCH_QCOM
> > +	depends on HAS_IOMEM
> > +	depends on OF
> > +	select GENERIC_PHY
> > +	help
> > +	  This option enables support for the Synopsis PHYs present inside
> the
> > +	  Qualcomm USB3.0 DWC3 controller on ipq806x SoC. This driver
> supports
> > +	  both HS and SS PHY controllers.
> > +
> > diff --git a/drivers/phy/qualcomm/Makefile
> b/drivers/phy/qualcomm/Makefile
> > index 283251d6a5d9..8629299c1495 100644
> > --- a/drivers/phy/qualcomm/Makefile
> > +++ b/drivers/phy/qualcomm/Makefile
> > @@ -10,3 +10,4 @@ obj-$(CONFIG_PHY_QCOM_UFS_14NM)
> 	+= phy-qcom-ufs-qmp-14nm.o
> >  obj-$(CONFIG_PHY_QCOM_UFS_20NM)		+= phy-qcom-ufs-
> qmp-20nm.o
> >  obj-$(CONFIG_PHY_QCOM_USB_HS) 		+= phy-qcom-usb-hs.o
> >  obj-$(CONFIG_PHY_QCOM_USB_HSIC) 	+= phy-qcom-usb-hsic.o
> > +obj-$(CONFIG_PHY_QCOM_IPQ806X_USB)		+= phy-qcom-
> ipq806x-usb.o
> > diff --git a/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> > new file mode 100644
> > index 000000000000..f37cd8760118
> > --- /dev/null
> > +++ b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> > @@ -0,0 +1,593 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +/* Copyright (c) 2014-2015, Code Aurora Forum. All rights reserved.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 and
> > + * only version 2 as published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +#include <linux/clk.h>
> > +#include <linux/err.h>
> > +#include <linux/io.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/phy/phy.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/delay.h>
> > +#include <linux/regmap.h>
> > +#include <linux/mfd/syscon.h>
> > +
> > +/* USB QSCRATCH Hardware registers */
> > +#define QSCRATCH_GENERAL_CFG		(0x08)
> > +#define HSUSB_PHY_CTRL_REG		(0x10)
> > +
> > +/* PHY_CTRL_REG */
> > +#define HSUSB_CTRL_DMSEHV_CLAMP		BIT(24)
> > +#define HSUSB_CTRL_USB2_SUSPEND		BIT(23)
> > +#define HSUSB_CTRL_UTMI_CLK_EN		BIT(21)
> > +#define HSUSB_CTRL_UTMI_OTG_VBUS_VALID	BIT(20)
> > +#define HSUSB_CTRL_USE_CLKCORE		BIT(18)
> > +#define HSUSB_CTRL_DPSEHV_CLAMP		BIT(17)
> > +#define HSUSB_CTRL_COMMONONN		BIT(11)
> > +#define HSUSB_CTRL_ID_HV_CLAMP		BIT(9)
> > +#define HSUSB_CTRL_OTGSESSVLD_CLAMP	BIT(8)
> > +#define HSUSB_CTRL_CLAMP_EN		BIT(7)
> > +#define HSUSB_CTRL_RETENABLEN		BIT(1)
> > +#define HSUSB_CTRL_POR			BIT(0)
> > +
> > +/* QSCRATCH_GENERAL_CFG */
> > +#define HSUSB_GCFG_XHCI_REV		BIT(2)
> > +
> > +/* USB QSCRATCH Hardware registers */
> > +#define SSUSB_PHY_CTRL_REG		(0x00)
> > +#define SSUSB_PHY_PARAM_CTRL_1		(0x04)
> > +#define SSUSB_PHY_PARAM_CTRL_2		(0x08)
> > +#define CR_PROTOCOL_DATA_IN_REG		(0x0c)
> > +#define CR_PROTOCOL_DATA_OUT_REG	(0x10)
> > +#define CR_PROTOCOL_CAP_ADDR_REG	(0x14)
> > +#define CR_PROTOCOL_CAP_DATA_REG	(0x18)
> > +#define CR_PROTOCOL_READ_REG		(0x1c)
> > +#define CR_PROTOCOL_WRITE_REG		(0x20)
> > +
> > +/* PHY_CTRL_REG */
> > +#define SSUSB_CTRL_REF_USE_PAD		BIT(28)
> > +#define SSUSB_CTRL_TEST_POWERDOWN	BIT(27)
> > +#define SSUSB_CTRL_LANE0_PWR_PRESENT	BIT(24)
> > +#define SSUSB_CTRL_SS_PHY_EN		BIT(8)
> > +#define SSUSB_CTRL_SS_PHY_RESET		BIT(7)
> > +
> > +/* SSPHY control registers - Does this need 0x30? */
> > +#define SSPHY_CTRL_RX_OVRD_IN_HI(lane)	(0x1006 + 0x100 *
> (lane))
> > +#define SSPHY_CTRL_TX_OVRD_DRV_LO(lane)	(0x1002 + 0x100 *
> (lane))
> > +
> > +/* SSPHY SoC version specific values */
> > +#define SSPHY_RX_EQ_VALUE		4 /* Override value for rx_eq
> */
> > +/* Override value for transmit preemphasis */
> > +#define SSPHY_TX_DEEMPH_3_5DB		23
> > +/* Override value for mpll */
> > +#define SSPHY_MPLL_VALUE		0
> > +
> > +/* QSCRATCH PHY_PARAM_CTRL1 fields */
> > +#define PHY_PARAM_CTRL1_TX_FULL_SWING_MASK	GENMASK(26,
> 19)
> > +#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK	GENMASK(19,
> 13)
> > +#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK	GENMASK(13,
> 7)
> > +#define PHY_PARAM_CTRL1_LOS_BIAS_MASK		GENMASK(7,
> 2)
> > +
> > +#define PHY_PARAM_CTRL1_MASK				\
> > +		(PHY_PARAM_CTRL1_TX_FULL_SWING_MASK |	\
> > +		 PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK |	\
> > +		 PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK |	\
> > +		 PHY_PARAM_CTRL1_LOS_BIAS_MASK)
> > +
> > +#define PHY_PARAM_CTRL1_TX_FULL_SWING(x)	\
> > +		(((x) << 20) & PHY_PARAM_CTRL1_TX_FULL_SWING_MASK)
> > +#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB(x)	\
> > +		(((x) << 14) &
> PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK)
> > +#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(x)	\
> > +		(((x) <<  8) &
> PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK)
> > +#define PHY_PARAM_CTRL1_LOS_BIAS(x)	\
> > +		(((x) <<  3) & PHY_PARAM_CTRL1_LOS_BIAS_MASK)
> > +
> > +/* RX OVRD IN HI bits */
> > +#define RX_OVRD_IN_HI_RX_RESET_OVRD		BIT(13)
> > +#define RX_OVRD_IN_HI_RX_RX_RESET		BIT(12)
> > +#define RX_OVRD_IN_HI_RX_EQ_OVRD		BIT(11)
> > +#define RX_OVRD_IN_HI_RX_EQ_MASK		GENMASK(10, 7)
> > +#define RX_OVRD_IN_HI_RX_EQ(x)			((x) << 8)
> > +#define RX_OVRD_IN_HI_RX_EQ_EN_OVRD		BIT(7)
> > +#define RX_OVRD_IN_HI_RX_EQ_EN			BIT(6)
> > +#define RX_OVRD_IN_HI_RX_LOS_FILTER_OVRD	BIT(5)
> > +#define RX_OVRD_IN_HI_RX_LOS_FILTER_MASK	GENMASK(4, 2)
> > +#define RX_OVRD_IN_HI_RX_RATE_OVRD		BIT(2)
> > +#define RX_OVRD_IN_HI_RX_RATE_MASK		GENMASK(2, 0)
> > +
> > +/* TX OVRD DRV LO register bits */
> > +#define TX_OVRD_DRV_LO_AMPLITUDE_MASK		GENMASK(6,
> 0)
> > +#define TX_OVRD_DRV_LO_PREEMPH_MASK		GENMASK(13,
> 6)
> > +#define TX_OVRD_DRV_LO_PREEMPH(x)		((x) << 7)
> > +#define TX_OVRD_DRV_LO_EN			BIT(14)
> > +
> > +/* MPLL bits */
> > +#define SSPHY_MPLL_MASK				GENMASK(8,
> 5)
> > +#define SSPHY_MPLL(x)				((x) << 5)
> > +
> > +/* SS CAP register bits */
> > +#define SS_CR_CAP_ADDR_REG			BIT(0)
> > +#define SS_CR_CAP_DATA_REG			BIT(0)
> > +#define SS_CR_READ_REG				BIT(0)
> > +#define SS_CR_WRITE_REG				BIT(0)
> > +
> > +struct usb_phy {
> > +	void __iomem		*base;
> > +	struct device		*dev;
> > +	struct clk		*xo_clk;
> > +	struct clk		*ref_clk;
> > +	u32			rx_eq;
> > +	u32			tx_deamp_3_5db;
> > +	u32			mpll;
> > +};
> > +
> > +struct phy_drvdata {
> > +	struct phy_ops	ops;
> > +	u32		clk_rate;
> > +};
> > +
> > +/**
> > + * Write register and read back masked value to confirm it is written
> > + *
> > + * @base - QCOM DWC3 PHY base virtual address.
> > + * @offset - register offset.
> > + * @mask - register bitmask specifying what should be updated
> > + * @val - value to write.
> > + */
> > +static inline void usb_phy_write_readback(struct usb_phy *phy_dwc3,
> > +					  u32 offset,
> > +					  const u32 mask, u32 val)
> > +{
> > +	u32 write_val, tmp = readl(phy_dwc3->base + offset);
> > +
> > +	tmp &= ~mask;		/* retain other bits */
> > +	write_val = tmp | val;
> > +
> > +	writel(write_val, phy_dwc3->base + offset);
> > +
> > +	/* Read back to see if val was written */
> > +	tmp = readl(phy_dwc3->base + offset);
> > +	tmp &= mask;		/* clear other bits */
> > +
> > +	if (tmp != val)
> > +		dev_err(phy_dwc3->dev, "write: %x to QSCRATCH: %x
> FAILED\n",
> > +			val, offset);
> > +}
> > +
> > +static int wait_for_latch(void __iomem *addr)
> > +{
> > +	u32 retry = 10;
> > +
> > +	while (true) {
> > +		if (!readl(addr))
> > +			break;
> > +
> > +		if (--retry == 0)
> > +			return -ETIMEDOUT;
> > +
> > +		usleep_range(10, 20);
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> > +/**
> > + * Write SSPHY register
> > + *
> > + * @base - QCOM DWC3 PHY base virtual address.
> > + * @addr - SSPHY address to write.
> > + * @val - value to write.
> > + */
> > +static int usb_ss_write_phycreg(struct usb_phy *phy_dwc3,
> > +				u32 addr, u32 val)
> > +{
> > +	int ret;
> > +
> > +	writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
> > +	writel(SS_CR_CAP_ADDR_REG,
> > +	       phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
> > +
> > +	ret = wait_for_latch(phy_dwc3->base +
> CR_PROTOCOL_CAP_ADDR_REG);
> > +	if (ret)
> > +		goto err_wait;
> > +
> > +	writel(val, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
> > +	writel(SS_CR_CAP_DATA_REG,
> > +	       phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG);
> > +
> > +	ret = wait_for_latch(phy_dwc3->base +
> CR_PROTOCOL_CAP_DATA_REG);
> > +	if (ret)
> > +		goto err_wait;
> > +
> > +	writel(SS_CR_WRITE_REG, phy_dwc3->base +
> CR_PROTOCOL_WRITE_REG);
> > +
> > +	ret = wait_for_latch(phy_dwc3->base +
> CR_PROTOCOL_WRITE_REG);
> > +
> > +err_wait:
> > +	if (ret)
> > +		dev_err(phy_dwc3->dev, "timeout waiting for latch\n");
> > +	return ret;
> > +}
> > +
> > +/**
> > + * Read SSPHY register.
> > + *
> > + * @base - QCOM DWC3 PHY base virtual address.
> > + * @addr - SSPHY address to read.
> > + */
> > +static int usb_ss_read_phycreg(struct usb_phy *phy_dwc3,
> > +			       u32 addr, u32 *val)
> > +{
> > +	int ret;
> > +
> > +	writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
> > +	writel(SS_CR_CAP_ADDR_REG,
> > +	       phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
> > +
> > +	ret = wait_for_latch(phy_dwc3->base +
> CR_PROTOCOL_CAP_ADDR_REG);
> > +	if (ret)
> > +		goto err_wait;
> > +
> > +	/*
> > +	 * Due to hardware bug, first read of SSPHY register might be
> > +	 * incorrect. Hence as workaround, SW should perform SSPHY
> register
> > +	 * read twice, but use only second read and ignore first read.
> > +	 */
> > +	writel(SS_CR_READ_REG, phy_dwc3->base +
> CR_PROTOCOL_READ_REG);
> > +
> > +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_READ_REG);
> > +	if (ret)
> > +		goto err_wait;
> > +
> > +	/* throwaway read */
> > +	readl(phy_dwc3->base + CR_PROTOCOL_DATA_OUT_REG);
> > +
> > +	writel(SS_CR_READ_REG, phy_dwc3->base +
> CR_PROTOCOL_READ_REG);
> > +
> > +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_READ_REG);
> > +	if (ret)
> > +		goto err_wait;
> > +
> > +	*val = readl(phy_dwc3->base + CR_PROTOCOL_DATA_OUT_REG);
> > +
> > +err_wait:
> > +	return ret;
> > +}
> > +
> > +static int qcom_ipq806x_usb_hs_phy_init(struct phy *phy)
> > +{
> > +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> > +	int ret;
> > +	u32 val;
> > +
> > +	ret = clk_prepare_enable(phy_dwc3->xo_clk);
> > +	if (ret)
> > +		return ret;
> > +
> > +	ret = clk_prepare_enable(phy_dwc3->ref_clk);
> > +	if (ret) {
> > +		clk_disable_unprepare(phy_dwc3->xo_clk);
> > +		return ret;
> > +	}
> > +
> > +	/*
> > +	 * HSPHY Initialization: Enable UTMI clock, select 19.2MHz fsel
> > +	 * enable clamping, and disable RETENTION (power-on default is
> ENABLED)
> > +	 */
> > +	val = HSUSB_CTRL_DPSEHV_CLAMP |
> HSUSB_CTRL_DMSEHV_CLAMP |
> > +		HSUSB_CTRL_RETENABLEN  | HSUSB_CTRL_COMMONONN |
> > +		HSUSB_CTRL_OTGSESSVLD_CLAMP |
> HSUSB_CTRL_ID_HV_CLAMP |
> > +		HSUSB_CTRL_DPSEHV_CLAMP |
> HSUSB_CTRL_UTMI_OTG_VBUS_VALID |
> > +		HSUSB_CTRL_UTMI_CLK_EN | HSUSB_CTRL_CLAMP_EN |
> 0x70;
> > +
> > +	/* use core clock if external reference is not present */
> > +	if (!phy_dwc3->xo_clk)
> > +		val |= HSUSB_CTRL_USE_CLKCORE;
> > +
> > +	writel(val, phy_dwc3->base + HSUSB_PHY_CTRL_REG);
> > +	usleep_range(2000, 2200);
> > +
> > +	/* Disable (bypass) VBUS and ID filters */
> > +	writel(HSUSB_GCFG_XHCI_REV, phy_dwc3->base +
> QSCRATCH_GENERAL_CFG);
> > +
> > +	return 0;
> > +}
> > +
> > +static int qcom_ipq806x_usb_hs_phy_exit(struct phy *phy)
> > +{
> > +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> > +
> > +	clk_disable_unprepare(phy_dwc3->ref_clk);
> > +	clk_disable_unprepare(phy_dwc3->xo_clk);
> > +
> > +	return 0;
> > +}
> > +
> > +static int qcom_ipq806x_usb_ss_phy_init(struct phy *phy)
> > +{
> > +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> > +	int ret;
> > +	u32 data = 0;
> > +
> > +	ret = clk_prepare_enable(phy_dwc3->xo_clk);
> > +	if (ret)
> > +		return ret;
> > +
> > +	ret = clk_prepare_enable(phy_dwc3->ref_clk);
> > +	if (ret) {
> > +		clk_disable_unprepare(phy_dwc3->xo_clk);
> > +		return ret;
> > +	}
> > +
> > +	/* reset phy */
> > +	data = readl(phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > +	writel(data | SSUSB_CTRL_SS_PHY_RESET,
> > +	       phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > +	usleep_range(2000, 2200);
> > +	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > +
> > +	/* clear REF_PAD if we don't have XO clk */
> > +	if (!phy_dwc3->xo_clk)
> > +		data &= ~SSUSB_CTRL_REF_USE_PAD;
> > +	else
> > +		data |= SSUSB_CTRL_REF_USE_PAD;
> > +
> > +	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > +
> > +	/* wait for ref clk to become stable, this can take up to 30ms */
> > +	msleep(30);
> > +
> > +	data |= SSUSB_CTRL_SS_PHY_EN |
> SSUSB_CTRL_LANE0_PWR_PRESENT;
> > +	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > +
> > +	/*
> > +	 * WORKAROUND: There is SSPHY suspend bug due to which USB
> enumerates
> > +	 * in HS mode instead of SS mode. Workaround it by asserting
> > +	 * LANE0.TX_ALT_BLOCK.EN_ALT_BUS to enable TX to use alt bus
> mode
> > +	 */
> > +	ret = usb_ss_read_phycreg(phy_dwc3, 0x102D, &data);
> > +	if (ret)
> > +		goto err_phy_trans;
> > +
> > +	data |= (1 << 7);
> > +	ret = usb_ss_write_phycreg(phy_dwc3, 0x102D, data);
> > +	if (ret)
> > +		goto err_phy_trans;
> > +
> > +	ret = usb_ss_read_phycreg(phy_dwc3, 0x1010, &data);
> > +	if (ret)
> > +		goto err_phy_trans;
> > +
> > +	data &= ~0xff0;
> > +	data |= 0x20;
> > +	ret = usb_ss_write_phycreg(phy_dwc3, 0x1010, data);
> > +	if (ret)
> > +		goto err_phy_trans;
> > +
> > +	/*
> > +	 * Fix RX Equalization setting as follows
> > +	 * LANE0.RX_OVRD_IN_HI. RX_EQ_EN set to 0
> > +	 * LANE0.RX_OVRD_IN_HI.RX_EQ_EN_OVRD set to 1
> > +	 * LANE0.RX_OVRD_IN_HI.RX_EQ set based on SoC version
> > +	 * LANE0.RX_OVRD_IN_HI.RX_EQ_OVRD set to 1
> > +	 */
> > +	ret = usb_ss_read_phycreg(phy_dwc3,
> > +				  SSPHY_CTRL_RX_OVRD_IN_HI(0), &data);
> > +	if (ret)
> > +		goto err_phy_trans;
> > +
> > +	data &= ~RX_OVRD_IN_HI_RX_EQ_EN;
> > +	data |= RX_OVRD_IN_HI_RX_EQ_EN_OVRD;
> > +	data &= ~RX_OVRD_IN_HI_RX_EQ_MASK;
> > +	data |= RX_OVRD_IN_HI_RX_EQ(phy_dwc3->rx_eq);
> > +	data |= RX_OVRD_IN_HI_RX_EQ_OVRD;
> > +	ret = usb_ss_write_phycreg(phy_dwc3,
> > +				   SSPHY_CTRL_RX_OVRD_IN_HI(0), data);
> > +	if (ret)
> > +		goto err_phy_trans;
> > +
> > +	/*
> > +	 * Set EQ and TX launch amplitudes as follows
> > +	 * LANE0.TX_OVRD_DRV_LO.PREEMPH set based on SoC version
> > +	 * LANE0.TX_OVRD_DRV_LO.AMPLITUDE set to 110
> > +	 * LANE0.TX_OVRD_DRV_LO.EN set to 1.
> > +	 */
> > +	ret = usb_ss_read_phycreg(phy_dwc3,
> > +				  SSPHY_CTRL_TX_OVRD_DRV_LO(0), &data);
> > +	if (ret)
> > +		goto err_phy_trans;
> > +
> > +	data &= ~TX_OVRD_DRV_LO_PREEMPH_MASK;
> > +	data |= TX_OVRD_DRV_LO_PREEMPH(phy_dwc3-
> >tx_deamp_3_5db);
> > +	data &= ~TX_OVRD_DRV_LO_AMPLITUDE_MASK;
> > +	data |= 0x6E;
> > +	data |= TX_OVRD_DRV_LO_EN;
> > +	ret = usb_ss_write_phycreg(phy_dwc3,
> > +				   SSPHY_CTRL_TX_OVRD_DRV_LO(0), data);
> > +	if (ret)
> > +		goto err_phy_trans;
> > +
> > +	data = 0;
> > +	data &= ~SSPHY_MPLL_MASK;
> > +	data |= SSPHY_MPLL(phy_dwc3->mpll);
> > +	usb_ss_write_phycreg(phy_dwc3, 0x30, data);
> > +
> > +	/*
> > +	 * Set the QSCRATCH PHY_PARAM_CTRL1 parameters as follows
> > +	 * TX_FULL_SWING [26:20] amplitude to 110
> > +	 * TX_DEEMPH_6DB [19:14] to 32
> > +	 * TX_DEEMPH_3_5DB [13:8] set based on SoC version
> > +	 * LOS_BIAS [7:3] to 9
> > +	 */
> > +	data = readl(phy_dwc3->base + SSUSB_PHY_PARAM_CTRL_1);
> > +
> > +	data &= ~PHY_PARAM_CTRL1_MASK;
> > +
> > +	data |= PHY_PARAM_CTRL1_TX_FULL_SWING(0x6e) |
> > +		PHY_PARAM_CTRL1_TX_DEEMPH_6DB(0x20) |
> > +		PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(phy_dwc3-
> >tx_deamp_3_5db) |
> > +		PHY_PARAM_CTRL1_LOS_BIAS(0x9);
> > +
> > +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_PARAM_CTRL_1,
> > +			       PHY_PARAM_CTRL1_MASK, data);
> > +
> > +err_phy_trans:
> > +	return ret;
> > +}
> > +
> > +static int qcom_ipq806x_usb_ss_phy_exit(struct phy *phy)
> > +{
> > +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> > +
> > +	/* Sequence to put SSPHY in low power state:
> > +	 * 1. Clear REF_PHY_EN in PHY_CTRL_REG
> > +	 * 2. Clear REF_USE_PAD in PHY_CTRL_REG
> > +	 * 3. Set TEST_POWERED_DOWN in PHY_CTRL_REG to enable PHY
> retention
> > +	 */
> > +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
> > +			       SSUSB_CTRL_SS_PHY_EN, 0x0);
> > +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
> > +			       SSUSB_CTRL_REF_USE_PAD, 0x0);
> > +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
> > +			       SSUSB_CTRL_TEST_POWERDOWN, 0x0);
> > +
> > +	clk_disable_unprepare(phy_dwc3->ref_clk);
> > +	clk_disable_unprepare(phy_dwc3->xo_clk);
> > +
> > +	return 0;
> > +}
> > +
> > +static const struct phy_drvdata qcom_ipq806x_usb_hs_drvdata = {
> > +	.ops = {
> > +		.init		= qcom_ipq806x_usb_hs_phy_init,
> > +		.exit		= qcom_ipq806x_usb_hs_phy_exit,
> > +		.owner		= THIS_MODULE,
> > +	},
> > +	.clk_rate = 60000000,
> > +};
> > +
> > +static const struct phy_drvdata qcom_ipq806x_usb_ss_drvdata = {
> > +	.ops = {
> > +		.init		= qcom_ipq806x_usb_ss_phy_init,
> > +		.exit		= qcom_ipq806x_usb_ss_phy_exit,
> > +		.owner		= THIS_MODULE,
> > +	},
> > +	.clk_rate = 125000000,
> > +};
> > +
> > +static const struct of_device_id qcom_ipq806x_usb_phy_table[] = {
> > +	{ .compatible = "qcom,ipq806x-usb-phy-hs",
> > +	  .data = &qcom_ipq806x_usb_hs_drvdata },
> > +	{ .compatible = "qcom,ipq806x-usb-phy-ss",
> > +	  .data = &qcom_ipq806x_usb_ss_drvdata },
> > +	{ /* Sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, qcom_ipq806x_usb_phy_table);
> > +
> > +static int qcom_ipq806x_usb_phy_probe(struct platform_device *pdev)
> > +{
> > +	struct usb_phy	*phy_dwc3;
> > +	struct phy_provider		*phy_provider;
> > +	struct phy			*generic_phy;
> > +	const struct of_device_id *match;
> > +	const struct phy_drvdata *data;
> > +	struct resource			*res;
> > +	resource_size_t			size;
> > +	struct device_node *np;
> > +
> > +	phy_dwc3 = devm_kzalloc(&pdev->dev, sizeof(*phy_dwc3),
> GFP_KERNEL);
> > +	if (!phy_dwc3)
> > +		return -ENOMEM;
> > +
> > +	match = of_match_node(qcom_ipq806x_usb_phy_table, pdev-
> >dev.of_node);
> > +	data = match->data;
> > +
> > +	phy_dwc3->dev = &pdev->dev;
> > +
> > +	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > +	if (!res)
> > +		return -EINVAL;
> > +	size = resource_size(res);
> > +	phy_dwc3->base = devm_ioremap(phy_dwc3->dev, res->start,
> size);
> > +
> > +	if (IS_ERR(phy_dwc3->base)) {
> > +		dev_err(phy_dwc3->dev, "failed to map reg\n");
> > +		return PTR_ERR(phy_dwc3->base);
> > +	}
> > +
> > +	phy_dwc3->ref_clk = devm_clk_get(phy_dwc3->dev, "ref");
> > +	if (IS_ERR(phy_dwc3->ref_clk)) {
> > +		dev_dbg(phy_dwc3->dev, "cannot get reference clock\n");
> > +		return PTR_ERR(phy_dwc3->ref_clk);
> > +	}
> > +
> > +	clk_set_rate(phy_dwc3->ref_clk, data->clk_rate);
> > +
> > +	phy_dwc3->xo_clk = devm_clk_get(phy_dwc3->dev, "xo");
> > +	if (IS_ERR(phy_dwc3->xo_clk)) {
> > +		dev_dbg(phy_dwc3->dev, "cannot get TCXO clock\n");
> > +		phy_dwc3->xo_clk = NULL;
> > +	}
> > +
> > +	/* Parse device node to probe HSIO settings */
> > +	np = of_node_get(pdev->dev.of_node);
> > +	if (!of_compat_cmp(match->compatible, "qcom,ipq806x-usb-phy-
> ss",
> > +			   strlen(match->compatible))) {
> > +		if (of_property_read_u32(np, "qcom,rx-eq", &phy_dwc3-
> >rx_eq) ||
> > +		    of_property_read_u32(np, "qcom,tx-deamp_3_5db",
> > +					 &phy_dwc3->tx_deamp_3_5db) ||
> > +		    of_property_read_u32(np, "qcom,mpll", &phy_dwc3-
> >mpll)) {
> > +			dev_err(phy_dwc3->dev, "cannot get HSIO settings
> from device node, using default values\n");
> > +
> > +			/* Default HSIO settings */
> > +			phy_dwc3->rx_eq = SSPHY_RX_EQ_VALUE;
> > +			phy_dwc3->tx_deamp_3_5db =
> SSPHY_TX_DEEMPH_3_5DB;
> > +			phy_dwc3->mpll = SSPHY_MPLL_VALUE;
> > +		}
> > +	}
> > +
> > +	generic_phy = devm_phy_create(phy_dwc3->dev, pdev-
> >dev.of_node,
> > +				      &data->ops);
> > +
> > +	if (IS_ERR(generic_phy))
> > +		return PTR_ERR(generic_phy);
> > +
> > +	phy_set_drvdata(generic_phy, phy_dwc3);
> > +	platform_set_drvdata(pdev, phy_dwc3);
> > +
> > +	phy_provider = devm_of_phy_provider_register(phy_dwc3->dev,
> > +						     of_phy_simple_xlate);
> > +
> > +	if (IS_ERR(phy_provider))
> > +		return PTR_ERR(phy_provider);
> > +
> > +	return 0;
> > +}
> > +
> > +static struct platform_driver qcom_ipq806x_usb_phy_driver = {
> > +	.probe		= qcom_ipq806x_usb_phy_probe,
> > +	.driver		= {
> > +		.name	= "qcom-ipq806x-usb-phy",
> > +		.owner	= THIS_MODULE,
> > +		.of_match_table = qcom_ipq806x_usb_phy_table,
> > +	},
> > +};
> > +
> > +module_platform_driver(qcom_ipq806x_usb_phy_driver);
> > +
> > +MODULE_ALIAS("platform:phy-qcom-ipq806x-usb");
> > +MODULE_LICENSE("GPL v2");
> > +MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
> > +MODULE_AUTHOR("Ivan T. Ivanov <iivanov@mm-sol.com>");
> > +MODULE_DESCRIPTION("DesignWare USB3 QCOM PHY driver");
> > --
> > 2.25.1
> 
> J.
> 
> --
> Hell is other people.


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: R: [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver
  2020-06-05 17:00   ` R: " ansuelsmth
@ 2020-06-09 11:41     ` Jonathan McDowell
  2020-06-09 11:55       ` Vinod Koul
  0 siblings, 1 reply; 7+ messages in thread
From: Jonathan McDowell @ 2020-06-09 11:41 UTC (permalink / raw)
  To: ansuelsmth
  Cc: 'Bjorn Andersson', 'Andy Gross',
	'Andy Gross', 'Kishon Vijay Abraham I',
	'Rob Herring', 'Mark Rutland',
	Vinod Koul, linux-arm-msm, linux-kernel, devicetree

On Fri, Jun 05, 2020 at 07:00:04PM +0200, ansuelsmth@gmail.com wrote:
> > On Wed, Jun 03, 2020 at 03:22:34PM +0200, Ansuel Smith wrote:
> > > This has lost in the original push for the dwc3 qcom driver.
> > > This is needed for ipq806x SoC as without this the usb ports
> > > doesn't work at all.
> > 
> > FWIW I tested this on my RB3011 so feel free to add:
> > 
> > Tested-by: Jonathan McDowell <noodles@earth.li>
> > 
> > One minor comment; would PHY_QCOM_USB_IPQ806X not be a better
> > choice than PHY_QCOM_IPQ806X_USB given the existing naming?
> > 
>
> Thanks for the feedback. About naming I'm following the sata ipq806x
> naming.  I really hope someone gets this and reviews it since usb is
> broken for a long time now.

Doesn't seem to have made the 5.8 merge window; I note Vinod has done a
bunch of the recent commits to phy/qualcomm/ so adding him to the CC in
addition to Kishon.

> > > Signed-off-by: Andy Gross <agross@codeaurora.org>
> > > Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> > > ---
> > > v6:
> > > * Use GENMASK instead of hex value
> > > v4:
> > > * Add qcom to specific bindings
> > > v3:
> > > * Use reg instead of regmap phandle
> > > v2:
> > > * Renamed config from PHY_QCOM_DWC3 to PHY_QCOM_IPQ806X_USB
> > > * Rename inline function to generic name to reduce length
> > > * Fix check reported by checkpatch --strict
> > > * Rename compatible to qcom,ipq806x-usb-phy-(hs/ss)
> > >
> > >  drivers/phy/qualcomm/Kconfig                |  12 +
> > >  drivers/phy/qualcomm/Makefile               |   1 +
> > >  drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 593
> > ++++++++++++++++++++
> > >  3 files changed, 606 insertions(+)
> > >  create mode 100644 drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> > >
> > > diff --git a/drivers/phy/qualcomm/Kconfig
> > b/drivers/phy/qualcomm/Kconfig
> > > index e46824da29f6..9d41c3d12800 100644
> > > --- a/drivers/phy/qualcomm/Kconfig
> > > +++ b/drivers/phy/qualcomm/Kconfig
> > > @@ -91,3 +91,15 @@ config PHY_QCOM_USB_HSIC
> > >  	select GENERIC_PHY
> > >  	help
> > >  	  Support for the USB HSIC ULPI compliant PHY on QCOM chipsets.
> > > +
> > > +config PHY_QCOM_IPQ806X_USB
> > > +	tristate "Qualcomm IPQ806x DWC3 USB PHY driver"
> > > +	depends on ARCH_QCOM
> > > +	depends on HAS_IOMEM
> > > +	depends on OF
> > > +	select GENERIC_PHY
> > > +	help
> > > +	  This option enables support for the Synopsis PHYs present inside
> > the
> > > +	  Qualcomm USB3.0 DWC3 controller on ipq806x SoC. This driver
> > supports
> > > +	  both HS and SS PHY controllers.
> > > +
> > > diff --git a/drivers/phy/qualcomm/Makefile
> > b/drivers/phy/qualcomm/Makefile
> > > index 283251d6a5d9..8629299c1495 100644
> > > --- a/drivers/phy/qualcomm/Makefile
> > > +++ b/drivers/phy/qualcomm/Makefile
> > > @@ -10,3 +10,4 @@ obj-$(CONFIG_PHY_QCOM_UFS_14NM)
> > 	+= phy-qcom-ufs-qmp-14nm.o
> > >  obj-$(CONFIG_PHY_QCOM_UFS_20NM)		+= phy-qcom-ufs-
> > qmp-20nm.o
> > >  obj-$(CONFIG_PHY_QCOM_USB_HS) 		+= phy-qcom-usb-hs.o
> > >  obj-$(CONFIG_PHY_QCOM_USB_HSIC) 	+= phy-qcom-usb-hsic.o
> > > +obj-$(CONFIG_PHY_QCOM_IPQ806X_USB)		+= phy-qcom-
> > ipq806x-usb.o
> > > diff --git a/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> > b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> > > new file mode 100644
> > > index 000000000000..f37cd8760118
> > > --- /dev/null
> > > +++ b/drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
> > > @@ -0,0 +1,593 @@
> > > +// SPDX-License-Identifier: GPL-2.0-only
> > > +/* Copyright (c) 2014-2015, Code Aurora Forum. All rights reserved.
> > > + *
> > > + * This program is free software; you can redistribute it and/or modify
> > > + * it under the terms of the GNU General Public License version 2 and
> > > + * only version 2 as published by the Free Software Foundation.
> > > + *
> > > + * This program is distributed in the hope that it will be useful,
> > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > > + * GNU General Public License for more details.
> > > + */
> > > +
> > > +#include <linux/clk.h>
> > > +#include <linux/err.h>
> > > +#include <linux/io.h>
> > > +#include <linux/module.h>
> > > +#include <linux/of.h>
> > > +#include <linux/phy/phy.h>
> > > +#include <linux/platform_device.h>
> > > +#include <linux/delay.h>
> > > +#include <linux/regmap.h>
> > > +#include <linux/mfd/syscon.h>
> > > +
> > > +/* USB QSCRATCH Hardware registers */
> > > +#define QSCRATCH_GENERAL_CFG		(0x08)
> > > +#define HSUSB_PHY_CTRL_REG		(0x10)
> > > +
> > > +/* PHY_CTRL_REG */
> > > +#define HSUSB_CTRL_DMSEHV_CLAMP		BIT(24)
> > > +#define HSUSB_CTRL_USB2_SUSPEND		BIT(23)
> > > +#define HSUSB_CTRL_UTMI_CLK_EN		BIT(21)
> > > +#define HSUSB_CTRL_UTMI_OTG_VBUS_VALID	BIT(20)
> > > +#define HSUSB_CTRL_USE_CLKCORE		BIT(18)
> > > +#define HSUSB_CTRL_DPSEHV_CLAMP		BIT(17)
> > > +#define HSUSB_CTRL_COMMONONN		BIT(11)
> > > +#define HSUSB_CTRL_ID_HV_CLAMP		BIT(9)
> > > +#define HSUSB_CTRL_OTGSESSVLD_CLAMP	BIT(8)
> > > +#define HSUSB_CTRL_CLAMP_EN		BIT(7)
> > > +#define HSUSB_CTRL_RETENABLEN		BIT(1)
> > > +#define HSUSB_CTRL_POR			BIT(0)
> > > +
> > > +/* QSCRATCH_GENERAL_CFG */
> > > +#define HSUSB_GCFG_XHCI_REV		BIT(2)
> > > +
> > > +/* USB QSCRATCH Hardware registers */
> > > +#define SSUSB_PHY_CTRL_REG		(0x00)
> > > +#define SSUSB_PHY_PARAM_CTRL_1		(0x04)
> > > +#define SSUSB_PHY_PARAM_CTRL_2		(0x08)
> > > +#define CR_PROTOCOL_DATA_IN_REG		(0x0c)
> > > +#define CR_PROTOCOL_DATA_OUT_REG	(0x10)
> > > +#define CR_PROTOCOL_CAP_ADDR_REG	(0x14)
> > > +#define CR_PROTOCOL_CAP_DATA_REG	(0x18)
> > > +#define CR_PROTOCOL_READ_REG		(0x1c)
> > > +#define CR_PROTOCOL_WRITE_REG		(0x20)
> > > +
> > > +/* PHY_CTRL_REG */
> > > +#define SSUSB_CTRL_REF_USE_PAD		BIT(28)
> > > +#define SSUSB_CTRL_TEST_POWERDOWN	BIT(27)
> > > +#define SSUSB_CTRL_LANE0_PWR_PRESENT	BIT(24)
> > > +#define SSUSB_CTRL_SS_PHY_EN		BIT(8)
> > > +#define SSUSB_CTRL_SS_PHY_RESET		BIT(7)
> > > +
> > > +/* SSPHY control registers - Does this need 0x30? */
> > > +#define SSPHY_CTRL_RX_OVRD_IN_HI(lane)	(0x1006 + 0x100 *
> > (lane))
> > > +#define SSPHY_CTRL_TX_OVRD_DRV_LO(lane)	(0x1002 + 0x100 *
> > (lane))
> > > +
> > > +/* SSPHY SoC version specific values */
> > > +#define SSPHY_RX_EQ_VALUE		4 /* Override value for rx_eq
> > */
> > > +/* Override value for transmit preemphasis */
> > > +#define SSPHY_TX_DEEMPH_3_5DB		23
> > > +/* Override value for mpll */
> > > +#define SSPHY_MPLL_VALUE		0
> > > +
> > > +/* QSCRATCH PHY_PARAM_CTRL1 fields */
> > > +#define PHY_PARAM_CTRL1_TX_FULL_SWING_MASK	GENMASK(26,
> > 19)
> > > +#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK	GENMASK(19,
> > 13)
> > > +#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK	GENMASK(13,
> > 7)
> > > +#define PHY_PARAM_CTRL1_LOS_BIAS_MASK		GENMASK(7,
> > 2)
> > > +
> > > +#define PHY_PARAM_CTRL1_MASK				\
> > > +		(PHY_PARAM_CTRL1_TX_FULL_SWING_MASK |	\
> > > +		 PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK |	\
> > > +		 PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK |	\
> > > +		 PHY_PARAM_CTRL1_LOS_BIAS_MASK)
> > > +
> > > +#define PHY_PARAM_CTRL1_TX_FULL_SWING(x)	\
> > > +		(((x) << 20) & PHY_PARAM_CTRL1_TX_FULL_SWING_MASK)
> > > +#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB(x)	\
> > > +		(((x) << 14) &
> > PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK)
> > > +#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(x)	\
> > > +		(((x) <<  8) &
> > PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK)
> > > +#define PHY_PARAM_CTRL1_LOS_BIAS(x)	\
> > > +		(((x) <<  3) & PHY_PARAM_CTRL1_LOS_BIAS_MASK)
> > > +
> > > +/* RX OVRD IN HI bits */
> > > +#define RX_OVRD_IN_HI_RX_RESET_OVRD		BIT(13)
> > > +#define RX_OVRD_IN_HI_RX_RX_RESET		BIT(12)
> > > +#define RX_OVRD_IN_HI_RX_EQ_OVRD		BIT(11)
> > > +#define RX_OVRD_IN_HI_RX_EQ_MASK		GENMASK(10, 7)
> > > +#define RX_OVRD_IN_HI_RX_EQ(x)			((x) << 8)
> > > +#define RX_OVRD_IN_HI_RX_EQ_EN_OVRD		BIT(7)
> > > +#define RX_OVRD_IN_HI_RX_EQ_EN			BIT(6)
> > > +#define RX_OVRD_IN_HI_RX_LOS_FILTER_OVRD	BIT(5)
> > > +#define RX_OVRD_IN_HI_RX_LOS_FILTER_MASK	GENMASK(4, 2)
> > > +#define RX_OVRD_IN_HI_RX_RATE_OVRD		BIT(2)
> > > +#define RX_OVRD_IN_HI_RX_RATE_MASK		GENMASK(2, 0)
> > > +
> > > +/* TX OVRD DRV LO register bits */
> > > +#define TX_OVRD_DRV_LO_AMPLITUDE_MASK		GENMASK(6,
> > 0)
> > > +#define TX_OVRD_DRV_LO_PREEMPH_MASK		GENMASK(13,
> > 6)
> > > +#define TX_OVRD_DRV_LO_PREEMPH(x)		((x) << 7)
> > > +#define TX_OVRD_DRV_LO_EN			BIT(14)
> > > +
> > > +/* MPLL bits */
> > > +#define SSPHY_MPLL_MASK				GENMASK(8,
> > 5)
> > > +#define SSPHY_MPLL(x)				((x) << 5)
> > > +
> > > +/* SS CAP register bits */
> > > +#define SS_CR_CAP_ADDR_REG			BIT(0)
> > > +#define SS_CR_CAP_DATA_REG			BIT(0)
> > > +#define SS_CR_READ_REG				BIT(0)
> > > +#define SS_CR_WRITE_REG				BIT(0)
> > > +
> > > +struct usb_phy {
> > > +	void __iomem		*base;
> > > +	struct device		*dev;
> > > +	struct clk		*xo_clk;
> > > +	struct clk		*ref_clk;
> > > +	u32			rx_eq;
> > > +	u32			tx_deamp_3_5db;
> > > +	u32			mpll;
> > > +};
> > > +
> > > +struct phy_drvdata {
> > > +	struct phy_ops	ops;
> > > +	u32		clk_rate;
> > > +};
> > > +
> > > +/**
> > > + * Write register and read back masked value to confirm it is written
> > > + *
> > > + * @base - QCOM DWC3 PHY base virtual address.
> > > + * @offset - register offset.
> > > + * @mask - register bitmask specifying what should be updated
> > > + * @val - value to write.
> > > + */
> > > +static inline void usb_phy_write_readback(struct usb_phy *phy_dwc3,
> > > +					  u32 offset,
> > > +					  const u32 mask, u32 val)
> > > +{
> > > +	u32 write_val, tmp = readl(phy_dwc3->base + offset);
> > > +
> > > +	tmp &= ~mask;		/* retain other bits */
> > > +	write_val = tmp | val;
> > > +
> > > +	writel(write_val, phy_dwc3->base + offset);
> > > +
> > > +	/* Read back to see if val was written */
> > > +	tmp = readl(phy_dwc3->base + offset);
> > > +	tmp &= mask;		/* clear other bits */
> > > +
> > > +	if (tmp != val)
> > > +		dev_err(phy_dwc3->dev, "write: %x to QSCRATCH: %x
> > FAILED\n",
> > > +			val, offset);
> > > +}
> > > +
> > > +static int wait_for_latch(void __iomem *addr)
> > > +{
> > > +	u32 retry = 10;
> > > +
> > > +	while (true) {
> > > +		if (!readl(addr))
> > > +			break;
> > > +
> > > +		if (--retry == 0)
> > > +			return -ETIMEDOUT;
> > > +
> > > +		usleep_range(10, 20);
> > > +	}
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +/**
> > > + * Write SSPHY register
> > > + *
> > > + * @base - QCOM DWC3 PHY base virtual address.
> > > + * @addr - SSPHY address to write.
> > > + * @val - value to write.
> > > + */
> > > +static int usb_ss_write_phycreg(struct usb_phy *phy_dwc3,
> > > +				u32 addr, u32 val)
> > > +{
> > > +	int ret;
> > > +
> > > +	writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
> > > +	writel(SS_CR_CAP_ADDR_REG,
> > > +	       phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
> > > +
> > > +	ret = wait_for_latch(phy_dwc3->base +
> > CR_PROTOCOL_CAP_ADDR_REG);
> > > +	if (ret)
> > > +		goto err_wait;
> > > +
> > > +	writel(val, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
> > > +	writel(SS_CR_CAP_DATA_REG,
> > > +	       phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG);
> > > +
> > > +	ret = wait_for_latch(phy_dwc3->base +
> > CR_PROTOCOL_CAP_DATA_REG);
> > > +	if (ret)
> > > +		goto err_wait;
> > > +
> > > +	writel(SS_CR_WRITE_REG, phy_dwc3->base +
> > CR_PROTOCOL_WRITE_REG);
> > > +
> > > +	ret = wait_for_latch(phy_dwc3->base +
> > CR_PROTOCOL_WRITE_REG);
> > > +
> > > +err_wait:
> > > +	if (ret)
> > > +		dev_err(phy_dwc3->dev, "timeout waiting for latch\n");
> > > +	return ret;
> > > +}
> > > +
> > > +/**
> > > + * Read SSPHY register.
> > > + *
> > > + * @base - QCOM DWC3 PHY base virtual address.
> > > + * @addr - SSPHY address to read.
> > > + */
> > > +static int usb_ss_read_phycreg(struct usb_phy *phy_dwc3,
> > > +			       u32 addr, u32 *val)
> > > +{
> > > +	int ret;
> > > +
> > > +	writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG);
> > > +	writel(SS_CR_CAP_ADDR_REG,
> > > +	       phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG);
> > > +
> > > +	ret = wait_for_latch(phy_dwc3->base +
> > CR_PROTOCOL_CAP_ADDR_REG);
> > > +	if (ret)
> > > +		goto err_wait;
> > > +
> > > +	/*
> > > +	 * Due to hardware bug, first read of SSPHY register might be
> > > +	 * incorrect. Hence as workaround, SW should perform SSPHY
> > register
> > > +	 * read twice, but use only second read and ignore first read.
> > > +	 */
> > > +	writel(SS_CR_READ_REG, phy_dwc3->base +
> > CR_PROTOCOL_READ_REG);
> > > +
> > > +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_READ_REG);
> > > +	if (ret)
> > > +		goto err_wait;
> > > +
> > > +	/* throwaway read */
> > > +	readl(phy_dwc3->base + CR_PROTOCOL_DATA_OUT_REG);
> > > +
> > > +	writel(SS_CR_READ_REG, phy_dwc3->base +
> > CR_PROTOCOL_READ_REG);
> > > +
> > > +	ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_READ_REG);
> > > +	if (ret)
> > > +		goto err_wait;
> > > +
> > > +	*val = readl(phy_dwc3->base + CR_PROTOCOL_DATA_OUT_REG);
> > > +
> > > +err_wait:
> > > +	return ret;
> > > +}
> > > +
> > > +static int qcom_ipq806x_usb_hs_phy_init(struct phy *phy)
> > > +{
> > > +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> > > +	int ret;
> > > +	u32 val;
> > > +
> > > +	ret = clk_prepare_enable(phy_dwc3->xo_clk);
> > > +	if (ret)
> > > +		return ret;
> > > +
> > > +	ret = clk_prepare_enable(phy_dwc3->ref_clk);
> > > +	if (ret) {
> > > +		clk_disable_unprepare(phy_dwc3->xo_clk);
> > > +		return ret;
> > > +	}
> > > +
> > > +	/*
> > > +	 * HSPHY Initialization: Enable UTMI clock, select 19.2MHz fsel
> > > +	 * enable clamping, and disable RETENTION (power-on default is
> > ENABLED)
> > > +	 */
> > > +	val = HSUSB_CTRL_DPSEHV_CLAMP |
> > HSUSB_CTRL_DMSEHV_CLAMP |
> > > +		HSUSB_CTRL_RETENABLEN  | HSUSB_CTRL_COMMONONN |
> > > +		HSUSB_CTRL_OTGSESSVLD_CLAMP |
> > HSUSB_CTRL_ID_HV_CLAMP |
> > > +		HSUSB_CTRL_DPSEHV_CLAMP |
> > HSUSB_CTRL_UTMI_OTG_VBUS_VALID |
> > > +		HSUSB_CTRL_UTMI_CLK_EN | HSUSB_CTRL_CLAMP_EN |
> > 0x70;
> > > +
> > > +	/* use core clock if external reference is not present */
> > > +	if (!phy_dwc3->xo_clk)
> > > +		val |= HSUSB_CTRL_USE_CLKCORE;
> > > +
> > > +	writel(val, phy_dwc3->base + HSUSB_PHY_CTRL_REG);
> > > +	usleep_range(2000, 2200);
> > > +
> > > +	/* Disable (bypass) VBUS and ID filters */
> > > +	writel(HSUSB_GCFG_XHCI_REV, phy_dwc3->base +
> > QSCRATCH_GENERAL_CFG);
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +static int qcom_ipq806x_usb_hs_phy_exit(struct phy *phy)
> > > +{
> > > +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> > > +
> > > +	clk_disable_unprepare(phy_dwc3->ref_clk);
> > > +	clk_disable_unprepare(phy_dwc3->xo_clk);
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +static int qcom_ipq806x_usb_ss_phy_init(struct phy *phy)
> > > +{
> > > +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> > > +	int ret;
> > > +	u32 data = 0;
> > > +
> > > +	ret = clk_prepare_enable(phy_dwc3->xo_clk);
> > > +	if (ret)
> > > +		return ret;
> > > +
> > > +	ret = clk_prepare_enable(phy_dwc3->ref_clk);
> > > +	if (ret) {
> > > +		clk_disable_unprepare(phy_dwc3->xo_clk);
> > > +		return ret;
> > > +	}
> > > +
> > > +	/* reset phy */
> > > +	data = readl(phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > > +	writel(data | SSUSB_CTRL_SS_PHY_RESET,
> > > +	       phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > > +	usleep_range(2000, 2200);
> > > +	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > > +
> > > +	/* clear REF_PAD if we don't have XO clk */
> > > +	if (!phy_dwc3->xo_clk)
> > > +		data &= ~SSUSB_CTRL_REF_USE_PAD;
> > > +	else
> > > +		data |= SSUSB_CTRL_REF_USE_PAD;
> > > +
> > > +	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > > +
> > > +	/* wait for ref clk to become stable, this can take up to 30ms */
> > > +	msleep(30);
> > > +
> > > +	data |= SSUSB_CTRL_SS_PHY_EN |
> > SSUSB_CTRL_LANE0_PWR_PRESENT;
> > > +	writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG);
> > > +
> > > +	/*
> > > +	 * WORKAROUND: There is SSPHY suspend bug due to which USB
> > enumerates
> > > +	 * in HS mode instead of SS mode. Workaround it by asserting
> > > +	 * LANE0.TX_ALT_BLOCK.EN_ALT_BUS to enable TX to use alt bus
> > mode
> > > +	 */
> > > +	ret = usb_ss_read_phycreg(phy_dwc3, 0x102D, &data);
> > > +	if (ret)
> > > +		goto err_phy_trans;
> > > +
> > > +	data |= (1 << 7);
> > > +	ret = usb_ss_write_phycreg(phy_dwc3, 0x102D, data);
> > > +	if (ret)
> > > +		goto err_phy_trans;
> > > +
> > > +	ret = usb_ss_read_phycreg(phy_dwc3, 0x1010, &data);
> > > +	if (ret)
> > > +		goto err_phy_trans;
> > > +
> > > +	data &= ~0xff0;
> > > +	data |= 0x20;
> > > +	ret = usb_ss_write_phycreg(phy_dwc3, 0x1010, data);
> > > +	if (ret)
> > > +		goto err_phy_trans;
> > > +
> > > +	/*
> > > +	 * Fix RX Equalization setting as follows
> > > +	 * LANE0.RX_OVRD_IN_HI. RX_EQ_EN set to 0
> > > +	 * LANE0.RX_OVRD_IN_HI.RX_EQ_EN_OVRD set to 1
> > > +	 * LANE0.RX_OVRD_IN_HI.RX_EQ set based on SoC version
> > > +	 * LANE0.RX_OVRD_IN_HI.RX_EQ_OVRD set to 1
> > > +	 */
> > > +	ret = usb_ss_read_phycreg(phy_dwc3,
> > > +				  SSPHY_CTRL_RX_OVRD_IN_HI(0), &data);
> > > +	if (ret)
> > > +		goto err_phy_trans;
> > > +
> > > +	data &= ~RX_OVRD_IN_HI_RX_EQ_EN;
> > > +	data |= RX_OVRD_IN_HI_RX_EQ_EN_OVRD;
> > > +	data &= ~RX_OVRD_IN_HI_RX_EQ_MASK;
> > > +	data |= RX_OVRD_IN_HI_RX_EQ(phy_dwc3->rx_eq);
> > > +	data |= RX_OVRD_IN_HI_RX_EQ_OVRD;
> > > +	ret = usb_ss_write_phycreg(phy_dwc3,
> > > +				   SSPHY_CTRL_RX_OVRD_IN_HI(0), data);
> > > +	if (ret)
> > > +		goto err_phy_trans;
> > > +
> > > +	/*
> > > +	 * Set EQ and TX launch amplitudes as follows
> > > +	 * LANE0.TX_OVRD_DRV_LO.PREEMPH set based on SoC version
> > > +	 * LANE0.TX_OVRD_DRV_LO.AMPLITUDE set to 110
> > > +	 * LANE0.TX_OVRD_DRV_LO.EN set to 1.
> > > +	 */
> > > +	ret = usb_ss_read_phycreg(phy_dwc3,
> > > +				  SSPHY_CTRL_TX_OVRD_DRV_LO(0), &data);
> > > +	if (ret)
> > > +		goto err_phy_trans;
> > > +
> > > +	data &= ~TX_OVRD_DRV_LO_PREEMPH_MASK;
> > > +	data |= TX_OVRD_DRV_LO_PREEMPH(phy_dwc3-
> > >tx_deamp_3_5db);
> > > +	data &= ~TX_OVRD_DRV_LO_AMPLITUDE_MASK;
> > > +	data |= 0x6E;
> > > +	data |= TX_OVRD_DRV_LO_EN;
> > > +	ret = usb_ss_write_phycreg(phy_dwc3,
> > > +				   SSPHY_CTRL_TX_OVRD_DRV_LO(0), data);
> > > +	if (ret)
> > > +		goto err_phy_trans;
> > > +
> > > +	data = 0;
> > > +	data &= ~SSPHY_MPLL_MASK;
> > > +	data |= SSPHY_MPLL(phy_dwc3->mpll);
> > > +	usb_ss_write_phycreg(phy_dwc3, 0x30, data);
> > > +
> > > +	/*
> > > +	 * Set the QSCRATCH PHY_PARAM_CTRL1 parameters as follows
> > > +	 * TX_FULL_SWING [26:20] amplitude to 110
> > > +	 * TX_DEEMPH_6DB [19:14] to 32
> > > +	 * TX_DEEMPH_3_5DB [13:8] set based on SoC version
> > > +	 * LOS_BIAS [7:3] to 9
> > > +	 */
> > > +	data = readl(phy_dwc3->base + SSUSB_PHY_PARAM_CTRL_1);
> > > +
> > > +	data &= ~PHY_PARAM_CTRL1_MASK;
> > > +
> > > +	data |= PHY_PARAM_CTRL1_TX_FULL_SWING(0x6e) |
> > > +		PHY_PARAM_CTRL1_TX_DEEMPH_6DB(0x20) |
> > > +		PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(phy_dwc3-
> > >tx_deamp_3_5db) |
> > > +		PHY_PARAM_CTRL1_LOS_BIAS(0x9);
> > > +
> > > +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_PARAM_CTRL_1,
> > > +			       PHY_PARAM_CTRL1_MASK, data);
> > > +
> > > +err_phy_trans:
> > > +	return ret;
> > > +}
> > > +
> > > +static int qcom_ipq806x_usb_ss_phy_exit(struct phy *phy)
> > > +{
> > > +	struct usb_phy *phy_dwc3 = phy_get_drvdata(phy);
> > > +
> > > +	/* Sequence to put SSPHY in low power state:
> > > +	 * 1. Clear REF_PHY_EN in PHY_CTRL_REG
> > > +	 * 2. Clear REF_USE_PAD in PHY_CTRL_REG
> > > +	 * 3. Set TEST_POWERED_DOWN in PHY_CTRL_REG to enable PHY
> > retention
> > > +	 */
> > > +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
> > > +			       SSUSB_CTRL_SS_PHY_EN, 0x0);
> > > +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
> > > +			       SSUSB_CTRL_REF_USE_PAD, 0x0);
> > > +	usb_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG,
> > > +			       SSUSB_CTRL_TEST_POWERDOWN, 0x0);
> > > +
> > > +	clk_disable_unprepare(phy_dwc3->ref_clk);
> > > +	clk_disable_unprepare(phy_dwc3->xo_clk);
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +static const struct phy_drvdata qcom_ipq806x_usb_hs_drvdata = {
> > > +	.ops = {
> > > +		.init		= qcom_ipq806x_usb_hs_phy_init,
> > > +		.exit		= qcom_ipq806x_usb_hs_phy_exit,
> > > +		.owner		= THIS_MODULE,
> > > +	},
> > > +	.clk_rate = 60000000,
> > > +};
> > > +
> > > +static const struct phy_drvdata qcom_ipq806x_usb_ss_drvdata = {
> > > +	.ops = {
> > > +		.init		= qcom_ipq806x_usb_ss_phy_init,
> > > +		.exit		= qcom_ipq806x_usb_ss_phy_exit,
> > > +		.owner		= THIS_MODULE,
> > > +	},
> > > +	.clk_rate = 125000000,
> > > +};
> > > +
> > > +static const struct of_device_id qcom_ipq806x_usb_phy_table[] = {
> > > +	{ .compatible = "qcom,ipq806x-usb-phy-hs",
> > > +	  .data = &qcom_ipq806x_usb_hs_drvdata },
> > > +	{ .compatible = "qcom,ipq806x-usb-phy-ss",
> > > +	  .data = &qcom_ipq806x_usb_ss_drvdata },
> > > +	{ /* Sentinel */ }
> > > +};
> > > +MODULE_DEVICE_TABLE(of, qcom_ipq806x_usb_phy_table);
> > > +
> > > +static int qcom_ipq806x_usb_phy_probe(struct platform_device *pdev)
> > > +{
> > > +	struct usb_phy	*phy_dwc3;
> > > +	struct phy_provider		*phy_provider;
> > > +	struct phy			*generic_phy;
> > > +	const struct of_device_id *match;
> > > +	const struct phy_drvdata *data;
> > > +	struct resource			*res;
> > > +	resource_size_t			size;
> > > +	struct device_node *np;
> > > +
> > > +	phy_dwc3 = devm_kzalloc(&pdev->dev, sizeof(*phy_dwc3),
> > GFP_KERNEL);
> > > +	if (!phy_dwc3)
> > > +		return -ENOMEM;
> > > +
> > > +	match = of_match_node(qcom_ipq806x_usb_phy_table, pdev-
> > >dev.of_node);
> > > +	data = match->data;
> > > +
> > > +	phy_dwc3->dev = &pdev->dev;
> > > +
> > > +	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > > +	if (!res)
> > > +		return -EINVAL;
> > > +	size = resource_size(res);
> > > +	phy_dwc3->base = devm_ioremap(phy_dwc3->dev, res->start,
> > size);
> > > +
> > > +	if (IS_ERR(phy_dwc3->base)) {
> > > +		dev_err(phy_dwc3->dev, "failed to map reg\n");
> > > +		return PTR_ERR(phy_dwc3->base);
> > > +	}
> > > +
> > > +	phy_dwc3->ref_clk = devm_clk_get(phy_dwc3->dev, "ref");
> > > +	if (IS_ERR(phy_dwc3->ref_clk)) {
> > > +		dev_dbg(phy_dwc3->dev, "cannot get reference clock\n");
> > > +		return PTR_ERR(phy_dwc3->ref_clk);
> > > +	}
> > > +
> > > +	clk_set_rate(phy_dwc3->ref_clk, data->clk_rate);
> > > +
> > > +	phy_dwc3->xo_clk = devm_clk_get(phy_dwc3->dev, "xo");
> > > +	if (IS_ERR(phy_dwc3->xo_clk)) {
> > > +		dev_dbg(phy_dwc3->dev, "cannot get TCXO clock\n");
> > > +		phy_dwc3->xo_clk = NULL;
> > > +	}
> > > +
> > > +	/* Parse device node to probe HSIO settings */
> > > +	np = of_node_get(pdev->dev.of_node);
> > > +	if (!of_compat_cmp(match->compatible, "qcom,ipq806x-usb-phy-
> > ss",
> > > +			   strlen(match->compatible))) {
> > > +		if (of_property_read_u32(np, "qcom,rx-eq", &phy_dwc3-
> > >rx_eq) ||
> > > +		    of_property_read_u32(np, "qcom,tx-deamp_3_5db",
> > > +					 &phy_dwc3->tx_deamp_3_5db) ||
> > > +		    of_property_read_u32(np, "qcom,mpll", &phy_dwc3-
> > >mpll)) {
> > > +			dev_err(phy_dwc3->dev, "cannot get HSIO settings
> > from device node, using default values\n");
> > > +
> > > +			/* Default HSIO settings */
> > > +			phy_dwc3->rx_eq = SSPHY_RX_EQ_VALUE;
> > > +			phy_dwc3->tx_deamp_3_5db =
> > SSPHY_TX_DEEMPH_3_5DB;
> > > +			phy_dwc3->mpll = SSPHY_MPLL_VALUE;
> > > +		}
> > > +	}
> > > +
> > > +	generic_phy = devm_phy_create(phy_dwc3->dev, pdev-
> > >dev.of_node,
> > > +				      &data->ops);
> > > +
> > > +	if (IS_ERR(generic_phy))
> > > +		return PTR_ERR(generic_phy);
> > > +
> > > +	phy_set_drvdata(generic_phy, phy_dwc3);
> > > +	platform_set_drvdata(pdev, phy_dwc3);
> > > +
> > > +	phy_provider = devm_of_phy_provider_register(phy_dwc3->dev,
> > > +						     of_phy_simple_xlate);
> > > +
> > > +	if (IS_ERR(phy_provider))
> > > +		return PTR_ERR(phy_provider);
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +static struct platform_driver qcom_ipq806x_usb_phy_driver = {
> > > +	.probe		= qcom_ipq806x_usb_phy_probe,
> > > +	.driver		= {
> > > +		.name	= "qcom-ipq806x-usb-phy",
> > > +		.owner	= THIS_MODULE,
> > > +		.of_match_table = qcom_ipq806x_usb_phy_table,
> > > +	},
> > > +};
> > > +
> > > +module_platform_driver(qcom_ipq806x_usb_phy_driver);
> > > +
> > > +MODULE_ALIAS("platform:phy-qcom-ipq806x-usb");
> > > +MODULE_LICENSE("GPL v2");
> > > +MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
> > > +MODULE_AUTHOR("Ivan T. Ivanov <iivanov@mm-sol.com>");
> > > +MODULE_DESCRIPTION("DesignWare USB3 QCOM PHY driver");
> > > --
> > > 2.25.1

J.

-- 
] https://www.earth.li/~noodles/ []   101 things you can't have too    [
]  PGP/GPG Key @ the.earth.li    []      much of : 34 - Beaches.       [
] via keyserver, web or email.   []                                    [
] RSA: 4096/0x94FA372B2DA8B985   []                                    [

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: R: [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver
  2020-06-09 11:41     ` Jonathan McDowell
@ 2020-06-09 11:55       ` Vinod Koul
  0 siblings, 0 replies; 7+ messages in thread
From: Vinod Koul @ 2020-06-09 11:55 UTC (permalink / raw)
  To: Jonathan McDowell
  Cc: ansuelsmth, 'Bjorn Andersson', 'Andy Gross',
	'Andy Gross', 'Kishon Vijay Abraham I',
	'Rob Herring', 'Mark Rutland',
	linux-arm-msm, linux-kernel, devicetree

On 09-06-20, 12:41, Jonathan McDowell wrote:
> On Fri, Jun 05, 2020 at 07:00:04PM +0200, ansuelsmth@gmail.com wrote:
> > > On Wed, Jun 03, 2020 at 03:22:34PM +0200, Ansuel Smith wrote:
> > > > This has lost in the original push for the dwc3 qcom driver.
> > > > This is needed for ipq806x SoC as without this the usb ports
> > > > doesn't work at all.
> > > 
> > > FWIW I tested this on my RB3011 so feel free to add:
> > > 
> > > Tested-by: Jonathan McDowell <noodles@earth.li>
> > > 
> > > One minor comment; would PHY_QCOM_USB_IPQ806X not be a better
> > > choice than PHY_QCOM_IPQ806X_USB given the existing naming?
> > > 
> >
> > Thanks for the feedback. About naming I'm following the sata ipq806x
> > naming.  I really hope someone gets this and reviews it since usb is
> > broken for a long time now.
> 
> Doesn't seem to have made the 5.8 merge window; I note Vinod has done a
> bunch of the recent commits to phy/qualcomm/ so adding him to the CC in
> addition to Kishon.

It is too late for 5.8 now, please rebase and resend it after rc1 is
tagged

Thanks
-- 
~Vinod

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v6 2/2] devicetree: bindings: phy: Document ipq806x dwc3 qcom phy
  2020-06-03 13:22 ` [PATCH v6 2/2] devicetree: bindings: phy: Document ipq806x dwc3 qcom phy Ansuel Smith
@ 2020-06-10 20:26   ` Rob Herring
  0 siblings, 0 replies; 7+ messages in thread
From: Rob Herring @ 2020-06-10 20:26 UTC (permalink / raw)
  To: Ansuel Smith
  Cc: Bjorn Andersson, Andy Gross, Kishon Vijay Abraham I,
	Mark Rutland, linux-arm-msm, linux-kernel, devicetree

On Wed, Jun 03, 2020 at 03:22:35PM +0200, Ansuel Smith wrote:
> Document dwc3 qcom phy hs and ss phy bindings needed to correctly
> inizialize and use usb on ipq806x SoC.
> 
> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> ---
> v6:
> * Add maximum value
> v5:
> * Fix dt_binding_check error
> v4:
> * Add qcom to specific bindings
> v3:
> * Use explicit reg instead of regmap
> 
>  .../bindings/phy/qcom,ipq806x-usb-phy-hs.yaml | 58 ++++++++++++++
>  .../bindings/phy/qcom,ipq806x-usb-phy-ss.yaml | 76 +++++++++++++++++++
>  2 files changed, 134 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml
>  create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml
> 
> diff --git a/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml b/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml
> new file mode 100644
> index 000000000000..c019de7478e3
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml
> @@ -0,0 +1,58 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/phy/qcom,ipq806x-usb-phy-hs.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm ipq806x usb DWC3 HS PHY CONTROLLER
> +
> +maintainers:
> +  - Ansuel Smith <ansuelsmth@gmail.com>
> +
> +description:
> +  DWC3 PHY nodes are defined to describe on-chip Synopsis Physical layer
> +  controllers used in ipq806x. Each DWC3 PHY controller should have its
> +  own node.
> +
> +properties:
> +  compatible:
> +    const: qcom,ipq806x-usb-phy-hs
> +
> +  "#phy-cells":
> +    const: 0
> +
> +  reg:
> +    maxItems: 1
> +
> +  clocks:
> +    minItems: 1
> +    maxItems: 2
> +
> +  clock-names:
> +    minItems: 1
> +    maxItems: 2
> +    description: |
> +      - "ref" Is required
> +      - "xo"	Optional external reference clock

This is just saying what the schema says. Drop it.

> +    items:
> +      - const: ref
> +      - const: xo
> +
> +required:
> +  - compatible
> +  - "#phy-cells"
> +  - reg
> +  - clocks
> +  - clock-names
> +
> +examples:
> +  - |
> +    #include <dt-bindings/clock/qcom,gcc-ipq806x.h>
> +
> +    hs_phy_0: phy@110f8800 {
> +      compatible = "qcom,ipq806x-usb-phy-hs";
> +      reg = <0x110f8800 0x30>;
> +      clocks = <&gcc USB30_0_UTMI_CLK>;
> +      clock-names = "ref";
> +      #phy-cells = <0>;
> +    };
> diff --git a/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml b/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml
> new file mode 100644
> index 000000000000..3696a8d7a5c7
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml
> @@ -0,0 +1,76 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/phy/qcom,ipq806x-usb-phy-ss.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm ipq806x usb DWC3 SS PHY CONTROLLER
> +
> +maintainers:
> +  - Ansuel Smith <ansuelsmth@gmail.com>
> +
> +description:
> +  DWC3 PHY nodes are defined to describe on-chip Synopsis Physical layer
> +  controllers used in ipq806x. Each DWC3 PHY controller should have its
> +  own node.
> +
> +properties:
> +  compatible:
> +    const: qcom,ipq806x-usb-phy-ss
> +
> +  "#phy-cells":
> +    const: 0
> +
> +  reg:
> +    maxItems: 1
> +
> +  clocks:
> +    minItems: 1
> +    maxItems: 2
> +
> +  clock-names:
> +    minItems: 1
> +    maxItems: 2
> +    items:
> +      - const: ref
> +      - const: xo
> +
> +  qcom,rx-eq:
> +    description: Override value for rx_eq.
> +    default: 4
> +    maximum: 7
> +    allOf:

You can drop 'allOf' now and just do $ref directly.

> +      - $ref: /schemas/types.yaml#/definitions/uint32
> +
> +  qcom,tx-deamp-3_5db:
> +    description: Override value for transmit preemphasis.
> +    default: 23
> +    maximum: 63
> +    allOf:
> +      - $ref: /schemas/types.yaml#/definitions/uint32
> +
> +  qcom,mpll:
> +    description: Override value for mpll.
> +    default: 0
> +    maximum: 7
> +    allOf:
> +      - $ref: /schemas/types.yaml#/definitions/uint32
> +
> +required:
> +  - compatible
> +  - "#phy-cells"
> +  - reg
> +  - clocks
> +  - clock-names
> +
> +examples:
> +  - |
> +    #include <dt-bindings/clock/qcom,gcc-ipq806x.h>
> +
> +    ss_phy_0: phy@110f8830 {
> +      compatible = "qcom,ipq806x-usb-phy-ss";
> +      reg = <0x110f8830 0x30>;
> +      clocks = <&gcc USB30_0_MASTER_CLK>;
> +      clock-names = "ref";
> +      #phy-cells = <0>;
> +    };
> -- 
> 2.25.1
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-06-10 20:26 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-03 13:22 [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver Ansuel Smith
2020-06-03 13:22 ` [PATCH v6 2/2] devicetree: bindings: phy: Document ipq806x dwc3 qcom phy Ansuel Smith
2020-06-10 20:26   ` Rob Herring
2020-06-04 16:19 ` [PATCH v6 1/2] phy: qualcomm: add qcom ipq806x dwc usb phy driver Jonathan McDowell
2020-06-05 17:00   ` R: " ansuelsmth
2020-06-09 11:41     ` Jonathan McDowell
2020-06-09 11:55       ` Vinod Koul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).