Jakub Kicinski
35b1b1fd96
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
...
Cross-merge networking fixes after downstream PR.
Conflicts:
net/dsa/port.c
9945c1fb03a88dd75384https://lore.kernel.org/all/20230731102254.2c9868ca@canb.auug.org.au/
net/xdp/xsk.c
3c5b4d69c3b7f72a30e9https://lore.kernel.org/all/20230731102631.39988412@canb.auug.org.au/
drivers/net/ethernet/broadcom/bnxt/bnxt.c
37b61cda9c2b56b3d992https://lore.kernel.org/all/20230801101708.1dc7faac@canb.auug.org.au/
Adjacent changes:
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
62da08331ffbd517549c55c1528f9bae9d445cd4kuba@kernel.org >
2023-08-03 14:34:37 -07:00
Eugen Hristev
5416d7925e
dt-bindings: net: rockchip-dwmac: fix {tx|rx}-delay defaults/range in schema
...
The range and the defaults are specified in the description instead of
being specified in the schema.
Fix it by adding the default value in the `default` field and specifying
the range as `minimum` and `maximum`.
Fixes: b331b8ef86eugen.hristev@collabora.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2023-07-28 10:56:40 +01:00
Eugen Hristev
51318bf443
dt-bindings: net: rockchip-dwmac: add default 'input' for clock_in_out
...
'clock_in_out' property is optional, and it can be one of two enums.
The binding does not specify what is the behavior when the property is
missing altogether.
Hence, add a default value that the driver can use.
Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com >
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com >
Acked-by: Rob Herring <robh@kernel.org >
Link: https://lore.kernel.org/r/20230718090914.282293-1-eugen.hristev@collabora.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
2023-07-19 20:58:42 -07:00
Krzysztof Kozlowski
61ab5a060a
dt-bindings: net: drop unneeded quotes
...
Cleanup bindings dropping unneeded quotes. Once all these are fixed,
checking for this can be enabled in yamllint.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org >
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2023-06-12 10:50:47 +01:00
Rob Herring
3079bfdbda
dt-bindings: net: Drop unneeded quotes
...
Cleanup bindings dropping unneeded quotes. Once all these are fixed,
checking for this can be enabled in yamllint.
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de > # for bindings/net/can
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org >
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com >
Acked-by: Florian Fainelli <f.fainelli@gmail.com >
Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com >
Signed-off-by: Rob Herring <robh@kernel.org >
Acked-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp > # for bindings/net/toshiba,visconti-dwmac.yaml
Reviewed-by: Heiko Stuebner <heiko@sntech.de > #rockchip
Link: https://lore.kernel.org/r/20230320233758.2918972-1-robh@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
2023-03-22 21:54:19 -07:00
Anand Moon
e471d83e1f
dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning
...
Fix compatible string for RV1126 gmac, and constrain it to
be compatible with Synopsys dwmac 4.20a.
fix below warning
$ make CHECK_DTBS=y rv1126-edgeble-neu2-io.dtb
arch/arm/boot/dts/rv1126-edgeble-neu2-io.dtb: ethernet@ffc40000:
compatible: 'oneOf' conditional failed, one must be fixed:
['rockchip,rv1126-gmac', 'snps,dwmac-4.20a'] is too long
'rockchip,rv1126-gmac' is not one of ['rockchip,rk3568-gmac', 'rockchip,rk3588-gmac']
Fixes: b36fe2f436jagan@edgeble.ai >
Acked-by: Rob Herring <robh@kernel.org >
Signed-off-by: Anand Moon <anand@edgeble.ai >
Link: https://lore.kernel.org/r/20230111172437.5295-1-anand@edgeble.ai
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
2023-01-13 20:15:39 -08:00
Anand Moon
b36fe2f436
dt-bindings: net: rockchip-dwmac: add rv1126 compatible
...
Add compatible string for RV1126 gmac, and constrain it to
be compatible with Synopsys dwmac 4.20a.
Reviewed-by: Heiko Stuebner <heiko@sntech.de >
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org >
Signed-off-by: Jagan Teki <jagan@edgeble.ai >
Signed-off-by: Anand Moon <anand@edgeble.ai >
Link: https://lore.kernel.org/r/20220920140944.2535-1-anand@edgeble.ai
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
2022-09-26 11:26:15 -07:00
Sebastian Reichel
a2b7783142
dt-bindings: net: rockchip-dwmac: add rk3588 gmac compatible
...
Add compatible string for RK3588 gmac, which is similar to the RK3568
one, but needs another syscon device for clock selection.
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org >
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com >
Signed-off-by: Paolo Abeni <pabeni@redhat.com >
2022-09-01 11:53:07 +02:00
Ezequiel Garcia
f9da1c9d7f
dt-bindings: net: rockchip-dwmac: add rk3568 compatible string
...
Add compatible string for RK3568 gmac, and constrain it to
be compatible with Synopsys dwmac 4.20a.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2021-05-17 15:34:43 -07:00
Tobias Schramm
2cc8c910f5
dt-bindings: net: rockchip-dwmac: add rk3308 gmac compatible
...
The Rockchip RK3308 has a gmac that is not fully compatible with any of the
other Rockchip gmacs.
This patch adds a compatible string for it.
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org >
Signed-off-by: David S. Miller <davem@davemloft.net >
2021-05-14 15:13:51 -07:00
Ezequiel Garcia
b331b8ef86
dt-bindings: net: convert rockchip-dwmac to json-schema
...
Convert Rockchip dwmac controller dt-bindings to YAML.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com >
Reviewed-by: David Wu <david.wu@rock-chips.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2021-04-26 12:59:37 -07:00
