aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisael Lopez Cruz2015-07-20 17:51:45 -0500
committerMisael Lopez Cruz2015-07-20 18:01:02 -0500
commit667f91919c66de90086c097f4fe31fa0439a1b31 (patch)
tree27f2a71f8fce01d622a7e0ae5b6e2a083dc5c9d9
parent38c3b6c6c7e31c13b77df34ab33e3575075ce805 (diff)
downloadkernel-audio-667f91919c66de90086c097f4fe31fa0439a1b31.tar.gz
kernel-audio-667f91919c66de90086c097f4fe31fa0439a1b31.tar.xz
kernel-audio-667f91919c66de90086c097f4fe31fa0439a1b31.zip
ARM: dts: DRA7: Fix tlv320aic3106 i2c address
i2c address of the tlv320aic3106 audio codec is 0x18 in J6 EVM boards with 7" panel (Rev. E or older). Newer EVM boards have a 10" panel whose i2c address is also 0x18, so the codec address is change to 0x19 instead. The lcd7 dtsi file includes the lcd10 one, which makes the i2c address to be incorrectly overwritten to 0x19. At this point, the less invasive solution is just explicitly setting the codec's i2c address back to 0x18. Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
-rw-r--r--arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi b/arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi
index 2d2866916fa0..34bf00b656ed 100644
--- a/arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi
+++ b/arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi
@@ -16,6 +16,10 @@
16 status = "disabled"; 16 status = "disabled";
17}; 17};
18 18
19&tlv320aic3106 {
20 reg = <0x18>;
21};
22
19&i2c1 { 23&i2c1 {
20 mxt244: touchscreen@4a { 24 mxt244: touchscreen@4a {
21 compatible = "atmel,mXT244"; 25 compatible = "atmel,mXT244";