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

Commit 252161ec authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Ralf Baechle
Browse files

[MIPS] merge GT64111 PCI routines and GT64120 PCI_0 routines 



This patch has merged GT64111 PCI routines and GT64120 PCI_0 routines.
GT64111 PCI is almost the same as GT64120's PCI_0.
This patch don't change GT64120 PCI routines.

Signed-off-by: default avatarYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 2a9effc6

arch/mips/Kconfig

+8 −11
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ config MIPS_COBALT 
	select HW_HAS_PCI

	select I8259

	select IRQ_CPU

	select MIPS_GT64111

	select PCI_GT64XXX_PCI0

	select SYS_HAS_CPU_NEVADA

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -207,7 +207,7 @@ config MIPS_EV64120 
	depends on EXPERIMENTAL

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select SYS_HAS_CPU_R5000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL
@@ -245,7 +245,7 @@ config LASAT 
	select DMA_NONCOHERENT

	select SYS_HAS_EARLY_PRINTK

	select HW_HAS_PCI

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select MIPS_NILE4

	select R5000_CPU_SCACHE

	select SYS_HAS_CPU_R5000
@@ -263,7 +263,7 @@ config MIPS_ATLAS 
	select HW_HAS_PCI

	select MIPS_BOARDS_GEN

	select MIPS_BONITO64

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select MIPS_MSC

	select RM7000_CPU_SCACHE

	select SWAP_IO_SPACE
@@ -296,7 +296,7 @@ config MIPS_MALTA 
	select MIPS_BOARDS_GEN

	select MIPS_BONITO64

	select MIPS_CPU_SCACHE

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select MIPS_MSC

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1
@@ -340,7 +340,7 @@ config WR_PPMC 
	select BOOT_ELF32

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2
@@ -398,7 +398,7 @@ config MOMENCO_OCELOT 
	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_CPU_RM7K

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select RM7000_CPU_SCACHE

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_RM7000
@@ -999,10 +999,7 @@ config DDB5XXX_COMMON 
config MIPS_BOARDS_GEN

	bool



config MIPS_GT64111

	bool



config MIPS_GT64120

config PCI_GT64XXX_PCI0

	bool



config MIPS_TX3927

arch/mips/cobalt/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include <asm/gt64120.h>



extern struct pci_ops gt64111_pci_ops;

extern struct pci_ops gt64xxx_pci0_ops;



static struct resource cobalt_mem_resource = {

	.start	= GT_DEF_PCI0_MEM0_BASE,
@@ -31,7 +31,7 @@ static struct resource cobalt_io_resource = { 
};



static struct pci_controller cobalt_pci_controller = {

	.pci_ops	= &gt64111_pci_ops,

	.pci_ops	= &gt64xxx_pci0_ops,

	.mem_resource	= &cobalt_mem_resource,

	.io_resource	= &cobalt_io_resource,

	.io_offset	= 0 - GT_DEF_PCI0_IO_BASE,

arch/mips/gt64120/wrppmc/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/kernel.h>

#include <asm/gt64120.h>



extern struct pci_ops gt64120_pci_ops;

extern struct pci_ops gt64xxx_pci0_ops;



static struct resource pci0_io_resource = {

	.name  = "pci_0 io",
@@ -30,7 +30,7 @@ static struct resource pci0_mem_resource = { 
};



static struct pci_controller hose_0 = {

	.pci_ops	= &gt64120_pci_ops,

	.pci_ops	= &gt64xxx_pci0_ops,

	.io_resource	= &pci0_io_resource,

	.mem_resource	= &pci0_mem_resource,

};

arch/mips/mips-boards/generic/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static struct resource msc_io_resource = { 
};



extern struct pci_ops bonito64_pci_ops;

extern struct pci_ops gt64120_pci_ops;

extern struct pci_ops gt64xxx_pci0_ops;

extern struct pci_ops msc_pci_ops;



static struct pci_controller bonito64_controller = {
@@ -76,7 +76,7 @@ static struct pci_controller bonito64_controller = { 
};



static struct pci_controller gt64120_controller = {

	.pci_ops	= &gt64120_pci_ops,

	.pci_ops	= &gt64xxx_pci0_ops,

	.io_resource	= &gt64120_io_resource,

	.mem_resource	= &gt64120_mem_resource,

};

arch/mips/pci/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ obj-y += pci.o pci-dac.o 
# PCI bus host bridge specific code

#

obj-$(CONFIG_MIPS_BONITO64)	+= ops-bonito64.o

obj-$(CONFIG_MIPS_GT64111)	+= ops-gt64111.o

obj-$(CONFIG_MIPS_GT64120)	+= ops-gt64120.o

obj-$(CONFIG_PCI_GT64XXX_PCI0)	+= ops-gt64xxx_pci0.o

obj-$(CONFIG_PCI_MARVELL)	+= ops-marvell.o

obj-$(CONFIG_MIPS_MSC)		+= ops-msc.o

obj-$(CONFIG_MIPS_NILE4)	+= ops-nile4.o