]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts
authorAnton Vorontsov <avorontsov@ru.mvista.com>
Thu, 27 Nov 2008 17:36:45 +0000 (20:36 +0300)
committerKumar Gala <galak@kernel.crashing.org>
Wed, 3 Dec 2008 15:56:02 +0000 (09:56 -0600)
commit9c616337d2bcb25c6072d6633b583b78ec552754
tree06f12f2e8a2d80f2a884074b2bad8e6aecfcd8e9
parent266ae72449d532856479b1fa7d37ccdde3fe1b2d
powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts

Just found the merge issue in a3cf4169e5ef59cb94e93272b08f8210b21b623c
("powerpc/83xx: Add support for MCU microcontroller in .dts files"):
the commit adds the MCU controller node into the DMA node, which is
wrong because the MCU sits on the I2C bus. Fix this by moving the MCU
node into the I2C controller node.

The original patch[1] was OK though. ;-)

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/boot/dts/mpc8349emitx.dts