Commit ebc742ed authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-6.19-20251017' of... 

Merge tag 'linux-can-next-for-6.19-20251017' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2025-10-17

The first patch is by me and adds support for an optional reset to the
m_can drivers.

Vincent Mailhol's patch targets all drivers and removes the
can_change_mtu() function, since the netdev's min and max MTU are
populated.

Markus Schneider-Pargmann contributes 4 patches to the m_can driver to
add am62 wakeup support.

The last 7 patches are by me and provide various cleanups to the m_can
driver.

* tag 'linux-can-next-for-6.19-20251017' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next:
  can: m_can: m_can_get_berr_counter(): don't wake up controller if interface is down
  can: m_can: m_can_tx_submit(): remove unneeded sanity checks
  can: m_can: m_can_class_register(): remove error message in case devm_kzalloc() fails
  can: m_can: m_can_interrupt_enable(): use m_can_write() instead of open coding it
  net: m_can: convert dev_{dbg,info,err} -> netdev_{dbg,info,err}
  can: m_can: hrtimer_callback(): rename to m_can_polling_timer()
  can: m_can: m_can_init_ram(): make static
  can: m_can: Support pinctrl wakeup state
  can: m_can: Return ERR_PTR on error in allocation
  can: m_can: Map WoL to device_set_wakeup_enable
  dt-bindings: can: m_can: Add wakeup properties
  can: treewide: remove can_change_mtu()
  can: m_can: add support for optional reset
====================

Link: https://patch.msgid.link/20251017150819.1415685-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 38516e3f e41287a0

Documentation/devicetree/bindings/net/can/bosch,m_can.yaml

+25 −0
Original line number Diff line number Diff line
@@ -109,6 +109,26 @@ properties: 
        maximum: 32

    minItems: 1



  pinctrl-0:

    description: Default pinctrl state



  pinctrl-1:

    description: Can be "sleep" or "wakeup" pinctrl state



  pinctrl-2:

    description: Can be "sleep" or "wakeup" pinctrl state



  pinctrl-names:

    description:

      When present should contain at least "default" describing the default pin

      states. Other states are "sleep" which describes the pinstate when

      sleeping and "wakeup" describing the pins if wakeup is enabled.

    minItems: 1

    items:

      - const: default

      - enum: [ sleep, wakeup ]

      - const: wakeup



  power-domains:

    description:

      Power domain provider node and an args specifier containing
@@ -125,6 +145,11 @@ properties: 
    minItems: 1

    maxItems: 2



  wakeup-source:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    description:

      List of phandles to system idle states in which mcan can wakeup the system.



required:

  - compatible

  - reg

drivers/net/can/at91_can.c

+0 −1
Original line number Diff line number Diff line
@@ -948,7 +948,6 @@ static const struct net_device_ops at91_netdev_ops = { 
	.ndo_open	= at91_open,

	.ndo_stop	= at91_close,

	.ndo_start_xmit	= at91_start_xmit,

	.ndo_change_mtu = can_change_mtu,

};



static const struct ethtool_ops at91_ethtool_ops = {

drivers/net/can/bxcan.c

+0 −1
Original line number Diff line number Diff line
@@ -881,7 +881,6 @@ static const struct net_device_ops bxcan_netdev_ops = { 
	.ndo_open = bxcan_open,

	.ndo_stop = bxcan_stop,

	.ndo_start_xmit = bxcan_start_xmit,

	.ndo_change_mtu = can_change_mtu,

};



static const struct ethtool_ops bxcan_ethtool_ops = {

drivers/net/can/c_can/c_can_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1362,7 +1362,6 @@ static const struct net_device_ops c_can_netdev_ops = { 
	.ndo_open = c_can_open,

	.ndo_stop = c_can_close,

	.ndo_start_xmit = c_can_start_xmit,

	.ndo_change_mtu = can_change_mtu,

};



int register_c_can_dev(struct net_device *dev)

drivers/net/can/can327.c

+0 −1
Original line number Diff line number Diff line
@@ -849,7 +849,6 @@ static const struct net_device_ops can327_netdev_ops = { 
	.ndo_open = can327_netdev_open,

	.ndo_stop = can327_netdev_close,

	.ndo_start_xmit = can327_netdev_start_xmit,

	.ndo_change_mtu = can_change_mtu,

};



static const struct ethtool_ops can327_ethtool_ops = {