diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-07-16 00:00:19 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-16 00:00:19 +0300 |
commit | cd06b2a573d4a6cb37092235d084ae99e30493e0 (patch) | |
tree | 7629a546b1b19a09627244b211c1529e29b585ec /Documentation | |
parent | cda1c2bdf6df90c12363877fda594a0a1b7ac74a (diff) | |
parent | 7aff0f29cdb484a5d9692a4d6c9e4b908a848688 (diff) | |
download | linux-cd06b2a573d4a6cb37092235d084ae99e30493e0.tar.xz |
Merge tag 'at91-ab-4.8-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
Merge "DT Changes for 4.8 #3" from Alexandre Belloni:
- Lot of fixes for dtc warnings
- Separate dtb compilation for ARMv4 and ARMv5
* tag 'at91-ab-4.8-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91: Don't build unnecessary dtbs
ARM: dts: at91: sama5d3x: separate motherboard gmac and emac definitions
ARM: dts: at91: at91sam9g25ek: fix isi endpoint node
ARM: dts: at91: move isi definition to at91sam9g25ek
ARM: dts: at91: fix i2c-gpio node name
ARM: dts: at91: vinco: fix regulator name
ARM: dts: at91: ariag25 : fix onewire node
ARM: dts: at91: sama5d4_ma5d4evk: fix regulator names
ARM: dts: at91: sama5d4_ma5d4: fix regulator names
ARM: dts: at91: sama5d4_xplained: fix regulator names
ARM: dts: at91: sama5d3_xplained: fix regulator name
ARM: dts: at91: sama5d4ek: remove useless lcd_bus
ARM: dts: at91: Fix USB endpoint nodes
Documentation: dt: usb: atmel-usb: add unit-address
ARM: dts: at91: Fix ADC trigger nodes
Documentation: dt: iio: at91_adc: fix trigger node names
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/iio/adc/at91_adc.txt | 12 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/usb/atmel-usb.txt | 14 |
2 files changed, 11 insertions, 15 deletions
diff --git a/Documentation/devicetree/bindings/iio/adc/at91_adc.txt b/Documentation/devicetree/bindings/iio/adc/at91_adc.txt index 0f813dec5e08..f65b04fb7962 100644 --- a/Documentation/devicetree/bindings/iio/adc/at91_adc.txt +++ b/Documentation/devicetree/bindings/iio/adc/at91_adc.txt @@ -59,28 +59,24 @@ adc0: adc@fffb0000 { atmel,adc-res-names = "lowres", "highres"; atmel,adc-use-res = "lowres"; - trigger@0 { - reg = <0>; + trigger0 { trigger-name = "external-rising"; trigger-value = <0x1>; trigger-external; }; - trigger@1 { - reg = <1>; + trigger1 { trigger-name = "external-falling"; trigger-value = <0x2>; trigger-external; }; - trigger@2 { - reg = <2>; + trigger2 { trigger-name = "external-any"; trigger-value = <0x3>; trigger-external; }; - trigger@3 { - reg = <3>; + trigger3 { trigger-name = "continuous"; trigger-value = <0x6>; }; diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt index 5883b73ea1b5..f4262ed60582 100644 --- a/Documentation/devicetree/bindings/usb/atmel-usb.txt +++ b/Documentation/devicetree/bindings/usb/atmel-usb.txt @@ -113,13 +113,13 @@ usb2: gadget@fff78000 { clock-names = "hclk", "pclk"; atmel,vbus-gpio = <&pioB 19 0>; - ep0 { + ep@0 { reg = <0>; atmel,fifo-size = <64>; atmel,nb-banks = <1>; }; - ep1 { + ep@1 { reg = <1>; atmel,fifo-size = <1024>; atmel,nb-banks = <2>; @@ -127,7 +127,7 @@ usb2: gadget@fff78000 { atmel,can-isoc; }; - ep2 { + ep@2 { reg = <2>; atmel,fifo-size = <1024>; atmel,nb-banks = <2>; @@ -135,21 +135,21 @@ usb2: gadget@fff78000 { atmel,can-isoc; }; - ep3 { + ep@3 { reg = <3>; atmel,fifo-size = <1024>; atmel,nb-banks = <3>; atmel,can-dma; }; - ep4 { + ep@4 { reg = <4>; atmel,fifo-size = <1024>; atmel,nb-banks = <3>; atmel,can-dma; }; - ep5 { + ep@5 { reg = <5>; atmel,fifo-size = <1024>; atmel,nb-banks = <3>; @@ -157,7 +157,7 @@ usb2: gadget@fff78000 { atmel,can-isoc; }; - ep6 { + ep@6 { reg = <6>; atmel,fifo-size = <1024>; atmel,nb-banks = <3>; |