Skip to content

Commit 0080665

Browse files
committed
Merge tag 'devicetree-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: - Refactor powerpc and arm64 kexec DT handling to common code. This enables IMA on arm64. - Add kbuild support for applying DT overlays at build time. The first user are the DT unittests. - Fix kerneldoc formatting and W=1 warnings in drivers/of/ - Fix handling 64-bit flag on PCI resources - Bump dtschema version required to v2021.2.1 - Enable undocumented compatible checks for dtbs_check. This allows tracking of missing binding schemas. - DT docs improvements. Regroup the DT docs and add the example schema and DT kernel ABI docs to the doc build. - Convert Broadcom Bluetooth and video-mux bindings to schema - Add QCom sm8250 Venus video codec binding schema - Add vendor prefixes for AESOP, YIC System Co., Ltd, and Siliconfile Technologies Inc. - Cleanup of DT schema type references on common properties and standard unit properties * tag 'devicetree-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (64 commits) powerpc: If kexec_build_elf_info() fails return immediately from elf64_load() powerpc: Free fdt on error in elf64_load() of: overlay: Fix kerneldoc warning in of_overlay_remove() of: linux/of.h: fix kernel-doc warnings of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses dt-bindings: bcm4329-fmac: add optional brcm,ccode-map docs: dt: update writing-schema.rst references dt-bindings: media: venus: Add sm8250 dt schema of: base: Fix spelling issue with function param 'prop' docs: dt: Add DT API documentation of: Add missing 'Return' section in kerneldoc comments of: Fix kerneldoc output formatting docs: dt: Group DT docs into relevant sub-sections docs: dt: Make 'Devicetree' wording more consistent docs: dt: writing-schema: Include the example schema in the doc build docs: dt: writing-schema: Remove spurious indentation dt-bindings: Fix reference in submitting-patches.rst to the DT ABI doc dt-bindings: ddr: Add optional manufacturer and revision ID to LPDDR3 dt-bindings: media: video-interfaces: Drop the example devicetree: bindings: clock: Minor typo fix in the file armada3700-tbg-clock.txt ...
2 parents 5a69e9b + 031cc26 commit 0080665

File tree

102 files changed

+1671
-1457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1671
-1457
lines changed

Documentation/devicetree/bindings/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DT_MK_SCHEMA ?= dt-mk-schema
55

66
DT_SCHEMA_LINT = $(shell which yamllint)
77

8-
DT_SCHEMA_MIN_VERSION = 2020.8.1
8+
DT_SCHEMA_MIN_VERSION = 2021.2.1
99

1010
PHONY += check_dtschema_version
1111
check_dtschema_version:
@@ -55,6 +55,9 @@ override DTC_FLAGS := \
5555
-Wno-graph_child_address \
5656
-Wno-interrupt_provider
5757

58+
# Disable undocumented compatible checks until warning free
59+
override DT_CHECKER_FLAGS ?=
60+
5861
$(obj)/processed-schema-examples.json: $(DT_DOCS) $(src)/.yamllint check_dtschema_version FORCE
5962
$(call if_changed_rule,chkdt)
6063

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ properties:
2626
- const: simple-mfd
2727

2828
mboxes:
29-
$ref: '/schemas/types.yaml#/definitions/phandle'
30-
description: |
31-
Phandle to the firmware device's Mailbox.
32-
(See: ../mailbox/mailbox.txt for more information)
29+
maxItems: 1
3330

3431
clocks:
3532
type: object

Documentation/devicetree/bindings/arm/cpus.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,11 @@ properties:
258258
where voltage is in V, frequency is in MHz.
259259

260260
power-domains:
261-
$ref: '/schemas/types.yaml#/definitions/phandle-array'
262261
description:
263262
List of phandles and PM domain specifiers, as defined by bindings of the
264263
PM domain provider (see also ../power_domain.txt).
265264

266265
power-domain-names:
267-
$ref: '/schemas/types.yaml#/definitions/string-array'
268266
description:
269267
A list of power domain name strings sorted in the same order as the
270268
power-domains property.

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll1-clk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ examples:
4444
- |
4545
clk@1c20000 {
4646
#clock-cells = <0>;
47-
compatible = "allwinner,sun4i-a10-pll1";
47+
compatible = "allwinner,sun4i-a10-pll1-clk";
4848
reg = <0x01c20000 0x4>;
4949
clocks = <&osc24M>;
5050
clock-output-names = "osc24M";

Documentation/devicetree/bindings/clock/armada3700-tbg-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
* Time Base Generator Clock bindings for Marvell Armada 37xx SoCs
22

3-
Marvell Armada 37xx SoCs provde Time Base Generator clocks which are
3+
Marvell Armada 37xx SoCs provide Time Base Generator clocks which are
44
used as parent clocks for the peripheral clocks.
55

66
The TBG clock consumer should specify the desired clock by having the

Documentation/devicetree/bindings/clock/milbeaut-clock.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ description: |
1818
1919
properties:
2020
compatible:
21-
oneOf:
22-
- items:
23-
- enum:
24-
- socionext,milbeaut-m10v-ccu
21+
enum:
22+
- socionext,milbeaut-m10v-ccu
23+
24+
reg:
25+
maxItems: 1
26+
2527
clocks:
2628
maxItems: 1
2729
description: external clock
@@ -41,7 +43,7 @@ examples:
4143
# Clock controller node:
4244
- |
4345
m10v-clk-ctrl@1d021000 {
44-
compatible = "socionext,milbeaut-m10v-clk-ccu";
46+
compatible = "socionext,milbeaut-m10v-ccu";
4547
reg = <0x1d021000 0x4000>;
4648
#clock-cells = <1>;
4749
clocks = <&clki40mhz>;

Documentation/devicetree/bindings/ddr/lpddr3.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Required properties:
1212

1313
Optional properties:
1414

15+
- manufacturer-id : <u32> Manufacturer ID value read from Mode Register 5
16+
- revision-id : <u32 u32> Revision IDs read from Mode Registers 6 and 7
17+
1518
The following optional properties represent the minimum value of some AC
1619
timing parameters of the DDR device in terms of number of clock cycles.
1720
These values shall be obtained from the device data-sheet.
@@ -49,6 +52,8 @@ samsung_K3QF2F20DB: lpddr3 {
4952
compatible = "samsung,K3QF2F20DB", "jedec,lpddr3";
5053
density = <16384>;
5154
io-width = <32>;
55+
manufacturer-id = <1>;
56+
revision-id = <123 234>;
5257
#address-cells = <1>;
5358
#size-cells = <0>;
5459

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ properties:
7373
clock-output-names:
7474
description:
7575
Name of the LCD pixel clock created.
76-
$ref: /schemas/types.yaml#/definitions/string-array
7776
maxItems: 1
7877

7978
dmas:

Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@ examples:
7777
7878
clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr";
7979
80-
pitouchscreen: panel@0 {
81-
compatible = "raspberrypi,touchscreen";
82-
reg = <0>;
83-
84-
/* ... */
85-
};
8680
};
8781
8882
...

Documentation/devicetree/bindings/display/msm/dpu.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ Qualcomm Technologies, Inc. DPU KMS
22

33
Description:
44

5-
Device tree bindings for MSM Mobile Display Subsytem(MDSS) that encapsulates
5+
Device tree bindings for MSM Mobile Display Subsystem(MDSS) that encapsulates
66
sub-blocks like DPU display controller, DSI and DP interfaces etc.
77
The DPU display controller is found in SDM845 SoC.
88

99
MDSS:
1010
Required properties:
1111
- compatible: "qcom,sdm845-mdss", "qcom,sc7180-mdss"
12-
- reg: physical base address and length of contoller's registers.
12+
- reg: physical base address and length of controller's registers.
1313
- reg-names: register region names. The following region is required:
1414
* "mdss"
1515
- power-domains: a power domain consumer specifier according to

0 commit comments

Comments
 (0)