[PATCH 0/2] phy: ti: phy-j721e-wiz: add j721s2 support

[PATCH 0/2] phy: ti: phy-j721e-wiz: add j721s2 support

[Matt Ranostay]

Add support for j721s2 support for phy-j721e-wiz module.

Matt Ranostay (2):
  dt-bindings: phy-j721e-wiz: add j721s2 compatible string
  phy: ti: phy-j721e-wiz: add j721s2-wiz-10g module support

 .../bindings/phy/ti,phy-j721e-wiz.yaml           |  1 +
 drivers/phy/ti/phy-j721e-wiz.c                   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

-- 
2.38.GIT

[PATCH 1/2] dt-bindings: phy-j721e-wiz: add j721s2 compatible string

[Matt Ranostay]

Add ti,j721s2-wiz-10g compatible string to binding documentation.

Signed-off-by: Matt Ranostay <mranostay@ti.com>
---
 Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml b/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
index a9e38739c010..b837748f33d1 100644
--- a/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
+++ b/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
@@ -18,6 +18,7 @@ properties:
       - ti,am64-wiz-10g
       - ti,j7200-wiz-10g
       - ti,j784s4-wiz-10g
+      - ti,j721s2-wiz-10g
 
   power-domains:
     maxItems: 1
-- 
2.38.GIT

Re: [PATCH 1/2] dt-bindings: phy-j721e-wiz: add j721s2 compatible string

[Krzysztof Kozlowski]

On 22/11/2022 10:22, Matt Ranostay wrote:
> Add ti,j721s2-wiz-10g compatible string to binding documentation.
> 
> Signed-off-by: Matt Ranostay <mranostay@ti.com>
> ---
>  Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml b/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
> index a9e38739c010..b837748f33d1 100644
> --- a/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
> +++ b/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
> @@ -18,6 +18,7 @@ properties:
>        - ti,am64-wiz-10g
>        - ti,j7200-wiz-10g
>        - ti,j784s4-wiz-10g
> +      - ti,j721s2-wiz-10g
>  
Keep items sorted.

Best regards,
Krzysztof

Re: [PATCH 1/2] dt-bindings: phy-j721e-wiz: add j721s2 compatible string

[Matt Ranostay]

On Tue, Nov 22, 2022 at 11:19:09AM +0100, Krzysztof Kozlowski wrote:
> On 22/11/2022 10:22, Matt Ranostay wrote:
> > Add ti,j721s2-wiz-10g compatible string to binding documentation.
> > 
> > Signed-off-by: Matt Ranostay <mranostay@ti.com>
> > ---
> >  Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml b/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
> > index a9e38739c010..b837748f33d1 100644
> > --- a/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
> > +++ b/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
> > @@ -18,6 +18,7 @@ properties:
> >        - ti,am64-wiz-10g
> >        - ti,j7200-wiz-10g
> >        - ti,j784s4-wiz-10g
> > +      - ti,j721s2-wiz-10g
> >  
> Keep items sorted.
>

Noted. Will correct in v2

- Matt

> Best regards,
> Krzysztof
> 

[PATCH 2/2] phy: ti: phy-j721e-wiz: add j721s2-wiz-10g module support

[Matt Ranostay]

Add support for j721s2-wiz-10g device which is similar to j721e-wiz-10g but
uses clock-names interface versus explicitly defining clock nodes within
device tree node.

Signed-off-by: Matt Ranostay <mranostay@ti.com>
---
 drivers/phy/ti/phy-j721e-wiz.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/phy/ti/phy-j721e-wiz.c b/drivers/phy/ti/phy-j721e-wiz.c
index 141b51af4427..ddce5ef7711c 100644
--- a/drivers/phy/ti/phy-j721e-wiz.c
+++ b/drivers/phy/ti/phy-j721e-wiz.c
@@ -322,6 +322,7 @@ enum wiz_type {
 	AM64_WIZ_10G,
 	J7200_WIZ_10G,  /* J7200 SR2.0 */
 	J784S4_WIZ_10G,
+	J721S2_WIZ_10G,
 };
 
 struct wiz_data {
@@ -1000,6 +1001,7 @@ static void wiz_clock_cleanup(struct wiz *wiz, struct device_node *node)
 	case AM64_WIZ_10G:
 	case J7200_WIZ_10G:
 	case J784S4_WIZ_10G:
+	case J721S2_WIZ_10G:
 		of_clk_del_provider(dev->of_node);
 		return;
 	default:
@@ -1132,6 +1134,7 @@ static int wiz_clock_init(struct wiz *wiz, struct device_node *node)
 	case AM64_WIZ_10G:
 	case J7200_WIZ_10G:
 	case J784S4_WIZ_10G:
+	case J721S2_WIZ_10G:
 		ret = wiz_clock_register(wiz);
 		if (ret)
 			dev_err(dev, "Failed to register wiz clocks\n");
@@ -1214,6 +1217,7 @@ static int wiz_phy_fullrt_div(struct wiz *wiz, int lane)
 		break;
 	case J721E_WIZ_10G:
 	case J7200_WIZ_10G:
+	case J721S2_WIZ_10G:
 		if (wiz->lane_phy_type[lane] == PHY_TYPE_SGMII)
 			return regmap_field_write(wiz->p0_fullrt_div[lane], 0x2);
 		break;
@@ -1318,6 +1322,15 @@ static struct wiz_data j784s4_10g_data = {
 	.clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_10G,
 };
 
+static struct wiz_data j721s2_10g_data = {
+	.type = J721S2_WIZ_10G,
+	.pll0_refclk_mux_sel = &pll0_refclk_mux_sel,
+	.pll1_refclk_mux_sel = &pll1_refclk_mux_sel,
+	.refclk_dig_sel = &refclk_dig_sel_10g,
+	.clk_mux_sel = clk_mux_sel_10g,
+	.clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_10G,
+};
+
 static const struct of_device_id wiz_id_table[] = {
 	{
 		.compatible = "ti,j721e-wiz-16g", .data = &j721e_16g_data,
@@ -1334,6 +1347,9 @@ static const struct of_device_id wiz_id_table[] = {
 	{
 		.compatible = "ti,j784s4-wiz-10g", .data = &j784s4_10g_data,
 	},
+	{
+		.compatible = "ti,j721s2-wiz-10g", .data = &j721s2_10g_data,
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, wiz_id_table);
-- 
2.38.GIT