mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
[PATCH] powerpc: Kill _machine and hard-coded platform numbers
This removes statically assigned platform numbers and reworks the powerpc platform probe code to use a better mechanism. With this, board support files can simply declare a new machine type with a macro, and implement a probe() function that uses the flattened device-tree to detect if they apply for a given machine. We now have a machine_is() macro that replaces the comparisons of _machine with the various PLATFORM_* constants. This commit also changes various drivers to use the new macro instead of looking at _machine. Signed-off-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
This commit is contained in:
parent
056cb48a2f
commit
e8222502ee
63 changed files with 560 additions and 543 deletions
|
|
@ -440,7 +440,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
|
|||
|
||||
|
||||
#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
|
||||
if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) {
|
||||
if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
|
||||
hwif->irq = hwif->channel ? 15 : 14;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1677,7 +1677,7 @@ MODULE_DEVICE_TABLE(pci, pmac_ide_pci_match);
|
|||
void __init
|
||||
pmac_ide_probe(void)
|
||||
{
|
||||
if (_machine != _MACH_Pmac)
|
||||
if (!machine_is(powermac))
|
||||
return;
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST
|
||||
|
|
|
|||
Loading…
Reference in a new issue