提交 24cb4120 编写于 作者: L Linus Torvalds

Merge tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree fixes from Rob Herring:
 - Various DT binding documentation updates
 - Add Kumar Gala and remove Stephen Warren as DT binding maintainers

* tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt: binding: reword PowerPC 8xxx GPIO documentation
  ARM: tegra: delete nvidia,tegra20-spi.txt binding
  hwmon: ntc_thermistor: Fix typo (pullup-uV -> pullup-uv)
  of: add vendor prefix for GMT
  clk: exynos: Fix typos in DT bindings documentation
  of: Add vendor prefix for LG Corporation
  Documentation: net: fsl-fec.txt: Add phy-supply entry
  ARM: dts: doc: Document missing binding for omap5-mpu
  dt-bindings: add ARMv8 PMU binding
  MAINTAINERS: remove swarren from DT bindings
  MAINTAINERS: Add Kumar to Device Tree Binding maintainers group
...@@ -7,10 +7,18 @@ The MPU contain CPUs, GIC, L2 cache and a local PRCM. ...@@ -7,10 +7,18 @@ The MPU contain CPUs, GIC, L2 cache and a local PRCM.
Required properties: Required properties:
- compatible : Should be "ti,omap3-mpu" for OMAP3 - compatible : Should be "ti,omap3-mpu" for OMAP3
Should be "ti,omap4-mpu" for OMAP4 Should be "ti,omap4-mpu" for OMAP4
Should be "ti,omap5-mpu" for OMAP5
- ti,hwmods: "mpu" - ti,hwmods: "mpu"
Examples: Examples:
- For an OMAP5 SMP system:
mpu {
compatible = "ti,omap5-mpu";
ti,hwmods = "mpu"
};
- For an OMAP4 SMP system: - For an OMAP4 SMP system:
mpu { mpu {
......
...@@ -7,6 +7,7 @@ representation in the device tree should be done as under:- ...@@ -7,6 +7,7 @@ representation in the device tree should be done as under:-
Required properties: Required properties:
- compatible : should be one of - compatible : should be one of
"arm,armv8-pmuv3"
"arm,cortex-a15-pmu" "arm,cortex-a15-pmu"
"arm,cortex-a9-pmu" "arm,cortex-a9-pmu"
"arm,cortex-a8-pmu" "arm,cortex-a8-pmu"
......
...@@ -49,7 +49,7 @@ adc@12D10000 { ...@@ -49,7 +49,7 @@ adc@12D10000 {
/* NTC thermistor is a hwmon device */ /* NTC thermistor is a hwmon device */
ncp15wb473@0 { ncp15wb473@0 {
compatible = "ntc,ncp15wb473"; compatible = "ntc,ncp15wb473";
pullup-uV = <1800000>; pullup-uv = <1800000>;
pullup-ohm = <47000>; pullup-ohm = <47000>;
pulldown-ohm = <0>; pulldown-ohm = <0>;
io-channels = <&adc 4>; io-channels = <&adc 4>;
......
...@@ -6,7 +6,7 @@ SoC's in the Exynos4 family. ...@@ -6,7 +6,7 @@ SoC's in the Exynos4 family.
Required Properties: Required Properties:
- comptible: should be one of the following. - compatible: should be one of the following.
- "samsung,exynos4210-clock" - controller compatible with Exynos4210 SoC. - "samsung,exynos4210-clock" - controller compatible with Exynos4210 SoC.
- "samsung,exynos4412-clock" - controller compatible with Exynos4412 SoC. - "samsung,exynos4412-clock" - controller compatible with Exynos4412 SoC.
......
...@@ -5,7 +5,7 @@ controllers within the Exynos5250 SoC. ...@@ -5,7 +5,7 @@ controllers within the Exynos5250 SoC.
Required Properties: Required Properties:
- comptible: should be one of the following. - compatible: should be one of the following.
- "samsung,exynos5250-clock" - controller compatible with Exynos5250 SoC. - "samsung,exynos5250-clock" - controller compatible with Exynos5250 SoC.
- reg: physical base address of the controller and length of memory mapped - reg: physical base address of the controller and length of memory mapped
......
...@@ -5,7 +5,7 @@ controllers within the Exynos5420 SoC. ...@@ -5,7 +5,7 @@ controllers within the Exynos5420 SoC.
Required Properties: Required Properties:
- comptible: should be one of the following. - compatible: should be one of the following.
- "samsung,exynos5420-clock" - controller compatible with Exynos5420 SoC. - "samsung,exynos5420-clock" - controller compatible with Exynos5420 SoC.
- reg: physical base address of the controller and length of memory mapped - reg: physical base address of the controller and length of memory mapped
......
...@@ -5,7 +5,7 @@ controllers within the Exynos5440 SoC. ...@@ -5,7 +5,7 @@ controllers within the Exynos5440 SoC.
Required Properties: Required Properties:
- comptible: should be "samsung,exynos5440-clock". - compatible: should be "samsung,exynos5440-clock".
- reg: physical base address of the controller and length of memory mapped - reg: physical base address of the controller and length of memory mapped
region. region.
......
...@@ -5,16 +5,42 @@ This is for the non-QE/CPM/GUTs GPIO controllers as found on ...@@ -5,16 +5,42 @@ This is for the non-QE/CPM/GUTs GPIO controllers as found on
Every GPIO controller node must have #gpio-cells property defined, Every GPIO controller node must have #gpio-cells property defined,
this information will be used to translate gpio-specifiers. this information will be used to translate gpio-specifiers.
See bindings/gpio/gpio.txt for details of how to specify GPIO
information for devices.
The GPIO module usually is connected to the SoC's internal interrupt
controller, see bindings/interrupt-controller/interrupts.txt (the
interrupt client nodes section) for details how to specify this GPIO
module's interrupt.
The GPIO module may serve as another interrupt controller (cascaded to
the SoC's internal interrupt controller). See the interrupt controller
nodes section in bindings/interrupt-controller/interrupts.txt for
details.
Required properties: Required properties:
- compatible : "fsl,<CHIP>-gpio" followed by "fsl,mpc8349-gpio" for - compatible: "fsl,<chip>-gpio" followed by "fsl,mpc8349-gpio"
83xx, "fsl,mpc8572-gpio" for 85xx and "fsl,mpc8610-gpio" for 86xx. for 83xx, "fsl,mpc8572-gpio" for 85xx, or
- #gpio-cells : Should be two. The first cell is the pin number and the "fsl,mpc8610-gpio" for 86xx.
second cell is used to specify optional parameters (currently unused). - #gpio-cells: Should be two. The first cell is the pin number
- interrupts : Interrupt mapping for GPIO IRQ. and the second cell is used to specify optional
- interrupt-parent : Phandle for the interrupt controller that parameters (currently unused).
- interrupt-parent: Phandle for the interrupt controller that
services interrupts for this device. services interrupts for this device.
- gpio-controller : Marks the port as GPIO controller. - interrupts: Interrupt mapping for GPIO IRQ.
- gpio-controller: Marks the port as GPIO controller.
Optional properties:
- interrupt-controller: Empty boolean property which marks the GPIO
module as an IRQ controller.
- #interrupt-cells: Should be two. Defines the number of integer
cells required to specify an interrupt within
this interrupt controller. The first cell
defines the pin number, the second cell
defines additional flags (trigger type,
trigger polarity). Note that the available
set of trigger conditions supported by the
GPIO module depends on the actual SoC.
Example of gpio-controller nodes for a MPC8347 SoC: Example of gpio-controller nodes for a MPC8347 SoC:
...@@ -22,39 +48,27 @@ Example of gpio-controller nodes for a MPC8347 SoC: ...@@ -22,39 +48,27 @@ Example of gpio-controller nodes for a MPC8347 SoC:
#gpio-cells = <2>; #gpio-cells = <2>;
compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio"; compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio";
reg = <0xc00 0x100>; reg = <0xc00 0x100>;
interrupts = <74 0x8>;
interrupt-parent = <&ipic>; interrupt-parent = <&ipic>;
interrupts = <74 0x8>;
gpio-controller; gpio-controller;
interrupt-controller;
#interrupt-cells = <2>;
}; };
gpio2: gpio-controller@d00 { gpio2: gpio-controller@d00 {
#gpio-cells = <2>; #gpio-cells = <2>;
compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio"; compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio";
reg = <0xd00 0x100>; reg = <0xd00 0x100>;
interrupts = <75 0x8>;
interrupt-parent = <&ipic>; interrupt-parent = <&ipic>;
interrupts = <75 0x8>;
gpio-controller; gpio-controller;
}; };
See booting-without-of.txt for details of how to specify GPIO Example of a peripheral using the GPIO module as an IRQ controller:
information for devices.
To use GPIO pins as interrupt sources for peripherals, specify the
GPIO controller as the interrupt parent and define GPIO number +
trigger mode using the interrupts property, which is defined like
this:
interrupts = <number trigger>, where:
- number: GPIO pin (0..31)
- trigger: trigger mode:
2 = trigger on falling edge
3 = trigger on both edges
Example of device using this is:
funkyfpga@0 { funkyfpga@0 {
compatible = "funky-fpga"; compatible = "funky-fpga";
... ...
interrupts = <4 3>;
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
interrupts = <4 3>;
}; };
...@@ -15,6 +15,7 @@ Optional properties: ...@@ -15,6 +15,7 @@ Optional properties:
only if property "phy-reset-gpios" is available. Missing the property only if property "phy-reset-gpios" is available. Missing the property
will have the duration be 1 millisecond. Numbers greater than 1000 are will have the duration be 1 millisecond. Numbers greater than 1000 are
invalid and 1 millisecond will be used instead. invalid and 1 millisecond will be used instead.
- phy-supply: regulator that powers the Ethernet PHY.
Example: Example:
...@@ -25,4 +26,5 @@ ethernet@83fec000 { ...@@ -25,4 +26,5 @@ ethernet@83fec000 {
phy-mode = "mii"; phy-mode = "mii";
phy-reset-gpios = <&gpio2 14 0>; /* GPIO2_14 */ phy-reset-gpios = <&gpio2 14 0>; /* GPIO2_14 */
local-mac-address = [00 04 9F 01 1B B9]; local-mac-address = [00 04 9F 01 1B B9];
phy-supply = <&reg_fec_supply>;
}; };
NVIDIA Tegra 2 SPI device
Required properties:
- compatible : should be "nvidia,tegra20-spi".
- gpios : should specify GPIOs used for chipselect.
...@@ -32,12 +32,14 @@ est ESTeem Wireless Modems ...@@ -32,12 +32,14 @@ est ESTeem Wireless Modems
fsl Freescale Semiconductor fsl Freescale Semiconductor
GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc.
gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. gef GE Fanuc Intelligent Platforms Embedded Systems, Inc.
gmt Global Mixed-mode Technology, Inc.
hisilicon Hisilicon Limited. hisilicon Hisilicon Limited.
hp Hewlett Packard hp Hewlett Packard
ibm International Business Machines (IBM) ibm International Business Machines (IBM)
idt Integrated Device Technologies, Inc. idt Integrated Device Technologies, Inc.
img Imagination Technologies Ltd. img Imagination Technologies Ltd.
intercontrol Inter Control Group intercontrol Inter Control Group
lg LG Corporation
linux Linux-specific binding linux Linux-specific binding
lsi LSI Corp. (LSI Logic) lsi LSI Corp. (LSI Logic)
marvell Marvell Technology Group Ltd. marvell Marvell Technology Group Ltd.
......
...@@ -6250,8 +6250,8 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS ...@@ -6250,8 +6250,8 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
M: Rob Herring <rob.herring@calxeda.com> M: Rob Herring <rob.herring@calxeda.com>
M: Pawel Moll <pawel.moll@arm.com> M: Pawel Moll <pawel.moll@arm.com>
M: Mark Rutland <mark.rutland@arm.com> M: Mark Rutland <mark.rutland@arm.com>
M: Stephen Warren <swarren@wwwdotorg.org>
M: Ian Campbell <ijc+devicetree@hellion.org.uk> M: Ian Campbell <ijc+devicetree@hellion.org.uk>
M: Kumar Gala <galak@codeaurora.org>
L: devicetree@vger.kernel.org L: devicetree@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/devicetree/ F: Documentation/devicetree/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册