Skip to content

Commit 15adb51

Browse files
committed
Merge tag 'devicetree-fixes-for-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Fix missing of_node_put() in init_overlay_changeset() - Fix schema for qcom,pmic-mpp "qcom,paired" property - Fix 'additionalProperties' in silvaco,i3c-master binding - usage-model.rst: Use documented "arm,primecell" compatible string - Update Damien Le Moal's email address - Fixes in Realtek Bluetooth binding * tag 'devicetree-fixes-for-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: pinctrl: qcom,pmic-mpp: Fix schema for "qcom,paired" dt-bindings: i3c: silvaco,i3c-master: fix missing schema restriction of: overlay: Fix missing of_node_put() in error case of init_overlay_changeset() docs: zh_CN/devicetree: sync usage-model fix docs: dt: fix documented Primecell compatible string dt-bindings: Change Damien Le Moal's contact email dt-bindings: net: realtek-bluetooth: Fix double RTL8723CS in desc dt-bindings: net: realtek-bluetooth: Fix RTL8821CS binding
2 parents fb05409 + c7753ed commit 15adb51

File tree

12 files changed

+15
-13
lines changed

12 files changed

+15
-13
lines changed

Documentation/devicetree/bindings/ata/ahci-common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Common Properties for Serial ATA AHCI controllers
88

99
maintainers:
1010
- Hans de Goede <[email protected]>
11-
- Damien Le Moal <[email protected]>
11+
- Damien Le Moal <[email protected]>
1212

1313
description:
1414
This document defines device tree properties for a common AHCI SATA

Documentation/devicetree/bindings/clock/canaan,k210-clk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Canaan Kendryte K210 Clock
88

99
maintainers:
10-
- Damien Le Moal <[email protected]>
10+
- Damien Le Moal <[email protected]>
1111

1212
description: |
1313
Canaan Kendryte K210 SoC clocks driver bindings. The clock

Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ required:
4444
- clock-names
4545
- clocks
4646

47-
additionalProperties: true
47+
unevaluatedProperties: false
4848

4949
examples:
5050
- |

Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Canaan Kendryte K210 System Controller
88

99
maintainers:
10-
- Damien Le Moal <[email protected]>
10+
- Damien Le Moal <[email protected]>
1111

1212
description:
1313
Canaan Inc. Kendryte K210 SoC system controller which provides a

Documentation/devicetree/bindings/net/realtek-bluetooth.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ maintainers:
1111
- Alistair Francis <[email protected]>
1212

1313
description:
14-
RTL8723CS/RTL8723CS/RTL8821CS/RTL8822CS is a WiFi + BT chip. WiFi part
14+
RTL8723BS/RTL8723CS/RTL8821CS/RTL8822CS is a WiFi + BT chip. WiFi part
1515
is connected over SDIO, while BT is connected over serial. It speaks
1616
H5 protocol with few extra commands to upload firmware and change
1717
module speed.
@@ -27,7 +27,7 @@ properties:
2727
- items:
2828
- enum:
2929
- realtek,rtl8821cs-bt
30-
- const: realtek,rtl8822cs-bt
30+
- const: realtek,rtl8723bs-bt
3131

3232
device-wake-gpios:
3333
maxItems: 1

Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Canaan Kendryte K210 FPIOA
88

99
maintainers:
10-
- Damien Le Moal <[email protected]>
10+
- Damien Le Moal <[email protected]>
1111

1212
description:
1313
The Canaan Kendryte K210 SoC Fully Programmable IO Array (FPIOA)

Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,9 @@ $defs:
144144
enum: [0, 1, 2, 3, 4, 5, 6, 7]
145145

146146
qcom,paired:
147-
- description:
148-
Indicates that the pin should be operating in paired mode.
147+
type: boolean
148+
description:
149+
Indicates that the pin should be operating in paired mode.
149150

150151
required:
151152
- pins

Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Canaan Kendryte K210 Reset Controller
88

99
maintainers:
10-
- Damien Le Moal <[email protected]>
10+
- Damien Le Moal <[email protected]>
1111

1212
description: |
1313
Canaan Kendryte K210 reset controller driver which supports the SoC

Documentation/devicetree/bindings/riscv/canaan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Canaan SoC-based boards
88

99
maintainers:
10-
- Damien Le Moal <[email protected]>
10+
- Damien Le Moal <[email protected]>
1111

1212
description:
1313
Canaan Kendryte K210 SoC-based boards

Documentation/devicetree/usage-model.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,6 @@ When using the DT, this creates problems for of_platform_populate()
415415
because it must decide whether to register each node as either a
416416
platform_device or an amba_device. This unfortunately complicates the
417417
device creation model a little bit, but the solution turns out not to
418-
be too invasive. If a node is compatible with "arm,amba-primecell", then
418+
be too invasive. If a node is compatible with "arm,primecell", then
419419
of_platform_populate() will register it as an amba_device instead of a
420420
platform_device.

0 commit comments

Comments
 (0)