diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-13 09:09:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-13 09:09:36 -0800 |
| commit | 9418d5dc9ba40b88737580457bf3b7c63c60ec43 (patch) | |
| tree | 764c82c8cfeea907b06514d9ccfb599fb4d49cae /arch | |
| parent | 31083eba370fbc5d544ac2fe67ca549c0aa2bdf7 (diff) | |
| parent | 59a030a9b7a1bab5bdae57d469583e611759e90b (diff) | |
| download | blackbird-op-linux-9418d5dc9ba40b88737580457bf3b7c63c60ec43.tar.gz blackbird-op-linux-9418d5dc9ba40b88737580457bf3b7c63c60ec43.zip | |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: (i5k_amb) Convert macros to C functions
hwmon: (w83781d) Add missing curly braces
hwmon: (abituguru3) Identify ABit IP35 Pro as such
hwmon: (f75375s) pwmX_mode sysfs files writable for f75375 variant
hwmon: (f75375s) On n2100 systems, set fans to full speed on boot
hwmon: (f75375s) Allow setting up fans with platform_data
hwmon: (f75375s) Add new style bindings
hwmon: (lm70) Convert semaphore to mutex
hwmon: (applesmc) Add support for Mac Pro 2 x Quad-Core
hwmon: (abituguru3) Add support for 2 new motherboards
hwmon: (ibmpex) Change printk to dev_{info,err} macros
hwmon: (i5k_amb) New memory temperature sensor driver
hwmon: (f75375s) fix pwm mode setting
hwmon: (ibmpex.c) fix NULL dereference
hwmon: (sis5595) Split sis5595_attributes_opt
hwmon: (sis5595) Add individual alarm files
hwmon: (w83627hf) push nr+1 offset into *_REG_FAN macros and simplify
hwmon: (w83627hf) hoist nr-1 offset out of show-store-temp-X
hwmon: Add power meter spec to Documentation/hwmon/sysfs-interface
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-iop32x/n2100.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c index 1873bd8cd1b2..bc91d6e66bc4 100644 --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c @@ -16,6 +16,7 @@ #include <linux/mm.h> #include <linux/init.h> +#include <linux/f75375s.h> #include <linux/delay.h> #include <linux/kernel.h> #include <linux/pci.h> @@ -200,11 +201,21 @@ static struct platform_device n2100_serial_device = { .resource = &n2100_uart_resource, }; +static struct f75375s_platform_data n2100_f75375s = { + .pwm = { 255, 255 }, + .pwm_enable = { 0, 0 }, +}; + static struct i2c_board_info __initdata n2100_i2c_devices[] = { { I2C_BOARD_INFO("rtc-rs5c372", 0x32), .type = "rs5c372b", }, + { + I2C_BOARD_INFO("f75375", 0x2e), + .type = "f75375", + .platform_data = &n2100_f75375s, + }, }; /* |
