diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-11-10 19:22:19 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 04:01:40 -0500 |
commit | 486a45c2a6c19b159602d044ab601a92cd81f524 (patch) | |
tree | 350a368208768873667cd1a659a6d264a76f7c91 /drivers/gpu/drm/nouveau/nouveau_bios.h | |
parent | 6b5a81a2e783f26a69fc262b3c393f0b391c8613 (diff) |
drm/nouveau/i2c: do parsing of i2c-related vbios info in nouveau_i2c.c
Not much point parsing the vbios data into a struct which is only used once
to parse the data into another struct, go directly from vbios to
nouveau_i2c_chan.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index b9f2da394f89..a0e9c2c7ae8c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h | |||
@@ -53,13 +53,6 @@ struct bit_entry { | |||
53 | 53 | ||
54 | int bit_table(struct drm_device *, u8 id, struct bit_entry *); | 54 | int bit_table(struct drm_device *, u8 id, struct bit_entry *); |
55 | 55 | ||
56 | struct dcb_i2c_entry { | ||
57 | uint32_t entry; | ||
58 | uint8_t port_type; | ||
59 | uint8_t read, write; | ||
60 | struct nouveau_i2c_chan *chan; | ||
61 | }; | ||
62 | |||
63 | enum dcb_gpio_tag { | 56 | enum dcb_gpio_tag { |
64 | DCB_GPIO_TVDAC0 = 0xc, | 57 | DCB_GPIO_TVDAC0 = 0xc, |
65 | DCB_GPIO_TVDAC1 = 0x2d, | 58 | DCB_GPIO_TVDAC1 = 0x2d, |
@@ -166,10 +159,6 @@ struct dcb_table { | |||
166 | int entries; | 159 | int entries; |
167 | struct dcb_entry entry[DCB_MAX_NUM_ENTRIES]; | 160 | struct dcb_entry entry[DCB_MAX_NUM_ENTRIES]; |
168 | 161 | ||
169 | uint8_t *i2c_table; | ||
170 | uint8_t i2c_default_indices; | ||
171 | struct dcb_i2c_entry i2c[DCB_MAX_NUM_I2C_ENTRIES]; | ||
172 | |||
173 | uint16_t gpio_table_ptr; | 162 | uint16_t gpio_table_ptr; |
174 | struct dcb_gpio_table gpio; | 163 | struct dcb_gpio_table gpio; |
175 | uint16_t connector_table_ptr; | 164 | uint16_t connector_table_ptr; |