| Message ID | 20230728075614.1014117-2-mkl@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8c07fb0d647772018e0562fc4e920e081efb4c80 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,01/21] dt-bindings: net: can: Add support for Allwinner D1 CAN controller | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next, async |
| netdev/apply | success | Patch already applied to net-next |
Hello: This series was applied to netdev/net-next.git (main) by Marc Kleine-Budde <mkl@pengutronix.de>: On Fri, 28 Jul 2023 09:55:54 +0200 you wrote: > From: John Watts <contact@jookia.org> > > The Allwinner D1 has two CAN controllers, both a variant of the R40 > controller. Unfortunately the registers for the D1 controllers are > moved around enough to be incompatible and require a new compatible. > > Introduce the "allwinner,sun20i-d1-can" compatible to support this. > > [...] Here is the summary with links: - [net-next,01/21] dt-bindings: net: can: Add support for Allwinner D1 CAN controller https://git.kernel.org/netdev/net-next/c/8c07fb0d6477 - [net-next,02/21] riscv: dts: allwinner: d1: Add CAN controller nodes https://git.kernel.org/netdev/net-next/c/6ea1ad888f59 - [net-next,03/21] can: sun4i_can: Add acceptance register quirk https://git.kernel.org/netdev/net-next/c/8cda0c6dfd42 - [net-next,04/21] MAINTAINERS: Add myself as maintainer of the ems_pci.c driver https://git.kernel.org/netdev/net-next/c/e58ee933c27a - [net-next,05/21] can: sun4i_can: Add support for the Allwinner D1 https://git.kernel.org/netdev/net-next/c/8abb95250ae6 - [net-next,06/21] can: peak_usb: remove unused/legacy peak_usb_netif_rx() function https://git.kernel.org/netdev/net-next/c/74dedbd74d2b - [net-next,07/21] can: Explicitly include correct DT includes, part 2 https://git.kernel.org/netdev/net-next/c/07382e6b68a7 - [net-next,08/21] can: gs_usb: remove leading space from goto labels https://git.kernel.org/netdev/net-next/c/f1a14714bf48 - [net-next,09/21] can: gs_usb: gs_usb_probe(): align block comment https://git.kernel.org/netdev/net-next/c/5780148bedd6 - [net-next,10/21] can: gs_usb: gs_usb_set_timestamp(): remove return statements form void function https://git.kernel.org/netdev/net-next/c/a2002f455c0e - [net-next,11/21] can: gs_usb: uniformly use "parent" as variable name for struct gs_usb https://git.kernel.org/netdev/net-next/c/b6980ad3a90c - [net-next,12/21] can: gs_usb: gs_usb_receive_bulk_callback(): make use of netdev https://git.kernel.org/netdev/net-next/c/fcb880ef2f55 - [net-next,13/21] can: gs_usb: gs_usb_receive_bulk_callback(): make use of stats https://git.kernel.org/netdev/net-next/c/55ad95d94425 - [net-next,14/21] can: gs_usb: gs_usb_receive_bulk_callback(): count RX overflow errors also in case of OOM https://git.kernel.org/netdev/net-next/c/6c8bc15f02b8 - [net-next,15/21] can: gs_usb: gs_can_start_xmit(), gs_can_open(): clean up printouts in error path https://git.kernel.org/netdev/net-next/c/1494ffe4cbe0 - [net-next,16/21] can: gs_usb: gs_can_close(): don't complain about failed device reset during ndo_stop https://git.kernel.org/netdev/net-next/c/5c6c313acdfc - [net-next,17/21] can: gs_usb: gs_destroy_candev(): remove not needed usb_kill_anchored_urbs() https://git.kernel.org/netdev/net-next/c/5391e0cbae02 - [net-next,18/21] can: gs_usb: gs_usb_disconnect(): remove not needed usb_kill_anchored_urbs() https://git.kernel.org/netdev/net-next/c/d4cfb83d566c - [net-next,19/21] can: rx-offload: rename rx_offload_get_echo_skb() -> can_rx_offload_get_echo_skb_queue_timestamp() https://git.kernel.org/netdev/net-next/c/2e3df4a3b317 - [net-next,20/21] can: rx-offload: add can_rx_offload_get_echo_skb_queue_tail() https://git.kernel.org/netdev/net-next/c/8e0e2950c9ef - [net-next,21/21] can: gs_usb: convert to NAPI/rx-offload to avoid OoO reception https://git.kernel.org/netdev/net-next/c/24bc41b45583 You are awesome, thank you!
diff --git a/Documentation/devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml b/Documentation/devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml index 9c494957a07a..e42ea28d6ab4 100644 --- a/Documentation/devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml +++ b/Documentation/devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml @@ -21,6 +21,7 @@ properties: - const: allwinner,sun4i-a10-can - const: allwinner,sun4i-a10-can - const: allwinner,sun8i-r40-can + - const: allwinner,sun20i-d1-can reg: maxItems: 1 @@ -37,8 +38,9 @@ properties: if: properties: compatible: - contains: - const: allwinner,sun8i-r40-can + enum: + - allwinner,sun8i-r40-can + - allwinner,sun20i-d1-can then: required: