Skip to content

Commit 3881433

Browse files
committed
Merge tag 'devicetree-for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: - Convert FPGA bridge, all TPMs (finally), and Rockchip HDMI bindings to schemas - Improvements in Samsung GPU schemas - A few more cases of dropping unneeded quotes in schemas - Merge QCom idle-states txt binding into common idle-states schema - Add X1E80100, SM8650, SM8650, and SDX75 SoCs to QCom Power Domain Controller - Add NXP i.mx8dl to SCU PD - Add synaptics r63353 panel controller - Clarify the wording around the use of 'wakeup-source' property - Add a DTS coding style doc - Add smi vendor prefix - Fix DT_SCHEMA_FILES incorrect matching of paths outside the kernel tree - Disable sysfb (e.g. EFI FB) when simple-framebuffer node is present - Fix double free in of_parse_phandle_with_args_map() - A couple of kerneldoc fixes * tag 'devicetree-for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (37 commits) of: unittest: Fix of_count_phandle_with_args() expected value message dt-bindings: fpga: altera: Convert bridge bindings to yaml dt-bindings: fpga: Convert bridge binding to yaml dt-bindings: vendor-prefixes: Add smi dt-bindings: power: Clarify wording for wakeup-source property of: Fix double free in of_parse_phandle_with_args_map dt-bindings: ignore paths outside kernel for DT_SCHEMA_FILES drivers: of: Fixed kernel doc warning dt-bindings: tpm: Document Microsoft fTPM bindings dt-bindings: tpm: Convert IBM vTPM bindings to DT schema dt-bindings: tpm: Convert Google Cr50 bindings to DT schema dt-bindings: tpm: Consolidate TCG TIS bindings dt-bindings: display: rockchip,inno-hdmi: Document RK3128 compatible dt-bindings: arm: Add remote etm dt-binding dt-bindings: mmc: sdhci-pxa: Fix 'regs' typo media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas dt-bindings: display: panel: Add synaptics r63353 panel controller dt-bindings: arm: merge qcom,idle-state with idle-state dt-bindings: drm: rockchip: convert inno_hdmi-rockchip.txt to yaml dt-bindings: cache: qcom,llcc: correct QDU1000 reg entries ...
2 parents 42bff4d + 716089b commit 3881433

Some content is hidden

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

65 files changed

+1432
-604
lines changed

Documentation/devicetree/bindings/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ $(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE
2828
find_all_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
2929
-name 'processed-schema*' \)
3030

31-
find_cmd = $(find_all_cmd) | grep -F -e "$(subst :," -e ",$(DT_SCHEMA_FILES))"
31+
find_cmd = $(find_all_cmd) | sed 's|^$(srctree)/$(src)/||' | grep -F -e "$(subst :," -e ",$(DT_SCHEMA_FILES))" | sed 's|^|$(srctree)/$(src)/|'
3232
CHK_DT_DOCS := $(shell $(find_cmd))
3333

3434
quiet_cmd_yamllint = LINT $(src)

Documentation/devicetree/bindings/arm/calxeda/l2ecc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainers:
1616

1717
properties:
1818
compatible:
19-
const: "calxeda,hb-sregs-l2-ecc"
19+
const: calxeda,hb-sregs-l2-ecc
2020

2121
reg:
2222
maxItems: 1

Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt

Lines changed: 0 additions & 84 deletions
This file was deleted.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/qcom,coresight-remote-etm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Coresight Remote ETM(Embedded Trace Macrocell)
8+
9+
maintainers:
10+
- Jinlong Mao <quic_jinlmao@quicinc.com>
11+
- Tao Zhang <quic_taozha@quicinc.com>
12+
13+
description:
14+
Support for ETM trace collection on remote processor using coresight
15+
framework. Enabling this will allow turning on ETM tracing on remote
16+
processor like modem processor via sysfs and collecting the trace
17+
via coresight TMC sinks.
18+
19+
properties:
20+
compatible:
21+
const: qcom,coresight-remote-etm
22+
23+
out-ports:
24+
$ref: /schemas/graph.yaml#/properties/ports
25+
additionalProperties: false
26+
27+
properties:
28+
port:
29+
description: Output connection to the CoreSight Trace bus.
30+
$ref: /schemas/graph.yaml#/properties/port
31+
32+
required:
33+
- compatible
34+
- out-ports
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
etm {
41+
compatible = "qcom,coresight-remote-etm";
42+
43+
out-ports {
44+
port {
45+
modem_etm0_out_funnel_modem: endpoint {
46+
remote-endpoint = <&funnel_modem_in_modem_etm0>;
47+
};
48+
};
49+
};
50+
};
51+
...

Documentation/devicetree/bindings/auxdisplay/hit,hd44780.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ examples:
113113
hd44780 {
114114
compatible = "hit,hd44780";
115115
display-height-chars = <2>;
116-
display-width-chars = <16>;
116+
display-width-chars = <16>;
117117
data-gpios = <&pcf8574 4 0>,
118118
<&pcf8574 5 0>,
119119
<&pcf8574 6 0>,

Documentation/devicetree/bindings/cache/qcom,llcc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ allOf:
6666
compatible:
6767
contains:
6868
enum:
69+
- qcom,qdu1000-llcc
6970
- qcom,sc7180-llcc
7071
- qcom,sm6350-llcc
7172
then:
@@ -103,7 +104,6 @@ allOf:
103104
compatible:
104105
contains:
105106
enum:
106-
- qcom,qdu1000-llcc
107107
- qcom,sc8180x-llcc
108108
- qcom,sc8280xp-llcc
109109
- qcom,x1e80100-llcc

Documentation/devicetree/bindings/clock/baikal,bt1-ccu-pll.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ examples:
125125
clk25m: clock-oscillator-25m {
126126
compatible = "fixed-clock";
127127
#clock-cells = <0>;
128-
clock-frequency = <25000000>;
128+
clock-frequency = <25000000>;
129129
clock-output-names = "clk25m";
130130
};
131131
...

Documentation/devicetree/bindings/cpu/idle-states.yaml

Lines changed: 77 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,64 @@ description: |+
243243
just supports idle_standby, an idle-states node is not required.
244244
245245
===========================================
246-
6 - References
246+
6 - Qualcomm specific STATES
247+
===========================================
248+
249+
Idle states have different enter/exit latency and residency values.
250+
The idle states supported by the QCOM SoC are defined as -
251+
252+
* Standby
253+
* Retention
254+
* Standalone Power Collapse (Standalone PC or SPC)
255+
* Power Collapse (PC)
256+
257+
Standby: Standby does a little more in addition to architectural clock gating.
258+
When the WFI instruction is executed the ARM core would gate its internal
259+
clocks. In addition to gating the clocks, QCOM cpus use this instruction as a
260+
trigger to execute the SPM state machine. The SPM state machine waits for the
261+
interrupt to trigger the core back in to active. This triggers the cache
262+
hierarchy to enter standby states, when all cpus are idle. An interrupt brings
263+
the SPM state machine out of its wait, the next step is to ensure that the
264+
cache hierarchy is also out of standby, and then the cpu is allowed to resume
265+
execution. This state is defined as a generic ARM WFI state by the ARM cpuidle
266+
driver and is not defined in the DT. The SPM state machine should be
267+
configured to execute this state by default and after executing every other
268+
state below.
269+
270+
Retention: Retention is a low power state where the core is clock gated and
271+
the memory and the registers associated with the core are retained. The
272+
voltage may be reduced to the minimum value needed to keep the processor
273+
registers active. The SPM should be configured to execute the retention
274+
sequence and would wait for interrupt, before restoring the cpu to execution
275+
state. Retention may have a slightly higher latency than Standby.
276+
277+
Standalone PC: A cpu can power down and warmboot if there is a sufficient time
278+
between the time it enters idle and the next known wake up. SPC mode is used
279+
to indicate a core entering a power down state without consulting any other
280+
cpu or the system resources. This helps save power only on that core. The SPM
281+
sequence for this idle state is programmed to power down the supply to the
282+
core, wait for the interrupt, restore power to the core, and ensure the
283+
system state including cache hierarchy is ready before allowing core to
284+
resume. Applying power and resetting the core causes the core to warmboot
285+
back into Elevation Level (EL) which trampolines the control back to the
286+
kernel. Entering a power down state for the cpu, needs to be done by trapping
287+
into a EL. Failing to do so, would result in a crash enforced by the warm boot
288+
code in the EL for the SoC. On SoCs with write-back L1 cache, the cache has to
289+
be flushed in s/w, before powering down the core.
290+
291+
Power Collapse: This state is similar to the SPC mode, but distinguishes
292+
itself in that the cpu acknowledges and permits the SoC to enter deeper sleep
293+
modes. In a hierarchical power domain SoC, this means L2 and other caches can
294+
be flushed, system bus, clocks - lowered, and SoC main XO clock gated and
295+
voltages reduced, provided all cpus enter this state. Since the span of low
296+
power modes possible at this state is vast, the exit latency and the residency
297+
of this low power mode would be considered high even though at a cpu level,
298+
this essentially is cpu power down. The SPM in this state also may handshake
299+
with the Resource power manager (RPM) processor in the SoC to indicate a
300+
complete application processor subsystem shut down.
301+
302+
===========================================
303+
7 - References
247304
===========================================
248305
249306
[1] ARM Linux Kernel documentation - CPUs bindings
@@ -301,9 +358,16 @@ patternProperties:
301358
302359
properties:
303360
compatible:
304-
enum:
305-
- arm,idle-state
306-
- riscv,idle-state
361+
oneOf:
362+
- items:
363+
- enum:
364+
- qcom,idle-state-ret
365+
- qcom,idle-state-spc
366+
- qcom,idle-state-pc
367+
- const: arm,idle-state
368+
- enum:
369+
- arm,idle-state
370+
- riscv,idle-state
307371

308372
arm,psci-suspend-param:
309373
$ref: /schemas/types.yaml#/definitions/uint32
@@ -852,4 +916,13 @@ examples:
852916
};
853917
};
854918
919+
// Example 4 - Qualcomm SPC
920+
idle-states {
921+
cpu_spc: cpu-spc {
922+
compatible = "qcom,idle-state-spc", "arm,idle-state";
923+
entry-latency-us = <150>;
924+
exit-latency-us = <200>;
925+
min-residency-us = <2000>;
926+
};
927+
};
855928
...
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/synaptics,r63353.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Synaptics R63353 based MIPI-DSI panels
8+
9+
maintainers:
10+
- Michael Trimarchi <michael@amarulasolutions.com>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- enum:
19+
- sharp,ls068b3sx02
20+
- const: syna,r63353
21+
22+
avdd-supply: true
23+
dvdd-supply: true
24+
reg: true
25+
26+
required:
27+
- compatible
28+
- avdd-supply
29+
- dvdd-supply
30+
- reg
31+
- reset-gpios
32+
- port
33+
- backlight
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/gpio/gpio.h>
40+
41+
dsi {
42+
#address-cells = <1>;
43+
#size-cells = <0>;
44+
45+
panel@0 {
46+
compatible = "sharp,ls068b3sx02", "syna,r63353";
47+
reg = <0>;
48+
avdd-supply = <&avdd_display>;
49+
dvdd-supply = <&dvdd_display>;
50+
reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL05 */
51+
backlight = <&backlight>;
52+
53+
port {
54+
panel_in: endpoint {
55+
remote-endpoint = <&mipi_dsi_out>;
56+
};
57+
};
58+
};
59+
};
60+
61+
...

0 commit comments

Comments
 (0)