Skip to content

Commit 4eb766f

Browse files
committed
Merge tag 'devicetree-for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: "Bindings: - DT schema conversions for Samsung clocks, RNG bindings, Qcom Command DB and rmtfs, gpio-restart, i2c-mux-gpio, i2c-mux-pinctl, Tegra I2C and BPMP, pwm-vibrator, Arm DSU, and Cadence macb - DT schema conversions for Broadcom platforms: interrupt controllers, STB GPIO, STB waketimer, STB reset, iProc MDIO mux, iProc PCIe, Cygnus PCIe PHY, PWM, USB BDC, BCM6328 LEDs, TMON, SYSTEMPORT, AMAC, Northstar 2 PCIe PHY, GENET, moca PHY, GISB arbiter, and SATA - Add binding schemas for Tegra210 EMC table, TI DC-DC converters, - Clean-ups of MDIO bus schemas to fix 'unevaluatedProperties' issues - More fixes due to 'unevaluatedProperties' enabling - Data type fixes and clean-ups of binding examples found in preparation to move to validating DTB files directly (instead of intermediate YAML representation. - Vendor prefixes for T-Head Semiconductor, OnePlus, and Sunplus - Add various new compatible strings DT core: - Silence a warning for overlapping reserved memory regions - Reimplement unittest overlay tracking - Fix stack frame size warning in unittest - Clean-ups of early FDT scanning functions - Fix handling of "linux,usable-memory-range" on EFI booted systems - Add support for 'fail' status on CPU nodes - Improve error message in of_phandle_iterator_next() - kbuild: Disable duplicate unit-address warnings for disabled nodes" * tag 'devicetree-for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (114 commits) dt-bindings: net: mdio: Drop resets/reset-names child properties dt-bindings: clock: samsung: convert S5Pv210 to dtschema dt-bindings: clock: samsung: convert Exynos5410 to dtschema dt-bindings: clock: samsung: convert Exynos5260 to dtschema dt-bindings: clock: samsung: extend Exynos7 bindings with UFS dt-bindings: clock: samsung: convert Exynos7 to dtschema dt-bindings: clock: samsung: convert Exynos5433 to dtschema dt-bindings: i2c: maxim,max96712: Add bindings for Maxim Integrated MAX96712 dt-bindings: iio: adi,ltc2983: Fix 64-bit property sizes dt-bindings: power: maxim,max17040: Fix incorrect type for 'maxim,rcomp' dt-bindings: interrupt-controller: arm,gic-v3: Fix 'interrupts' cell size in example dt-bindings: iio/magnetometer: yamaha,yas530: Fix invalid 'interrupts' in example dt-bindings: clock: imx5: Drop clock consumer node from example dt-bindings: Drop required 'interrupt-parent' dt-bindings: net: ti,dp83869: Drop value on boolean 'ti,max-output-impedance' dt-bindings: net: wireless: mt76: Fix 8-bit property sizes dt-bindings: PCI: snps,dw-pcie-ep: Drop conflicting 'max-functions' schema dt-bindings: i2c: st,stm32-i2c: Make each example a separate entry dt-bindings: net: stm32-dwmac: Make each example a separate entry dt-bindings: net: Cleanup MDIO node schemas ...
2 parents ce990f1 + e623611 commit 4eb766f

File tree

172 files changed

+5189
-3379
lines changed

Some content is hidden

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

172 files changed

+5189
-3379
lines changed

Documentation/devicetree/bindings/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ DT_DOCS = $(patsubst $(srctree)/%,%,$(shell $(find_all_cmd)))
6565
override DTC_FLAGS := \
6666
-Wno-avoid_unnecessary_addr_size \
6767
-Wno-graph_child_address \
68-
-Wno-interrupt_provider
68+
-Wno-interrupt_provider \
69+
-Wno-unique_unit_address \
70+
-Wunique_unit_address_if_enabled
6971

7072
# Disable undocumented compatible checks until warning free
7173
override DT_CHECKER_FLAGS ?=

Documentation/devicetree/bindings/arm/arm,cci-400.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,6 @@ examples:
166166
};
167167
};
168168
169-
dma0: dma@3000000 {
170-
/* compatible = "arm,pl330", "arm,primecell"; */
171-
cci-control-port = <&cci_control0>;
172-
reg = <0x0 0x3000000 0x0 0x1000>;
173-
interrupts = <10>;
174-
#dma-cells = <1>;
175-
#dma-channels = <8>;
176-
#dma-requests = <32>;
177-
};
178-
179169
cci@2c090000 {
180170
compatible = "arm,cci-400";
181171
#address-cells = <1>;

Documentation/devicetree/bindings/arm/arm-dsu-pmu.txt

Lines changed: 0 additions & 27 deletions
This file was deleted.

Documentation/devicetree/bindings/arm/cpus.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ properties:
137137
- arm,cortex-a75
138138
- arm,cortex-a76
139139
- arm,cortex-a77
140+
- arm,cortex-a78
141+
- arm,cortex-a510
142+
- arm,cortex-a710
140143
- arm,cortex-m0
141144
- arm,cortex-m0+
142145
- arm,cortex-m1
@@ -145,8 +148,12 @@ properties:
145148
- arm,cortex-r4
146149
- arm,cortex-r5
147150
- arm,cortex-r7
151+
- arm,cortex-x1
152+
- arm,cortex-x2
148153
- arm,neoverse-e1
149154
- arm,neoverse-n1
155+
- arm,neoverse-n2
156+
- arm,neoverse-v1
150157
- brcm,brahma-b15
151158
- brcm,brahma-b53
152159
- brcm,vulcan

Documentation/devicetree/bindings/arm/pmu.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,18 @@ properties:
4444
- arm,cortex-a76-pmu
4545
- arm,cortex-a77-pmu
4646
- arm,cortex-a78-pmu
47+
- arm,cortex-a510-pmu
48+
- arm,cortex-a710-pmu
49+
- arm,cortex-x1-pmu
50+
- arm,cortex-x2-pmu
4751
- arm,neoverse-e1-pmu
4852
- arm,neoverse-n1-pmu
53+
- arm,neoverse-n2-pmu
54+
- arm,neoverse-v1-pmu
4955
- brcm,vulcan-pmu
5056
- cavium,thunder-pmu
57+
- nvidia,denver-pmu
58+
- nvidia,carmel-pmu
5159
- qcom,krait-pmu
5260
- qcom,scorpion-pmu
5361
- qcom,scorpion-mp-pmu

Documentation/devicetree/bindings/arm/ux500.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ properties:
2020
- const: st-ericsson,mop500
2121
- const: st-ericsson,u8500
2222

23+
- description: ST-Ericsson HREF520
24+
items:
25+
- const: st-ericsson,href520
26+
- const: st-ericsson,u8500
27+
2328
- description: ST-Ericsson HREF (v60+)
2429
items:
2530
- const: st-ericsson,hrefv60+
@@ -30,9 +35,34 @@ properties:
3035
- const: calaosystems,snowball-a9500
3136
- const: st-ericsson,u9500
3237

38+
- description: Samsung Galaxy Ace 2 (GT-I8160)
39+
items:
40+
- const: samsung,codina
41+
- const: st-ericsson,u8500
42+
43+
- description: Samsung Galaxy Beam (GT-I8530)
44+
items:
45+
- const: samsung,gavini
46+
- const: st-ericsson,u8500
47+
3348
- description: Samsung Galaxy S III mini (GT-I8190)
3449
items:
3550
- const: samsung,golden
3651
- const: st-ericsson,u8500
3752

53+
- description: Samsung Galaxy S Advance (GT-I9070)
54+
items:
55+
- const: samsung,janice
56+
- const: st-ericsson,u8500
57+
58+
- description: Samsung Galaxy Amp (SGH-I407)
59+
items:
60+
- const: samsung,kyle
61+
- const: st-ericsson,u8500
62+
63+
- description: Samsung Galaxy XCover 2 (GT-S7710)
64+
items:
65+
- const: samsung,skomer
66+
- const: st-ericsson,u8500
67+
3868
additionalProperties: true

Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt

Lines changed: 0 additions & 45 deletions
This file was deleted.
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ata/brcm,sata-brcm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom SATA3 AHCI Controller
8+
9+
description:
10+
SATA nodes are defined to describe on-chip Serial ATA controllers.
11+
Each SATA controller should have its own node.
12+
13+
maintainers:
14+
- Florian Fainelli <f.fainelli@gmail.com>
15+
16+
allOf:
17+
- $ref: sata-common.yaml#
18+
19+
properties:
20+
compatible:
21+
oneOf:
22+
- items:
23+
- enum:
24+
- brcm,bcm7216-ahci
25+
- brcm,bcm7445-ahci
26+
- brcm,bcm7425-ahci
27+
- brcm,bcm63138-ahci
28+
- const: brcm,sata3-ahci
29+
- items:
30+
- const: brcm,bcm-nsp-ahci
31+
32+
reg:
33+
minItems: 2
34+
maxItems: 2
35+
36+
reg-names:
37+
items:
38+
- const: ahci
39+
- const: top-ctrl
40+
41+
interrupts:
42+
maxItems: 1
43+
44+
dma-coherent: true
45+
46+
if:
47+
properties:
48+
compatible:
49+
contains:
50+
enum:
51+
- brcm,bcm7216-ahci
52+
- brcm,bcm63138-ahci
53+
then:
54+
properties:
55+
resets:
56+
maxItems: 1
57+
reset-names:
58+
enum:
59+
- rescal
60+
- ahci
61+
62+
required:
63+
- compatible
64+
- reg
65+
- interrupts
66+
- "#address-cells"
67+
- "#size-cells"
68+
69+
unevaluatedProperties: false
70+
71+
examples:
72+
- |
73+
sata@f045a000 {
74+
compatible = "brcm,bcm7445-ahci", "brcm,sata3-ahci";
75+
reg = <0xf045a000 0xa9c>, <0xf0458040 0x24>;
76+
reg-names = "ahci", "top-ctrl";
77+
interrupts = <0 30 0>;
78+
#address-cells = <1>;
79+
#size-cells = <0>;
80+
81+
sata0: sata-port@0 {
82+
reg = <0>;
83+
phys = <&sata_phy 0>;
84+
};
85+
86+
sata1: sata-port@1 {
87+
reg = <1>;
88+
phys = <&sata_phy 1>;
89+
};
90+
};

Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/bus/brcm,gisb-arb.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom GISB bus Arbiter controller
8+
9+
maintainers:
10+
- Florian Fainelli <f.fainelli@gmail.com>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- items:
16+
- enum:
17+
- brcm,bcm7445-gisb-arb # for other 28nm chips
18+
- const: brcm,gisb-arb
19+
- items:
20+
- enum:
21+
- brcm,bcm7278-gisb-arb # for V7 28nm chips
22+
- brcm,bcm7435-gisb-arb # for newer 40nm chips
23+
- brcm,bcm7400-gisb-arb # for older 40nm chips and all 65nm chips
24+
- brcm,bcm7038-gisb-arb # for 130nm chips
25+
- brcm,gisb-arb # fallback compatible
26+
27+
reg:
28+
maxItems: 1
29+
30+
interrupts:
31+
minItems: 2
32+
items:
33+
- description: timeout interrupt line
34+
- description: target abort interrupt line
35+
- description: breakpoint interrupt line
36+
37+
brcm,gisb-arb-master-mask:
38+
$ref: /schemas/types.yaml#/definitions/uint32
39+
description: >
40+
32-bits wide bitmask used to specify which GISB masters are valid at the
41+
system level
42+
43+
brcm,gisb-arb-master-names:
44+
$ref: /schemas/types.yaml#/definitions/string-array
45+
description: >
46+
String list of the litteral name of the GISB masters. Should match the
47+
number of bits set in brcm,gisb-master-mask and the order in which they
48+
appear from MSB to LSB.
49+
50+
required:
51+
- compatible
52+
- reg
53+
- interrupts
54+
55+
additionalProperties: false
56+
57+
examples:
58+
- |
59+
gisb-arb@f0400000 {
60+
compatible = "brcm,gisb-arb";
61+
reg = <0xf0400000 0x800>;
62+
interrupts = <0>, <2>;
63+
interrupt-parent = <&sun_l2_intc>;
64+
brcm,gisb-arb-master-mask = <0x7>;
65+
brcm,gisb-arb-master-names = "bsp_0", "scpu_0", "cpu_0";
66+
};

0 commit comments

Comments
 (0)