|
@@ -10,7 +10,6 @@
|
|
|
|
|
|
#include <linux/acpi.h>
|
|
|
#include <linux/delay.h>
|
|
|
-#include <linux/pci.h>
|
|
|
#include <linux/gpio.h>
|
|
|
#include <asm/olpc.h>
|
|
|
|
|
@@ -62,33 +61,6 @@ static int dcon_was_irq(void)
|
|
|
static int dcon_init_xo_1_5(struct dcon_priv *dcon)
|
|
|
{
|
|
|
unsigned int irq;
|
|
|
- u_int8_t tmp;
|
|
|
- struct pci_dev *pdev;
|
|
|
-
|
|
|
- pdev = pci_get_device(PCI_VENDOR_ID_VIA,
|
|
|
- PCI_DEVICE_ID_VIA_VX855, NULL);
|
|
|
- if (!pdev) {
|
|
|
- pr_err("cannot find VX855 PCI ID\n");
|
|
|
- return 1;
|
|
|
- }
|
|
|
-
|
|
|
- pci_read_config_byte(pdev, 0x95, &tmp);
|
|
|
- pci_write_config_byte(pdev, 0x95, tmp|0x0c);
|
|
|
-
|
|
|
- /* Set GPIO8 to GPIO mode, not SSPICLK */
|
|
|
- pci_read_config_byte(pdev, 0xe3, &tmp);
|
|
|
- pci_write_config_byte(pdev, 0xe3, tmp | 0x04);
|
|
|
-
|
|
|
- /* Set GPI10/GPI11 to GPI mode, not SSPISDI/SSPISS */
|
|
|
- pci_read_config_byte(pdev, 0xe4, &tmp);
|
|
|
- pci_write_config_byte(pdev, 0xe4, tmp|0x08);
|
|
|
-
|
|
|
- /* clear PMU_RxE1[6] to select SCI on GPIO12 */
|
|
|
- /* clear PMU_RxE0[6] to choose falling edge */
|
|
|
- pci_read_config_byte(pdev, 0xe1, &tmp);
|
|
|
- pci_write_config_byte(pdev, 0xe1, tmp & ~BIT_GPIO12);
|
|
|
- pci_read_config_byte(pdev, 0xe0, &tmp);
|
|
|
- pci_write_config_byte(pdev, 0xe0, tmp & ~BIT_GPIO12);
|
|
|
|
|
|
dcon_clear_irq();
|
|
|
|
|
@@ -101,8 +73,6 @@ static int dcon_init_xo_1_5(struct dcon_priv *dcon)
|
|
|
DCON_SOURCE_CPU : DCON_SOURCE_DCON;
|
|
|
dcon->pending_src = dcon->curr_src;
|
|
|
|
|
|
- pci_dev_put(pdev);
|
|
|
-
|
|
|
/* we're sharing the IRQ with ACPI */
|
|
|
irq = acpi_gbl_FADT.sci_interrupt;
|
|
|
if (request_irq(irq, &dcon_interrupt, IRQF_SHARED, "DCON", dcon)) {
|