From 08827bfc18c8b2325729e6d7e001b92665d9a9fe Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 7 May 2014 12:26:55 +0200 Subject: dts: update to v3.15-rc4 Signed-off-by: Sascha Hauer --- dts/Bindings/sound/davinci-mcasp-audio.txt | 2 +- dts/Bindings/sound/tlv320aic31xx.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dts/Bindings/sound') diff --git a/dts/Bindings/sound/davinci-mcasp-audio.txt b/dts/Bindings/sound/davinci-mcasp-audio.txt index 569b26c4a8..60ca079964 100644 --- a/dts/Bindings/sound/davinci-mcasp-audio.txt +++ b/dts/Bindings/sound/davinci-mcasp-audio.txt @@ -47,7 +47,7 @@ mcasp0: mcasp0@1d00000 { reg = <0x100000 0x3000>; reg-names "mpu"; interrupts = <82>, <83>; - interrupts-names = "tx", "rx"; + interrupt-names = "tx", "rx"; op-mode = <0>; /* MCASP_IIS_MODE */ tdm-slots = <2>; serial-dir = < diff --git a/dts/Bindings/sound/tlv320aic31xx.txt b/dts/Bindings/sound/tlv320aic31xx.txt index 74c66dee3e..eff12be5e7 100644 --- a/dts/Bindings/sound/tlv320aic31xx.txt +++ b/dts/Bindings/sound/tlv320aic31xx.txt @@ -13,6 +13,9 @@ Required properties: "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP) - reg - - I2C slave address +- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply, + DVDD-supply : power supplies for the device as covered in + Documentation/devicetree/bindings/regulator/regulator.txt Optional properties: @@ -24,9 +27,6 @@ Optional properties: 3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD If this node is not mentioned or if the value is unknown, then micbias is set to 2.0V. -- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply, - DVDD-supply : power supplies for the device as covered in - Documentation/devicetree/bindings/regulator/regulator.txt CODEC output pins: * HPL -- cgit v1.2.3