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

Commit 47d7c44b authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Ralf Baechle
Browse files

[MIPS] Cobalt: update reserved resources 



This patch has removed unused timer resource.
Moreover, the name of reserved resources ware changed.

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

arch/mips/cobalt/setup.c

+24 −23
Original line number Original line Diff line number Diff line
@@ -79,37 +79,38 @@ static struct resource cobalt_io_resource = { 
	.flags	= IORESOURCE_IO

	.flags	= IORESOURCE_IO

};

};





static struct resource cobalt_io_resources[] = {

/*

	{

 * Cobalt doesn't have PS/2 keyboard/mouse interfaces,

 * keyboard conntroller is never used.

 * Also PCI-ISA bridge DMA contoroller is never used.

 */

static struct resource cobalt_reserved_resources[] = {

	{	/* dma1 */

		.start	= 0x00,

		.start	= 0x00,

		.end	= 0x1f,

		.end	= 0x1f,

		.name	= "dma1",

		.name	= "reserved",

		.flags	= IORESOURCE_BUSY

		.flags	= IORESOURCE_BUSY | IORESOURCE_IO,

	}, {

	},

		.start	= 0x40,

	{	/* keyboard */

		.end	= 0x5f,

		.name	= "timer",

		.flags	= IORESOURCE_BUSY

	}, {

		.start	= 0x60,

		.start	= 0x60,

		.end	= 0x6f,

		.end	= 0x6f,

		.name	= "keyboard",

		.name	= "reserved",

		.flags	= IORESOURCE_BUSY

		.flags	= IORESOURCE_BUSY | IORESOURCE_IO,

	}, {

	},

	{	/* dma page reg */

		.start	= 0x80,

		.start	= 0x80,

		.end	= 0x8f,

		.end	= 0x8f,

		.name	= "dma page reg",

		.name	= "reserved",

		.flags	= IORESOURCE_BUSY

		.flags	= IORESOURCE_BUSY | IORESOURCE_IO,

	}, {

	},

	{	/* dma2 */

		.start	= 0xc0,

		.start	= 0xc0,

		.end	= 0xdf,

		.end	= 0xdf,

		.name	= "dma2",

		.name	= "reserved",

		.flags	= IORESOURCE_BUSY

		.flags	= IORESOURCE_BUSY | IORESOURCE_IO,

	},

	},

};

};





#define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))



static struct pci_controller cobalt_pci_controller = {

static struct pci_controller cobalt_pci_controller = {

	.pci_ops	= &gt64111_pci_ops,

	.pci_ops	= &gt64111_pci_ops,

	.mem_resource	= &cobalt_mem_resource,

	.mem_resource	= &cobalt_mem_resource,
@@ -133,9 +134,9 @@ void __init plat_mem_setup(void) 
	/* I/O port resource must include LCD/buttons */

	/* I/O port resource must include LCD/buttons */

	ioport_resource.end = 0x0fffffff;

	ioport_resource.end = 0x0fffffff;





	/* request I/O space for devices used on all i[345]86 PCs */

	/* These resources have been reserved by VIA SuperI/O chip. */

	for (i = 0; i < COBALT_IO_RESOURCES; i++)

	for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++)

		request_resource(&ioport_resource, cobalt_io_resources + i);

		request_resource(&ioport_resource, cobalt_reserved_resources + i);





        /* Read the cobalt id register out of the PCI config space */

        /* Read the cobalt id register out of the PCI config space */

        PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3));

        PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3));