powerpc/85xx: don't call of_platform_bus_probe() twice
authorTimur Tabi <timur@freescale.com>
Wed, 30 Nov 2011 16:19:17 +0000 (10:19 -0600)
committerKumar Gala <galak@kernel.crashing.org>
Thu, 19 Apr 2012 19:43:27 +0000 (14:43 -0500)
commit8a95bc8dfe06982fc2b8a0a2adda7baa2346a17b
treebfb0f17c732c072eb9a477d8972a733b1e848906
parentfae2e0fb24c61ca68c98d854a34732549ebc1854
powerpc/85xx: don't call of_platform_bus_probe() twice

Commit 46d026ac ("powerpc/85xx: consolidate of_platform_bus_probe calls")
replaced platform-specific of_device_id tables with a single function
that probes the most of the busses in 85xx device trees.  If a specific
platform needed additional busses probed, then it could call
of_platform_bus_probe() again.  Typically, the additional platform-specific
busses are children of existing busses that have already been probed.
of_platform_bus_probe() does not handle those child busses automatically.

Unfortunately, this doesn't actually work.  The second (platform-specific)
call to of_platform_bus_probe() never finds any of the busses it's asked
to find.

To remedy this, the platform-specific of_device_id tables are eliminated,
and their entries are merged into mpc85xx_common_ids[], so that all busses
are probed at once.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/platforms/85xx/common.c
arch/powerpc/platforms/85xx/mpc85xx_mds.c
arch/powerpc/platforms/85xx/p1022_ds.c