Commit a01105f1 authored by David S. Miller's avatar 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: default avatarDavid S. Miller <davem@davemloft.net>
parents aa51b80e f4c1f51c
...@@ -130,8 +130,6 @@ required: ...@@ -130,8 +130,6 @@ required:
- reg-names - reg-names
- interrupts - interrupts
- interrupt-names - interrupt-names
- resets
- reset-names
- ethernet-ports - ethernet-ports
additionalProperties: false additionalProperties: false
......
...@@ -971,7 +971,8 @@ static int lan966x_reset_switch(struct lan966x *lan966x) ...@@ -971,7 +971,8 @@ static int lan966x_reset_switch(struct lan966x *lan966x)
int val = 0; int val = 0;
int ret; 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)) if (IS_ERR(switch_reset))
return dev_err_probe(lan966x->dev, PTR_ERR(switch_reset), return dev_err_probe(lan966x->dev, PTR_ERR(switch_reset),
"Could not obtain switch reset"); "Could not obtain switch reset");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment