diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 17:51:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 17:51:34 -0400 |
| commit | e7f44b65b532040ac90b73b60ea0b629742ced33 (patch) | |
| tree | 1dec69d411543c5c8ee1b61311db4470070745f0 /Documentation/devicetree/bindings/memory-controllers | |
| parent | 76b584d3125a1f7d8b64e9c522a4555bc2844bde (diff) | |
| parent | f2c27767af0a91cbdc3d832231f953110473e853 (diff) | |
Merge tag 'devicetree-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring:
- Rewrite of the unflattening code to avoid recursion and lessen the
stack usage.
- Rewrite of the phandle args parsing code to get rid of the fixed args
size. This is needed for IOMMU code.
- Sync to latest dtc which adds more dts style checking. These
warnings are enabled with "W=1" compiles.
- Tegra documentation updates related to the above warnings.
- A bunch of spelling and other doc fixes.
- Various vendor prefix additions.
* tag 'devicetree-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (52 commits)
devicetree: Add Creative Technology vendor id
gpio: dt-bindings: add ibm,ppc4xx-gpio binding
of/unittest: Remove unnecessary module.h header inclusion
drivers/of: Fix build warning in populate_node()
drivers/of: Fix depth when unflattening devicetree
of: dynamic: changeset prop-update revert fix
drivers/of: Export of_detach_node()
drivers/of: Return allocated memory from of_fdt_unflatten_tree()
drivers/of: Specify parent node in of_fdt_unflatten_tree()
drivers/of: Rename unflatten_dt_node()
drivers/of: Avoid recursively calling unflatten_dt_node()
drivers/of: Split unflatten_dt_node()
of: include errno.h in of_graph.h
of: document refcount incrementation of of_get_cpu_node()
Documentation: dt: soc: fix spelling mistakes
Documentation: dt: power: fix spelling mistake
Documentation: dt: pinctrl: fix spelling mistake
Documentation: dt: opp: fix spelling mistake
Documentation: dt: net: fix spelling mistakes
Documentation: dt: mtd: fix spelling mistake
...
Diffstat (limited to 'Documentation/devicetree/bindings/memory-controllers')
| -rw-r--r-- | Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt (renamed from Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt) | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.txt (renamed from Documentation/devicetree/bindings/memory-controllers/nvidia,tegra-mc.txt) | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt index b59c625d6336..ba0bc3f12419 100644 --- a/Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt +++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt | |||
| @@ -190,7 +190,7 @@ be specified, according to the board documentation: | |||
| 190 | Example SoC include file: | 190 | Example SoC include file: |
| 191 | 191 | ||
| 192 | / { | 192 | / { |
| 193 | emc@0,7001b000 { | 193 | emc@7001b000 { |
| 194 | compatible = "nvidia,tegra124-emc"; | 194 | compatible = "nvidia,tegra124-emc"; |
| 195 | reg = <0x0 0x7001b000 0x0 0x1000>; | 195 | reg = <0x0 0x7001b000 0x0 0x1000>; |
| 196 | 196 | ||
| @@ -201,7 +201,7 @@ Example SoC include file: | |||
| 201 | Example board file: | 201 | Example board file: |
| 202 | 202 | ||
| 203 | / { | 203 | / { |
| 204 | emc@0,7001b000 { | 204 | emc@7001b000 { |
| 205 | emc-timings-3 { | 205 | emc-timings-3 { |
| 206 | nvidia,ram-code = <3>; | 206 | nvidia,ram-code = <3>; |
| 207 | 207 | ||
diff --git a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra-mc.txt b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.txt index 3338a2834ad7..8dbe47013c2b 100644 --- a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra-mc.txt +++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.txt | |||
| @@ -61,7 +61,7 @@ specified, according to the board documentation: | |||
| 61 | Example SoC include file: | 61 | Example SoC include file: |
| 62 | 62 | ||
| 63 | / { | 63 | / { |
| 64 | mc: memory-controller@0,70019000 { | 64 | mc: memory-controller@70019000 { |
| 65 | compatible = "nvidia,tegra124-mc"; | 65 | compatible = "nvidia,tegra124-mc"; |
| 66 | reg = <0x0 0x70019000 0x0 0x1000>; | 66 | reg = <0x0 0x70019000 0x0 0x1000>; |
| 67 | clocks = <&tegra_car TEGRA124_CLK_MC>; | 67 | clocks = <&tegra_car TEGRA124_CLK_MC>; |
| @@ -72,7 +72,7 @@ Example SoC include file: | |||
| 72 | #iommu-cells = <1>; | 72 | #iommu-cells = <1>; |
| 73 | }; | 73 | }; |
| 74 | 74 | ||
| 75 | sdhci@0,700b0000 { | 75 | sdhci@700b0000 { |
| 76 | compatible = "nvidia,tegra124-sdhci"; | 76 | compatible = "nvidia,tegra124-sdhci"; |
| 77 | ... | 77 | ... |
| 78 | iommus = <&mc TEGRA_SWGROUP_SDMMC1A>; | 78 | iommus = <&mc TEGRA_SWGROUP_SDMMC1A>; |
| @@ -82,7 +82,7 @@ Example SoC include file: | |||
| 82 | Example board file: | 82 | Example board file: |
| 83 | 83 | ||
| 84 | / { | 84 | / { |
| 85 | memory-controller@0,70019000 { | 85 | memory-controller@70019000 { |
| 86 | emc-timings-3 { | 86 | emc-timings-3 { |
| 87 | nvidia,ram-code = <3>; | 87 | nvidia,ram-code = <3>; |
| 88 | 88 | ||
