Skip to content

Commit 4419779

Browse files
torvaldstorvalds
committed
Merge tag 'devicetree-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull Devicetree updates from Rob Herring: - Improve device links cycle detection and breaking. Add more bindings for device link dependencies. - Refactor parsing 'no-map' in __reserved_mem_alloc_size() - Improve DT unittest 'ranges' and 'dma-ranges' test case to check differing cell sizes - Various http to https link conversions - Add a schema check to prevent 'syscon' from being used by itself without a more specific compatible - A bunch more DT binding conversions to schema * tag 'devicetree-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (55 commits) of: reserved-memory: remove duplicated call to of_get_flat_dt_prop() for no-map node of: unittest: Use bigger address cells to catch parser regressions dt-bindings: memory-controllers: Convert mmdc to json-schema dt-bindings: mtd: Convert imx nand to json-schema dt-bindings: mtd: Convert gpmi nand to json-schema dt-bindings: iio: io-channel-mux: Fix compatible string in example code of: property: Add device link support for pinctrl-0 through pinctrl-8 of: property: Add device link support for multiple DT bindings dt-bindings: phy: ti: phy-gmii-sel: convert bindings to json-schema dt-bindings: mux: mux.h: drop a duplicated word dt-bindings: misc: Convert olpc,xo1.75-ec to json-schema dt-bindings: aspeed-lpc: Replace HTTP links with HTTPS ones dt-bindings: drm/bridge: Replace HTTP links with HTTPS ones drm/tilcdc: Replace HTTP links with HTTPS ones dt-bindings: iommu: renesas,ipmmu-vmsa: Add r8a774e1 support dt-bindings: fpga: Replace HTTP links with HTTPS ones dt-bindings: virtio: Replace HTTP links with HTTPS ones dt-bindings: media: imx274: Add optional input clock and supplies dt-bindings: i2c-gpio: Use 'deprecated' keyword on deprecated properties dt-bindings: interrupt-controller: Fix typos in loongson,liointc.yaml ...
2 parents 1d8ce0e + 6f1188b commit 4419779

85 files changed

Lines changed: 2610 additions & 1267 deletions

File tree

Some content is hidden

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

‎Documentation/devicetree/bindings/clock/imx35-clock.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ examples:
130130
#clock-cells = <1>;
131131
};
132132
133-
esdhc@53fb4000 {
133+
mmc@53fb4000 {
134134
compatible = "fsl,imx35-esdhc";
135135
reg = <0x53fb4000 0x4000>;
136136
interrupts = <7>;

‎Documentation/devicetree/bindings/clock/imx7ulp-clock.txt‎

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

‎Documentation/devicetree/bindings/clock/imx7ulp-pcc-clock.yaml‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/imx7ulp-pcc-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Clock bindings for Freescale i.MX7ULP Peripheral Clock Control (PCC) modules
8+
9+
maintainers:
10+
- A.s. Dong <aisheng.dong@nxp.com>
11+
12+
description: |
13+
i.MX7ULP Clock functions are under joint control of the System
14+
Clock Generation (SCG) modules, Peripheral Clock Control (PCC)
15+
modules, and Core Mode Controller (CMC)1 blocks
16+
17+
The clocking scheme provides clear separation between M4 domain
18+
and A7 domain. Except for a few clock sources shared between two
19+
domains, such as the System Oscillator clock, the Slow IRC (SIRC),
20+
and and the Fast IRC clock (FIRCLK), clock sources and clock
21+
management are separated and contained within each domain.
22+
23+
M4 clock management consists of SCG0, PCC0, PCC1, and CMC0 modules.
24+
A7 clock management consists of SCG1, PCC2, PCC3, and CMC1 modules.
25+
26+
Note: this binding doc is only for A7 clock domain.
27+
28+
The Peripheral Clock Control (PCC) is responsible for clock selection,
29+
optional division and clock gating mode for peripherals in their
30+
respected power domain.
31+
32+
The clock consumer should specify the desired clock by having the clock
33+
ID in its "clocks" phandle cell.
34+
See include/dt-bindings/clock/imx7ulp-clock.h for the full list of
35+
i.MX7ULP clock IDs of each module.
36+
37+
properties:
38+
compatible:
39+
enum:
40+
- fsl,imx7ulp-pcc2
41+
- fsl,imx7ulp-pcc3
42+
43+
reg:
44+
maxItems: 1
45+
46+
'#clock-cells':
47+
const: 1
48+
49+
clocks:
50+
items:
51+
- description: nic1 bus clock
52+
- description: nic1 clock
53+
- description: ddr clock
54+
- description: apll pfd2
55+
- description: apll pfd1
56+
- description: apll pfd0
57+
- description: usb pll
58+
- description: system osc bus clock
59+
- description: fast internal reference clock bus
60+
- description: rtc osc
61+
- description: system pll bus clock
62+
63+
clock-names:
64+
items:
65+
- const: nic1_bus_clk
66+
- const: nic1_clk
67+
- const: ddr_clk
68+
- const: apll_pfd2
69+
- const: apll_pfd1
70+
- const: apll_pfd0
71+
- const: upll
72+
- const: sosc_bus_clk
73+
- const: firc_bus_clk
74+
- const: rosc
75+
- const: spll_bus_clk
76+
77+
required:
78+
- compatible
79+
- reg
80+
- '#clock-cells'
81+
- clocks
82+
- clock-names
83+
84+
additionalProperties: false
85+
86+
examples:
87+
- |
88+
#include <dt-bindings/clock/imx7ulp-clock.h>
89+
#include <dt-bindings/interrupt-controller/arm-gic.h>
90+
91+
clock-controller@403f0000 {
92+
compatible = "fsl,imx7ulp-pcc2";
93+
reg = <0x403f0000 0x10000>;
94+
#clock-cells = <1>;
95+
clocks = <&scg1 IMX7ULP_CLK_NIC1_BUS_DIV>,
96+
<&scg1 IMX7ULP_CLK_NIC1_DIV>,
97+
<&scg1 IMX7ULP_CLK_DDR_DIV>,
98+
<&scg1 IMX7ULP_CLK_APLL_PFD2>,
99+
<&scg1 IMX7ULP_CLK_APLL_PFD1>,
100+
<&scg1 IMX7ULP_CLK_APLL_PFD0>,
101+
<&scg1 IMX7ULP_CLK_UPLL>,
102+
<&scg1 IMX7ULP_CLK_SOSC_BUS_CLK>,
103+
<&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>,
104+
<&scg1 IMX7ULP_CLK_ROSC>,
105+
<&scg1 IMX7ULP_CLK_SPLL_BUS_CLK>;
106+
clock-names = "nic1_bus_clk", "nic1_clk", "ddr_clk",
107+
"apll_pfd2", "apll_pfd1", "apll_pfd0",
108+
"upll", "sosc_bus_clk", "firc_bus_clk",
109+
"rosc", "spll_bus_clk";
110+
};
111+
112+
mmc@40380000 {
113+
compatible = "fsl,imx7ulp-usdhc";
114+
reg = <0x40380000 0x10000>;
115+
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
116+
clocks = <&scg1 IMX7ULP_CLK_NIC1_BUS_DIV>,
117+
<&scg1 IMX7ULP_CLK_NIC1_DIV>,
118+
<&pcc2 IMX7ULP_CLK_USDHC1>;
119+
clock-names ="ipg", "ahb", "per";
120+
bus-width = <4>;
121+
};

‎Documentation/devicetree/bindings/clock/imx7ulp-scg-clock.yaml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/imx7ulp-scg-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Clock bindings for Freescale i.MX7ULP System Clock Generation (SCG) modules
8+
9+
maintainers:
10+
- A.s. Dong <aisheng.dong@nxp.com>
11+
12+
description: |
13+
i.MX7ULP Clock functions are under joint control of the System
14+
Clock Generation (SCG) modules, Peripheral Clock Control (PCC)
15+
modules, and Core Mode Controller (CMC)1 blocks
16+
17+
The clocking scheme provides clear separation between M4 domain
18+
and A7 domain. Except for a few clock sources shared between two
19+
domains, such as the System Oscillator clock, the Slow IRC (SIRC),
20+
and and the Fast IRC clock (FIRCLK), clock sources and clock
21+
management are separated and contained within each domain.
22+
23+
M4 clock management consists of SCG0, PCC0, PCC1, and CMC0 modules.
24+
A7 clock management consists of SCG1, PCC2, PCC3, and CMC1 modules.
25+
26+
Note: this binding doc is only for A7 clock domain.
27+
28+
The System Clock Generation (SCG) is responsible for clock generation
29+
and distribution across this device. Functions performed by the SCG
30+
include: clock reference selection, generation of clock used to derive
31+
processor, system, peripheral bus and external memory interface clocks,
32+
source selection for peripheral clocks and control of power saving
33+
clock gating mode.
34+
35+
The clock consumer should specify the desired clock by having the clock
36+
ID in its "clocks" phandle cell.
37+
See include/dt-bindings/clock/imx7ulp-clock.h for the full list of
38+
i.MX7ULP clock IDs of each module.
39+
40+
properties:
41+
compatible:
42+
const: fsl,imx7ulp-scg1
43+
44+
reg:
45+
maxItems: 1
46+
47+
'#clock-cells':
48+
const: 1
49+
50+
clocks:
51+
items:
52+
- description: rtc osc
53+
- description: system osc
54+
- description: slow internal reference clock
55+
- description: fast internal reference clock
56+
- description: usb PLL
57+
58+
clock-names:
59+
items:
60+
- const: rosc
61+
- const: sosc
62+
- const: sirc
63+
- const: firc
64+
- const: upll
65+
66+
required:
67+
- compatible
68+
- reg
69+
- '#clock-cells'
70+
- clocks
71+
- clock-names
72+
73+
additionalProperties: false
74+
75+
examples:
76+
- |
77+
#include <dt-bindings/clock/imx7ulp-clock.h>
78+
#include <dt-bindings/interrupt-controller/arm-gic.h>
79+
80+
clock-controller@403e0000 {
81+
compatible = "fsl,imx7ulp-scg1";
82+
reg = <0x403e0000 0x10000>;
83+
clocks = <&rosc>, <&sosc>, <&sirc>,
84+
<&firc>, <&upll>;
85+
clock-names = "rosc", "sosc", "sirc",
86+
"firc", "upll";
87+
#clock-cells = <1>;
88+
};
89+
90+
mmc@40380000 {
91+
compatible = "fsl,imx7ulp-usdhc";
92+
reg = <0x40380000 0x10000>;
93+
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
94+
clocks = <&scg1 IMX7ULP_CLK_NIC1_BUS_DIV>,
95+
<&scg1 IMX7ULP_CLK_NIC1_DIV>,
96+
<&pcc2 IMX7ULP_CLK_USDHC1>;
97+
clock-names ="ipg", "ahb", "per";
98+
bus-width = <4>;
99+
};

‎Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ examples:
6262
};
6363
6464
mmc@5b010000 {
65-
compatible = "fsl,imx8qxp-usdhc", "fsl,imx7d-usdhc";
65+
compatible = "fsl,imx8qxp-usdhc";
6666
interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>;
6767
reg = <0x5b010000 0x10000>;
6868
clocks = <&conn_lpcg IMX_CONN_LPCG_SDHC0_IPG_CLK>,

‎Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SN65DSI86 DSI to eDP bridge chip
22
--------------------------------
33

44
This is the binding for Texas Instruments SN65DSI86 bridge.
5-
http://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf
5+
https://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf
66

77
Required properties:
88
- compatible: Must be "ti,sn65dsi86"

‎Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Optional nodes:
4646
crossed and LCD_DATA[0:4] is for Red[3:7] and LCD_DATA[11:15] is
4747
for Blue[3-7]. For more details see section 3.1.1 in AM335x
4848
Silicon Errata:
49-
http://www.ti.com/general/docs/lit/getliterature.tsp?baseLiteratureNumber=sprz360
49+
https://www.ti.com/general/docs/lit/getliterature.tsp?baseLiteratureNumber=sprz360
5050

5151
Example:
5252

‎Documentation/devicetree/bindings/fpga/fpga-region.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,4 +493,4 @@ FPGA Bridges that exist on the FPGA fabric prior to the partial reconfiguration.
493493
--
494494
[1] www.altera.com/content/dam/altera-www/global/en_US/pdfs/literature/ug/ug_partrecon.pdf
495495
[2] tspace.library.utoronto.ca/bitstream/1807/67932/1/Byma_Stuart_A_201411_MAS_thesis.pdf
496-
[3] http://www.xilinx.com/support/documentation/sw_manuals/xilinx14_1/ug702.pdf
496+
[3] https://www.xilinx.com/support/documentation/sw_manuals/xilinx14_1/ug702.pdf

0 commit comments

Comments
 (0)