diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-18 20:53:28 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-18 20:53:28 +0300 |
| commit | c60c41e8c07fa57bbda4c13b5fd256ef1dd62013 (patch) | |
| tree | 00bef949b5ce37cee7ccc860df4bcd4b524b0fa5 /Documentation/devicetree/bindings/usb | |
| parent | 964971c8a3ef34d7d9c5d0be0941e08012e2b784 (diff) | |
| parent | b662a9dd8a1a03e6e2d61e74d3e7a08400edefb7 (diff) | |
| download | linux-c60c41e8c07fa57bbda4c13b5fd256ef1dd62013.tar.xz | |
Merge tag 'at91-ab-4.10-dt1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
DT changes for 4.10:
- Many additions for sama5d2
- few non urgent fixes for sam9260ek, sama5d4 and sama5d2
* tag 'at91-ab-4.10-dt1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91: replace gpio-key,wakeup with wakeup-source for sam9260ek
ARM: dts: at91: sama5d2: Add securam node
ARM: dts: at91: sama5d2: Add secumod node
ARM: dts: at91: sama5d2: use correct sckc compatible
ARM: dts: at91: sama5d4: use proper sckc compatible
ARM: dts: at91: fixes dbgu pinctrl, set pullup on rx, clear pullup on tx
dt-bindings: usb: atmel: fix a couple of copy-paste style typos
ARM: dts: at91: sama5d2: enable FIFOs for high-speed i2c controllers
ARM: dts: at91: sama5d4: Add new MA5D4EVK manufacturer compat
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/usb')
| -rw-r--r-- | Documentation/devicetree/bindings/usb/atmel-usb.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt index f4262ed60582..ad8ea56a9ed3 100644 --- a/Documentation/devicetree/bindings/usb/atmel-usb.txt +++ b/Documentation/devicetree/bindings/usb/atmel-usb.txt @@ -6,9 +6,9 @@ Required properties: - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers used in host mode. - reg: Address and length of the register set for the device - - interrupts: Should contain ehci interrupt + - interrupts: Should contain ohci interrupt - clocks: Should reference the peripheral, host and system clocks - - clock-names: Should contains two strings + - clock-names: Should contain three strings "ohci_clk" for the peripheral clock "hclk" for the host clock "uhpck" for the system clock @@ -35,7 +35,7 @@ Required properties: - reg: Address and length of the register set for the device - interrupts: Should contain ehci interrupt - clocks: Should reference the peripheral and the UTMI clocks - - clock-names: Should contains two strings + - clock-names: Should contain two strings "ehci_clk" for the peripheral clock "usb_clk" for the UTMI clock @@ -58,7 +58,7 @@ Required properties: - reg: Address and length of the register set for the device - interrupts: Should contain macb interrupt - clocks: Should reference the peripheral and the AHB clocks - - clock-names: Should contains two strings + - clock-names: Should contain two strings "pclk" for the peripheral clock "hclk" for the AHB clock @@ -85,7 +85,7 @@ Required properties: - reg: Address and length of the register set for the device - interrupts: Should contain usba interrupt - clocks: Should reference the peripheral and host clocks - - clock-names: Should contains two strings + - clock-names: Should contain two strings "pclk" for the peripheral clock "hclk" for the host clock - ep childnode: To specify the number of endpoints and their properties. |