Commit a01105f1 authored Sep 02, 2022 by David S. Miller

Merge branch 'lan966x-make-reset-optional'

Michael Walle says:

====================
net: lan966x: make reset optional

This is the remaining part of the reset rework on the LAN966x targetting
the netdev tree.

The former series can be found at:
https://lore.kernel.org/lkml/20220826115607.1148489-1-michael@walle.cc/


====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents aa51b80e f4c1f51c

Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml

+0 −2

Original line number	Diff line number	Diff line
		@@ -130,8 +130,6 @@ required:
		- reg-names
		- interrupts
		- interrupt-names
		- resets
		- reset-names
		- ethernet-ports

		additionalProperties: false

drivers/net/ethernet/microchip/lan966x/lan966x_main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -971,7 +971,8 @@ static int lan966x_reset_switch(struct lan966x *lan966x)
		int val = 0;
		int ret;

		switch_reset = devm_reset_control_get_shared(lan966x->dev, "switch");
		switch_reset = devm_reset_control_get_optional_shared(lan966x->dev,
		"switch");
		if (IS_ERR(switch_reset))
		return dev_err_probe(lan966x->dev, PTR_ERR(switch_reset),
		"Could not obtain switch reset");