(Phil) Beginnings of Voodoo3 I2C support and BT869 driver.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@447 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Philip Edelbrock committed 1999-05-06 05:12:36 +00:00
1 parent 70d3fcf4c4
commit 6a83949e74
6 files changed
+761 -2

No files matched your search

+1 -1
View File
@@ -24,7 +24,7 @@ MODULE_DIR := kernel/busses
# defined value verbatim into the command-list of rules...
KERNELBUSSESTARGETS := $(MODULE_DIR)/i2c-piix4.o $(MODULE_DIR)/i2c-isa.o \
$(MODULE_DIR)/i2c-via.o $(MODULE_DIR)/i2c-ali15x3.o \
$(MODULE_DIR)/i2c-hydra.o
$(MODULE_DIR)/i2c-hydra.o $(MODULE_DIR)/i2c-voodoo3.o
KERNELBUSSESOLD := bit-via.o bit-mb.o isa.o piix4.o
+343
View File
@@ -0,0 +1,343 @@
/*
voodoo3.c - Part of lm_sensors, Linux kernel modules for hardware
monitoring
Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and
Philip Edelbrock <phil@netroedge.com>
Based on code written by Ralph Metzler <rjkm@thp.uni-koeln.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* This interfaces to the I2C bus of the Voodoo3 to gain access to
the BT869 and possibly other I2C devices. */
#include <linux/module.h>
#include <linux/pci.h>
#include <asm/io.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include "smbus.h"
#include "version.h"
#include "compat.h"
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,54))
#include <linux/bios32.h>
#endif
/* 3DFX defines */
#ifndef PCI_VENDOR_ID_3DFX
#define PCI_VENDOR_ID_3DFX 0x121a
#endif
#ifndef PCI_DEVICE_ID_3DFX_VOODOO3
#define PCI_DEVICE_ID_3DFX_VOODOO3 0x05
#endif
/* insmod parameters */
static int voodoo3_init(void);
static int voodoo3_cleanup(void);
static int voodoo3_setup(void);
static s32 voodoo3_access(u8 addr, char read_write,
u8 command, int size, union smbus_data * data);
#ifdef MODULE
extern int init_module(void);
extern int cleanup_module(void);
#endif /* MODULE */
static struct smbus_adapter voodoo3_adapter;
static int voodoo3_initialized;
static unsigned short voodoo3_smba = 0;
static unsigned int state=0xcf980020;
static unsigned char *mem;
static int v3_num;
inline outlong(int off,unsigned int dat)
{
*((unsigned int*)(mem+off))=dat;
}
inline unsigned int readlong(int off)
{
return *((unsigned int*)(mem+off));
}
inline out(void)
{
outlong(0x78,state);
udelay(10);
}
inline void dat(int data)
{
state&=~(1<<25);
if (data)
state|=(1<<25);
}
inline void clkon(void)
{
state|=(1<<24);
}
inline void clkoff(void)
{
state&=~(1<<24);
}
inline int rdat(void)
{
dat(1);
out();
return((readlong(0x78)&(1<<27) )!=0 );
}
void Voodoo3_I2CStart(void)
{
dat(1);
out();
clkon();
out();
dat(0);
out();
clkoff();
out();
}
void Voodoo3_I2CStop(void)
{
dat(0);
out();
clkon();
out();
dat(1);
out();
}
int Voodoo3_I2CAck(int ack)
{
dat(ack);
out();
clkon();
out();
ack=rdat();
clkoff();
out();
return ack;
}
unsigned char Voodoo3_I2CReadByte(int ack)
{
int i;
unsigned char data=0;
clkoff();
dat(1);
out();
for (i=7; i>=0; i--) {
clkon();
out();
data|=(rdat()<<i);
clkoff();
out();
}
Voodoo3_I2CAck(ack);
return data;
}
int Voodoo3_I2CSendByte(unsigned char data)
{
int i;
clkoff();
dat(0);
out();
for (i=7; i>=0; i--) {
dat(data&(1<<i));
out();
clkon();
out();
clkoff();
out();
}
return Voodoo3_I2CAck(1);
}
/* Note, this is actually a byte read and not a byte_data read */
/* I.e., the command value is dumped. */
unsigned char Voodoo3_I2CRead(int adr,int command)
{
int i,j;
unsigned char dat;
Voodoo3_I2CStart();
Voodoo3_I2CSendByte(adr);
dat=Voodoo3_I2CReadByte(1);
Voodoo3_I2CStop();
#ifdef DEBUG
printk("i2c-voodoo3: Byte read at addr:0x%X (command:0x%X) result:0x%X\n",adr,command,dat);
#endif
return dat;
}
void Voodoo3_I2CWrite(int addr,int command,int data)
{
Voodoo3_I2CStart();
Voodoo3_I2CSendByte(addr);
Voodoo3_I2CSendByte(command);
Voodoo3_I2CSendByte(data);
Voodoo3_I2CStop();
#ifdef DEBUG
printk("i2c-voodoo3: Byte write at addr:0x%X command:0x%X data:0x%X\n",addr,command,data);
#endif
}
void config_v3(struct pci_dev *dev, int num)
{
unsigned int cadr;
/* map Voodoo3 memory */
cadr=dev->base_address[0];
cadr&=PCI_BASE_ADDRESS_MEM_MASK;
mem=ioremap(cadr, 0x1000);
/* Enable TV out mode, Voodoo3_I2C bus, etc. */
*((unsigned int *)(mem+0x70))=0x8160;
*((unsigned int *)(mem+0x78))=0xcf980020;
}
/* Detect whether a Voodoo3 can be found, and initialize it, where necessary.
Note the differences between kernels with the old PCI BIOS interface and
newer kernels with the real PCI interface. In compat.h some things are
defined to make the transition easier. */
static int voodoo3_setup(void)
{
struct pci_dev *dev = pci_devices;
int result=0;
v3_num=0;
while (dev)
{
if (dev->vendor == PCI_VENDOR_ID_3DFX)
if (dev->device == PCI_DEVICE_ID_3DFX_VOODOO3)
config_v3(dev,v3_num++);
if (result)
return result;
dev = dev->next;
}
if(v3_num) {
printk(KERN_INFO "v3tv: %d Voodoo3(s) found.\n", v3_num);
return 0;
} else {
printk(KERN_INFO "v3tv: No Voodoo3 found.\n");
return -ENODEV;
}
}
/* Return -1 on error. See smbus.h for more information */
s32 voodoo3_access(u8 addr, char read_write,
u8 command, int size, union smbus_data * data)
{
if (size == SMBUS_BYTE_DATA) {
addr=((addr & 0x7f) << 1) | (read_write & 0x01);
if (read_write == SMBUS_READ) {
data->byte=Voodoo3_I2CRead(addr,command);
printk("i2c-voodoo3: access returning 0x%X\n",data->byte);
} else {
Voodoo3_I2CWrite(addr,command,data->byte);
}
return 0;
} else { return -1; } /* The rest isn't implemented yet */
}
int voodoo3_init(void)
{
int res;
printk("i2c-voodoo3.o version %s (%s)\n",LM_VERSION,LM_DATE);
#ifdef DEBUG
/* PE- It might be good to make this a permanent part of the code! */
if (voodoo3_initialized) {
printk("i2c-voodoo3.o: Oops, voodoo3_init called a second time!\n");
return -EBUSY;
}
#endif
voodoo3_initialized = 0;
if ((res = voodoo3_setup())) {
printk("i2c-voodoo3.o: Voodoo3 not detected, module not inserted.\n");
voodoo3_cleanup();
return res;
}
voodoo3_initialized ++;
sprintf(voodoo3_adapter.name,"SMBus Voodoo3 adapter at %04x",voodoo3_smba);
voodoo3_adapter.id = ALGO_SMBUS | SMBUS_VOODOO3;
voodoo3_adapter.algo = &smbus_algorithm;
voodoo3_adapter.smbus_access = &voodoo3_access;
if ((res = smbus_add_adapter(&voodoo3_adapter))) {
printk("i2c-voodoo3.o: Adapter registration failed, module not inserted.\n");
voodoo3_cleanup();
return res;
}
voodoo3_initialized++;
printk("i2c-voodoo3.o: Voodoo3 I2C bus detected and initialized\n");
return 0;
}
int voodoo3_cleanup(void)
{
int res;
iounmap(mem);
if (voodoo3_initialized >= 2)
{
if ((res = smbus_del_adapter(&voodoo3_adapter))) {
printk("i2c-voodoo3.o: smbus_del_adapter failed, module not removed\n");
return res;
} else
voodoo3_initialized--;
}
if (voodoo3_initialized >= 1) {
voodoo3_initialized--;
}
return 0;
}
#ifdef MODULE
MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and Philip Edelbrock <phil@netroedge.com> and Ralph");
MODULE_DESCRIPTION("Voodoo3 I2C/SMBus driver");
int init_module(void)
{
return voodoo3_init();
}
int cleanup_module(void)
{
return voodoo3_cleanup();
}
#endif /* MODULE */
+1 -1
View File
@@ -27,7 +27,7 @@ KERNELCHIPSTARGETS := $(MODULE_DIR)/adm1021.o $(MODULE_DIR)/adm9240.o \
$(MODULE_DIR)/lm75.o $(MODULE_DIR)/lm78.o \
$(MODULE_DIR)/lm80.o $(MODULE_DIR)/ltc1710.o \
$(MODULE_DIR)/w83781d.o $(MODULE_DIR)/sis5595.o \
$(MODULE_DIR)/maxilife.o
$(MODULE_DIR)/maxilife.o $(MODULE_DIR)/bt869.o
# Include all dependency files
INCLUDEFILES += $(KERNELCHIPSTARGETS:.o=.d)
+411
View File
@@ -0,0 +1,411 @@
/*
bt869.c - Part of lm_sensors, Linux kernel modules for hardware
monitoring
Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#define DEBUG 1
#include <linux/module.h>
#include <linux/malloc.h>
#include "smbus.h"
#include "sensors.h"
#include "i2c.h"
#include "i2c-isa.h"
#include "version.h"
/* Addresses to scan */
static unsigned short normal_i2c[] = {SENSORS_I2C_END};
static unsigned short normal_i2c_range[] = {0x44,0x45,SENSORS_I2C_END};
static unsigned int normal_isa[] = {SENSORS_ISA_END};
static unsigned int normal_isa_range[] = {SENSORS_ISA_END};
/* Insmod parameters */
SENSORS_INSMOD_1(bt869);
/* Many bt869 constants specified below */
/* The bt869 registers */
/* Coming soon: Many, many registers */
/* Conversions. Rounding and limit checking is only done on the TO_REG
variants. Note that you should be a bit careful with which arguments
these macros are called: arguments may be evaluated more than once.
Fixing this is just not worth it. */
/*none*/
/* Initial values */
/*none*/
/* Each client has this additional data */
struct bt869_data {
int sysctl_id;
struct semaphore update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
u16 status[3]; /* Register values */
};
#ifdef MODULE
extern int init_module(void);
extern int cleanup_module(void);
#endif /* MODULE */
static int bt869_init(void);
static int bt869_cleanup(void);
static int bt869_attach_adapter(struct i2c_adapter *adapter);
static int bt869_detect(struct i2c_adapter *adapter, int address, int kind);
static void bt869_init_client(struct i2c_client *client);
static int bt869_detach_client(struct i2c_client *client);
static int bt869_command(struct i2c_client *client, unsigned int cmd,
void *arg);
static void bt869_inc_use (struct i2c_client *client);
static void bt869_dec_use (struct i2c_client *client);
static u16 swap_bytes(u16 val);
static int bt869_read_value(struct i2c_client *client, u8 reg);
static int bt869_write_value(struct i2c_client *client, u8 reg, u16 value);
static void bt869_status(struct i2c_client *client, int operation, int ctl_name,
int *nrels_mag, long *results);
static void bt869_update_client(struct i2c_client *client);
/* This is the driver that will be inserted */
static struct i2c_driver bt869_driver = {
/* name */ "BT869 video-output chip driver",
/* id */ I2C_DRIVERID_BT869,
/* flags */ DF_NOTIFY,
/* attach_adapter */ &bt869_attach_adapter,
/* detach_client */ &bt869_detach_client,
/* command */ &bt869_command,
/* inc_use */ &bt869_inc_use,
/* dec_use */ &bt869_dec_use
};
/* These files are created for each detected bt869. This is just a template;
though at first sight, you might think we could use a statically
allocated list, we need some way to get back to the parent - which
is done through one of the 'extra' fields which are initialized
when a new copy is allocated. */
static ctl_table bt869_dir_table_template[] = {
{ BT869_SYSCTL_STATUS, "status", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &bt869_status },
{ 0 }
};
/* Used by init/cleanup */
static int bt869_initialized = 0;
/* I choose here for semi-static bt869 allocation. Complete dynamic
allocation could also be used; the code needed for this would probably
take more memory than the datastructure takes now. */
#define MAX_bt869_NR 16
static struct i2c_client *bt869_list[MAX_bt869_NR];
int bt869_attach_adapter(struct i2c_adapter *adapter)
{
return sensors_detect(adapter,&addr_data,bt869_detect);
}
/* This function is called by sensors_detect */
int bt869_detect(struct i2c_adapter *adapter, int address, int kind)
{
int i,cur,conf,hyst,os;
struct i2c_client *new_client;
struct bt869_data *data;
int err=0;
const char *type_name,*client_name;
printk("bt869.o: probing address %d .\n",address);
/* Make sure we aren't probing the ISA bus!! This is just a safety check
at this moment; sensors_detect really won't call us. */
#ifdef DEBUG
if (i2c_is_isa_adapter(adapter)) {
printk("bt869.o: bt869_detect called for an ISA bus adapter?!?\n");
return 0;
}
#endif
/* Here, we have to do the address registration check for the I2C bus.
But that is not yet implemented. */
/* OK. For now, we presume we have a valid client. We now create the
client structure, even though we cannot fill it completely yet.
But it allows us to access bt869_{read,write}_value. */
if (! (new_client = kmalloc(sizeof(struct i2c_client) +
sizeof(struct bt869_data),
GFP_KERNEL))) {
err = -ENOMEM;
goto ERROR0;
}
data = (struct bt869_data *) (((struct i2c_client *) new_client) + 1);
new_client->addr = address;
new_client->data = data;
new_client->adapter = adapter;
new_client->driver = &bt869_driver;
/* Now, we do the remaining detection. It is lousy. */
cur = smbus_read_word_data(adapter,address,0);
printk("bt869.o: testing-->%d\n",cur);
if ((cur | 0x20) != 0x21)
goto ERROR1;
/* Determine the chip type */
kind = ((cur & 0x20)>>5);
if (kind) {
type_name = "bt869";
client_name = "bt869 chip";
printk("bt869.o: BT869 detected\n");
} else {
type_name = "bt868";
client_name = "bt868 chip";
printk("bt869.o: BT868 detected\n");
}
/* Fill in the remaining client fields and put it into the global list */
strcpy(new_client->name,client_name);
/* Find a place in our global list */
for (i = 0; i < MAX_bt869_NR; i++)
if (! bt869_list[i])
break;
if (i == MAX_bt869_NR) {
err = -ENOMEM;
printk("bt869.o: No empty slots left, recompile and heighten "
"MAX_bt869_NR!\n");
goto ERROR2;
}
bt869_list[i] = new_client;
new_client->id = i;
data->valid = 0;
data->update_lock = MUTEX;
/* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client)))
goto ERROR3;
/* Register a new directory entry with module sensors */
if ((i = sensors_register_entry(new_client,type_name,
bt869_dir_table_template)) < 0) {
err = i;
goto ERROR4;
}
data->sysctl_id = i;
bt869_init_client((struct i2c_client *) new_client);
return 0;
/* OK, this is not exactly good programming practice, usually. But it is
very code-efficient in this case. */
ERROR4:
i2c_detach_client(new_client);
ERROR3:
for (i = 0; i < MAX_bt869_NR; i++)
if (new_client == bt869_list[i])
bt869_list[i] = NULL;
ERROR2:
ERROR1:
kfree(new_client);
ERROR0:
return err;
}
int bt869_detach_client(struct i2c_client *client)
{
int err,i;
sensors_deregister_entry(((struct bt869_data *)(client->data))->sysctl_id);
if ((err = i2c_detach_client(client))) {
printk("bt869.o: Client deregistration failed, client not detached.\n");
return err;
}
for (i = 0; i < MAX_bt869_NR; i++)
if (client == bt869_list[i])
break;
if ((i == MAX_bt869_NR)) {
printk("bt869.o: Client to detach not found.\n");
return -ENOENT;
}
bt869_list[i] = NULL;
kfree(client);
return 0;
}
/* No commands defined yet */
int bt869_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
return 0;
}
/* Nothing here yet */
void bt869_inc_use (struct i2c_client *client)
{
#ifdef MODULE
MOD_INC_USE_COUNT;
#endif
}
/* Nothing here yet */
void bt869_dec_use (struct i2c_client *client)
{
#ifdef MODULE
MOD_DEC_USE_COUNT;
#endif
}
u16 swap_bytes(u16 val)
{
return (val >> 8) | (val << 8);
}
/* All registers are word-sized, except for the configuration register.
bt869 uses a high-byte first convention, which is exactly opposite to
the usual practice. */
int bt869_read_value(struct i2c_client *client, u8 reg)
{
return smbus_read_byte_data(client->adapter,client->addr,reg);
}
/* All registers are word-sized, except for the configuration register.
bt869 uses a high-byte first convention, which is exactly opposite to
the usual practice. */
int bt869_write_value(struct i2c_client *client, u8 reg, u16 value)
{
return smbus_write_byte_data(client->adapter,client->addr,reg,value);
}
void bt869_init_client(struct i2c_client *client)
{
/* Initialize the bt869 chip */
bt869_write_value(client,0xC4,0);
/* Todo: setup the proper modes */
}
void bt869_update_client(struct i2c_client *client)
{
struct bt869_data *data = client->data;
down(&data->update_lock);
if ((jiffies - data->last_updated > HZ+HZ/2 ) ||
(jiffies < data->last_updated) || ! data->valid) {
#ifdef DEBUG
printk("Starting bt869 update\n");
#endif
bt869_write_value(client,0xC4,0);
data->status[0] = bt869_read_value(client,1);
bt869_write_value(client,0xC4,0x40);
data->status[1] = bt869_read_value(client,1);
bt869_write_value(client,0xC4,0x80);
data->status[2] = bt869_read_value(client,1);
bt869_write_value(client,0xC4,0x0C0);
data->last_updated = jiffies;
data->valid = 1;
}
up(&data->update_lock);
}
void bt869_status(struct i2c_client *client, int operation, int ctl_name,
int *nrels_mag, long *results)
{
struct bt869_data *data = client->data;
if (operation == SENSORS_PROC_REAL_INFO)
*nrels_mag = 1;
else if (operation == SENSORS_PROC_REAL_READ) {
bt869_update_client(client);
results[0] = data->status[0];
results[1] = data->status[1];
results[2] = data->status[2];
*nrels_mag = 3;
} else if (operation == SENSORS_PROC_REAL_WRITE) {
if (*nrels_mag >= 1) {
// data->temp_os = TEMP_TO_REG(results[0]);
// bt869_write_value(client,bt869_REG_TEMP_OS,data->temp_os);
}
if (*nrels_mag >= 2) {
// data->temp_os = TEMP_TO_REG(results[1]);
// bt869_write_value(client,bt869_REG_TEMP_HYST,data->temp_os);
}
}
}
int bt869_init(void)
{
int res;
printk("bt869.o version %s (%s)\n",LM_VERSION,LM_DATE);
bt869_initialized = 0;
if ((res = i2c_add_driver(&bt869_driver))) {
printk("bt869.o: Driver registration failed, module not inserted.\n");
bt869_cleanup();
return res;
}
bt869_initialized ++;
return 0;
}
int bt869_cleanup(void)
{
int res;
if (bt869_initialized >= 1) {
if ((res = i2c_del_driver(&bt869_driver))) {
printk("bt869.o: Driver deregistration failed, module not removed.\n");
return res;
}
bt869_initialized --;
}
return 0;
}
#ifdef MODULE
MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and Philip Edelbrock <phil@netroedge.com>");
MODULE_DESCRIPTION("bt869 driver");
int init_module(void)
{
return bt869_init();
}
int cleanup_module(void)
{
return bt869_cleanup();
}
#endif /* MODULE */
+4
View File
@@ -314,6 +314,7 @@ extern inline int SENSORS_LIMIT(long value, long low, long high)
#define I2C_DRIVERID_SIS5595 1011
#define I2C_DRIVERID_ICSPLL 1012
#define I2C_DRIVERID_MAXILIFE 1012
#define I2C_DRIVERID_BT869 1013
/* Sysctl IDs */
#ifdef DEV_HWMON
@@ -553,4 +554,7 @@ struct sensors_chips_data {
#define SIS5595_ALARM_FAN2 0x80
#define ICSPLL_SYSCTL1 1000
#define BT869_SYSCTL_STATUS 1000
#endif /* def SENSORS_SENSORS_H */
+1
View File
@@ -151,6 +151,7 @@ struct smbus_adapter {
/* SMBus Adapter ids */
#define SMBUS_PIIX4 1
#define SMBUS_VOODOO3 2
/* Detect whether we are on an SMBus-only bus. Note that if this returns
false, you can still use the smbus access routines, as these emulate