diff options
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/c2port/core.c | 4 | ||||
| -rw-r--r-- | drivers/misc/ds1682.c | 6 | ||||
| -rw-r--r-- | drivers/misc/eeprom/at24.c | 65 | ||||
| -rw-r--r-- | drivers/misc/eeprom/at25.c | 6 | ||||
| -rw-r--r-- | drivers/misc/eeprom/eeprom.c | 3 | ||||
| -rw-r--r-- | drivers/misc/eeprom/max6875.c | 2 | ||||
| -rw-r--r-- | drivers/misc/hdpuftrs/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/hdpuftrs/hdpu_cpustate.c | 256 | ||||
| -rw-r--r-- | drivers/misc/hdpuftrs/hdpu_nexus.c | 149 |
10 files changed, 65 insertions, 428 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 7b6f7eefdf8d..f12dc3e54402 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_IBM_ASM) += ibmasm/ | 5 | obj-$(CONFIG_IBM_ASM) += ibmasm/ |
| 6 | obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ | ||
| 7 | obj-$(CONFIG_AD525X_DPOT) += ad525x_dpot.o | 6 | obj-$(CONFIG_AD525X_DPOT) += ad525x_dpot.o |
| 8 | obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o | 7 | obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o |
| 9 | obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o | 8 | obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o |
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c index ed090e77c9cd..19fc7c1cb428 100644 --- a/drivers/misc/c2port/core.c +++ b/drivers/misc/c2port/core.c | |||
| @@ -707,7 +707,7 @@ static ssize_t __c2port_read_flash_data(struct c2port_device *dev, | |||
| 707 | return nread; | 707 | return nread; |
| 708 | } | 708 | } |
| 709 | 709 | ||
| 710 | static ssize_t c2port_read_flash_data(struct kobject *kobj, | 710 | static ssize_t c2port_read_flash_data(struct file *filp, struct kobject *kobj, |
| 711 | struct bin_attribute *attr, | 711 | struct bin_attribute *attr, |
| 712 | char *buffer, loff_t offset, size_t count) | 712 | char *buffer, loff_t offset, size_t count) |
| 713 | { | 713 | { |
| @@ -824,7 +824,7 @@ static ssize_t __c2port_write_flash_data(struct c2port_device *dev, | |||
| 824 | return nwrite; | 824 | return nwrite; |
| 825 | } | 825 | } |
| 826 | 826 | ||
| 827 | static ssize_t c2port_write_flash_data(struct kobject *kobj, | 827 | static ssize_t c2port_write_flash_data(struct file *filp, struct kobject *kobj, |
| 828 | struct bin_attribute *attr, | 828 | struct bin_attribute *attr, |
| 829 | char *buffer, loff_t offset, size_t count) | 829 | char *buffer, loff_t offset, size_t count) |
| 830 | { | 830 | { |
diff --git a/drivers/misc/ds1682.c b/drivers/misc/ds1682.c index 9197cfc55015..a513f0aa6432 100644 --- a/drivers/misc/ds1682.c +++ b/drivers/misc/ds1682.c | |||
| @@ -140,7 +140,8 @@ static const struct attribute_group ds1682_group = { | |||
| 140 | /* | 140 | /* |
| 141 | * User data attribute | 141 | * User data attribute |
| 142 | */ | 142 | */ |
| 143 | static ssize_t ds1682_eeprom_read(struct kobject *kobj, struct bin_attribute *attr, | 143 | static ssize_t ds1682_eeprom_read(struct file *filp, struct kobject *kobj, |
| 144 | struct bin_attribute *attr, | ||
| 144 | char *buf, loff_t off, size_t count) | 145 | char *buf, loff_t off, size_t count) |
| 145 | { | 146 | { |
| 146 | struct i2c_client *client = kobj_to_i2c_client(kobj); | 147 | struct i2c_client *client = kobj_to_i2c_client(kobj); |
| @@ -163,7 +164,8 @@ static ssize_t ds1682_eeprom_read(struct kobject *kobj, struct bin_attribute *at | |||
| 163 | return count; | 164 | return count; |
| 164 | } | 165 | } |
| 165 | 166 | ||
| 166 | static ssize_t ds1682_eeprom_write(struct kobject *kobj, struct bin_attribute *attr, | 167 | static ssize_t ds1682_eeprom_write(struct file *filp, struct kobject *kobj, |
| 168 | struct bin_attribute *attr, | ||
| 167 | char *buf, loff_t off, size_t count) | 169 | char *buf, loff_t off, size_t count) |
| 168 | { | 170 | { |
| 169 | struct i2c_client *client = kobj_to_i2c_client(kobj); | 171 | struct i2c_client *client = kobj_to_i2c_client(kobj); |
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index db7d0f21b65d..f7ca3a42b490 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | struct at24_data { | 54 | struct at24_data { |
| 55 | struct at24_platform_data chip; | 55 | struct at24_platform_data chip; |
| 56 | struct memory_accessor macc; | 56 | struct memory_accessor macc; |
| 57 | bool use_smbus; | 57 | int use_smbus; |
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * Lock protects against activities from other Linux tasks, | 60 | * Lock protects against activities from other Linux tasks, |
| @@ -184,11 +184,19 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf, | |||
| 184 | if (count > io_limit) | 184 | if (count > io_limit) |
| 185 | count = io_limit; | 185 | count = io_limit; |
| 186 | 186 | ||
| 187 | if (at24->use_smbus) { | 187 | switch (at24->use_smbus) { |
| 188 | case I2C_SMBUS_I2C_BLOCK_DATA: | ||
| 188 | /* Smaller eeproms can work given some SMBus extension calls */ | 189 | /* Smaller eeproms can work given some SMBus extension calls */ |
| 189 | if (count > I2C_SMBUS_BLOCK_MAX) | 190 | if (count > I2C_SMBUS_BLOCK_MAX) |
| 190 | count = I2C_SMBUS_BLOCK_MAX; | 191 | count = I2C_SMBUS_BLOCK_MAX; |
| 191 | } else { | 192 | break; |
| 193 | case I2C_SMBUS_WORD_DATA: | ||
| 194 | count = 2; | ||
| 195 | break; | ||
| 196 | case I2C_SMBUS_BYTE_DATA: | ||
| 197 | count = 1; | ||
| 198 | break; | ||
| 199 | default: | ||
| 192 | /* | 200 | /* |
| 193 | * When we have a better choice than SMBus calls, use a | 201 | * When we have a better choice than SMBus calls, use a |
| 194 | * combined I2C message. Write address; then read up to | 202 | * combined I2C message. Write address; then read up to |
| @@ -219,10 +227,27 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf, | |||
| 219 | timeout = jiffies + msecs_to_jiffies(write_timeout); | 227 | timeout = jiffies + msecs_to_jiffies(write_timeout); |
| 220 | do { | 228 | do { |
| 221 | read_time = jiffies; | 229 | read_time = jiffies; |
| 222 | if (at24->use_smbus) { | 230 | switch (at24->use_smbus) { |
| 231 | case I2C_SMBUS_I2C_BLOCK_DATA: | ||
| 223 | status = i2c_smbus_read_i2c_block_data(client, offset, | 232 | status = i2c_smbus_read_i2c_block_data(client, offset, |
| 224 | count, buf); | 233 | count, buf); |
| 225 | } else { | 234 | break; |
| 235 | case I2C_SMBUS_WORD_DATA: | ||
| 236 | status = i2c_smbus_read_word_data(client, offset); | ||
| 237 | if (status >= 0) { | ||
| 238 | buf[0] = status & 0xff; | ||
| 239 | buf[1] = status >> 8; | ||
| 240 | status = count; | ||
| 241 | } | ||
| 242 | break; | ||
| 243 | case I2C_SMBUS_BYTE_DATA: | ||
| 244 | status = i2c_smbus_read_byte_data(client, offset); | ||
| 245 | if (status >= 0) { | ||
| 246 | buf[0] = status; | ||
| 247 | status = count; | ||
| 248 | } | ||
| 249 | break; | ||
| 250 | default: | ||
| 226 | status = i2c_transfer(client->adapter, msg, 2); | 251 | status = i2c_transfer(client->adapter, msg, 2); |
| 227 | if (status == 2) | 252 | if (status == 2) |
| 228 | status = count; | 253 | status = count; |
| @@ -274,7 +299,8 @@ static ssize_t at24_read(struct at24_data *at24, | |||
| 274 | return retval; | 299 | return retval; |
| 275 | } | 300 | } |
| 276 | 301 | ||
| 277 | static ssize_t at24_bin_read(struct kobject *kobj, struct bin_attribute *attr, | 302 | static ssize_t at24_bin_read(struct file *filp, struct kobject *kobj, |
| 303 | struct bin_attribute *attr, | ||
| 278 | char *buf, loff_t off, size_t count) | 304 | char *buf, loff_t off, size_t count) |
| 279 | { | 305 | { |
| 280 | struct at24_data *at24; | 306 | struct at24_data *at24; |
| @@ -395,7 +421,8 @@ static ssize_t at24_write(struct at24_data *at24, const char *buf, loff_t off, | |||
| 395 | return retval; | 421 | return retval; |
| 396 | } | 422 | } |
| 397 | 423 | ||
| 398 | static ssize_t at24_bin_write(struct kobject *kobj, struct bin_attribute *attr, | 424 | static ssize_t at24_bin_write(struct file *filp, struct kobject *kobj, |
| 425 | struct bin_attribute *attr, | ||
| 399 | char *buf, loff_t off, size_t count) | 426 | char *buf, loff_t off, size_t count) |
| 400 | { | 427 | { |
| 401 | struct at24_data *at24; | 428 | struct at24_data *at24; |
| @@ -434,7 +461,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 434 | { | 461 | { |
| 435 | struct at24_platform_data chip; | 462 | struct at24_platform_data chip; |
| 436 | bool writable; | 463 | bool writable; |
| 437 | bool use_smbus = false; | 464 | int use_smbus = 0; |
| 438 | struct at24_data *at24; | 465 | struct at24_data *at24; |
| 439 | int err; | 466 | int err; |
| 440 | unsigned i, num_addresses; | 467 | unsigned i, num_addresses; |
| @@ -475,12 +502,19 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 475 | err = -EPFNOSUPPORT; | 502 | err = -EPFNOSUPPORT; |
| 476 | goto err_out; | 503 | goto err_out; |
| 477 | } | 504 | } |
| 478 | if (!i2c_check_functionality(client->adapter, | 505 | if (i2c_check_functionality(client->adapter, |
| 479 | I2C_FUNC_SMBUS_READ_I2C_BLOCK)) { | 506 | I2C_FUNC_SMBUS_READ_I2C_BLOCK)) { |
| 507 | use_smbus = I2C_SMBUS_I2C_BLOCK_DATA; | ||
| 508 | } else if (i2c_check_functionality(client->adapter, | ||
| 509 | I2C_FUNC_SMBUS_READ_WORD_DATA)) { | ||
| 510 | use_smbus = I2C_SMBUS_WORD_DATA; | ||
| 511 | } else if (i2c_check_functionality(client->adapter, | ||
| 512 | I2C_FUNC_SMBUS_READ_BYTE_DATA)) { | ||
| 513 | use_smbus = I2C_SMBUS_BYTE_DATA; | ||
| 514 | } else { | ||
| 480 | err = -EPFNOSUPPORT; | 515 | err = -EPFNOSUPPORT; |
| 481 | goto err_out; | 516 | goto err_out; |
| 482 | } | 517 | } |
| 483 | use_smbus = true; | ||
| 484 | } | 518 | } |
| 485 | 519 | ||
| 486 | if (chip.flags & AT24_FLAG_TAKE8ADDR) | 520 | if (chip.flags & AT24_FLAG_TAKE8ADDR) |
| @@ -566,11 +600,16 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 566 | dev_info(&client->dev, "%zu byte %s EEPROM %s\n", | 600 | dev_info(&client->dev, "%zu byte %s EEPROM %s\n", |
| 567 | at24->bin.size, client->name, | 601 | at24->bin.size, client->name, |
| 568 | writable ? "(writable)" : "(read-only)"); | 602 | writable ? "(writable)" : "(read-only)"); |
| 603 | if (use_smbus == I2C_SMBUS_WORD_DATA || | ||
| 604 | use_smbus == I2C_SMBUS_BYTE_DATA) { | ||
| 605 | dev_notice(&client->dev, "Falling back to %s reads, " | ||
| 606 | "performance will suffer\n", use_smbus == | ||
| 607 | I2C_SMBUS_WORD_DATA ? "word" : "byte"); | ||
| 608 | } | ||
| 569 | dev_dbg(&client->dev, | 609 | dev_dbg(&client->dev, |
| 570 | "page_size %d, num_addresses %d, write_max %d%s\n", | 610 | "page_size %d, num_addresses %d, write_max %d, use_smbus %d\n", |
| 571 | chip.page_size, num_addresses, | 611 | chip.page_size, num_addresses, |
| 572 | at24->write_max, | 612 | at24->write_max, use_smbus); |
| 573 | use_smbus ? ", use_smbus" : ""); | ||
| 574 | 613 | ||
| 575 | /* export data to kernel code */ | 614 | /* export data to kernel code */ |
| 576 | if (chip.setup) | 615 | if (chip.setup) |
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c index d194212a41f6..c627e4174ccd 100644 --- a/drivers/misc/eeprom/at25.c +++ b/drivers/misc/eeprom/at25.c | |||
| @@ -126,7 +126,8 @@ at25_ee_read( | |||
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | static ssize_t | 128 | static ssize_t |
| 129 | at25_bin_read(struct kobject *kobj, struct bin_attribute *bin_attr, | 129 | at25_bin_read(struct file *filp, struct kobject *kobj, |
| 130 | struct bin_attribute *bin_attr, | ||
| 130 | char *buf, loff_t off, size_t count) | 131 | char *buf, loff_t off, size_t count) |
| 131 | { | 132 | { |
| 132 | struct device *dev; | 133 | struct device *dev; |
| @@ -253,7 +254,8 @@ at25_ee_write(struct at25_data *at25, const char *buf, loff_t off, | |||
| 253 | } | 254 | } |
| 254 | 255 | ||
| 255 | static ssize_t | 256 | static ssize_t |
| 256 | at25_bin_write(struct kobject *kobj, struct bin_attribute *bin_attr, | 257 | at25_bin_write(struct file *filp, struct kobject *kobj, |
| 258 | struct bin_attribute *bin_attr, | ||
| 257 | char *buf, loff_t off, size_t count) | 259 | char *buf, loff_t off, size_t count) |
| 258 | { | 260 | { |
| 259 | struct device *dev; | 261 | struct device *dev; |
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c index e306a8cd2f96..45060ddc4e59 100644 --- a/drivers/misc/eeprom/eeprom.c +++ b/drivers/misc/eeprom/eeprom.c | |||
| @@ -81,7 +81,8 @@ exit: | |||
| 81 | mutex_unlock(&data->update_lock); | 81 | mutex_unlock(&data->update_lock); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | static ssize_t eeprom_read(struct kobject *kobj, struct bin_attribute *bin_attr, | 84 | static ssize_t eeprom_read(struct file *filp, struct kobject *kobj, |
| 85 | struct bin_attribute *bin_attr, | ||
| 85 | char *buf, loff_t off, size_t count) | 86 | char *buf, loff_t off, size_t count) |
| 86 | { | 87 | { |
| 87 | struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj)); | 88 | struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj)); |
diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c index fe2909278507..5653a3ce0517 100644 --- a/drivers/misc/eeprom/max6875.c +++ b/drivers/misc/eeprom/max6875.c | |||
| @@ -107,7 +107,7 @@ exit_up: | |||
| 107 | mutex_unlock(&data->update_lock); | 107 | mutex_unlock(&data->update_lock); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | static ssize_t max6875_read(struct kobject *kobj, | 110 | static ssize_t max6875_read(struct file *filp, struct kobject *kobj, |
| 111 | struct bin_attribute *bin_attr, | 111 | struct bin_attribute *bin_attr, |
| 112 | char *buf, loff_t off, size_t count) | 112 | char *buf, loff_t off, size_t count) |
| 113 | { | 113 | { |
diff --git a/drivers/misc/hdpuftrs/Makefile b/drivers/misc/hdpuftrs/Makefile deleted file mode 100644 index ac74ae679230..000000000000 --- a/drivers/misc/hdpuftrs/Makefile +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | obj-$(CONFIG_HDPU_FEATURES) := hdpu_cpustate.o hdpu_nexus.o | ||
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c deleted file mode 100644 index 176fe4e09d3f..000000000000 --- a/drivers/misc/hdpuftrs/hdpu_cpustate.c +++ /dev/null | |||
| @@ -1,256 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Sky CPU State Driver | ||
| 3 | * | ||
| 4 | * Copyright (C) 2002 Brian Waite | ||
| 5 | * | ||
| 6 | * This driver allows use of the CPU state bits | ||
| 7 | * It exports the /dev/sky_cpustate and also | ||
| 8 | * /proc/sky_cpustate pseudo-file for status information. | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or | ||
| 11 | * modify it under the terms of the GNU General Public License | ||
| 12 | * as published by the Free Software Foundation; either version | ||
| 13 | * 2 of the License, or (at your option) any later version. | ||
| 14 | * | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include <linux/module.h> | ||
| 18 | #include <linux/kernel.h> | ||
| 19 | #include <linux/spinlock.h> | ||
| 20 | #include <linux/smp_lock.h> | ||
| 21 | #include <linux/miscdevice.h> | ||
| 22 | #include <linux/proc_fs.h> | ||
| 23 | #include <linux/hdpu_features.h> | ||
| 24 | #include <linux/platform_device.h> | ||
| 25 | #include <asm/uaccess.h> | ||
| 26 | #include <linux/seq_file.h> | ||
| 27 | #include <asm/io.h> | ||
| 28 | |||
| 29 | #define SKY_CPUSTATE_VERSION "1.1" | ||
| 30 | |||
| 31 | static int hdpu_cpustate_probe(struct platform_device *pdev); | ||
| 32 | static int hdpu_cpustate_remove(struct platform_device *pdev); | ||
| 33 | |||
| 34 | static unsigned char cpustate_get_state(void); | ||
| 35 | static int cpustate_proc_open(struct inode *inode, struct file *file); | ||
| 36 | static int cpustate_proc_read(struct seq_file *seq, void *offset); | ||
| 37 | |||
| 38 | static struct cpustate_t cpustate; | ||
| 39 | |||
| 40 | static const struct file_operations proc_cpustate = { | ||
| 41 | .open = cpustate_proc_open, | ||
| 42 | .read = seq_read, | ||
| 43 | .llseek = seq_lseek, | ||
| 44 | .release = single_release, | ||
| 45 | .owner = THIS_MODULE, | ||
| 46 | }; | ||
| 47 | |||
| 48 | static int cpustate_proc_open(struct inode *inode, struct file *file) | ||
| 49 | { | ||
| 50 | return single_open(file, cpustate_proc_read, NULL); | ||
| 51 | } | ||
| 52 | |||
| 53 | static int cpustate_proc_read(struct seq_file *seq, void *offset) | ||
| 54 | { | ||
| 55 | seq_printf(seq, "CPU State: %04x\n", cpustate_get_state()); | ||
| 56 | return 0; | ||
| 57 | } | ||
| 58 | |||
| 59 | static int cpustate_get_ref(int excl) | ||
| 60 | { | ||
| 61 | |||
| 62 | int retval = -EBUSY; | ||
| 63 | |||
| 64 | spin_lock(&cpustate.lock); | ||
| 65 | |||
| 66 | if (cpustate.excl) | ||
| 67 | goto out_busy; | ||
| 68 | |||
| 69 | if (excl) { | ||
| 70 | if (cpustate.open_count) | ||
| 71 | goto out_busy; | ||
| 72 | cpustate.excl = 1; | ||
| 73 | } | ||
| 74 | |||
| 75 | cpustate.open_count++; | ||
| 76 | retval = 0; | ||
| 77 | |||
| 78 | out_busy: | ||
| 79 | spin_unlock(&cpustate.lock); | ||
| 80 | return retval; | ||
| 81 | } | ||
| 82 | |||
| 83 | static int cpustate_free_ref(void) | ||
| 84 | { | ||
| 85 | |||
| 86 | spin_lock(&cpustate.lock); | ||
| 87 | |||
| 88 | cpustate.excl = 0; | ||
| 89 | cpustate.open_count--; | ||
| 90 | |||
| 91 | spin_unlock(&cpustate.lock); | ||
| 92 | return 0; | ||
| 93 | } | ||
| 94 | |||
| 95 | static unsigned char cpustate_get_state(void) | ||
| 96 | { | ||
| 97 | |||
| 98 | return cpustate.cached_val; | ||
| 99 | } | ||
| 100 | |||
| 101 | static void cpustate_set_state(unsigned char new_state) | ||
| 102 | { | ||
| 103 | unsigned int state = (new_state << 21); | ||
| 104 | |||
| 105 | #ifdef DEBUG_CPUSTATE | ||
| 106 | printk("CPUSTATE -> 0x%x\n", new_state); | ||
| 107 | #endif | ||
| 108 | spin_lock(&cpustate.lock); | ||
| 109 | cpustate.cached_val = new_state; | ||
| 110 | writel((0xff << 21), cpustate.clr_addr); | ||
| 111 | writel(state, cpustate.set_addr); | ||
| 112 | spin_unlock(&cpustate.lock); | ||
| 113 | } | ||
| 114 | |||
| 115 | /* | ||
| 116 | * Now all the various file operations that we export. | ||
| 117 | */ | ||
| 118 | |||
| 119 | static ssize_t cpustate_read(struct file *file, char *buf, | ||
| 120 | size_t count, loff_t * ppos) | ||
| 121 | { | ||
| 122 | unsigned char data; | ||
| 123 | |||
| 124 | if (count < 0) | ||
| 125 | return -EFAULT; | ||
| 126 | if (count == 0) | ||
| 127 | return 0; | ||
| 128 | |||
| 129 | data = cpustate_get_state(); | ||
| 130 | if (copy_to_user(buf, &data, sizeof(unsigned char))) | ||
| 131 | return -EFAULT; | ||
| 132 | return sizeof(unsigned char); | ||
| 133 | } | ||
| 134 | |||
| 135 | static ssize_t cpustate_write(struct file *file, const char *buf, | ||
| 136 | size_t count, loff_t * ppos) | ||
| 137 | { | ||
| 138 | unsigned char data; | ||
| 139 | |||
| 140 | if (count < 0) | ||
| 141 | return -EFAULT; | ||
| 142 | |||
| 143 | if (count == 0) | ||
| 144 | return 0; | ||
| 145 | |||
| 146 | if (copy_from_user((unsigned char *)&data, buf, sizeof(unsigned char))) | ||
| 147 | return -EFAULT; | ||
| 148 | |||
| 149 | cpustate_set_state(data); | ||
| 150 | return sizeof(unsigned char); | ||
| 151 | } | ||
| 152 | |||
| 153 | static int cpustate_open(struct inode *inode, struct file *file) | ||
| 154 | { | ||
| 155 | int ret; | ||
| 156 | |||
| 157 | lock_kernel(); | ||
| 158 | ret = cpustate_get_ref((file->f_flags & O_EXCL)); | ||
| 159 | unlock_kernel(); | ||
| 160 | |||
| 161 | return ret; | ||
| 162 | } | ||
| 163 | |||
| 164 | static int cpustate_release(struct inode *inode, struct file *file) | ||
| 165 | { | ||
| 166 | return cpustate_free_ref(); | ||
| 167 | } | ||
| 168 | |||
| 169 | static struct platform_driver hdpu_cpustate_driver = { | ||
| 170 | .probe = hdpu_cpustate_probe, | ||
| 171 | .remove = hdpu_cpustate_remove, | ||
| 172 | .driver = { | ||
| 173 | .name = HDPU_CPUSTATE_NAME, | ||
| 174 | .owner = THIS_MODULE, | ||
| 175 | }, | ||
| 176 | }; | ||
| 177 | |||
| 178 | /* | ||
| 179 | * The various file operations we support. | ||
| 180 | */ | ||
| 181 | static const struct file_operations cpustate_fops = { | ||
| 182 | .owner = THIS_MODULE, | ||
| 183 | .open = cpustate_open, | ||
| 184 | .release = cpustate_release, | ||
| 185 | .read = cpustate_read, | ||
| 186 | .write = cpustate_write, | ||
| 187 | .llseek = no_llseek, | ||
| 188 | }; | ||
| 189 | |||
| 190 | static struct miscdevice cpustate_dev = { | ||
| 191 | .minor = MISC_DYNAMIC_MINOR, | ||
| 192 | .name = "sky_cpustate", | ||
| 193 | .fops = &cpustate_fops, | ||
| 194 | }; | ||
| 195 | |||
| 196 | static int hdpu_cpustate_probe(struct platform_device *pdev) | ||
| 197 | { | ||
| 198 | struct resource *res; | ||
| 199 | struct proc_dir_entry *proc_de; | ||
| 200 | int ret; | ||
| 201 | |||
| 202 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 203 | if (!res) { | ||
| 204 | printk(KERN_ERR "sky_cpustate: " | ||
| 205 | "Invalid memory resource.\n"); | ||
| 206 | return -EINVAL; | ||
| 207 | } | ||
| 208 | cpustate.set_addr = (unsigned long *)res->start; | ||
| 209 | cpustate.clr_addr = (unsigned long *)res->end - 1; | ||
| 210 | |||
| 211 | ret = misc_register(&cpustate_dev); | ||
| 212 | if (ret) { | ||
| 213 | printk(KERN_WARNING "sky_cpustate: " | ||
| 214 | "Unable to register misc device.\n"); | ||
| 215 | cpustate.set_addr = NULL; | ||
| 216 | cpustate.clr_addr = NULL; | ||
| 217 | return ret; | ||
| 218 | } | ||
| 219 | |||
| 220 | proc_de = proc_create("sky_cpustate", 0666, NULL, &proc_cpustate); | ||
| 221 | if (!proc_de) { | ||
| 222 | printk(KERN_WARNING "sky_cpustate: " | ||
| 223 | "Unable to create proc entry\n"); | ||
| 224 | } | ||
| 225 | |||
| 226 | printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n"); | ||
| 227 | return 0; | ||
| 228 | } | ||
| 229 | |||
| 230 | static int hdpu_cpustate_remove(struct platform_device *pdev) | ||
| 231 | { | ||
| 232 | cpustate.set_addr = NULL; | ||
| 233 | cpustate.clr_addr = NULL; | ||
| 234 | |||
| 235 | remove_proc_entry("sky_cpustate", NULL); | ||
| 236 | misc_deregister(&cpustate_dev); | ||
| 237 | |||
| 238 | return 0; | ||
| 239 | } | ||
| 240 | |||
| 241 | static int __init cpustate_init(void) | ||
| 242 | { | ||
| 243 | return platform_driver_register(&hdpu_cpustate_driver); | ||
| 244 | } | ||
| 245 | |||
| 246 | static void __exit cpustate_exit(void) | ||
| 247 | { | ||
| 248 | platform_driver_unregister(&hdpu_cpustate_driver); | ||
| 249 | } | ||
| 250 | |||
| 251 | module_init(cpustate_init); | ||
| 252 | module_exit(cpustate_exit); | ||
| 253 | |||
| 254 | MODULE_AUTHOR("Brian Waite"); | ||
| 255 | MODULE_LICENSE("GPL"); | ||
| 256 | MODULE_ALIAS("platform:" HDPU_CPUSTATE_NAME); | ||
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c deleted file mode 100644 index ce39fa54949b..000000000000 --- a/drivers/misc/hdpuftrs/hdpu_nexus.c +++ /dev/null | |||
| @@ -1,149 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Sky Nexus Register Driver | ||
| 3 | * | ||
| 4 | * Copyright (C) 2002 Brian Waite | ||
| 5 | * | ||
| 6 | * This driver allows reading the Nexus register | ||
| 7 | * It exports the /proc/sky_chassis_id and also | ||
| 8 | * /proc/sky_slot_id pseudo-file for status information. | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or | ||
| 11 | * modify it under the terms of the GNU General Public License | ||
| 12 | * as published by the Free Software Foundation; either version | ||
| 13 | * 2 of the License, or (at your option) any later version. | ||
| 14 | * | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include <linux/module.h> | ||
| 18 | #include <linux/kernel.h> | ||
| 19 | #include <linux/proc_fs.h> | ||
| 20 | #include <linux/hdpu_features.h> | ||
| 21 | #include <linux/platform_device.h> | ||
| 22 | #include <linux/seq_file.h> | ||
| 23 | #include <asm/io.h> | ||
| 24 | |||
| 25 | static int hdpu_nexus_probe(struct platform_device *pdev); | ||
| 26 | static int hdpu_nexus_remove(struct platform_device *pdev); | ||
| 27 | static int hdpu_slot_id_open(struct inode *inode, struct file *file); | ||
| 28 | static int hdpu_slot_id_read(struct seq_file *seq, void *offset); | ||
| 29 | static int hdpu_chassis_id_open(struct inode *inode, struct file *file); | ||
| 30 | static int hdpu_chassis_id_read(struct seq_file *seq, void *offset); | ||
| 31 | |||
| 32 | static struct proc_dir_entry *hdpu_slot_id; | ||
| 33 | static struct proc_dir_entry *hdpu_chassis_id; | ||
| 34 | static int slot_id = -1; | ||
| 35 | static int chassis_id = -1; | ||
| 36 | |||
| 37 | static const struct file_operations proc_slot_id = { | ||
| 38 | .open = hdpu_slot_id_open, | ||
| 39 | .read = seq_read, | ||
| 40 | .llseek = seq_lseek, | ||
| 41 | .release = single_release, | ||
| 42 | .owner = THIS_MODULE, | ||
| 43 | }; | ||
| 44 | |||
| 45 | static const struct file_operations proc_chassis_id = { | ||
| 46 | .open = hdpu_chassis_id_open, | ||
| 47 | .read = seq_read, | ||
| 48 | .llseek = seq_lseek, | ||
| 49 | .release = single_release, | ||
| 50 | .owner = THIS_MODULE, | ||
| 51 | }; | ||
| 52 | |||
| 53 | static struct platform_driver hdpu_nexus_driver = { | ||
| 54 | .probe = hdpu_nexus_probe, | ||
| 55 | .remove = hdpu_nexus_remove, | ||
| 56 | .driver = { | ||
| 57 | .name = HDPU_NEXUS_NAME, | ||
| 58 | .owner = THIS_MODULE, | ||
| 59 | }, | ||
| 60 | }; | ||
| 61 | |||
| 62 | static int hdpu_slot_id_open(struct inode *inode, struct file *file) | ||
| 63 | { | ||
| 64 | return single_open(file, hdpu_slot_id_read, NULL); | ||
| 65 | } | ||
| 66 | |||
| 67 | static int hdpu_slot_id_read(struct seq_file *seq, void *offset) | ||
| 68 | { | ||
| 69 | seq_printf(seq, "%d\n", slot_id); | ||
| 70 | return 0; | ||
| 71 | } | ||
| 72 | |||
| 73 | static int hdpu_chassis_id_open(struct inode *inode, struct file *file) | ||
| 74 | { | ||
| 75 | return single_open(file, hdpu_chassis_id_read, NULL); | ||
| 76 | } | ||
| 77 | |||
| 78 | static int hdpu_chassis_id_read(struct seq_file *seq, void *offset) | ||
| 79 | { | ||
| 80 | seq_printf(seq, "%d\n", chassis_id); | ||
| 81 | return 0; | ||
| 82 | } | ||
| 83 | |||
| 84 | static int hdpu_nexus_probe(struct platform_device *pdev) | ||
| 85 | { | ||
| 86 | struct resource *res; | ||
| 87 | int *nexus_id_addr; | ||
| 88 | |||
| 89 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 90 | if (!res) { | ||
| 91 | printk(KERN_ERR "sky_nexus: " | ||
| 92 | "Invalid memory resource.\n"); | ||
| 93 | return -EINVAL; | ||
| 94 | } | ||
| 95 | nexus_id_addr = ioremap(res->start, | ||
| 96 | (unsigned long)(res->end - res->start)); | ||
| 97 | if (nexus_id_addr) { | ||
| 98 | slot_id = (*nexus_id_addr >> 8) & 0x1f; | ||
| 99 | chassis_id = *nexus_id_addr & 0xff; | ||
| 100 | iounmap(nexus_id_addr); | ||
| 101 | } else { | ||
| 102 | printk(KERN_ERR "sky_nexus: Could not map slot id\n"); | ||
| 103 | } | ||
| 104 | |||
| 105 | hdpu_slot_id = proc_create("sky_slot_id", 0666, NULL, &proc_slot_id); | ||
| 106 | if (!hdpu_slot_id) { | ||
| 107 | printk(KERN_WARNING "sky_nexus: " | ||
| 108 | "Unable to create proc dir entry: sky_slot_id\n"); | ||
| 109 | } | ||
| 110 | |||
| 111 | hdpu_chassis_id = proc_create("sky_chassis_id", 0666, NULL, | ||
| 112 | &proc_chassis_id); | ||
| 113 | if (!hdpu_chassis_id) | ||
| 114 | printk(KERN_WARNING "sky_nexus: " | ||
| 115 | "Unable to create proc dir entry: sky_chassis_id\n"); | ||
| 116 | |||
| 117 | return 0; | ||
| 118 | } | ||
| 119 | |||
| 120 | static int hdpu_nexus_remove(struct platform_device *pdev) | ||
| 121 | { | ||
| 122 | slot_id = -1; | ||
| 123 | chassis_id = -1; | ||
| 124 | |||
| 125 | remove_proc_entry("sky_slot_id", NULL); | ||
| 126 | remove_proc_entry("sky_chassis_id", NULL); | ||
| 127 | |||
| 128 | hdpu_slot_id = 0; | ||
| 129 | hdpu_chassis_id = 0; | ||
| 130 | |||
| 131 | return 0; | ||
| 132 | } | ||
| 133 | |||
| 134 | static int __init nexus_init(void) | ||
| 135 | { | ||
| 136 | return platform_driver_register(&hdpu_nexus_driver); | ||
| 137 | } | ||
| 138 | |||
| 139 | static void __exit nexus_exit(void) | ||
| 140 | { | ||
| 141 | platform_driver_unregister(&hdpu_nexus_driver); | ||
| 142 | } | ||
| 143 | |||
| 144 | module_init(nexus_init); | ||
| 145 | module_exit(nexus_exit); | ||
| 146 | |||
| 147 | MODULE_AUTHOR("Brian Waite"); | ||
| 148 | MODULE_LICENSE("GPL"); | ||
| 149 | MODULE_ALIAS("platform:" HDPU_NEXUS_NAME); | ||
