diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-07 23:06:34 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-07 23:06:34 +0300 |
commit | 1ad77a05cfaed42cba301368350817333ac69b6a (patch) | |
tree | b408928197a128c83f814986ca04c94a9dfb2530 /Documentation | |
parent | 51595e3b4943b0079638b2657f603cf5c8ea3a66 (diff) | |
parent | 0d95f41ebde40d552bb4fea64b1d618607915fd6 (diff) | |
download | linux-1ad77a05cfaed42cba301368350817333ac69b6a.tar.xz |
Merge tag 'i3c/for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
Pull i3cupdates from Alexandre Belloni:
"Fix i3c_master_register error path"
* tag 'i3c/for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register"
dt-bindings: i3c: Fix silvaco,i3c-master-v1 compatible string
i3c: master: svc: remove redundant assignment to cmd->read_len
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml b/Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml index adb5165505aa..62f3ca66274f 100644 --- a/Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml +++ b/Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml @@ -49,7 +49,7 @@ additionalProperties: true examples: - | i3c-master@a0000000 { - compatible = "silvaco,i3c-master"; + compatible = "silvaco,i3c-master-v1"; clocks = <&zynqmp_clk 71>, <&fclk>, <&sclk>; clock-names = "pclk", "fast_clk", "slow_clk"; interrupt-parent = <&gic>; |