diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-04 13:30:09 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-04 13:30:09 +0300 |
| commit | 9c0532f9cc939b470e7008fdb659f46d463f386b (patch) | |
| tree | 43ad68ba7121d0df07cc7f65f87449c02873fc51 /Documentation | |
| parent | 51b8f812e5b327b343232685ea7969e02348d5dd (diff) | |
| parent | d85165b2381ce2638cfb8c8787a61b97b38251c2 (diff) | |
| download | linux-9c0532f9cc939b470e7008fdb659f46d463f386b.tar.xz | |
Merge tag 'linux-can-next-for-5.15-20210804' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2021-08-04
this is a pull request of 5 patches for net-next/master.
The first patch is by me and fixes a typo in a comment in the CAN
J1939 protocol.
The next 2 patches are by Oleksij Rempel and update the CAN J1939
protocol to send RX status updates via the error queue mechanism.
The next patch is by me and adds a missing variable initialization to
the flexcan driver (the problem was introduced in the current net-next
cycle).
The last patch is by Aswath Govindraju and adds power-domains to the
Bosch m_can DT binding documentation.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/bosch,m_can.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/can/bosch,m_can.yaml b/Documentation/devicetree/bindings/net/can/bosch,m_can.yaml index a7b5807c5543..fb547e26c676 100644 --- a/Documentation/devicetree/bindings/net/can/bosch,m_can.yaml +++ b/Documentation/devicetree/bindings/net/can/bosch,m_can.yaml @@ -104,6 +104,12 @@ properties: maximum: 32 maxItems: 1 + power-domains: + description: + Power domain provider node and an args specifier containing + the can device id value. + maxItems: 1 + can-transceiver: $ref: can-transceiver.yaml# |