[PATCH v6 0/3] Stingray USB PHY driver support

[PATCH v6 0/3] Stingray USB PHY driver support

[Srinath Mannam]

These patches add Stingray USB PHY driver and its corresponding
DT nodes with documentation.

This patch set is based on Linux-5.0-rc2.

Changes from v5:
  - Removed redundant address and size cells in DT nodes.

Changes from v4:
  - Addressed Rob Herring review comments
     - Removed child nodes and added #phy-cells 1
     - Added xlate function to get phy using phandle argument.

Changes from v3:
  - Addressed Rob Herring review comments
     - Changed compatible strings.
     - updated driver based on new compatible strings.

Changes from v2:
  - Addressed Kishon review comments
  - Updated patchset to Linux-5.0-rc2

Changes from v1:
  - Addressed Kishon review comments
  - phy init call return value handle
  
Srinath Mannam (3):
  dt-bindings: phy: Add Stingray USB PHY binding document
  phy: sr-usb: Add Stingray USB PHY driver
  arm64: dts: Add USB DT nodes for Stingray SoC

 .../bindings/phy/brcm,stingray-usb-phy.txt         |  32 ++
 .../boot/dts/broadcom/stingray/stingray-usb.dtsi   |  72 ++++
 .../arm64/boot/dts/broadcom/stingray/stingray.dtsi |   1 +
 drivers/phy/broadcom/Kconfig                       |  11 +
 drivers/phy/broadcom/Makefile                      |   1 +
 drivers/phy/broadcom/phy-bcm-sr-usb.c              | 393 +++++++++++++++++++++
 6 files changed, 510 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt
 create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
 create mode 100644 drivers/phy/broadcom/phy-bcm-sr-usb.c

-- 
2.7.4

[PATCH v6 1/3] dt-bindings: phy: Add Stingray USB PHY binding document

[Srinath Mannam]

Add DT binding document for Stingray USB PHY.

Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
 .../bindings/phy/brcm,stingray-usb-phy.txt         | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt

diff --git a/Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt b/Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt
new file mode 100644
index 0000000..4ba2989
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt
@@ -0,0 +1,32 @@
+Broadcom Stingray USB PHY
+
+Required properties:
+ - compatible : should be one of the listed compatibles
+	- "brcm,sr-usb-combo-phy" is combo PHY has two PHYs, one SS and one HS.
+	- "brcm,sr-usb-hs-phy" is a single HS PHY.
+ - reg: offset and length of the PHY blocks registers
+ - #phy-cells:
+   - Must be 1 for brcm,sr-usb-combo-phy as it expects one argument to indicate
+     the PHY number of two PHYs. 0 for HS PHY and 1 for SS PHY.
+   - Must be 0 for brcm,sr-usb-hs-phy.
+
+Refer to phy/phy-bindings.txt for the generic PHY binding properties
+
+Example:
+	usbphy0: usb-phy@0 {
+		compatible = "brcm,sr-usb-combo-phy";
+		reg = <0x00000000 0x100>;
+		#phy-cells = <1>;
+	};
+
+	usbphy1: usb-phy@10000 {
+		compatible = "brcm,sr-usb-combo-phy";
+		reg = <0x00010000 0x100>,
+		#phy-cells = <1>;
+	};
+
+	usbphy2: usb-phy@20000 {
+		compatible = "brcm,sr-usb-hs-phy";
+		reg = <0x00020000 0x100>,
+		#phy-cells = <0>;
+	};
-- 
2.7.4

[PATCH v6 2/3] phy: sr-usb: Add Stingray USB PHY driver

[Srinath Mannam]

USB PHY driver supports two types of stingray USB PHYs
 - Type 1 is a combo PHY contains two PHYs, one SS and one HS.
 - Type 2 is a single HS PHY.

These two PHY versons support both Generic xHCI host controller driver
and BDC Broadcom device controller driver.

Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
---
 drivers/phy/broadcom/Kconfig          |  11 +
 drivers/phy/broadcom/Makefile         |   1 +
 drivers/phy/broadcom/phy-bcm-sr-usb.c | 393 ++++++++++++++++++++++++++++++++++
 3 files changed, 405 insertions(+)
 create mode 100644 drivers/phy/broadcom/phy-bcm-sr-usb.c

diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig
index aa917a6..f30f481 100644
--- a/drivers/phy/broadcom/Kconfig
+++ b/drivers/phy/broadcom/Kconfig
@@ -10,6 +10,17 @@ config PHY_CYGNUS_PCIE
 	  Enable this to support the Broadcom Cygnus PCIe PHY.
 	  If unsure, say N.
 
+config PHY_BCM_SR_USB
+	tristate "Broadcom Stingray USB PHY driver"
+	depends on OF && (ARCH_BCM_IPROC || COMPILE_TEST)
+	select GENERIC_PHY
+	default ARCH_BCM_IPROC
+	help
+	  Enable this to support the Broadcom Stingray USB PHY
+	  driver. It supports all versions of Superspeed and
+	  Highspeed PHYs.
+	  If unsure, say N.
+
 config BCM_KONA_USB2_PHY
 	tristate "Broadcom Kona USB2 PHY Driver"
 	depends on HAS_IOMEM
diff --git a/drivers/phy/broadcom/Makefile b/drivers/phy/broadcom/Makefile
index 0f60184..f453c7d 100644
--- a/drivers/phy/broadcom/Makefile
+++ b/drivers/phy/broadcom/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_PHY_BRCM_USB)		+= phy-brcm-usb-dvr.o
 phy-brcm-usb-dvr-objs := phy-brcm-usb.o phy-brcm-usb-init.o
 
 obj-$(CONFIG_PHY_BCM_SR_PCIE)		+= phy-bcm-sr-pcie.o
+obj-$(CONFIG_PHY_BCM_SR_USB)		+= phy-bcm-sr-usb.o
diff --git a/drivers/phy/broadcom/phy-bcm-sr-usb.c b/drivers/phy/broadcom/phy-bcm-sr-usb.c
new file mode 100644
index 0000000..bfe8237
--- /dev/null
+++ b/drivers/phy/broadcom/phy-bcm-sr-usb.c
@@ -0,0 +1,393 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2016-2018 Broadcom
+ */
+
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+
+enum bcm_usb_phy_version {
+	BCM_SR_USB_COMBO_PHY,
+	BCM_SR_USB_HS_PHY,
+};
+
+enum bcm_usb_phy_reg {
+	PLL_NDIV_FRAC,
+	PLL_NDIV_INT,
+	PLL_CTRL,
+	PHY_CTRL,
+	PHY_PLL_CTRL,
+};
+
+/* USB PHY registers */
+
+static const u8 bcm_usb_combo_phy_ss[] = {
+	[PLL_CTRL]		= 0x18,
+	[PHY_CTRL]		= 0x14,
+};
+
+static const u8 bcm_usb_combo_phy_hs[] = {
+	[PLL_NDIV_FRAC]	= 0x04,
+	[PLL_NDIV_INT]	= 0x08,
+	[PLL_CTRL]	= 0x0c,
+	[PHY_CTRL]	= 0x10,
+};
+
+#define HSPLL_NDIV_INT_VAL	0x13
+#define HSPLL_NDIV_FRAC_VAL	0x1005
+
+static const u8 bcm_usb_hs_phy[] = {
+	[PLL_NDIV_FRAC]	= 0x0,
+	[PLL_NDIV_INT]	= 0x4,
+	[PLL_CTRL]	= 0x8,
+	[PHY_CTRL]	= 0xc,
+};
+
+enum pll_ctrl_bits {
+	PLL_RESETB,
+	SSPLL_SUSPEND_EN,
+	PLL_SEQ_START,
+	PLL_LOCK,
+	PLL_PDIV,
+};
+
+static const u8 u3pll_ctrl[] = {
+	[PLL_RESETB]		= 0,
+	[SSPLL_SUSPEND_EN]	= 1,
+	[PLL_SEQ_START]		= 2,
+	[PLL_LOCK]		= 3,
+};
+
+#define HSPLL_PDIV_MASK		0xF
+#define HSPLL_PDIV_VAL		0x1
+
+static const u8 u2pll_ctrl[] = {
+	[PLL_PDIV]	= 1,
+	[PLL_RESETB]	= 5,
+	[PLL_LOCK]	= 6,
+};
+
+enum bcm_usb_phy_ctrl_bits {
+	CORERDY,
+	AFE_LDO_PWRDWNB,
+	AFE_PLL_PWRDWNB,
+	AFE_BG_PWRDWNB,
+	PHY_ISO,
+	PHY_RESETB,
+	PHY_PCTL,
+};
+
+#define PHY_PCTL_MASK	0xffff
+/*
+ * 0x0806 of PCTL_VAL has below bits set
+ * BIT-8 : refclk divider 1
+ * BIT-3:2: device mode; mode is not effect
+ * BIT-1: soft reset active low
+ */
+#define HSPHY_PCTL_VAL	0x0806
+#define SSPHY_PCTL_VAL	0x0006
+
+static const u8 u3phy_ctrl[] = {
+	[PHY_RESETB]	= 1,
+	[PHY_PCTL]	= 2,
+};
+
+static const u8 u2phy_ctrl[] = {
+	[CORERDY]		= 0,
+	[AFE_LDO_PWRDWNB]	= 1,
+	[AFE_PLL_PWRDWNB]	= 2,
+	[AFE_BG_PWRDWNB]	= 3,
+	[PHY_ISO]		= 4,
+	[PHY_RESETB]		= 5,
+	[PHY_PCTL]		= 6,
+};
+
+struct bcm_usb_phy_cfg {
+	uint32_t type;
+	uint32_t version;
+	void __iomem *regs;
+	struct phy *phy;
+	const u8 *offset;
+};
+
+#define PLL_LOCK_RETRY_COUNT	1000
+
+enum bcm_usb_phy_type {
+	USB_HS_PHY,
+	USB_SS_PHY,
+};
+
+#define NUM_BCM_SR_USB_COMBO_PHYS	2
+
+static inline void bcm_usb_reg32_clrbits(void __iomem *addr, uint32_t clear)
+{
+	writel(readl(addr) & ~clear, addr);
+}
+
+static inline void bcm_usb_reg32_setbits(void __iomem *addr, uint32_t set)
+{
+	writel(readl(addr) | set, addr);
+}
+
+static int bcm_usb_pll_lock_check(void __iomem *addr, u32 bit)
+{
+	int retry;
+	u32 rd_data;
+
+	retry = PLL_LOCK_RETRY_COUNT;
+	do {
+		rd_data = readl(addr);
+		if (rd_data & bit)
+			return 0;
+		udelay(1);
+	} while (--retry > 0);
+
+	pr_err("%s: FAIL\n", __func__);
+	return -ETIMEDOUT;
+}
+
+static int bcm_usb_ss_phy_init(struct bcm_usb_phy_cfg *phy_cfg)
+{
+	int ret = 0;
+	void __iomem *regs = phy_cfg->regs;
+	const u8 *offset;
+	u32 rd_data;
+
+	offset = phy_cfg->offset;
+
+	/* Set pctl with mode and soft reset */
+	rd_data = readl(regs + offset[PHY_CTRL]);
+	rd_data &= ~(PHY_PCTL_MASK << u3phy_ctrl[PHY_PCTL]);
+	rd_data |= (SSPHY_PCTL_VAL << u3phy_ctrl[PHY_PCTL]);
+	writel(rd_data, regs + offset[PHY_CTRL]);
+
+	bcm_usb_reg32_clrbits(regs + offset[PLL_CTRL],
+			      BIT(u3pll_ctrl[SSPLL_SUSPEND_EN]));
+	bcm_usb_reg32_setbits(regs + offset[PLL_CTRL],
+			      BIT(u3pll_ctrl[PLL_SEQ_START]));
+	bcm_usb_reg32_setbits(regs + offset[PLL_CTRL],
+			      BIT(u3pll_ctrl[PLL_RESETB]));
+
+	/* Maximum timeout for PLL reset done */
+	msleep(30);
+
+	ret = bcm_usb_pll_lock_check(regs + offset[PLL_CTRL],
+				     BIT(u3pll_ctrl[PLL_LOCK]));
+
+	return ret;
+}
+
+static int bcm_usb_hs_phy_init(struct bcm_usb_phy_cfg *phy_cfg)
+{
+	int ret = 0;
+	void __iomem *regs = phy_cfg->regs;
+	const u8 *offset;
+	u32 rd_data;
+
+	offset = phy_cfg->offset;
+
+	writel(HSPLL_NDIV_INT_VAL, regs + offset[PLL_NDIV_INT]);
+	writel(HSPLL_NDIV_FRAC_VAL, regs + offset[PLL_NDIV_FRAC]);
+
+	rd_data = readl(regs + offset[PLL_CTRL]);
+	rd_data &= ~(HSPLL_PDIV_MASK << u2pll_ctrl[PLL_PDIV]);
+	rd_data |= (HSPLL_PDIV_VAL << u2pll_ctrl[PLL_PDIV]);
+	writel(rd_data, regs + offset[PLL_CTRL]);
+
+	/* Set Core Ready high */
+	bcm_usb_reg32_setbits(regs + offset[PHY_CTRL],
+			      BIT(u2phy_ctrl[CORERDY]));
+
+	/* Maximum timeout for Core Ready done */
+	msleep(30);
+
+	bcm_usb_reg32_setbits(regs + offset[PLL_CTRL],
+			      BIT(u2pll_ctrl[PLL_RESETB]));
+	bcm_usb_reg32_setbits(regs + offset[PHY_CTRL],
+			      BIT(u2phy_ctrl[PHY_RESETB]));
+
+
+	rd_data = readl(regs + offset[PHY_CTRL]);
+	rd_data &= ~(PHY_PCTL_MASK << u2phy_ctrl[PHY_PCTL]);
+	rd_data |= (HSPHY_PCTL_VAL << u2phy_ctrl[PHY_PCTL]);
+	writel(rd_data, regs + offset[PHY_CTRL]);
+
+	/* Maximum timeout for PLL reset done */
+	msleep(30);
+
+	ret = bcm_usb_pll_lock_check(regs + offset[PLL_CTRL],
+				     BIT(u2pll_ctrl[PLL_LOCK]));
+
+	return ret;
+}
+
+static int bcm_usb_phy_reset(struct phy *phy)
+{
+	struct bcm_usb_phy_cfg *phy_cfg = phy_get_drvdata(phy);
+	void __iomem *regs = phy_cfg->regs;
+	const u8 *offset;
+
+	offset = phy_cfg->offset;
+
+	if (phy_cfg->type == USB_HS_PHY) {
+		bcm_usb_reg32_clrbits(regs + offset[PHY_CTRL],
+				      BIT(u2phy_ctrl[CORERDY]));
+		bcm_usb_reg32_setbits(regs + offset[PHY_CTRL],
+				      BIT(u2phy_ctrl[CORERDY]));
+	}
+
+	return 0;
+}
+
+static int bcm_usb_phy_init(struct phy *phy)
+{
+	struct bcm_usb_phy_cfg *phy_cfg = phy_get_drvdata(phy);
+	int ret = -EINVAL;
+
+	if (phy_cfg->type == USB_SS_PHY)
+		ret = bcm_usb_ss_phy_init(phy_cfg);
+	else if (phy_cfg->type == USB_HS_PHY)
+		ret = bcm_usb_hs_phy_init(phy_cfg);
+
+	return ret;
+}
+
+static struct phy_ops sr_phy_ops = {
+	.init		= bcm_usb_phy_init,
+	.reset		= bcm_usb_phy_reset,
+	.owner		= THIS_MODULE,
+};
+
+static struct phy *bcm_usb_phy_xlate(struct device *dev,
+				     struct of_phandle_args *args)
+{
+	struct bcm_usb_phy_cfg *phy_cfg;
+	int phy_idx;
+
+	phy_cfg = dev_get_drvdata(dev);
+	if (!phy_cfg)
+		return ERR_PTR(-EINVAL);
+
+	if (phy_cfg->version == BCM_SR_USB_COMBO_PHY) {
+		phy_idx = args->args[0];
+
+		if (WARN_ON(phy_idx > 1))
+			return ERR_PTR(-ENODEV);
+
+		return phy_cfg[phy_idx].phy;
+	} else
+		return phy_cfg->phy;
+}
+
+static int bcm_usb_phy_create(struct device *dev, struct device_node *node,
+			      void __iomem *regs, uint32_t version)
+{
+	struct bcm_usb_phy_cfg *phy_cfg;
+	int idx;
+
+	if (version == BCM_SR_USB_COMBO_PHY) {
+		phy_cfg = devm_kzalloc(dev, NUM_BCM_SR_USB_COMBO_PHYS *
+				       sizeof(struct bcm_usb_phy_cfg),
+				       GFP_KERNEL);
+		if (!phy_cfg)
+			return -ENOMEM;
+
+		for (idx = 0; idx < NUM_BCM_SR_USB_COMBO_PHYS; idx++) {
+			phy_cfg[idx].regs = regs;
+			phy_cfg[idx].version = version;
+			if (idx == 0) {
+				phy_cfg[idx].offset = bcm_usb_combo_phy_hs;
+				phy_cfg[idx].type = USB_HS_PHY;
+			} else {
+				phy_cfg[idx].offset = bcm_usb_combo_phy_ss;
+				phy_cfg[idx].type = USB_SS_PHY;
+			}
+			phy_cfg[idx].phy = devm_phy_create(dev, node,
+							   &sr_phy_ops);
+			if (IS_ERR(phy_cfg[idx].phy))
+				return PTR_ERR(phy_cfg[idx].phy);
+
+			phy_set_drvdata(phy_cfg[idx].phy, &phy_cfg[idx]);
+		}
+	} else if (version == BCM_SR_USB_HS_PHY) {
+		phy_cfg = devm_kzalloc(dev, sizeof(struct bcm_usb_phy_cfg),
+				       GFP_KERNEL);
+		if (!phy_cfg)
+			return -ENOMEM;
+
+		phy_cfg->regs = regs;
+		phy_cfg->version = version;
+		phy_cfg->offset = bcm_usb_hs_phy;
+		phy_cfg->type = USB_HS_PHY;
+		phy_cfg->phy = devm_phy_create(dev, node, &sr_phy_ops);
+		if (IS_ERR(phy_cfg->phy))
+			return PTR_ERR(phy_cfg->phy);
+
+		phy_set_drvdata(phy_cfg->phy, phy_cfg);
+	}
+
+	dev_set_drvdata(dev, phy_cfg);
+
+	return 0;
+}
+
+static const struct of_device_id bcm_usb_phy_of_match[] = {
+	{
+		.compatible = "brcm,sr-usb-combo-phy",
+		.data = (void *)BCM_SR_USB_COMBO_PHY,
+	},
+	{
+		.compatible = "brcm,sr-usb-hs-phy",
+		.data = (void *)BCM_SR_USB_HS_PHY,
+	},
+	{ /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, bcm_usb_phy_of_match);
+
+static int bcm_usb_phy_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct device_node *dn = dev->of_node;
+	const struct of_device_id *of_id;
+	struct resource *res;
+	void __iomem *regs;
+	int ret;
+	enum bcm_usb_phy_version version;
+	struct phy_provider *phy_provider;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	regs = devm_ioremap_resource(dev, res);
+	if (IS_ERR(regs))
+		return PTR_ERR(regs);
+
+	of_id = of_match_node(bcm_usb_phy_of_match, dn);
+	if (of_id)
+		version = (enum bcm_usb_phy_version)of_id->data;
+	else
+		return -ENODEV;
+
+	ret = bcm_usb_phy_create(dev, dn, regs, version);
+	if (ret)
+		return ret;
+
+	phy_provider = devm_of_phy_provider_register(dev, bcm_usb_phy_xlate);
+
+	return PTR_ERR_OR_ZERO(phy_provider);
+}
+
+static struct platform_driver bcm_usb_phy_driver = {
+	.driver = {
+		.name = "phy-bcm-sr-usb",
+		.of_match_table = bcm_usb_phy_of_match,
+	},
+	.probe = bcm_usb_phy_probe,
+};
+module_platform_driver(bcm_usb_phy_driver);
+
+MODULE_AUTHOR("Broadcom");
+MODULE_DESCRIPTION("Broadcom stingray USB Phy driver");
+MODULE_LICENSE("GPL v2");
-- 
2.7.4

[PATCH v6 3/3] arm64: dts: Add USB DT nodes for Stingray SoC

[Srinath Mannam]

Add DT nodes for
  - Two xHCI host controllers
  - Two BDC Broadcom USB device controller
  - Five USB PHY controllers

[xHCI0]      [BDC0]            [xHCI1]            [BDC1]
   |           |                  |                 |
  ---------------               -----------------------
   |           |                 |         |         |
[SS-PHY0]   [HS-PHY0]        [SS-PHY1] [HS-PHY2] [HS-PHY1]

[SS-PHY0/HS-PHY0] and [SS-PHY1/HS-PHY1] are combo PHYs has one SS and
one HS PHYs. [HS-PHY2] is a single HS PHY.

xHCI use SS-PHY to detect SS devices and HS-PHY to detect HS/FS/LS
devices. BDC use SS-PHY in SS mode and HS-PHY in HS mode.

xHCI0 port1 is SS-PHY0, port2 is HS-PHY0.
xHCI1 port1 is SS-PHY1, port2 is HS-PHY2 and port3 is HS-PHY1.

Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
---
 .../boot/dts/broadcom/stingray/stingray-usb.dtsi   | 72 ++++++++++++++++++++++
 .../arm64/boot/dts/broadcom/stingray/stingray.dtsi |  1 +
 2 files changed, 73 insertions(+)
 create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi

diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
new file mode 100644
index 0000000..55259f9
--- /dev/null
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: (GPL-2.0 or BSD-3-Clause)
+/*
+ *Copyright(c) 2018 Broadcom
+ */
+	usb {
+		compatible = "simple-bus";
+		dma-ranges;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0x0 0x0 0x68500000 0x00400000>;
+
+		usbphy0: usb-phy@0 {
+			compatible = "brcm,sr-usb-combo-phy";
+			reg = <0x00000000 0x100>;
+			#phy-cells = <1>;
+			status = "disabled";
+		};
+
+		xhci0: usb@1000 {
+			compatible = "generic-xhci";
+			reg = <0x00001000 0x1000>;
+			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>;
+			phys = <&usbphy0 1>, <&usbphy0 0>;
+			phy-names = "phy0", "phy1";
+			dma-coherent;
+			status = "disabled";
+		};
+
+		bdc0: usb@2000 {
+			compatible = "brcm,bdc-v0.16";
+			reg = <0x00002000 0x1000>;
+			interrupts = <GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>;
+			phys = <&usbphy0 0>, <&usbphy0 1>;
+			phy-names = "phy0", "phy1";
+			dma-coherent;
+			status = "disabled";
+		};
+
+		usbphy1: usb-phy@10000 {
+			compatible = "brcm,sr-usb-combo-phy";
+			reg = <0x00010000 0x100>;
+			#phy-cells = <1>;
+			status = "disabled";
+		};
+
+		usbphy2: usb-phy@20000 {
+			compatible = "brcm,sr-usb-hs-phy";
+			reg = <0x00020000 0x100>;
+			#phy-cells = <0>;
+			status = "disabled";
+		};
+
+		xhci1: usb@11000 {
+			compatible = "generic-xhci";
+			reg = <0x00011000 0x1000>;
+			interrupts = <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
+			phys = <&usbphy1 1>, <&usbphy2>, <&usbphy1 0>;
+			phy-names = "phy0", "phy1", "phy2";
+			dma-coherent;
+			status = "disabled";
+		};
+
+		bdc1: usb@21000 {
+			compatible = "brcm,bdc-v0.16";
+			reg = <0x00021000 0x1000>;
+			interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
+			phys = <&usbphy2>;
+			phy-names = "phy0";
+			dma-coherent;
+			status = "disabled";
+		};
+	};
diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
index cfeaa85..21dbb12 100644
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
@@ -287,6 +287,7 @@
 	#include "stingray-fs4.dtsi"
 	#include "stingray-sata.dtsi"
 	#include "stingray-pcie.dtsi"
+	#include "stingray-usb.dtsi"
 
 	hsls {
 		compatible = "simple-bus";
-- 
2.7.4

Re: [PATCH v6 0/3] Stingray USB PHY driver support

[Scott Branden]

Thanks Srinath and Rob - patch series looks good now.

patch series,

Acked-by: Scott Branden <scott.branden@broadcom.com>


On 2019-03-19 2:15 a.m., Srinath Mannam wrote:
> These patches add Stingray USB PHY driver and its corresponding
> DT nodes with documentation.
>
> This patch set is based on Linux-5.0-rc2.
>
> Changes from v5:
>    - Removed redundant address and size cells in DT nodes.
>
> Changes from v4:
>    - Addressed Rob Herring review comments
>       - Removed child nodes and added #phy-cells 1
>       - Added xlate function to get phy using phandle argument.
>
> Changes from v3:
>    - Addressed Rob Herring review comments
>       - Changed compatible strings.
>       - updated driver based on new compatible strings.
>
> Changes from v2:
>    - Addressed Kishon review comments
>    - Updated patchset to Linux-5.0-rc2
>
> Changes from v1:
>    - Addressed Kishon review comments
>    - phy init call return value handle
>    
> Srinath Mannam (3):
>    dt-bindings: phy: Add Stingray USB PHY binding document
>    phy: sr-usb: Add Stingray USB PHY driver
>    arm64: dts: Add USB DT nodes for Stingray SoC
>
>   .../bindings/phy/brcm,stingray-usb-phy.txt         |  32 ++
>   .../boot/dts/broadcom/stingray/stingray-usb.dtsi   |  72 ++++
>   .../arm64/boot/dts/broadcom/stingray/stingray.dtsi |   1 +
>   drivers/phy/broadcom/Kconfig                       |  11 +
>   drivers/phy/broadcom/Makefile                      |   1 +
>   drivers/phy/broadcom/phy-bcm-sr-usb.c              | 393 +++++++++++++++++++++
>   6 files changed, 510 insertions(+)
>   create mode 100644 Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt
>   create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
>   create mode 100644 drivers/phy/broadcom/phy-bcm-sr-usb.c
>

Re: [PATCH v6 0/3] Stingray USB PHY driver support

[Florian Fainelli]

On 3/19/19 11:38 AM, Scott Branden wrote:
> Thanks Srinath and Rob - patch series looks good now.
> 
> patch series,
> 
> Acked-by: Scott Branden <scott.branden@broadcom.com>
> 

Kishon, can you let me know when you apply patches 1 and 2 so I can
queue up patch 3 for inclusion the 5.2 ARM SoC pull request? Thanks!

> 
> On 2019-03-19 2:15 a.m., Srinath Mannam wrote:
>> These patches add Stingray USB PHY driver and its corresponding
>> DT nodes with documentation.
>>
>> This patch set is based on Linux-5.0-rc2.
>>
>> Changes from v5:
>>    - Removed redundant address and size cells in DT nodes.
>>
>> Changes from v4:
>>    - Addressed Rob Herring review comments
>>       - Removed child nodes and added #phy-cells 1
>>       - Added xlate function to get phy using phandle argument.
>>
>> Changes from v3:
>>    - Addressed Rob Herring review comments
>>       - Changed compatible strings.
>>       - updated driver based on new compatible strings.
>>
>> Changes from v2:
>>    - Addressed Kishon review comments
>>    - Updated patchset to Linux-5.0-rc2
>>
>> Changes from v1:
>>    - Addressed Kishon review comments
>>    - phy init call return value handle
>>    Srinath Mannam (3):
>>    dt-bindings: phy: Add Stingray USB PHY binding document
>>    phy: sr-usb: Add Stingray USB PHY driver
>>    arm64: dts: Add USB DT nodes for Stingray SoC
>>
>>   .../bindings/phy/brcm,stingray-usb-phy.txt         |  32 ++
>>   .../boot/dts/broadcom/stingray/stingray-usb.dtsi   |  72 ++++
>>   .../arm64/boot/dts/broadcom/stingray/stingray.dtsi |   1 +
>>   drivers/phy/broadcom/Kconfig                       |  11 +
>>   drivers/phy/broadcom/Makefile                      |   1 +
>>   drivers/phy/broadcom/phy-bcm-sr-usb.c              | 393
>> +++++++++++++++++++++
>>   6 files changed, 510 insertions(+)
>>   create mode 100644
>> Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt
>>   create mode 100644
>> arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
>>   create mode 100644 drivers/phy/broadcom/phy-bcm-sr-usb.c
>>


-- 
Florian

Re: [PATCH v6 0/3] Stingray USB PHY driver support

[Kishon Vijay Abraham I]

On 22/03/19 10:12 PM, Florian Fainelli wrote:
> On 3/19/19 11:38 AM, Scott Branden wrote:
>> Thanks Srinath and Rob - patch series looks good now.
>>
>> patch series,
>>
>> Acked-by: Scott Branden <scott.branden@broadcom.com>
>>
> 
> Kishon, can you let me know when you apply patches 1 and 2 so I can
> queue up patch 3 for inclusion the 5.2 ARM SoC pull request? Thanks!

merged the dt-binding and sr-usb driver, thanks.

-Kishon
> 
>>
>> On 2019-03-19 2:15 a.m., Srinath Mannam wrote:
>>> These patches add Stingray USB PHY driver and its corresponding
>>> DT nodes with documentation.
>>>
>>> This patch set is based on Linux-5.0-rc2.
>>>
>>> Changes from v5:
>>>    - Removed redundant address and size cells in DT nodes.
>>>
>>> Changes from v4:
>>>    - Addressed Rob Herring review comments
>>>       - Removed child nodes and added #phy-cells 1
>>>       - Added xlate function to get phy using phandle argument.
>>>
>>> Changes from v3:
>>>    - Addressed Rob Herring review comments
>>>       - Changed compatible strings.
>>>       - updated driver based on new compatible strings.
>>>
>>> Changes from v2:
>>>    - Addressed Kishon review comments
>>>    - Updated patchset to Linux-5.0-rc2
>>>
>>> Changes from v1:
>>>    - Addressed Kishon review comments
>>>    - phy init call return value handle
>>>    Srinath Mannam (3):
>>>    dt-bindings: phy: Add Stingray USB PHY binding document
>>>    phy: sr-usb: Add Stingray USB PHY driver
>>>    arm64: dts: Add USB DT nodes for Stingray SoC
>>>
>>>   .../bindings/phy/brcm,stingray-usb-phy.txt         |  32 ++
>>>   .../boot/dts/broadcom/stingray/stingray-usb.dtsi   |  72 ++++
>>>   .../arm64/boot/dts/broadcom/stingray/stingray.dtsi |   1 +
>>>   drivers/phy/broadcom/Kconfig                       |  11 +
>>>   drivers/phy/broadcom/Makefile                      |   1 +
>>>   drivers/phy/broadcom/phy-bcm-sr-usb.c              | 393
>>> +++++++++++++++++++++
>>>   6 files changed, 510 insertions(+)
>>>   create mode 100644
>>> Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt
>>>   create mode 100644
>>> arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
>>>   create mode 100644 drivers/phy/broadcom/phy-bcm-sr-usb.c
>>>
> 
> 

Re: [PATCH v6 0/3] Stingray USB PHY driver support

[Srinath Mannam]

On Tue, Mar 26, 2019 at 1:00 PM Kishon Vijay Abraham I <kishon@ti.com> wrote:
>
>
>
> On 22/03/19 10:12 PM, Florian Fainelli wrote:
> > On 3/19/19 11:38 AM, Scott Branden wrote:
> >> Thanks Srinath and Rob - patch series looks good now.
> >>
> >> patch series,
> >>
> >> Acked-by: Scott Branden <scott.branden@broadcom.com>
> >>
> >
> > Kishon, can you let me know when you apply patches 1 and 2 so I can
> > queue up patch 3 for inclusion the 5.2 ARM SoC pull request? Thanks!
>
> merged the dt-binding and sr-usb driver, thanks.

Thanks a lot Kishon.

Regards,
Srinath.
>
> -Kishon
> >
> >>
> >> On 2019-03-19 2:15 a.m., Srinath Mannam wrote:
> >>> These patches add Stingray USB PHY driver and its corresponding
> >>> DT nodes with documentation.
> >>>
> >>> This patch set is based on Linux-5.0-rc2.
> >>>
> >>> Changes from v5:
> >>>    - Removed redundant address and size cells in DT nodes.
> >>>
> >>> Changes from v4:
> >>>    - Addressed Rob Herring review comments
> >>>       - Removed child nodes and added #phy-cells 1
> >>>       - Added xlate function to get phy using phandle argument.
> >>>
> >>> Changes from v3:
> >>>    - Addressed Rob Herring review comments
> >>>       - Changed compatible strings.
> >>>       - updated driver based on new compatible strings.
> >>>
> >>> Changes from v2:
> >>>    - Addressed Kishon review comments
> >>>    - Updated patchset to Linux-5.0-rc2
> >>>
> >>> Changes from v1:
> >>>    - Addressed Kishon review comments
> >>>    - phy init call return value handle
> >>>    Srinath Mannam (3):
> >>>    dt-bindings: phy: Add Stingray USB PHY binding document
> >>>    phy: sr-usb: Add Stingray USB PHY driver
> >>>    arm64: dts: Add USB DT nodes for Stingray SoC
> >>>
> >>>   .../bindings/phy/brcm,stingray-usb-phy.txt         |  32 ++
> >>>   .../boot/dts/broadcom/stingray/stingray-usb.dtsi   |  72 ++++
> >>>   .../arm64/boot/dts/broadcom/stingray/stingray.dtsi |   1 +
> >>>   drivers/phy/broadcom/Kconfig                       |  11 +
> >>>   drivers/phy/broadcom/Makefile                      |   1 +
> >>>   drivers/phy/broadcom/phy-bcm-sr-usb.c              | 393
> >>> +++++++++++++++++++++
> >>>   6 files changed, 510 insertions(+)
> >>>   create mode 100644
> >>> Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt
> >>>   create mode 100644
> >>> arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
> >>>   create mode 100644 drivers/phy/broadcom/phy-bcm-sr-usb.c
> >>>
> >
> >

Re: [PATCH v6 3/3] arm64: dts: Add USB DT nodes for Stingray SoC

[Florian Fainelli]

On Tue, 19 Mar 2019 14:45:44 +0530, Srinath Mannam <srinath.mannam@broadcom.com> wrote:
> Add DT nodes for
>   - Two xHCI host controllers
>   - Two BDC Broadcom USB device controller
>   - Five USB PHY controllers
> 
> [xHCI0]      [BDC0]            [xHCI1]            [BDC1]
>    |           |                  |                 |
>   ---------------               -----------------------
>    |           |                 |         |         |
> [SS-PHY0]   [HS-PHY0]        [SS-PHY1] [HS-PHY2] [HS-PHY1]
> 
> [SS-PHY0/HS-PHY0] and [SS-PHY1/HS-PHY1] are combo PHYs has one SS and
> one HS PHYs. [HS-PHY2] is a single HS PHY.
> 
> xHCI use SS-PHY to detect SS devices and HS-PHY to detect HS/FS/LS
> devices. BDC use SS-PHY in SS mode and HS-PHY in HS mode.
> 
> xHCI0 port1 is SS-PHY0, port2 is HS-PHY0.
> xHCI1 port1 is SS-PHY1, port2 is HS-PHY2 and port3 is HS-PHY1.
> 
> Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
> ---

Applied to devicetree-arm64/next, thanks!
--
Florian