Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+59 -37
+8
Documentation/devicetree/bindings/arm/omap/mpu.txt
··· 7 7 Required properties: 8 8 - compatible : Should be "ti,omap3-mpu" for OMAP3 9 9 Should be "ti,omap4-mpu" for OMAP4 10 + Should be "ti,omap5-mpu" for OMAP5 10 11 - ti,hwmods: "mpu" 11 12 12 13 Examples: 14 + 15 + - For an OMAP5 SMP system: 16 + 17 + mpu { 18 + compatible = "ti,omap5-mpu"; 19 + ti,hwmods = "mpu" 20 + }; 13 21 14 22 - For an OMAP4 SMP system: 15 23
+1
Documentation/devicetree/bindings/arm/pmu.txt
··· 7 7 Required properties: 8 8 9 9 - compatible : should be one of 10 + "arm,armv8-pmuv3" 10 11 "arm,cortex-a15-pmu" 11 12 "arm,cortex-a9-pmu" 12 13 "arm,cortex-a8-pmu"
+1 -1
Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
··· 49 49 /* NTC thermistor is a hwmon device */ 50 50 ncp15wb473@0 { 51 51 compatible = "ntc,ncp15wb473"; 52 - pullup-uV = <1800000>; 52 + pullup-uv = <1800000>; 53 53 pullup-ohm = <47000>; 54 54 pulldown-ohm = <0>; 55 55 io-channels = <&adc 4>;
+1 -1
Documentation/devicetree/bindings/clock/exynos4-clock.txt
··· 6 6 7 7 Required Properties: 8 8 9 - - comptible: should be one of the following. 9 + - compatible: should be one of the following. 10 10 - "samsung,exynos4210-clock" - controller compatible with Exynos4210 SoC. 11 11 - "samsung,exynos4412-clock" - controller compatible with Exynos4412 SoC. 12 12
+1 -1
Documentation/devicetree/bindings/clock/exynos5250-clock.txt
··· 5 5 6 6 Required Properties: 7 7 8 - - comptible: should be one of the following. 8 + - compatible: should be one of the following. 9 9 - "samsung,exynos5250-clock" - controller compatible with Exynos5250 SoC. 10 10 11 11 - reg: physical base address of the controller and length of memory mapped
+1 -1
Documentation/devicetree/bindings/clock/exynos5420-clock.txt
··· 5 5 6 6 Required Properties: 7 7 8 - - comptible: should be one of the following. 8 + - compatible: should be one of the following. 9 9 - "samsung,exynos5420-clock" - controller compatible with Exynos5420 SoC. 10 10 11 11 - reg: physical base address of the controller and length of memory mapped
+1 -1
Documentation/devicetree/bindings/clock/exynos5440-clock.txt
··· 5 5 6 6 Required Properties: 7 7 8 - - comptible: should be "samsung,exynos5440-clock". 8 + - compatible: should be "samsung,exynos5440-clock". 9 9 10 10 - reg: physical base address of the controller and length of memory mapped 11 11 region.
+40 -26
Documentation/devicetree/bindings/gpio/8xxx_gpio.txt
··· 5 5 6 6 Every GPIO controller node must have #gpio-cells property defined, 7 7 this information will be used to translate gpio-specifiers. 8 + See bindings/gpio/gpio.txt for details of how to specify GPIO 9 + information for devices. 10 + 11 + The GPIO module usually is connected to the SoC's internal interrupt 12 + controller, see bindings/interrupt-controller/interrupts.txt (the 13 + interrupt client nodes section) for details how to specify this GPIO 14 + module's interrupt. 15 + 16 + The GPIO module may serve as another interrupt controller (cascaded to 17 + the SoC's internal interrupt controller). See the interrupt controller 18 + nodes section in bindings/interrupt-controller/interrupts.txt for 19 + details. 8 20 9 21 Required properties: 10 - - compatible : "fsl,<CHIP>-gpio" followed by "fsl,mpc8349-gpio" for 11 - 83xx, "fsl,mpc8572-gpio" for 85xx and "fsl,mpc8610-gpio" for 86xx. 12 - - #gpio-cells : Should be two. The first cell is the pin number and the 13 - second cell is used to specify optional parameters (currently unused). 14 - - interrupts : Interrupt mapping for GPIO IRQ. 15 - - interrupt-parent : Phandle for the interrupt controller that 16 - services interrupts for this device. 17 - - gpio-controller : Marks the port as GPIO controller. 22 + - compatible: "fsl,<chip>-gpio" followed by "fsl,mpc8349-gpio" 23 + for 83xx, "fsl,mpc8572-gpio" for 85xx, or 24 + "fsl,mpc8610-gpio" for 86xx. 25 + - #gpio-cells: Should be two. The first cell is the pin number 26 + and the second cell is used to specify optional 27 + parameters (currently unused). 28 + - interrupt-parent: Phandle for the interrupt controller that 29 + services interrupts for this device. 30 + - interrupts: Interrupt mapping for GPIO IRQ. 31 + - gpio-controller: Marks the port as GPIO controller. 32 + 33 + Optional properties: 34 + - interrupt-controller: Empty boolean property which marks the GPIO 35 + module as an IRQ controller. 36 + - #interrupt-cells: Should be two. Defines the number of integer 37 + cells required to specify an interrupt within 38 + this interrupt controller. The first cell 39 + defines the pin number, the second cell 40 + defines additional flags (trigger type, 41 + trigger polarity). Note that the available 42 + set of trigger conditions supported by the 43 + GPIO module depends on the actual SoC. 18 44 19 45 Example of gpio-controller nodes for a MPC8347 SoC: 20 46 ··· 48 22 #gpio-cells = <2>; 49 23 compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio"; 50 24 reg = <0xc00 0x100>; 51 - interrupts = <74 0x8>; 52 25 interrupt-parent = <&ipic>; 26 + interrupts = <74 0x8>; 53 27 gpio-controller; 28 + interrupt-controller; 29 + #interrupt-cells = <2>; 54 30 }; 55 31 56 32 gpio2: gpio-controller@d00 { 57 33 #gpio-cells = <2>; 58 34 compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio"; 59 35 reg = <0xd00 0x100>; 60 - interrupts = <75 0x8>; 61 36 interrupt-parent = <&ipic>; 37 + interrupts = <75 0x8>; 62 38 gpio-controller; 63 39 }; 64 40 65 - See booting-without-of.txt for details of how to specify GPIO 66 - information for devices. 67 - 68 - To use GPIO pins as interrupt sources for peripherals, specify the 69 - GPIO controller as the interrupt parent and define GPIO number + 70 - trigger mode using the interrupts property, which is defined like 71 - this: 72 - 73 - interrupts = <number trigger>, where: 74 - - number: GPIO pin (0..31) 75 - - trigger: trigger mode: 76 - 2 = trigger on falling edge 77 - 3 = trigger on both edges 78 - 79 - Example of device using this is: 41 + Example of a peripheral using the GPIO module as an IRQ controller: 80 42 81 43 funkyfpga@0 { 82 44 compatible = "funky-fpga"; 83 45 ... 84 - interrupts = <4 3>; 85 46 interrupt-parent = <&gpio1>; 47 + interrupts = <4 3>; 86 48 };
+2
Documentation/devicetree/bindings/net/fsl-fec.txt
··· 15 15 only if property "phy-reset-gpios" is available. Missing the property 16 16 will have the duration be 1 millisecond. Numbers greater than 1000 are 17 17 invalid and 1 millisecond will be used instead. 18 + - phy-supply: regulator that powers the Ethernet PHY. 18 19 19 20 Example: 20 21 ··· 26 25 phy-mode = "mii"; 27 26 phy-reset-gpios = <&gpio2 14 0>; /* GPIO2_14 */ 28 27 local-mac-address = [00 04 9F 01 1B B9]; 28 + phy-supply = <&reg_fec_supply>; 29 29 };
-5
Documentation/devicetree/bindings/spi/nvidia,tegra20-spi.txt
··· 1 - NVIDIA Tegra 2 SPI device 2 - 3 - Required properties: 4 - - compatible : should be "nvidia,tegra20-spi". 5 - - gpios : should specify GPIOs used for chipselect.
+2
Documentation/devicetree/bindings/vendor-prefixes.txt
··· 32 32 fsl Freescale Semiconductor 33 33 GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. 34 34 gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. 35 + gmt Global Mixed-mode Technology, Inc. 35 36 hisilicon Hisilicon Limited. 36 37 hp Hewlett Packard 37 38 ibm International Business Machines (IBM) 38 39 idt Integrated Device Technologies, Inc. 39 40 img Imagination Technologies Ltd. 40 41 intercontrol Inter Control Group 42 + lg LG Corporation 41 43 linux Linux-specific binding 42 44 lsi LSI Corp. (LSI Logic) 43 45 marvell Marvell Technology Group Ltd.
+1 -1
MAINTAINERS
··· 6250 6250 M: Rob Herring <rob.herring@calxeda.com> 6251 6251 M: Pawel Moll <pawel.moll@arm.com> 6252 6252 M: Mark Rutland <mark.rutland@arm.com> 6253 - M: Stephen Warren <swarren@wwwdotorg.org> 6254 6253 M: Ian Campbell <ijc+devicetree@hellion.org.uk> 6254 + M: Kumar Gala <galak@codeaurora.org> 6255 6255 L: devicetree@vger.kernel.org 6256 6256 S: Maintained 6257 6257 F: Documentation/devicetree/