On Tue, Mar 03, 2009 at 08:22:29PM -0500, Kyle McMartin wrote: > From: Kyle McMartin <k...@redhat.com> > > Bug #486511 in Fedora, this is getting applied to any machine with a NEC > USB pci device if this CONFIG_GEF_SBC610 is on (as it was in Fedora.) > Obviously this isn't appropriate to do in any more than the SBC610 > case..., so flag that we're a sbc610 board, and skip the fixup if we're > not. > > (Fedora: Should fix USB on Mac G4/G5...) > > Signed-off-by: Kyle McMartin <k...@redhat.com> > > --- > diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c > b/arch/powerpc/platforms/86xx/gef_sbc610.c > index fb371f5..54afda2 100644 > --- a/arch/powerpc/platforms/86xx/gef_sbc610.c > +++ b/arch/powerpc/platforms/86xx/gef_sbc610.c > @@ -51,6 +51,8 @@ > > void __iomem *sbc610_regs; > > +static int is_sbc610;
I came up with this as well, but used the machine_is() infrasturcture. Subject: [PATCH] Run fixup code only on the appropriate platform. commit a969e76a7101bf5f3d369563df1ca1253dd6131b (powerpc: Correct USB support for GE Fanuc SBC610) introduced a fixup for NEC usb controllers. This fixup should only run on GEF SBC610 boards. Fixes Fedora bug #486511. (https://bugzilla.redhat.com/show_bug.cgi?id=486511) Signed-off-by: Tony Breeds <t...@bakeyournoodle.com> --- arch/powerpc/platforms/86xx/gef_sbc610.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c index fb371f5..d6b772b 100644 --- a/arch/powerpc/platforms/86xx/gef_sbc610.c +++ b/arch/powerpc/platforms/86xx/gef_sbc610.c @@ -142,6 +142,10 @@ static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev) { unsigned int val; + /* Do not do the fixup on other platforms! */ + if (!machine_is(gef_sbc610)) + return; + printk(KERN_INFO "Running NEC uPD720101 Fixup\n"); /* Ensure ports 1, 2, 3, 4 & 5 are enabled */ -- 1.6.0.6 Yours Tony _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
