Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cc30d07 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc/pci: Move IO workarounds to the common kernel dir 



Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 21176fed

arch/powerpc/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o \ 
obj-$(CONFIG_AUDIT)		+= audit.o

obj64-$(CONFIG_AUDIT)		+= compat_audit.o



obj-$(CONFIG_PPC_IO_WORKAROUNDS)	+= io-workarounds.o



obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o

obj-$(CONFIG_PERF_EVENTS)	+= perf_callchain.o

arch/powerpc/platforms/cell/io-workarounds.c→arch/powerpc/kernel/io-workarounds.c

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
#include <asm/machdep.h>

#include <asm/pgtable.h>

#include <asm/ppc-pci.h>



#include "io-workarounds.h"

#include <asm/io-workarounds.h>



#define IOWA_MAX_BUS	8

arch/powerpc/platforms/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ config PPC_INDIRECT_MMIO 
	bool

	select PPC_INDIRECT_IO



config PPC_IO_WORKAROUNDS

	bool



config GENERIC_IOMAP

	bool

arch/powerpc/platforms/cell/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config PPC_CELL_NATIVE 
	bool

	select PPC_CELL_COMMON

	select MPIC

	select PPC_IO_WORKAROUNDS

	select IBM_NEW_EMAC_EMAC4

	select IBM_NEW_EMAC_RGMII

	select IBM_NEW_EMAC_ZMII #test only