Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 00:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Devicetree fixes for v6.4, part 3:

Browse Source 
- 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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEktVUI4SxYhzZyEuo+vtdtY28YcMFAmSIh9YACgkQ+vtdtY28
 YcNvXg/9E92dDOCaxMAIjse9SghSQymtIeFu24a52fbsimoR7pq6RhbhxwAfmVNk
 eh1nScVvRrjMdsc2nTiWaa3UTsTiiSGOCL6J8Lj1vJiApOmyj9a5h8Vpv4EOIHbf
 hxGWdEIXfO7c3cnUvbNu89n9gfpHDSKAYNVH5mkB9F1t/e/BOa0tZDLDT7OwF91u
 taeBdJvTHRHPqtoV5KlCVoCR1VYUd5uzBSpFAC7mJ9JzDLygmo2apB4RT0FdnBaA
 92Xxjub474tMxwWycbfSqesrNIP6tDUTqw6dIYJ29J3WaRagUCO2tr1qGqP4o8Sz
 5hOE5ZosHl7OVYx0XpLKOrna3RgKwvY9nEBSu3rQeEnX4lVFQbS+dzRC2dJry3qc
 mwOHlohUs3BDLza7DB+B2AooM8a7engLcloN1pBe3/jOQpVPkRXeLA+WnX0+BJ+r
 fODlMQcg3ismawkKbn+bkB6ygnTnmNqNYGUsGwl2CFiwMrKLHTJ9PJs3nFb65KQM
 /THXlmWCvxudEmbCh6c/PKFdUOS0LKt2TqBemOzgH5B2JuU8SkQsZcpW5AXg5vvE
 YQdRtNS79ZQeFeOB/NKSS23JTyJxV4zHP2lCCqxWNkDeXjHM5duihOiycul1mG7R
 nGo0Cn6dBzb5X6cBCwMeHQRNDeFBjLKx4Mn/u5w+b6JfwTXcKQA=
 =jy6F
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-06-13 10:27:56 -07:00
commit 15adb51c04
12 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/ata/ahci-common.yaml
View File

@ -8,7 +8,7 @@ title: Common Properties for Serial ATA AHCI controllers
maintainers: maintainers:
- Hans de Goede <hdegoede@redhat.com> - Hans de Goede <hdegoede@redhat.com>
- Damien Le Moal <damien.lemoal@opensource.wdc.com> - Damien Le Moal <dlemoal@kernel.org>
description: description:
This document defines device tree properties for a common AHCI SATA This document defines device tree properties for a common AHCI SATA

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

@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Canaan Kendryte K210 Clock title: Canaan Kendryte K210 Clock
maintainers: maintainers:
- Damien Le Moal <damien.lemoal@wdc.com> - Damien Le Moal <dlemoal@kernel.org>
description: | description: |
Canaan Kendryte K210 SoC clocks driver bindings. The clock Canaan Kendryte K210 SoC clocks driver bindings. The clock

2
Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
View File

@ -44,7 +44,7 @@ required:
- clock-names - clock-names
- clocks - clocks
additionalProperties: true unevaluatedProperties: false
examples: examples:
- | - |

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

@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Canaan Kendryte K210 System Controller title: Canaan Kendryte K210 System Controller
maintainers: maintainers:
- Damien Le Moal <damien.lemoal@wdc.com> - Damien Le Moal <dlemoal@kernel.org>
description: description:
Canaan Inc. Kendryte K210 SoC system controller which provides a Canaan Inc. Kendryte K210 SoC system controller which provides a

4
Documentation/devicetree/bindings/net/realtek-bluetooth.yaml
View File

@ -11,7 +11,7 @@ maintainers:
- Alistair Francis <alistair@alistair23.me> - Alistair Francis <alistair@alistair23.me>
description: description:
RTL8723CS/RTL8723CS/RTL8821CS/RTL8822CS is a WiFi + BT chip. WiFi part RTL8723BS/RTL8723CS/RTL8821CS/RTL8822CS is a WiFi + BT chip. WiFi part
is connected over SDIO, while BT is connected over serial. It speaks is connected over SDIO, while BT is connected over serial. It speaks
H5 protocol with few extra commands to upload firmware and change H5 protocol with few extra commands to upload firmware and change
module speed. module speed.
@ -27,7 +27,7 @@ properties:
- items: - items:
- enum: - enum:
- realtek,rtl8821cs-bt - realtek,rtl8821cs-bt
- const: realtek,rtl8822cs-bt - const: realtek,rtl8723bs-bt
device-wake-gpios: device-wake-gpios:
maxItems: 1 maxItems: 1

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

@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Canaan Kendryte K210 FPIOA title: Canaan Kendryte K210 FPIOA
maintainers: maintainers:
- Damien Le Moal <damien.lemoal@wdc.com> - Damien Le Moal <dlemoal@kernel.org>
description: description:
The Canaan Kendryte K210 SoC Fully Programmable IO Array (FPIOA) The Canaan Kendryte K210 SoC Fully Programmable IO Array (FPIOA)

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

@ -144,8 +144,9 @@ $defs:
enum: [0, 1, 2, 3, 4, 5, 6, 7] enum: [0, 1, 2, 3, 4, 5, 6, 7]
qcom,paired: qcom,paired:
- description: type: boolean
Indicates that the pin should be operating in paired mode. description:
Indicates that the pin should be operating in paired mode.
required: required:
- pins - pins

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

@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Canaan Kendryte K210 Reset Controller title: Canaan Kendryte K210 Reset Controller
maintainers: maintainers:
- Damien Le Moal <damien.lemoal@wdc.com> - Damien Le Moal <dlemoal@kernel.org>
description: | description: |
Canaan Kendryte K210 reset controller driver which supports the SoC Canaan Kendryte K210 reset controller driver which supports the SoC

2
Documentation/devicetree/bindings/riscv/canaan.yaml
View File

@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Canaan SoC-based boards title: Canaan SoC-based boards
maintainers: maintainers:
- Damien Le Moal <damien.lemoal@wdc.com> - Damien Le Moal <dlemoal@kernel.org>
description: description:
Canaan Kendryte K210 SoC-based boards Canaan Kendryte K210 SoC-based boards

2
Documentation/devicetree/usage-model.rst
View File

@ -415,6 +415,6 @@ When using the DT, this creates problems for of_platform_populate()
because it must decide whether to register each node as either a because it must decide whether to register each node as either a
platform_device or an amba_device. This unfortunately complicates the platform_device or an amba_device. This unfortunately complicates the
device creation model a little bit, but the solution turns out not to device creation model a little bit, but the solution turns out not to
be too invasive. If a node is compatible with "arm,amba-primecell", then be too invasive. If a node is compatible with "arm,primecell", then
of_platform_populate() will register it as an amba_device instead of a of_platform_populate() will register it as an amba_device instead of a
platform_device. platform_device.

2
Documentation/translations/zh_CN/devicetree/usage-model.rst
View File

@ -325,6 +325,6 @@ Primecell设备。然而，棘手的一点是，AMBA总线上的所有设备并
当使用DT时，这给of_platform_populate()带来了问题，因为它必须决定是否将 当使用DT时，这给of_platform_populate()带来了问题，因为它必须决定是否将
每个节点注册为platform_device或amba_device。不幸的是，这使设备创建模型 每个节点注册为platform_device或amba_device。不幸的是，这使设备创建模型
变得有点复杂，但解决方案原来并不是太具有侵略性。如果一个节点与“arm,amba-primecell” 变得有点复杂，但解决方案原来并不是太具有侵略性。如果一个节点与“arm,primecell”
兼容，那么of_platform_populate()将把它注册为amba_device而不是 兼容，那么of_platform_populate()将把它注册为amba_device而不是
platform_device。 platform_device。

1
drivers/of/overlay.c
View File

@ -811,6 +811,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs)
if (!fragment->target) { if (!fragment->target) {
pr_err("symbols in overlay, but not in live tree\n"); pr_err("symbols in overlay, but not in live tree\n");
ret = -EINVAL; ret = -EINVAL;
of_node_put(node);
goto err_out; goto err_out;
} }