Commit e090f978 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-dsa-rzn1_a5psw-add-compile_test' 

Rosen Penev says:

====================
net: dsa: rzn1_a5psw: add COMPILE_TEST

Allows the various bots to test compilation. Also threw in a small devm
conversion for enabling clocks.
====================

Link: https://patch.msgid.link/20250708014144.2514-1-rosenp@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 45e359be 37bfeebc

drivers/net/dsa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ source "drivers/net/dsa/realtek/Kconfig" 


config NET_DSA_RZN1_A5PSW

	tristate "Renesas RZ/N1 A5PSW Ethernet switch support"

	depends on OF && ARCH_RZN1

	depends on OF && (ARCH_RZN1 || COMPILE_TEST)

	select NET_DSA_TAG_RZN1_A5PSW

	select PCS_RZN1_MIIC

	help

drivers/net/dsa/rzn1_a5psw.c

+4 −18
Original line number Diff line number Diff line
@@ -1227,35 +1227,27 @@ static int a5psw_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	a5psw->hclk = devm_clk_get(dev, "hclk");

	a5psw->hclk = devm_clk_get_enabled(dev, "hclk");

	if (IS_ERR(a5psw->hclk)) {

		dev_err(dev, "failed get hclk clock\n");

		ret = PTR_ERR(a5psw->hclk);

		goto free_pcs;

	}



	a5psw->clk = devm_clk_get(dev, "clk");

	a5psw->clk = devm_clk_get_enabled(dev, "clk");

	if (IS_ERR(a5psw->clk)) {

		dev_err(dev, "failed get clk_switch clock\n");

		ret = PTR_ERR(a5psw->clk);

		goto free_pcs;

	}



	ret = clk_prepare_enable(a5psw->clk);

	if (ret)

		goto free_pcs;



	ret = clk_prepare_enable(a5psw->hclk);

	if (ret)

		goto clk_disable;



	mdio = of_get_available_child_by_name(dev->of_node, "mdio");

	if (mdio) {

		ret = a5psw_probe_mdio(a5psw, mdio);

		of_node_put(mdio);

		if (ret) {

			dev_err(dev, "Failed to register MDIO: %d\n", ret);

			goto hclk_disable;

			goto free_pcs;

		}

	}
@@ -1269,15 +1261,11 @@ static int a5psw_probe(struct platform_device *pdev) 
	ret = dsa_register_switch(ds);

	if (ret) {

		dev_err(dev, "Failed to register DSA switch: %d\n", ret);

		goto hclk_disable;

		goto free_pcs;

	}



	return 0;



hclk_disable:

	clk_disable_unprepare(a5psw->hclk);

clk_disable:

	clk_disable_unprepare(a5psw->clk);

free_pcs:

	a5psw_pcs_free(a5psw);
@@ -1293,8 +1281,6 @@ static void a5psw_remove(struct platform_device *pdev) 


	dsa_unregister_switch(&a5psw->ds);

	a5psw_pcs_free(a5psw);

	clk_disable_unprepare(a5psw->hclk);

	clk_disable_unprepare(a5psw->clk);

}



static void a5psw_shutdown(struct platform_device *pdev)