diff options
author | Olof Johansson <olof@lixom.net> | 2015-01-26 20:26:34 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-01-26 20:26:34 -0800 |
commit | 9a5074ff5908da051731ad4e9f1beae4117a321d (patch) | |
tree | 717338cab3b11e658bc907ba9e543b0baf34caaa /Documentation | |
parent | 8749f9f3cfd961b9f4e1525de7b363e650562bb4 (diff) | |
parent | c7f85be1fdd130490b8b525b8f3a821a59e75feb (diff) | |
download | linux-stable-9a5074ff5908da051731ad4e9f1beae4117a321d.tar.gz linux-stable-9a5074ff5908da051731ad4e9f1beae4117a321d.tar.bz2 linux-stable-9a5074ff5908da051731ad4e9f1beae4117a321d.zip |
Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt
Merge "at91: dt for 3.20 #2" from Nicolas Ferre:
Second DT batch for 3.20:
- correct some pin configuration for at91sam9x5ek
- add pioD on sama5d4 following a modification of pinctrl driver
- add more precise nand compatibility string for sama5d4
- audio modifications for wm8904 or ac97
* tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/dt: sam9263: Add ac97 device node
dt: atmel_ac97c: Add device tree documentation
ARM: at91: at91sam9n12ek/dt: use dt ids for wm8904
ARM: at91: sama5d3xek/dt: use dt ids for wm8904
ARM: at91: sama5d4: dts: change the nand compatible string
ARM: at91/dt: sama5d4: add pioD controller
ARM: at91/dt: disable pull-up on vbus-gpio (PB16) to reduce power consumption
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/sound/atmel_ac97c.txt | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/atmel_ac97c.txt b/Documentation/devicetree/bindings/sound/atmel_ac97c.txt new file mode 100644 index 000000000000..b151bd902ce3 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/atmel_ac97c.txt @@ -0,0 +1,20 @@ +* Atmel AC97 controller + +Required properties: + - compatible: "atmel,at91sam9263-ac97c" + - reg: Address and length of the register set for the device + - interrupts: Should contain AC97 interrupt + - ac97-gpios: Please refer to soc-ac97link.txt, only ac97-reset is used +Optional properties: + - pinctrl-names, pinctrl-0: Please refer to pinctrl-bindings.txt + +Example: +sound@fffa0000 { + compatible = "atmel,at91sam9263-ac97c"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ac97>; + reg = <0xfffa0000 0x4000>; + interrupts = <18 IRQ_TYPE_LEVEL_HIGH 5>; + + ac97-gpios = <&pioB 0 0 &pioB 2 0 &pioC 29 GPIO_ACTIVE_LOW>; +}; |