diff options
| author | David S. Miller <davem@davemloft.net> | 2022-09-02 11:37:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-09-02 11:37:27 +0100 |
| commit | a01105f1748e8151ef43c300659b99d471f5f61d (patch) | |
| tree | 4d8cb186c5b146ec1d22c85a6bebcbc8c8af53a5 | |
| parent | aa51b80e1af47b3781abb1fb1666445a7616f0cd (diff) | |
| parent | f4c1f51cea4e145995076d5dae98486934e8f281 (diff) | |
| download | linux-a01105f1748e8151ef43c300659b99d471f5f61d.tar.bz2 | |
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>
| -rw-r--r-- | Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml b/Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml index 0807aa7a8f63..57ffeb8fc876 100644 --- a/Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml +++ b/Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml @@ -130,8 +130,6 @@ required: - reg-names - interrupts - interrupt-names - - resets - - reset-names - ethernet-ports additionalProperties: false diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c index 2ad078608c45..e2c77f954a3d 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c @@ -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"); |