cd354f1ae7
After Al Viro (finally) succeeded in removing the sched.h #include in module.h recently, it makes sense again to remove other superfluous sched.h includes. There are quite a lot of files which include it but don't actually need anything defined in there. Presumably these includes were once needed for macros that used to live in sched.h, but moved to other header files in the course of cleaning it up. To ease the pain, this time I did not fiddle with any header files and only removed #includes from .c-files, which tend to cause less trouble. Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha, arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig, allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all configs in arch/arm/configs on arm. I also checked that no new warnings were introduced by the patch (actually, some warnings are removed that were emitted by unnecessarily included header files). Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
172 lines
3.7 KiB
C
172 lines
3.7 KiB
C
/*
|
|
* linux/drivers/video/riva/fbdev-i2c.c - nVidia i2c
|
|
*
|
|
* Maintained by Ani Joshi <ajoshi@shell.unixbox.com>
|
|
*
|
|
* Copyright 2004 Antonino A. Daplas <adaplas @pol.net>
|
|
*
|
|
* Based on radeonfb-i2c.c
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/fb.h>
|
|
#include <linux/jiffies.h>
|
|
|
|
#include <asm/io.h>
|
|
|
|
#include "rivafb.h"
|
|
#include "../edid.h"
|
|
|
|
static void riva_gpio_setscl(void* data, int state)
|
|
{
|
|
struct riva_i2c_chan *chan = data;
|
|
struct riva_par *par = chan->par;
|
|
u32 val;
|
|
|
|
VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base + 1);
|
|
val = VGA_RD08(par->riva.PCIO, 0x3d5) & 0xf0;
|
|
|
|
if (state)
|
|
val |= 0x20;
|
|
else
|
|
val &= ~0x20;
|
|
|
|
VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base + 1);
|
|
VGA_WR08(par->riva.PCIO, 0x3d5, val | 0x1);
|
|
}
|
|
|
|
static void riva_gpio_setsda(void* data, int state)
|
|
{
|
|
struct riva_i2c_chan *chan = data;
|
|
struct riva_par *par = chan->par;
|
|
u32 val;
|
|
|
|
VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base + 1);
|
|
val = VGA_RD08(par->riva.PCIO, 0x3d5) & 0xf0;
|
|
|
|
if (state)
|
|
val |= 0x10;
|
|
else
|
|
val &= ~0x10;
|
|
|
|
VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base + 1);
|
|
VGA_WR08(par->riva.PCIO, 0x3d5, val | 0x1);
|
|
}
|
|
|
|
static int riva_gpio_getscl(void* data)
|
|
{
|
|
struct riva_i2c_chan *chan = data;
|
|
struct riva_par *par = chan->par;
|
|
u32 val = 0;
|
|
|
|
VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base);
|
|
if (VGA_RD08(par->riva.PCIO, 0x3d5) & 0x04)
|
|
val = 1;
|
|
|
|
val = VGA_RD08(par->riva.PCIO, 0x3d5);
|
|
|
|
return val;
|
|
}
|
|
|
|
static int riva_gpio_getsda(void* data)
|
|
{
|
|
struct riva_i2c_chan *chan = data;
|
|
struct riva_par *par = chan->par;
|
|
u32 val = 0;
|
|
|
|
VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base);
|
|
if (VGA_RD08(par->riva.PCIO, 0x3d5) & 0x08)
|
|
val = 1;
|
|
|
|
return val;
|
|
}
|
|
|
|
static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
|
|
{
|
|
int rc;
|
|
|
|
strcpy(chan->adapter.name, name);
|
|
chan->adapter.owner = THIS_MODULE;
|
|
chan->adapter.id = I2C_HW_B_RIVA;
|
|
chan->adapter.algo_data = &chan->algo;
|
|
chan->adapter.dev.parent = &chan->par->pdev->dev;
|
|
chan->algo.setsda = riva_gpio_setsda;
|
|
chan->algo.setscl = riva_gpio_setscl;
|
|
chan->algo.getsda = riva_gpio_getsda;
|
|
chan->algo.getscl = riva_gpio_getscl;
|
|
chan->algo.udelay = 40;
|
|
chan->algo.timeout = msecs_to_jiffies(2);
|
|
chan->algo.data = chan;
|
|
|
|
i2c_set_adapdata(&chan->adapter, chan);
|
|
|
|
/* Raise SCL and SDA */
|
|
riva_gpio_setsda(chan, 1);
|
|
riva_gpio_setscl(chan, 1);
|
|
udelay(20);
|
|
|
|
rc = i2c_bit_add_bus(&chan->adapter);
|
|
if (rc == 0)
|
|
dev_dbg(&chan->par->pdev->dev, "I2C bus %s registered.\n", name);
|
|
else {
|
|
dev_warn(&chan->par->pdev->dev,
|
|
"Failed to register I2C bus %s.\n", name);
|
|
chan->par = NULL;
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
void riva_create_i2c_busses(struct riva_par *par)
|
|
{
|
|
par->bus = 3;
|
|
|
|
par->chan[0].par = par;
|
|
par->chan[1].par = par;
|
|
par->chan[2].par = par;
|
|
|
|
par->chan[0].ddc_base = 0x3e;
|
|
par->chan[1].ddc_base = 0x36;
|
|
par->chan[2].ddc_base = 0x50;
|
|
riva_setup_i2c_bus(&par->chan[0], "BUS1");
|
|
riva_setup_i2c_bus(&par->chan[1], "BUS2");
|
|
riva_setup_i2c_bus(&par->chan[2], "BUS3");
|
|
}
|
|
|
|
void riva_delete_i2c_busses(struct riva_par *par)
|
|
{
|
|
if (par->chan[0].par)
|
|
i2c_del_adapter(&par->chan[0].adapter);
|
|
par->chan[0].par = NULL;
|
|
|
|
if (par->chan[1].par)
|
|
i2c_del_adapter(&par->chan[1].adapter);
|
|
par->chan[1].par = NULL;
|
|
|
|
if (par->chan[2].par)
|
|
i2c_del_adapter(&par->chan[2].adapter);
|
|
par->chan[2].par = NULL;
|
|
}
|
|
|
|
int riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid)
|
|
{
|
|
u8 *edid = NULL;
|
|
|
|
edid = fb_ddc_read(&par->chan[conn-1].adapter);
|
|
|
|
if (out_edid)
|
|
*out_edid = edid;
|
|
if (!edid)
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|