]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: fsl/powerpc: don't rely on the cell-index property
authorTimur Tabi <timur@freescale.com>
Fri, 2 Dec 2011 01:52:47 +0000 (19:52 -0600)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 2 Dec 2011 10:37:18 +0000 (10:37 +0000)
commit4fa1d22ff30f1a750655ec49dc042c64031e4ce7
tree994019cc02aacabc13f06353b91ee3525c47b0c6
parent6eb129f2b8e596530a78f453ebcc9c3fb2563ec8
ASoC: fsl/powerpc: don't rely on the cell-index property

Instead of using the 'cell-index' property in the I2C adapter node to
determine the adapter number, just query the i2c_adapter object directly.

Previously, the I2C nodes always appeared in cell-index order, so the
dynamic numbering coincided with the cell-index property.  With commit
23b7e935 ("powerpc/85xx: Rework P1022DS device tree"), the I2C nodes are
unintentionally reversed in the device tree, and so the machine driver
guesses the wrong I2C adapter number.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/fsl/p1022_ds.c