Rev 2326 | Rev 2330 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2326 | Rev 2327 | ||
|---|---|---|---|
| Line 287... | Line 287... | ||
| 287 | GPIOE, |
287 | GPIOE, |
| 288 | 0, |
288 | 0, |
| 289 | GPIOF, |
289 | GPIOF, |
| 290 | }; |
290 | }; |
| 291 | struct intel_gpio *gpio; |
291 | struct intel_gpio *gpio; |
| 292 | ENTER(); |
292 | |
| 293 | if (pin >= ARRAY_SIZE(map_pin_to_reg) || !map_pin_to_reg[pin]) |
293 | if (pin >= ARRAY_SIZE(map_pin_to_reg) || !map_pin_to_reg[pin]) |
| 294 | return NULL; |
294 | return NULL; |
| Line 295... | Line 295... | ||
| 295 | 295 | ||
| 296 | gpio = kzalloc(sizeof(struct intel_gpio), GFP_KERNEL); |
296 | gpio = kzalloc(sizeof(struct intel_gpio), GFP_KERNEL); |
| Line 315... | Line 315... | ||
| 315 | gpio->algo.timeout = usecs_to_jiffies(2200); |
315 | gpio->algo.timeout = usecs_to_jiffies(2200); |
| 316 | gpio->algo.data = gpio; |
316 | gpio->algo.data = gpio; |
| Line 317... | Line 317... | ||
| 317 | 317 | ||
| 318 | if (i2c_bit_add_bus(&gpio->adapter)) |
318 | if (i2c_bit_add_bus(&gpio->adapter)) |
| 319 | goto out_free; |
319 | goto out_free; |
| 320 | LEAVE(); |
320 | |
| Line 321... | Line 321... | ||
| 321 | return &gpio->adapter; |
321 | return &gpio->adapter; |
| 322 | 322 | ||
| 323 | out_free: |
323 | out_free: |
| Line 500... | Line 500... | ||
| 500 | "reserved", |
500 | "reserved", |
| 501 | "dpd", |
501 | "dpd", |
| 502 | }; |
502 | }; |
| 503 | struct drm_i915_private *dev_priv = dev->dev_private; |
503 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 504 | int ret, i; |
504 | int ret, i; |
| 505 | ENTER(); |
505 | |
| 506 | dev_priv->gmbus = kcalloc(sizeof(struct intel_gmbus), GMBUS_NUM_PORTS, |
506 | dev_priv->gmbus = kcalloc(sizeof(struct intel_gmbus), GMBUS_NUM_PORTS, |
| 507 | GFP_KERNEL); |
507 | GFP_KERNEL); |
| 508 | if (dev_priv->gmbus == NULL) |
508 | if (dev_priv->gmbus == NULL) |
| 509 | return -ENOMEM; |
509 | return -ENOMEM; |
| Line 532... | Line 532... | ||
| 532 | /* XXX force bit banging until GMBUS is fully debugged */ |
532 | /* XXX force bit banging until GMBUS is fully debugged */ |
| 533 | bus->force_bit = intel_gpio_create(dev_priv, i); |
533 | bus->force_bit = intel_gpio_create(dev_priv, i); |
| 534 | } |
534 | } |
| Line 535... | Line 535... | ||
| 535 | 535 | ||
| 536 | intel_i2c_reset(dev_priv->dev); |
536 | intel_i2c_reset(dev_priv->dev); |
| 537 | LEAVE(); |
537 | |
| Line 538... | Line 538... | ||
| 538 | return 0; |
538 | return 0; |
| 539 | 539 | ||
| 540 | err: |
540 | err: |