linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
@ 2024-08-06  5:06 Xu Yang
  2024-08-06  5:06 ` [PATCH v2 2/5] dt-bindings: usb: dwc3-imx8mp: add compatible string for imx95 Xu Yang
                   ` (5 more replies)
  0 siblings, 6 replies; 14+ messages in thread
From: Xu Yang @ 2024-08-06  5:06 UTC (permalink / raw)
  To: vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo, s.hauer, kernel,
	festevam, gregkh, Frank.Li, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein
  Cc: linux-phy, devicetree, imx, linux-arm-kernel, linux-usb

The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
block. Since i.MX95 usb phy is able to switch SS lanes, this will also
add orientation-switch and port property to the file.

Signed-off-by: Xu Yang <xu.yang_2@nxp.com>

---
Changes in v2:
 - replace minItems with description in reg property
 - remove orientation-switch and port
 - refer to usb-switch.yaml
 - use unevaluatedProperties
---
 .../bindings/phy/fsl,imx8mq-usb-phy.yaml      | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
index dc3a3f709fea..6d6d211883ae 100644
--- a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
@@ -11,12 +11,17 @@ maintainers:
 
 properties:
   compatible:
-    enum:
-      - fsl,imx8mq-usb-phy
-      - fsl,imx8mp-usb-phy
+    oneOf:
+      - enum:
+          - fsl,imx8mq-usb-phy
+          - fsl,imx8mp-usb-phy
+      - items:
+          - const: fsl,imx95-usb-phy
+          - const: fsl,imx8mp-usb-phy
 
   reg:
-    maxItems: 1
+    minItems: 1
+    maxItems: 2
 
   "#phy-cells":
     const: 0
@@ -89,7 +94,34 @@ required:
   - clocks
   - clock-names
 
-additionalProperties: false
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - fsl,imx95-usb-phy
+    then:
+      properties:
+        reg:
+          items:
+            - description: USB PHY Control range
+            - description: USB PHY TCA Block range
+    else:
+      properties:
+        reg:
+          maxItems: 1
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - fsl,imx95-usb-phy
+    then:
+      $ref: /schemas/usb/usb-switch.yaml#
+
+unevaluatedProperties: false
 
 examples:
   - |
-- 
2.34.1



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

* [PATCH v2 2/5] dt-bindings: usb: dwc3-imx8mp: add compatible string for imx95
  2024-08-06  5:06 [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Xu Yang
@ 2024-08-06  5:06 ` Xu Yang
  2024-08-06  5:06 ` [PATCH v2 3/5] phy: fsl-imx8mq-usb: add tca function driver " Xu Yang
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 14+ messages in thread
From: Xu Yang @ 2024-08-06  5:06 UTC (permalink / raw)
  To: vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo, s.hauer, kernel,
	festevam, gregkh, Frank.Li, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein
  Cc: linux-phy, devicetree, imx, linux-arm-kernel, linux-usb

The i.MX95 is compatible with i.MX8MP's usb controller. This will add a
compatible string "fsl,imx95-dwc3" for i.MX95.

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Xu Yang <xu.yang_2@nxp.com>

---
Changes in v2:
 - add Ack-by tag
---
 Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml b/Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml
index 9ea1e4cd0709..baf130669c38 100644
--- a/Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml
@@ -12,7 +12,11 @@ maintainers:
 
 properties:
   compatible:
-    const: fsl,imx8mp-dwc3
+    oneOf:
+      - items:
+          - const: fsl,imx95-dwc3
+          - const: fsl,imx8mp-dwc3
+      - const: fsl,imx8mp-dwc3
 
   reg:
     items:
-- 
2.34.1



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

* [PATCH v2 3/5] phy: fsl-imx8mq-usb: add tca function driver for imx95
  2024-08-06  5:06 [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Xu Yang
  2024-08-06  5:06 ` [PATCH v2 2/5] dt-bindings: usb: dwc3-imx8mp: add compatible string for imx95 Xu Yang
@ 2024-08-06  5:06 ` Xu Yang
  2024-08-06  5:06 ` [PATCH v2 4/5] arm64: dts: imx95: add usb3 related nodes Xu Yang
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 14+ messages in thread
From: Xu Yang @ 2024-08-06  5:06 UTC (permalink / raw)
  To: vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo, s.hauer, kernel,
	festevam, gregkh, Frank.Li, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein
  Cc: linux-phy, devicetree, imx, linux-arm-kernel, linux-usb

The i.MX95 USB3 phy has a Type-C Assist block (TCA). This block consists
two functional blocks (XBar assist and VBus assist) and one system
access interface using APB.

The primary functionality of XBar assist is:
 - switching lane for flip
 - moving unused lanes into lower power states.

This info can be get from:
i.MX95 RM Chapter 163.3.8 Type-C assist (TCA) block.

This will add support for TCA block to achieve lane switching and tca
lower power functionality.

Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
Reviewed-by: Jun Li <jun.li@nxp.com>

---
Changes in v2:
 - return the value of imx95_usb_phy_get_tca()
---
 drivers/phy/freescale/Kconfig              |   1 +
 drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 240 +++++++++++++++++++++
 2 files changed, 241 insertions(+)

diff --git a/drivers/phy/freescale/Kconfig b/drivers/phy/freescale/Kconfig
index dcd9acff6d01..81f53564ee15 100644
--- a/drivers/phy/freescale/Kconfig
+++ b/drivers/phy/freescale/Kconfig
@@ -5,6 +5,7 @@ if (ARCH_MXC && ARM64) || COMPILE_TEST
 config PHY_FSL_IMX8MQ_USB
 	tristate "Freescale i.MX8M USB3 PHY"
 	depends on OF && HAS_IOMEM
+	depends on TYPEC || TYPEC=n
 	select GENERIC_PHY
 	default ARCH_MXC && ARM64
 
diff --git a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
index adc6394626ce..8bd6d91951a2 100644
--- a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
+++ b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
@@ -10,6 +10,7 @@
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
+#include <linux/usb/typec_mux.h>
 
 #define PHY_CTRL0			0x0
 #define PHY_CTRL0_REF_SSP_EN		BIT(2)
@@ -50,11 +51,66 @@
 
 #define PHY_TUNE_DEFAULT		0xffffffff
 
+#define TCA_CLK_RST			0x00
+#define TCA_CLK_RST_SW			BIT(9)
+#define TCA_CLK_RST_REF_CLK_EN		BIT(1)
+#define TCA_CLK_RST_SUSPEND_CLK_EN	BIT(0)
+
+#define TCA_INTR_EN			0x04
+#define TCA_INTR_STS			0x08
+
+#define TCA_GCFG			0x10
+#define TCA_GCFG_ROLE_HSTDEV		BIT(4)
+#define TCA_GCFG_OP_MODE		GENMASK(1, 0)
+#define TCA_GCFG_OP_MODE_SYSMODE	0
+#define TCA_GCFG_OP_MODE_SYNCMODE	1
+
+#define TCA_TCPC			0x14
+#define TCA_TCPC_VALID			BIT(4)
+#define TCA_TCPC_LOW_POWER_EN		BIT(3)
+#define TCA_TCPC_ORIENTATION_NORMAL	BIT(2)
+#define TCA_TCPC_MUX_CONTRL		GENMASK(1, 0)
+#define TCA_TCPC_MUX_CONTRL_NO_CONN	0
+#define TCA_TCPC_MUX_CONTRL_USB_CONN	1
+
+#define TCA_SYSMODE_CFG			0x18
+#define TCA_SYSMODE_TCPC_DISABLE	BIT(3)
+#define TCA_SYSMODE_TCPC_FLIP		BIT(2)
+
+#define TCA_CTRLSYNCMODE_CFG0		0x20
+#define TCA_CTRLSYNCMODE_CFG1           0x20
+
+#define TCA_PSTATE			0x30
+#define TCA_PSTATE_CM_STS		BIT(4)
+#define TCA_PSTATE_TX_STS		BIT(3)
+#define TCA_PSTATE_RX_PLL_STS		BIT(2)
+#define TCA_PSTATE_PIPE0_POWER_DOWN	GENMASK(1, 0)
+
+#define TCA_GEN_STATUS			0x34
+#define TCA_GEN_DEV_POR			BIT(12)
+#define TCA_GEN_REF_CLK_SEL		BIT(8)
+#define TCA_GEN_TYPEC_FLIP_INVERT	BIT(4)
+#define TCA_GEN_PHY_TYPEC_DISABLE	BIT(3)
+#define TCA_GEN_PHY_TYPEC_FLIP		BIT(2)
+
+#define TCA_VBUS_CTRL			0x40
+#define TCA_VBUS_STATUS			0x44
+
+#define TCA_INFO			0xFC
+
+struct tca_blk {
+	struct typec_switch_dev *sw;
+	void __iomem *base;
+	struct mutex mutex;
+	enum typec_orientation orientation;
+};
+
 struct imx8mq_usb_phy {
 	struct phy *phy;
 	struct clk *clk;
 	void __iomem *base;
 	struct regulator *vbus;
+	struct tca_blk *tca;
 	u32 pcs_tx_swing_full;
 	u32 pcs_tx_deemph_3p5db;
 	u32 tx_vref_tune;
@@ -64,6 +120,170 @@ struct imx8mq_usb_phy {
 	u32 comp_dis_tune;
 };
 
+
+static void tca_blk_orientation_set(struct tca_blk *tca,
+				enum typec_orientation orientation);
+
+#ifdef CONFIG_TYPEC
+
+static int tca_blk_typec_switch_set(struct typec_switch_dev *sw,
+				enum typec_orientation orientation)
+{
+	struct imx8mq_usb_phy *imx_phy = typec_switch_get_drvdata(sw);
+	struct tca_blk *tca = imx_phy->tca;
+	int ret;
+
+	if (tca->orientation == orientation)
+		return 0;
+
+	ret = clk_prepare_enable(imx_phy->clk);
+	if (ret)
+		return ret;
+
+	tca_blk_orientation_set(tca, orientation);
+	clk_disable_unprepare(imx_phy->clk);
+
+	return 0;
+}
+
+static struct typec_switch_dev *tca_blk_get_typec_switch(struct platform_device *pdev,
+					struct imx8mq_usb_phy *imx_phy)
+{
+	struct device *dev = &pdev->dev;
+	struct typec_switch_dev *sw;
+	struct typec_switch_desc sw_desc = { };
+
+	sw_desc.drvdata = imx_phy;
+	sw_desc.fwnode = dev->fwnode;
+	sw_desc.set = tca_blk_typec_switch_set;
+	sw_desc.name = NULL;
+
+	sw = typec_switch_register(dev, &sw_desc);
+	if (IS_ERR(sw)) {
+		dev_err(dev, "Error register tca orientation switch: %ld",
+				PTR_ERR(sw));
+		return NULL;
+	}
+
+	return sw;
+}
+
+static void tca_blk_put_typec_switch(struct typec_switch_dev *sw)
+{
+	typec_switch_unregister(sw);
+}
+
+#else
+
+static struct typec_switch_dev *tca_blk_get_typec_switch(struct platform_device *pdev,
+			struct imx8mq_usb_phy *imx_phy)
+{
+	return NULL;
+}
+
+static void tca_blk_put_typec_switch(struct typec_switch_dev *sw) {}
+
+#endif /* CONFIG_TYPEC */
+
+static void tca_blk_orientation_set(struct tca_blk *tca,
+				enum typec_orientation orientation)
+{
+	u32 val;
+
+	mutex_lock(&tca->mutex);
+
+	if (orientation == TYPEC_ORIENTATION_NONE) {
+		/*
+		 * use Controller Synced Mode for TCA low power enable and
+		 * put PHY to USB safe state.
+		 */
+		val = readl(tca->base + TCA_GCFG);
+		val = FIELD_PREP(TCA_GCFG_OP_MODE, TCA_GCFG_OP_MODE_SYNCMODE);
+		writel(val, tca->base + TCA_GCFG);
+
+		val = readl(tca->base + TCA_TCPC);
+		val = TCA_TCPC_VALID | TCA_TCPC_LOW_POWER_EN;
+		writel(val, tca->base + TCA_TCPC);
+
+		goto out;
+	}
+
+	/* use System Configuration Mode for TCA mux control. */
+	val = readl(tca->base + TCA_GCFG);
+	val = FIELD_PREP(TCA_GCFG_OP_MODE, TCA_GCFG_OP_MODE_SYSMODE);
+	writel(val, tca->base + TCA_GCFG);
+
+	/* Disable TCA module */
+	val = readl(tca->base + TCA_SYSMODE_CFG);
+	val |= TCA_SYSMODE_TCPC_DISABLE;
+	writel(val, tca->base + TCA_SYSMODE_CFG);
+
+	if (orientation == TYPEC_ORIENTATION_REVERSE)
+		val |= TCA_SYSMODE_TCPC_FLIP;
+	else if (orientation == TYPEC_ORIENTATION_NORMAL)
+		val &= ~TCA_SYSMODE_TCPC_FLIP;
+
+	writel(val, tca->base + TCA_SYSMODE_CFG);
+
+	/* Enable TCA module */
+	val &= ~TCA_SYSMODE_TCPC_DISABLE;
+	writel(val, tca->base + TCA_SYSMODE_CFG);
+
+out:
+	tca->orientation = orientation;
+	mutex_unlock(&tca->mutex);
+}
+
+static void tca_blk_init(struct tca_blk *tca)
+{
+	u32 val;
+
+	/* reset XBar block */
+	val = readl(tca->base + TCA_CLK_RST);
+	val &= ~TCA_CLK_RST_SW;
+	writel(val, tca->base + TCA_CLK_RST);
+
+	udelay(100);
+
+	/* clear reset */
+	val |= TCA_CLK_RST_SW;
+	writel(val, tca->base + TCA_CLK_RST);
+
+	tca_blk_orientation_set(tca, tca->orientation);
+}
+
+static struct tca_blk *imx95_usb_phy_get_tca(struct platform_device *pdev,
+				struct imx8mq_usb_phy *imx_phy)
+{
+	struct device *dev = &pdev->dev;
+	struct tca_blk *tca;
+
+	tca = devm_kzalloc(dev, sizeof(*tca), GFP_KERNEL);
+	if (!tca)
+		return ERR_PTR(-ENOMEM);
+
+	tca->base = devm_platform_ioremap_resource(pdev, 1);
+	if (IS_ERR(tca->base))
+		return tca->base;
+
+	mutex_init(&tca->mutex);
+
+	tca->orientation = TYPEC_ORIENTATION_NORMAL;
+	tca->sw = tca_blk_get_typec_switch(pdev, imx_phy);
+
+	return tca;
+}
+
+static void imx95_usb_phy_put_tca(struct imx8mq_usb_phy *imx_phy)
+{
+	struct tca_blk *tca = imx_phy->tca;
+
+	if (!tca)
+		return;
+
+	tca_blk_put_typec_switch(tca->sw);
+}
+
 static u32 phy_tx_vref_tune_from_property(u32 percent)
 {
 	percent = clamp(percent, 94U, 124U);
@@ -315,6 +535,9 @@ static int imx8mp_usb_phy_init(struct phy *phy)
 
 	imx8m_phy_tune(imx_phy);
 
+	if (imx_phy->tca)
+		tca_blk_init(imx_phy->tca);
+
 	return 0;
 }
 
@@ -359,6 +582,8 @@ static const struct of_device_id imx8mq_usb_phy_of_match[] = {
 	 .data = &imx8mq_usb_phy_ops,},
 	{.compatible = "fsl,imx8mp-usb-phy",
 	 .data = &imx8mp_usb_phy_ops,},
+	{.compatible = "fsl,imx95-usb-phy",
+	 .data = &imx8mp_usb_phy_ops,},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, imx8mq_usb_phy_of_match);
@@ -398,6 +623,13 @@ static int imx8mq_usb_phy_probe(struct platform_device *pdev)
 
 	phy_set_drvdata(imx_phy->phy, imx_phy);
 
+	if (device_is_compatible(dev, "fsl,imx95-usb-phy")) {
+		imx_phy->tca = imx95_usb_phy_get_tca(pdev, imx_phy);
+		if (IS_ERR(imx_phy->tca))
+			return dev_err_probe(dev, PTR_ERR(imx_phy->tca),
+						"failed to get tca\n");
+	}
+
 	imx8m_get_phy_tuning_data(imx_phy);
 
 	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
@@ -405,8 +637,16 @@ static int imx8mq_usb_phy_probe(struct platform_device *pdev)
 	return PTR_ERR_OR_ZERO(phy_provider);
 }
 
+static void imx8mq_usb_phy_remove(struct platform_device *pdev)
+{
+	struct imx8mq_usb_phy *imx_phy = platform_get_drvdata(pdev);
+
+	imx95_usb_phy_put_tca(imx_phy);
+}
+
 static struct platform_driver imx8mq_usb_phy_driver = {
 	.probe	= imx8mq_usb_phy_probe,
+	.remove = imx8mq_usb_phy_remove,
 	.driver = {
 		.name	= "imx8mq-usb-phy",
 		.of_match_table	= imx8mq_usb_phy_of_match,
-- 
2.34.1



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

* [PATCH v2 4/5] arm64: dts: imx95: add usb3 related nodes
  2024-08-06  5:06 [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Xu Yang
  2024-08-06  5:06 ` [PATCH v2 2/5] dt-bindings: usb: dwc3-imx8mp: add compatible string for imx95 Xu Yang
  2024-08-06  5:06 ` [PATCH v2 3/5] phy: fsl-imx8mq-usb: add tca function driver " Xu Yang
@ 2024-08-06  5:06 ` Xu Yang
  2024-08-06  5:06 ` [PATCH v2 5/5] arm64: dts: imx95-19x19-evk: add typec nodes and enable usb3 node Xu Yang
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 14+ messages in thread
From: Xu Yang @ 2024-08-06  5:06 UTC (permalink / raw)
  To: vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo, s.hauer, kernel,
	festevam, gregkh, Frank.Li, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein
  Cc: linux-phy, devicetree, imx, linux-arm-kernel, linux-usb

Add usb3 phy and controller nodes for imx95.

Signed-off-by: Xu Yang <xu.yang_2@nxp.com>

---
Changes in v2:
 - no changes
---
 arch/arm64/boot/dts/freescale/imx95.dtsi | 43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
index 1bbf9a0468f6..06a7c2f1e211 100644
--- a/arch/arm64/boot/dts/freescale/imx95.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
@@ -1188,5 +1188,48 @@ pcie1_ep: pcie-ep@4c380000 {
 			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
 			status = "disabled";
 		};
+
+		usb3_phy: phy@4c1f0040 {
+			compatible = "fsl,imx95-usb-phy", "fsl,imx8mp-usb-phy";
+			reg = <0x0 0x4c1f0040 0x0 0x40>,
+			      <0x0 0x4c1fc000 0x0 0x100>;
+			clocks = <&scmi_clk IMX95_CLK_HSIO>;
+			clock-names = "phy";
+			#phy-cells = <0>;
+			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
+			orientation-switch;
+			status = "disabled";
+		};
+
+		usb3: usb@4c010010 {
+			compatible = "fsl,imx95-dwc3", "fsl,imx8mp-dwc3";
+			reg = <0x0 0x4c010010 0x0 0x04>,
+			      <0x0 0x4c1f0000 0x0 0x20>;
+			clocks = <&scmi_clk IMX95_CLK_HSIO>,
+				 <&scmi_clk IMX95_CLK_32K>;
+			clock-names = "hsio", "suspend";
+			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+			#address-cells = <2>;
+			#size-cells = <2>;
+			ranges;
+			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
+			dma-ranges = <0x0 0x0 0x0 0x0 0x10 0x0>;
+			status = "disabled";
+
+			usb3_dwc3: usb@4c100000 {
+				compatible = "snps,dwc3";
+				reg = <0x0 0x4c100000 0x0 0x10000>;
+				clocks = <&scmi_clk IMX95_CLK_HSIO>,
+					 <&scmi_clk IMX95_CLK_24M>,
+					 <&scmi_clk IMX95_CLK_32K>;
+				clock-names = "bus_early", "ref", "suspend";
+				interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+				phys = <&usb3_phy>, <&usb3_phy>;
+				phy-names = "usb2-phy", "usb3-phy";
+				snps,gfladj-refclk-lpm-sel-quirk;
+				snps,parkmode-disable-ss-quirk;
+				iommus = <&smmu 0xe>;
+			};
+		};
 	};
 };
-- 
2.34.1



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

* [PATCH v2 5/5] arm64: dts: imx95-19x19-evk: add typec nodes and enable usb3 node
  2024-08-06  5:06 [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Xu Yang
                   ` (2 preceding siblings ...)
  2024-08-06  5:06 ` [PATCH v2 4/5] arm64: dts: imx95: add usb3 related nodes Xu Yang
@ 2024-08-06  5:06 ` Xu Yang
  2024-08-06  8:29 ` [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Krzysztof Kozlowski
  2024-08-07  7:20 ` Krzysztof Kozlowski
  5 siblings, 0 replies; 14+ messages in thread
From: Xu Yang @ 2024-08-06  5:06 UTC (permalink / raw)
  To: vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo, s.hauer, kernel,
	festevam, gregkh, Frank.Li, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein
  Cc: linux-phy, devicetree, imx, linux-arm-kernel, linux-usb

This board has one Type-C port which has USB3 capability. This will
add typec nodes and enable usb3 node.

Signed-off-by: Xu Yang <xu.yang_2@nxp.com>

---
Changes in v2:
 - no changes
---
 .../boot/dts/freescale/imx95-19x19-evk.dts    | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts b/arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts
index d14a54ab4fd4..46a9cd3d4403 100644
--- a/arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts
@@ -5,6 +5,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/usb/pd.h>
 #include "imx95.dtsi"
 
 / {
@@ -99,6 +100,48 @@ i2c7_pcal6524: i2c7-gpio@22 {
 		interrupt-parent = <&gpio5>;
 		interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
 	};
+
+	ptn5110: tcpc@50 {
+		compatible = "nxp,ptn5110", "tcpci";
+		reg = <0x50>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_typec>;
+		interrupt-parent = <&gpio5>;
+		interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
+
+		typec_con: connector {
+			compatible = "usb-c-connector";
+			label = "USB-C";
+			power-role = "dual";
+			data-role = "dual";
+			try-power-role = "sink";
+			source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
+			sink-pdos = <PDO_FIXED(5000, 0, PDO_FIXED_USB_COMM)>;
+			op-sink-microwatt = <0>;
+			self-powered;
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+
+					typec_con_hs: endpoint {
+						remote-endpoint = <&usb3_data_hs>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+
+					typec_con_ss: endpoint {
+						remote-endpoint = <&usb3_data_ss>;
+					};
+				};
+			};
+		};
+	};
 };
 
 &lpuart1 {
@@ -128,6 +171,38 @@ &pcie1 {
 	status = "okay";
 };
 
+&usb3 {
+	status = "okay";
+};
+
+&usb3_phy {
+	status = "okay";
+
+	port {
+		usb3_data_ss: endpoint {
+			remote-endpoint = <&typec_con_ss>;
+		};
+	};
+};
+
+&usb3_dwc3 {
+	dr_mode = "otg";
+	hnp-disable;
+	srp-disable;
+	adp-disable;
+	usb-role-switch;
+	role-switch-default-mode = "peripheral";
+	snps,dis-u1-entry-quirk;
+	snps,dis-u2-entry-quirk;
+	status = "okay";
+
+	port {
+		usb3_data_hs: endpoint {
+			remote-endpoint = <&typec_con_hs>;
+		};
+	};
+};
+
 &usdhc1 {
 	pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
 	pinctrl-0 = <&pinctrl_usdhc1>;
@@ -245,6 +320,12 @@ IMX95_PAD_SD2_RESET_B__GPIO3_IO_BIT7		0x31e
 		>;
 	};
 
+	pinctrl_typec: typecgrp {
+		fsl,pins = <
+			IMX95_PAD_GPIO_IO34__GPIO5_IO_BIT14			0x31e
+		>;
+	};
+
 	pinctrl_usdhc2_gpio: usdhc2gpiogrp {
 		fsl,pins = <
 			IMX95_PAD_SD2_CD_B__GPIO3_IO_BIT0		0x31e
-- 
2.34.1



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

* Re: [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
  2024-08-06  5:06 [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Xu Yang
                   ` (3 preceding siblings ...)
  2024-08-06  5:06 ` [PATCH v2 5/5] arm64: dts: imx95-19x19-evk: add typec nodes and enable usb3 node Xu Yang
@ 2024-08-06  8:29 ` Krzysztof Kozlowski
  2024-08-06 16:11   ` Frank Li
  2024-08-07  7:20 ` Krzysztof Kozlowski
  5 siblings, 1 reply; 14+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-06  8:29 UTC (permalink / raw)
  To: Xu Yang, vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo,
	s.hauer, kernel, festevam, gregkh, Frank.Li, jun.li, l.stach,
	aford173, hongxing.zhu, alexander.stein
  Cc: linux-phy, devicetree, imx, linux-arm-kernel, linux-usb

On 06/08/2024 07:06, Xu Yang wrote:
> The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
> compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
> to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
> block. Since i.MX95 usb phy is able to switch SS lanes, this will also
> add orientation-switch and port property to the file.
> 
> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> 
> ---
> Changes in v2:
>  - replace minItems with description in reg property
>  - remove orientation-switch and port
>  - refer to usb-switch.yaml
>  - use unevaluatedProperties
> ---
>  .../bindings/phy/fsl,imx8mq-usb-phy.yaml      | 42 ++++++++++++++++---
>  1 file changed, 37 insertions(+), 5 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> index dc3a3f709fea..6d6d211883ae 100644
> --- a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> @@ -11,12 +11,17 @@ maintainers:
>  
>  properties:
>    compatible:
> -    enum:
> -      - fsl,imx8mq-usb-phy
> -      - fsl,imx8mp-usb-phy
> +    oneOf:
> +      - enum:
> +          - fsl,imx8mq-usb-phy
> +          - fsl,imx8mp-usb-phy
> +      - items:
> +          - const: fsl,imx95-usb-phy
> +          - const: fsl,imx8mp-usb-phy
>  
>    reg:
> -    maxItems: 1
> +    minItems: 1
> +    maxItems: 2
>  
>    "#phy-cells":
>      const: 0
> @@ -89,7 +94,34 @@ required:
>    - clocks
>    - clock-names
>  
> -additionalProperties: false
> +allOf:
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            enum:
> +              - fsl,imx95-usb-phy
> +    then:
> +      properties:
> +        reg:
> +          items:
> +            - description: USB PHY Control range
> +            - description: USB PHY TCA Block range
> +    else:
> +      properties:
> +        reg:
> +          maxItems: 1
> +
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            enum:
> +              - fsl,imx95-usb-phy
> +    then:
> +      $ref: /schemas/usb/usb-switch.yaml#

ref should be rather in top-level. You can always disallow certain
properties for devices, if they are really not applicable.

Best regards,
Krzysztof



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

* Re: [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
  2024-08-06  8:29 ` [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Krzysztof Kozlowski
@ 2024-08-06 16:11   ` Frank Li
  2024-08-07  2:24     ` Xu Yang
  2024-08-07  5:48     ` Krzysztof Kozlowski
  0 siblings, 2 replies; 14+ messages in thread
From: Frank Li @ 2024-08-06 16:11 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Xu Yang, vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo,
	s.hauer, kernel, festevam, gregkh, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein, linux-phy, devicetree, imx,
	linux-arm-kernel, linux-usb

On Tue, Aug 06, 2024 at 10:29:47AM +0200, Krzysztof Kozlowski wrote:
> On 06/08/2024 07:06, Xu Yang wrote:
> > The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
> > compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
> > to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
> > block. Since i.MX95 usb phy is able to switch SS lanes, this will also
> > add orientation-switch and port property to the file.
> >
> > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> >
> > ---
> > Changes in v2:
> >  - replace minItems with description in reg property
> >  - remove orientation-switch and port
> >  - refer to usb-switch.yaml
> >  - use unevaluatedProperties
> > ---
> >  .../bindings/phy/fsl,imx8mq-usb-phy.yaml      | 42 ++++++++++++++++---
> >  1 file changed, 37 insertions(+), 5 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> > index dc3a3f709fea..6d6d211883ae 100644
> > --- a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> > +++ b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> > @@ -11,12 +11,17 @@ maintainers:
> >
> >  properties:
> >    compatible:
> > -    enum:
> > -      - fsl,imx8mq-usb-phy
> > -      - fsl,imx8mp-usb-phy
> > +    oneOf:
> > +      - enum:
> > +          - fsl,imx8mq-usb-phy
> > +          - fsl,imx8mp-usb-phy
> > +      - items:
> > +          - const: fsl,imx95-usb-phy
> > +          - const: fsl,imx8mp-usb-phy
> >
> >    reg:
> > -    maxItems: 1
> > +    minItems: 1
> > +    maxItems: 2
> >
> >    "#phy-cells":
> >      const: 0
> > @@ -89,7 +94,34 @@ required:
> >    - clocks
> >    - clock-names
> >
> > -additionalProperties: false
> > +allOf:
> > +  - if:
> > +      properties:
> > +        compatible:
> > +          contains:
> > +            enum:
> > +              - fsl,imx95-usb-phy
> > +    then:
> > +      properties:
> > +        reg:
> > +          items:
> > +            - description: USB PHY Control range
> > +            - description: USB PHY TCA Block range
> > +    else:
> > +      properties:
> > +        reg:
> > +          maxItems: 1
> > +
> > +  - if:
> > +      properties:
> > +        compatible:
> > +          contains:
> > +            enum:
> > +              - fsl,imx95-usb-phy
> > +    then:
> > +      $ref: /schemas/usb/usb-switch.yaml#
>
> ref should be rather in top-level. You can always disallow certain
> properties for devices, if they are really not applicable.

There are some "required" in usb-switch.yaml,

oneOf:
  - required:
      - port
  - required:
      - ports

If put on the top, it may cause DTB check warning for other compatible
strings, which have not support usb-switch.

Frank
>
> Best regards,
> Krzysztof
>


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

* Re: [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
  2024-08-06 16:11   ` Frank Li
@ 2024-08-07  2:24     ` Xu Yang
  2024-08-07  5:48     ` Krzysztof Kozlowski
  1 sibling, 0 replies; 14+ messages in thread
From: Xu Yang @ 2024-08-07  2:24 UTC (permalink / raw)
  To: Frank Li
  Cc: Krzysztof Kozlowski, vkoul, kishon, robh, krzk+dt, conor+dt,
	shawnguo, s.hauer, kernel, festevam, gregkh, jun.li, l.stach,
	aford173, hongxing.zhu, alexander.stein, linux-phy, devicetree,
	imx, linux-arm-kernel, linux-usb

On Tue, Aug 06, 2024 at 12:11:55PM -0400, Frank Li wrote:
> On Tue, Aug 06, 2024 at 10:29:47AM +0200, Krzysztof Kozlowski wrote:
> > On 06/08/2024 07:06, Xu Yang wrote:
> > > The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
> > > compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
> > > to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
> > > block. Since i.MX95 usb phy is able to switch SS lanes, this will also
> > > add orientation-switch and port property to the file.
> > >
> > > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> > >
> > > ---
> > > Changes in v2:
> > >  - replace minItems with description in reg property
> > >  - remove orientation-switch and port
> > >  - refer to usb-switch.yaml
> > >  - use unevaluatedProperties
> > > ---
> > >  .../bindings/phy/fsl,imx8mq-usb-phy.yaml      | 42 ++++++++++++++++---
> > >  1 file changed, 37 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> > > index dc3a3f709fea..6d6d211883ae 100644
> > > --- a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> > > +++ b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> > > @@ -11,12 +11,17 @@ maintainers:
> > >
> > >  properties:
> > >    compatible:
> > > -    enum:
> > > -      - fsl,imx8mq-usb-phy
> > > -      - fsl,imx8mp-usb-phy
> > > +    oneOf:
> > > +      - enum:
> > > +          - fsl,imx8mq-usb-phy
> > > +          - fsl,imx8mp-usb-phy
> > > +      - items:
> > > +          - const: fsl,imx95-usb-phy
> > > +          - const: fsl,imx8mp-usb-phy
> > >
> > >    reg:
> > > -    maxItems: 1
> > > +    minItems: 1
> > > +    maxItems: 2
> > >
> > >    "#phy-cells":
> > >      const: 0
> > > @@ -89,7 +94,34 @@ required:
> > >    - clocks
> > >    - clock-names
> > >
> > > -additionalProperties: false
> > > +allOf:
> > > +  - if:
> > > +      properties:
> > > +        compatible:
> > > +          contains:
> > > +            enum:
> > > +              - fsl,imx95-usb-phy
> > > +    then:
> > > +      properties:
> > > +        reg:
> > > +          items:
> > > +            - description: USB PHY Control range
> > > +            - description: USB PHY TCA Block range
> > > +    else:
> > > +      properties:
> > > +        reg:
> > > +          maxItems: 1
> > > +
> > > +  - if:
> > > +      properties:
> > > +        compatible:
> > > +          contains:
> > > +            enum:
> > > +              - fsl,imx95-usb-phy
> > > +    then:
> > > +      $ref: /schemas/usb/usb-switch.yaml#
> >
> > ref should be rather in top-level. You can always disallow certain
> > properties for devices, if they are really not applicable.
> 
> There are some "required" in usb-switch.yaml,
> 
> oneOf:
>   - required:
>       - port
>   - required:
>       - ports
> 
> If put on the top, it may cause DTB check warning for other compatible
> strings, which have not support usb-switch.

Yes, even though I move usb-switch to top and set false for certain properties,
dtbinding check still has below error:

/home/nxf75279/work/usb/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.example.dtb: phy@381f0040: 'oneOf' conditional failed, one must be fixed:
        'port' is a required property
        'ports' is a required property
        from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#

Thanks,
Xu Yang

> 
> Frank
> >
> > Best regards,
> > Krzysztof
> >


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

* Re: [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
  2024-08-06 16:11   ` Frank Li
  2024-08-07  2:24     ` Xu Yang
@ 2024-08-07  5:48     ` Krzysztof Kozlowski
  2024-08-07  5:57       ` Xu Yang
  1 sibling, 1 reply; 14+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-07  5:48 UTC (permalink / raw)
  To: Frank Li
  Cc: Xu Yang, vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo,
	s.hauer, kernel, festevam, gregkh, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein, linux-phy, devicetree, imx,
	linux-arm-kernel, linux-usb

On 06/08/2024 18:11, Frank Li wrote:
> On Tue, Aug 06, 2024 at 10:29:47AM +0200, Krzysztof Kozlowski wrote:
>> On 06/08/2024 07:06, Xu Yang wrote:
>>> The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
>>> compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
>>> to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
>>> block. Since i.MX95 usb phy is able to switch SS lanes, this will also
>>> add orientation-switch and port property to the file.
>>>
>>> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
>>>
>>> ---
>>> Changes in v2:
>>>  - replace minItems with description in reg property
>>>  - remove orientation-switch and port
>>>  - refer to usb-switch.yaml
>>>  - use unevaluatedProperties
>>> ---
>>>  .../bindings/phy/fsl,imx8mq-usb-phy.yaml      | 42 ++++++++++++++++---
>>>  1 file changed, 37 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
>>> index dc3a3f709fea..6d6d211883ae 100644
>>> --- a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
>>> +++ b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
>>> @@ -11,12 +11,17 @@ maintainers:
>>>
>>>  properties:
>>>    compatible:
>>> -    enum:
>>> -      - fsl,imx8mq-usb-phy
>>> -      - fsl,imx8mp-usb-phy
>>> +    oneOf:
>>> +      - enum:
>>> +          - fsl,imx8mq-usb-phy
>>> +          - fsl,imx8mp-usb-phy
>>> +      - items:
>>> +          - const: fsl,imx95-usb-phy
>>> +          - const: fsl,imx8mp-usb-phy
>>>
>>>    reg:
>>> -    maxItems: 1
>>> +    minItems: 1
>>> +    maxItems: 2
>>>
>>>    "#phy-cells":
>>>      const: 0
>>> @@ -89,7 +94,34 @@ required:
>>>    - clocks
>>>    - clock-names
>>>
>>> -additionalProperties: false
>>> +allOf:
>>> +  - if:
>>> +      properties:
>>> +        compatible:
>>> +          contains:
>>> +            enum:
>>> +              - fsl,imx95-usb-phy
>>> +    then:
>>> +      properties:
>>> +        reg:
>>> +          items:
>>> +            - description: USB PHY Control range
>>> +            - description: USB PHY TCA Block range
>>> +    else:
>>> +      properties:
>>> +        reg:
>>> +          maxItems: 1
>>> +
>>> +  - if:
>>> +      properties:
>>> +        compatible:
>>> +          contains:
>>> +            enum:
>>> +              - fsl,imx95-usb-phy
>>> +    then:
>>> +      $ref: /schemas/usb/usb-switch.yaml#
>>
>> ref should be rather in top-level. You can always disallow certain
>> properties for devices, if they are really not applicable.
> 
> There are some "required" in usb-switch.yaml,
> 
> oneOf:
>   - required:
>       - port
>   - required:
>       - ports
> 
> If put on the top, it may cause DTB check warning for other compatible
> strings, which have not support usb-switch.

Hm, indeed, that's unusual case to have such different devices in one
schema. Did you test that above $ref in if: actually works?

Best regards,
Krzysztof



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

* Re: [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
  2024-08-07  5:48     ` Krzysztof Kozlowski
@ 2024-08-07  5:57       ` Xu Yang
  2024-08-07  5:59         ` Krzysztof Kozlowski
  0 siblings, 1 reply; 14+ messages in thread
From: Xu Yang @ 2024-08-07  5:57 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Frank Li, vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo,
	s.hauer, kernel, festevam, gregkh, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein, linux-phy, devicetree, imx,
	linux-arm-kernel, linux-usb

On Wed, Aug 07, 2024 at 07:48:43AM +0200, Krzysztof Kozlowski wrote:
> On 06/08/2024 18:11, Frank Li wrote:
> > On Tue, Aug 06, 2024 at 10:29:47AM +0200, Krzysztof Kozlowski wrote:
> >> On 06/08/2024 07:06, Xu Yang wrote:
> >>> The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
> >>> compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
> >>> to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
> >>> block. Since i.MX95 usb phy is able to switch SS lanes, this will also
> >>> add orientation-switch and port property to the file.
> >>>
> >>> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> >>>
> >>> ---
> >>> Changes in v2:
> >>>  - replace minItems with description in reg property
> >>>  - remove orientation-switch and port
> >>>  - refer to usb-switch.yaml
> >>>  - use unevaluatedProperties
> >>> ---
> >>>  .../bindings/phy/fsl,imx8mq-usb-phy.yaml      | 42 ++++++++++++++++---
> >>>  1 file changed, 37 insertions(+), 5 deletions(-)
> >>>
> >>> diff --git a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> >>> index dc3a3f709fea..6d6d211883ae 100644
> >>> --- a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> >>> +++ b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
> >>> @@ -11,12 +11,17 @@ maintainers:
> >>>
> >>>  properties:
> >>>    compatible:
> >>> -    enum:
> >>> -      - fsl,imx8mq-usb-phy
> >>> -      - fsl,imx8mp-usb-phy
> >>> +    oneOf:
> >>> +      - enum:
> >>> +          - fsl,imx8mq-usb-phy
> >>> +          - fsl,imx8mp-usb-phy
> >>> +      - items:
> >>> +          - const: fsl,imx95-usb-phy
> >>> +          - const: fsl,imx8mp-usb-phy
> >>>
> >>>    reg:
> >>> -    maxItems: 1
> >>> +    minItems: 1
> >>> +    maxItems: 2
> >>>
> >>>    "#phy-cells":
> >>>      const: 0
> >>> @@ -89,7 +94,34 @@ required:
> >>>    - clocks
> >>>    - clock-names
> >>>
> >>> -additionalProperties: false
> >>> +allOf:
> >>> +  - if:
> >>> +      properties:
> >>> +        compatible:
> >>> +          contains:
> >>> +            enum:
> >>> +              - fsl,imx95-usb-phy
> >>> +    then:
> >>> +      properties:
> >>> +        reg:
> >>> +          items:
> >>> +            - description: USB PHY Control range
> >>> +            - description: USB PHY TCA Block range
> >>> +    else:
> >>> +      properties:
> >>> +        reg:
> >>> +          maxItems: 1
> >>> +
> >>> +  - if:
> >>> +      properties:
> >>> +        compatible:
> >>> +          contains:
> >>> +            enum:
> >>> +              - fsl,imx95-usb-phy
> >>> +    then:
> >>> +      $ref: /schemas/usb/usb-switch.yaml#
> >>
> >> ref should be rather in top-level. You can always disallow certain
> >> properties for devices, if they are really not applicable.
> > 
> > There are some "required" in usb-switch.yaml,
> > 
> > oneOf:
> >   - required:
> >       - port
> >   - required:
> >       - ports
> > 
> > If put on the top, it may cause DTB check warning for other compatible
> > strings, which have not support usb-switch.
> 
> Hm, indeed, that's unusual case to have such different devices in one
> schema. Did you test that above $ref in if: actually works?

Yes, it works and this yaml pass dt_binding_check and dtbs_check. 

Thanks,
Xu Yang

> 
> Best regards,
> Krzysztof
> 


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

* Re: [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
  2024-08-07  5:57       ` Xu Yang
@ 2024-08-07  5:59         ` Krzysztof Kozlowski
  2024-08-07  7:11           ` Xu Yang
  0 siblings, 1 reply; 14+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-07  5:59 UTC (permalink / raw)
  To: Xu Yang
  Cc: Frank Li, vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo,
	s.hauer, kernel, festevam, gregkh, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein, linux-phy, devicetree, imx,
	linux-arm-kernel, linux-usb

On 07/08/2024 07:57, Xu Yang wrote:
> On Wed, Aug 07, 2024 at 07:48:43AM +0200, Krzysztof Kozlowski wrote:
>> On 06/08/2024 18:11, Frank Li wrote:
>>> On Tue, Aug 06, 2024 at 10:29:47AM +0200, Krzysztof Kozlowski wrote:
>>>> On 06/08/2024 07:06, Xu Yang wrote:
>>>>> The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
>>>>> compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
>>>>> to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
>>>>> block. Since i.MX95 usb phy is able to switch SS lanes, this will also
>>>>> add orientation-switch and port property to the file.
>>>>>
>>>>> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
>>>>>
>>>>> ---
>>>>> Changes in v2:
>>>>>  - replace minItems with description in reg property
>>>>>  - remove orientation-switch and port
>>>>>  - refer to usb-switch.yaml
>>>>>  - use unevaluatedProperties
>>>>> ---
>>>>>  .../bindings/phy/fsl,imx8mq-usb-phy.yaml      | 42 ++++++++++++++++---
>>>>>  1 file changed, 37 insertions(+), 5 deletions(-)
>>>>>
>>>>> diff --git a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
>>>>> index dc3a3f709fea..6d6d211883ae 100644
>>>>> --- a/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
>>>>> +++ b/Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
>>>>> @@ -11,12 +11,17 @@ maintainers:
>>>>>
>>>>>  properties:
>>>>>    compatible:
>>>>> -    enum:
>>>>> -      - fsl,imx8mq-usb-phy
>>>>> -      - fsl,imx8mp-usb-phy
>>>>> +    oneOf:
>>>>> +      - enum:
>>>>> +          - fsl,imx8mq-usb-phy
>>>>> +          - fsl,imx8mp-usb-phy
>>>>> +      - items:
>>>>> +          - const: fsl,imx95-usb-phy
>>>>> +          - const: fsl,imx8mp-usb-phy
>>>>>
>>>>>    reg:
>>>>> -    maxItems: 1
>>>>> +    minItems: 1
>>>>> +    maxItems: 2
>>>>>
>>>>>    "#phy-cells":
>>>>>      const: 0
>>>>> @@ -89,7 +94,34 @@ required:
>>>>>    - clocks
>>>>>    - clock-names
>>>>>
>>>>> -additionalProperties: false
>>>>> +allOf:
>>>>> +  - if:
>>>>> +      properties:
>>>>> +        compatible:
>>>>> +          contains:
>>>>> +            enum:
>>>>> +              - fsl,imx95-usb-phy
>>>>> +    then:
>>>>> +      properties:
>>>>> +        reg:
>>>>> +          items:
>>>>> +            - description: USB PHY Control range
>>>>> +            - description: USB PHY TCA Block range
>>>>> +    else:
>>>>> +      properties:
>>>>> +        reg:
>>>>> +          maxItems: 1
>>>>> +
>>>>> +  - if:
>>>>> +      properties:
>>>>> +        compatible:
>>>>> +          contains:
>>>>> +            enum:
>>>>> +              - fsl,imx95-usb-phy
>>>>> +    then:
>>>>> +      $ref: /schemas/usb/usb-switch.yaml#
>>>>
>>>> ref should be rather in top-level. You can always disallow certain
>>>> properties for devices, if they are really not applicable.
>>>
>>> There are some "required" in usb-switch.yaml,
>>>
>>> oneOf:
>>>   - required:
>>>       - port
>>>   - required:
>>>       - ports
>>>
>>> If put on the top, it may cause DTB check warning for other compatible
>>> strings, which have not support usb-switch.
>>
>> Hm, indeed, that's unusual case to have such different devices in one
>> schema. Did you test that above $ref in if: actually works?
> 
> Yes, it works and this yaml pass dt_binding_check and dtbs_check. 

I know it passes, I am asking whether it actually works. Is the $ref
actually effective? Is it properly applied?

Best regards,
Krzysztof



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

* Re: [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
  2024-08-07  5:59         ` Krzysztof Kozlowski
@ 2024-08-07  7:11           ` Xu Yang
  2024-08-07  7:20             ` Krzysztof Kozlowski
  0 siblings, 1 reply; 14+ messages in thread
From: Xu Yang @ 2024-08-07  7:11 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Frank Li, vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo,
	s.hauer, kernel, festevam, gregkh, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein, linux-phy, devicetree, imx,
	linux-arm-kernel, linux-usb

On Wed, Aug 07, 2024 at 07:59:02AM +0200, Krzysztof Kozlowski wrote:
> On 07/08/2024 07:57, Xu Yang wrote:
> > On Wed, Aug 07, 2024 at 07:48:43AM +0200, Krzysztof Kozlowski wrote:
> >> On 06/08/2024 18:11, Frank Li wrote:
> >>> On Tue, Aug 06, 2024 at 10:29:47AM +0200, Krzysztof Kozlowski wrote:
> >>>> On 06/08/2024 07:06, Xu Yang wrote:
> >>>>> The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
> >>>>> compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
> >>>>> to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
> >>>>> block. Since i.MX95 usb phy is able to switch SS lanes, this will also
> >>>>> add orientation-switch and port property to the file.
> >>>>>
> >>>>> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> >>>>>
> >>>>> ---
> >>>>> Changes in v2:
> >>>>>  - replace minItems with description in reg property
> >>>>>  - remove orientation-switch and port
> >>>>>  - refer to usb-switch.yaml
> >>>>>  - use unevaluatedProperties
> >>>>>
[...]
> >>>>
> >>>> ref should be rather in top-level. You can always disallow certain
> >>>> properties for devices, if they are really not applicable.
> >>>
> >>> There are some "required" in usb-switch.yaml,
> >>>
> >>> oneOf:
> >>>   - required:
> >>>       - port
> >>>   - required:
> >>>       - ports
> >>>
> >>> If put on the top, it may cause DTB check warning for other compatible
> >>> strings, which have not support usb-switch.
> >>
> >> Hm, indeed, that's unusual case to have such different devices in one
> >> schema. Did you test that above $ref in if: actually works?
> > 
> > Yes, it works and this yaml pass dt_binding_check and dtbs_check. 
> 
> I know it passes, I am asking whether it actually works. Is the $ref
> actually effective? Is it properly applied?

If imx95 usb phy node doesn't contain "orientation-switch" and "port", dtb check will
show below error:

usb/arch/arm64/boot/dts/freescale/imx95-19x19-evk.dtb: phy@4c1f0040: 'oneOf' conditional failed, one must be fixed:
        'port' is a required property
        'ports' is a required property
        from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#

Do you want other test results?

Thanks,
Xu Yang

> 
> Best regards,
> Krzysztof
> 


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

* Re: [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
  2024-08-07  7:11           ` Xu Yang
@ 2024-08-07  7:20             ` Krzysztof Kozlowski
  0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-07  7:20 UTC (permalink / raw)
  To: Xu Yang
  Cc: Frank Li, vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo,
	s.hauer, kernel, festevam, gregkh, jun.li, l.stach, aford173,
	hongxing.zhu, alexander.stein, linux-phy, devicetree, imx,
	linux-arm-kernel, linux-usb

On 07/08/2024 09:11, Xu Yang wrote:
> On Wed, Aug 07, 2024 at 07:59:02AM +0200, Krzysztof Kozlowski wrote:
>> On 07/08/2024 07:57, Xu Yang wrote:
>>> On Wed, Aug 07, 2024 at 07:48:43AM +0200, Krzysztof Kozlowski wrote:
>>>> On 06/08/2024 18:11, Frank Li wrote:
>>>>> On Tue, Aug 06, 2024 at 10:29:47AM +0200, Krzysztof Kozlowski wrote:
>>>>>> On 06/08/2024 07:06, Xu Yang wrote:
>>>>>>> The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
>>>>>>> compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
>>>>>>> to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
>>>>>>> block. Since i.MX95 usb phy is able to switch SS lanes, this will also
>>>>>>> add orientation-switch and port property to the file.
>>>>>>>
>>>>>>> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
>>>>>>>
>>>>>>> ---
>>>>>>> Changes in v2:
>>>>>>>  - replace minItems with description in reg property
>>>>>>>  - remove orientation-switch and port
>>>>>>>  - refer to usb-switch.yaml
>>>>>>>  - use unevaluatedProperties
>>>>>>>
> [...]
>>>>>>
>>>>>> ref should be rather in top-level. You can always disallow certain
>>>>>> properties for devices, if they are really not applicable.
>>>>>
>>>>> There are some "required" in usb-switch.yaml,
>>>>>
>>>>> oneOf:
>>>>>   - required:
>>>>>       - port
>>>>>   - required:
>>>>>       - ports
>>>>>
>>>>> If put on the top, it may cause DTB check warning for other compatible
>>>>> strings, which have not support usb-switch.
>>>>
>>>> Hm, indeed, that's unusual case to have such different devices in one
>>>> schema. Did you test that above $ref in if: actually works?
>>>
>>> Yes, it works and this yaml pass dt_binding_check and dtbs_check. 
>>
>> I know it passes, I am asking whether it actually works. Is the $ref
>> actually effective? Is it properly applied?
> 
> If imx95 usb phy node doesn't contain "orientation-switch" and "port", dtb check will
> show below error:
> 
> usb/arch/arm64/boot/dts/freescale/imx95-19x19-evk.dtb: phy@4c1f0040: 'oneOf' conditional failed, one must be fixed:
>         'port' is a required property
>         'ports' is a required property
>         from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#
> 
> Do you want other test results?

Thank you for confirmation, it's enough.

Best regards,
Krzysztof



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

* Re: [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
  2024-08-06  5:06 [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Xu Yang
                   ` (4 preceding siblings ...)
  2024-08-06  8:29 ` [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Krzysztof Kozlowski
@ 2024-08-07  7:20 ` Krzysztof Kozlowski
  5 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-07  7:20 UTC (permalink / raw)
  To: Xu Yang, vkoul, kishon, robh, krzk+dt, conor+dt, shawnguo,
	s.hauer, kernel, festevam, gregkh, Frank.Li, jun.li, l.stach,
	aford173, hongxing.zhu, alexander.stein
  Cc: linux-phy, devicetree, imx, linux-arm-kernel, linux-usb

On 06/08/2024 07:06, Xu Yang wrote:
> The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
> compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
> to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
> block. Since i.MX95 usb phy is able to switch SS lanes, this will also
> add orientation-switch and port property to the file.
> 
> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof



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

end of thread, other threads:[~2024-08-07  7:21 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-06  5:06 [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Xu Yang
2024-08-06  5:06 ` [PATCH v2 2/5] dt-bindings: usb: dwc3-imx8mp: add compatible string for imx95 Xu Yang
2024-08-06  5:06 ` [PATCH v2 3/5] phy: fsl-imx8mq-usb: add tca function driver " Xu Yang
2024-08-06  5:06 ` [PATCH v2 4/5] arm64: dts: imx95: add usb3 related nodes Xu Yang
2024-08-06  5:06 ` [PATCH v2 5/5] arm64: dts: imx95-19x19-evk: add typec nodes and enable usb3 node Xu Yang
2024-08-06  8:29 ` [PATCH v2 1/5] dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy" Krzysztof Kozlowski
2024-08-06 16:11   ` Frank Li
2024-08-07  2:24     ` Xu Yang
2024-08-07  5:48     ` Krzysztof Kozlowski
2024-08-07  5:57       ` Xu Yang
2024-08-07  5:59         ` Krzysztof Kozlowski
2024-08-07  7:11           ` Xu Yang
2024-08-07  7:20             ` Krzysztof Kozlowski
2024-08-07  7:20 ` Krzysztof Kozlowski

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).