summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 67eb6f9)
raw | patch | inline | side by side (parent: 67eb6f9)
author | Daniel Drake <dsd@laptop.org> | |
Tue, 21 Sep 2010 15:37:26 +0000 (16:37 +0100) | ||
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | |
Tue, 9 Nov 2010 16:38:09 +0000 (16:38 +0000) |
The OLPC XO-1.5 does not use the standard port wiring suggested
in the viafb driver.
This is required for the upcoming OLPC DCON and via-camera drivers,
to be submitted soon.
Signed-off-by: Daniel Drake <dsd@laptop.org>
[fts: removed useless ifdef's and corrected comment]
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
in the viafb driver.
This is required for the upcoming OLPC DCON and via-camera drivers,
to be submitted soon.
Signed-off-by: Daniel Drake <dsd@laptop.org>
[fts: removed useless ifdef's and corrected comment]
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
drivers/video/via/via-core.c | patch | blob | history |
index 42be3d955887856215103d0114596ca52cc4d86e..86bd7197f366136666c69a48f80086765b05dab1 100644 (file)
#include <linux/platform_device.h>
#include <linux/list.h>
#include <linux/pm.h>
+#include <asm/olpc.h>
/*
* The default port config.
{ 0, 0, 0, 0 }
};
+/*
+ * The OLPC XO-1.5 puts the camera power and reset lines onto
+ * GPIO 2C.
+ */
+static const struct via_port_cfg olpc_adap_configs[] = {
+ [VIA_PORT_26] = { VIA_PORT_I2C, VIA_MODE_I2C, VIASR, 0x26 },
+ [VIA_PORT_31] = { VIA_PORT_I2C, VIA_MODE_I2C, VIASR, 0x31 },
+ [VIA_PORT_25] = { VIA_PORT_GPIO, VIA_MODE_GPIO, VIASR, 0x25 },
+ [VIA_PORT_2C] = { VIA_PORT_GPIO, VIA_MODE_GPIO, VIASR, 0x2c },
+ [VIA_PORT_3D] = { VIA_PORT_GPIO, VIA_MODE_GPIO, VIASR, 0x3d },
+ { 0, 0, 0, 0 }
+};
+
/*
* We currently only support one viafb device (will there ever be
* more than one?), so just declare it globally here.
global_dev.pdev = pdev;
global_dev.chip_type = ent->driver_data;
global_dev.port_cfg = adap_configs;
+ if (machine_is_olpc())
+ global_dev.port_cfg = olpc_adap_configs;
+
spin_lock_init(&global_dev.reg_lock);
ret = via_pci_setup_mmio(&global_dev);
if (ret)