Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[MIPS] Cobalt: update reserved resources
This patch has removed unused timer resource.
Moreover, the name of reserved resources ware changed.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
authored by Yoichi Yuasa and committed by Ralf Baechle 47d7c44b 3a1d8217
+24
-23
arch/mips/cobalt/setup.c
+24
-23
arch/mips/cobalt/setup.c
···
79
79
.flags = IORESOURCE_IO
80
80
};
81
81
82
-
static struct resource cobalt_io_resources[] = {
83
-
{
82
+
/*
83
+
* Cobalt doesn't have PS/2 keyboard/mouse interfaces,
84
+
* keyboard conntroller is never used.
85
+
* Also PCI-ISA bridge DMA contoroller is never used.
86
+
*/
87
+
static struct resource cobalt_reserved_resources[] = {
88
+
{ /* dma1 */
84
89
.start = 0x00,
85
90
.end = 0x1f,
86
-
.name = "dma1",
87
-
.flags = IORESOURCE_BUSY
88
-
}, {
89
-
.start = 0x40,
90
-
.end = 0x5f,
91
-
.name = "timer",
92
-
.flags = IORESOURCE_BUSY
93
-
}, {
91
+
.name = "reserved",
92
+
.flags = IORESOURCE_BUSY | IORESOURCE_IO,
93
+
},
94
+
{ /* keyboard */
94
95
.start = 0x60,
95
96
.end = 0x6f,
96
-
.name = "keyboard",
97
-
.flags = IORESOURCE_BUSY
98
-
}, {
97
+
.name = "reserved",
98
+
.flags = IORESOURCE_BUSY | IORESOURCE_IO,
99
+
},
100
+
{ /* dma page reg */
99
101
.start = 0x80,
100
102
.end = 0x8f,
101
-
.name = "dma page reg",
102
-
.flags = IORESOURCE_BUSY
103
-
}, {
103
+
.name = "reserved",
104
+
.flags = IORESOURCE_BUSY | IORESOURCE_IO,
105
+
},
106
+
{ /* dma2 */
104
107
.start = 0xc0,
105
108
.end = 0xdf,
106
-
.name = "dma2",
107
-
.flags = IORESOURCE_BUSY
109
+
.name = "reserved",
110
+
.flags = IORESOURCE_BUSY | IORESOURCE_IO,
108
111
},
109
112
};
110
-
111
-
#define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))
112
113
113
114
static struct pci_controller cobalt_pci_controller = {
114
115
.pci_ops = >64111_pci_ops,
···
134
133
/* I/O port resource must include LCD/buttons */
135
134
ioport_resource.end = 0x0fffffff;
136
135
137
-
/* request I/O space for devices used on all i[345]86 PCs */
138
-
for (i = 0; i < COBALT_IO_RESOURCES; i++)
139
-
request_resource(&ioport_resource, cobalt_io_resources + i);
136
+
/* These resources have been reserved by VIA SuperI/O chip. */
137
+
for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++)
138
+
request_resource(&ioport_resource, cobalt_reserved_resources + i);
140
139
141
140
/* Read the cobalt id register out of the PCI config space */
142
141
PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3));