diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 11:58:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 11:58:43 -0500 |
| commit | cdd305454ebd181fa35b648c0921fe7df27d6f3b (patch) | |
| tree | 93f2350402601465888e9f3c3e3e47d9fe598e22 | |
| parent | 42cf0f203e877cc7e502883d43b3f72149033d86 (diff) | |
| parent | 3c3c8e3618b018aee1dfd42343a74f3ab5ddf23c (diff) | |
Merge tag 'devicetree-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree changes from Rob Herring:
- DT unittests for I2C probing and overlays from Pantelis Antoniou
- Remove DT unittest dependency on OF_DYNAMIC from Gaurav Minocha
- Add Tegra compatible strings missing for newer parts from Paul
Walmsley
- Various vendor prefix additions
* tag 'devicetree-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
of: Add vendor prefix for OmniVision Technologies
of: Use ovti for Omnivision
of: Add vendor prefix for Truly Semiconductors Limited
of: Add vendor prefix for Himax Technologies Inc.
of/fdt: fix sparse warning
of: unitest: Add I2C overlay unit tests.
Documentation: DT: document compatible string existence requirement
Documentation: DT bindings: add nvidia, tegra132-denver compatible string
Documentation: DT bindings: add more Tegra chip compatible strings
of: EXPORT_SYMBOL_GPL of_property_read_u64_array
of: Fix brace position for struct of_device_id definition
of/unittest: Remove obsolete code
dt-bindings: use isil prefix for Intersil in vendor-prefixes.txt
Add AD Holdings Plc. to vendor-prefixes.
dt-bindings: Add Silicon Mitus vendor prefix
Removes OF_UNITTEST dependency on OF_DYNAMIC config symbol
pinctrl: fix up device tree bindings
DT: Vendors: Add Everspin
doc: add bindings document for altera fpga manager
drivers: of: Export of_reserved_mem_device_{init,release}
36 files changed, 766 insertions, 172 deletions
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt index b2aacbe16ed9..8b9e0a95de31 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt | |||
| @@ -175,6 +175,7 @@ nodes to be present and contain the properties described below. | |||
| 175 | "marvell,pj4a" | 175 | "marvell,pj4a" |
| 176 | "marvell,pj4b" | 176 | "marvell,pj4b" |
| 177 | "marvell,sheeva-v5" | 177 | "marvell,sheeva-v5" |
| 178 | "nvidia,tegra132-denver" | ||
| 178 | "qcom,krait" | 179 | "qcom,krait" |
| 179 | "qcom,scorpion" | 180 | "qcom,scorpion" |
| 180 | - enable-method | 181 | - enable-method |
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt index 234406d41c12..067c9790062f 100644 --- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt +++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt | |||
| @@ -1,7 +1,10 @@ | |||
| 1 | NVIDIA Tegra AHB | 1 | NVIDIA Tegra AHB |
| 2 | 2 | ||
| 3 | Required properties: | 3 | Required properties: |
| 4 | - compatible : "nvidia,tegra20-ahb" or "nvidia,tegra30-ahb" | 4 | - compatible : For Tegra20, must contain "nvidia,tegra20-ahb". For |
| 5 | Tegra30, must contain "nvidia,tegra30-ahb". Otherwise, must contain | ||
| 6 | '"nvidia,<chip>-ahb", "nvidia,tegra30-ahb"' where <chip> is tegra124, | ||
| 7 | tegra132, or tegra210. | ||
| 5 | - reg : Should contain 1 register ranges(address and length) | 8 | - reg : Should contain 1 register ranges(address and length) |
| 6 | 9 | ||
| 7 | Example: | 10 | Example: |
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt index 68ac65f82a1c..dd75b972ee37 100644 --- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt +++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt | |||
| @@ -6,7 +6,11 @@ modes. It provides power-gating controllers for SoC and CPU power-islands. | |||
| 6 | 6 | ||
| 7 | Required properties: | 7 | Required properties: |
| 8 | - name : Should be pmc | 8 | - name : Should be pmc |
| 9 | - compatible : Should contain "nvidia,tegra<chip>-pmc". | 9 | - compatible : For Tegra20, must contain "nvidia,tegra20-pmc". For Tegra30, |
| 10 | must contain "nvidia,tegra30-pmc". For Tegra114, must contain | ||
| 11 | "nvidia,tegra114-pmc". For Tegra124, must contain "nvidia,tegra124-pmc". | ||
| 12 | Otherwise, must contain "nvidia,<chip>-pmc", plus at least one of the | ||
| 13 | above, where <chip> is tegra132. | ||
| 10 | - reg : Offset and length of the register set for the device | 14 | - reg : Offset and length of the register set for the device |
| 11 | - clocks : Must contain an entry for each entry in clock-names. | 15 | - clocks : Must contain an entry for each entry in clock-names. |
| 12 | See ../clocks/clock-bindings.txt for details. | 16 | See ../clocks/clock-bindings.txt for details. |
diff --git a/Documentation/devicetree/bindings/ata/tegra-sata.txt b/Documentation/devicetree/bindings/ata/tegra-sata.txt index 946f2072570b..66c83c3e8915 100644 --- a/Documentation/devicetree/bindings/ata/tegra-sata.txt +++ b/Documentation/devicetree/bindings/ata/tegra-sata.txt | |||
| @@ -1,7 +1,9 @@ | |||
| 1 | Tegra124 SoC SATA AHCI controller | 1 | Tegra124 SoC SATA AHCI controller |
| 2 | 2 | ||
| 3 | Required properties : | 3 | Required properties : |
| 4 | - compatible : "nvidia,tegra124-ahci". | 4 | - compatible : For Tegra124, must contain "nvidia,tegra124-ahci". Otherwise, |
| 5 | must contain '"nvidia,<chip>-ahci", "nvidia,tegra124-ahci"', where <chip> | ||
| 6 | is tegra132. | ||
| 5 | - reg : Should contain 2 entries: | 7 | - reg : Should contain 2 entries: |
| 6 | - AHCI register set (SATA BAR5) | 8 | - AHCI register set (SATA BAR5) |
| 7 | - SATA register set | 9 | - SATA register set |
diff --git a/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt b/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt new file mode 100644 index 000000000000..9b027a615486 --- /dev/null +++ b/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | Altera SOCFPGA FPGA Manager | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | - compatible : should contain "altr,socfpga-fpga-mgr" | ||
| 5 | - reg : base address and size for memory mapped io. | ||
| 6 | - The first index is for FPGA manager register access. | ||
| 7 | - The second index is for writing FPGA configuration data. | ||
| 8 | - interrupts : interrupt for the FPGA Manager device. | ||
| 9 | |||
| 10 | Example: | ||
| 11 | |||
| 12 | hps_0_fpgamgr: fpgamgr@0xff706000 { | ||
| 13 | compatible = "altr,socfpga-fpga-mgr"; | ||
| 14 | reg = <0xFF706000 0x1000 | ||
| 15 | 0xFFB90000 0x1000>; | ||
| 16 | interrupts = <0 175 4>; | ||
| 17 | }; | ||
diff --git a/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt b/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt index d8c98c7614d0..23e1d3194174 100644 --- a/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt +++ b/Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | NVIDIA Tegra20/Tegra30/Tegr114/Tegra124 fuse block. | 1 | NVIDIA Tegra20/Tegra30/Tegr114/Tegra124 fuse block. |
| 2 | 2 | ||
| 3 | Required properties: | 3 | Required properties: |
| 4 | - compatible : should be: | 4 | - compatible : For Tegra20, must contain "nvidia,tegra20-efuse". For Tegra30, |
| 5 | "nvidia,tegra20-efuse" | 5 | must contain "nvidia,tegra30-efuse". For Tegra114, must contain |
| 6 | "nvidia,tegra30-efuse" | 6 | "nvidia,tegra114-efuse". For Tegra124, must contain "nvidia,tegra124-efuse". |
| 7 | "nvidia,tegra114-efuse" | 7 | Otherwise, must contain "nvidia,<chip>-efuse", plus one of the above, where |
| 8 | "nvidia,tegra124-efuse" | 8 | <chip> is tegra132. |
| 9 | Details: | 9 | Details: |
| 10 | nvidia,tegra20-efuse: Tegra20 requires using APB DMA to read the fuse data | 10 | nvidia,tegra20-efuse: Tegra20 requires using APB DMA to read the fuse data |
| 11 | due to a hardware bug. Tegra20 also lacks certain information which is | 11 | due to a hardware bug. Tegra20 also lacks certain information which is |
diff --git a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt index 4c32ef0b7db8..009f4bfa1590 100644 --- a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt +++ b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt | |||
| @@ -197,7 +197,9 @@ of the following host1x client modules: | |||
| 197 | - sor: serial output resource | 197 | - sor: serial output re |
