diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 10:47:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 10:47:41 -0700 |
commit | 4e455c6782bd6bf6a0135c1e1c9f018ec191979e (patch) | |
tree | b26d342b454b4829344985c968adf16d092dc534 /include | |
parent | 105a048a4f35f7a74c7cc20b36dd83658b6ec232 (diff) | |
parent | dce80a56268fffd6b5ea57b3f6ba3d027a68f05e (diff) | |
download | linux-stable-4e455c6782bd6bf6a0135c1e1c9f018ec191979e.tar.gz linux-stable-4e455c6782bd6bf6a0135c1e1c9f018ec191979e.tar.bz2 linux-stable-4e455c6782bd6bf6a0135c1e1c9f018ec191979e.zip |
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6
* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
SFI: add sysfs interface for SFI tables.
SFI: add support for v0.81 spec
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sfi.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/include/linux/sfi.h b/include/linux/sfi.h index 9a6f7607174e..0299b4ce63db 100644 --- a/include/linux/sfi.h +++ b/include/linux/sfi.h @@ -73,6 +73,8 @@ #define SFI_SIG_SPIB "SPIB" #define SFI_SIG_I2CB "I2CB" #define SFI_SIG_GPEM "GPEM" +#define SFI_SIG_DEVS "DEVS" +#define SFI_SIG_GPIO "GPIO" #define SFI_SIGNATURE_SIZE 4 #define SFI_OEM_ID_SIZE 6 @@ -145,6 +147,27 @@ struct sfi_rtc_table_entry { u32 irq; } __packed; +struct sfi_device_table_entry { + u8 type; /* bus type, I2C, SPI or ...*/ +#define SFI_DEV_TYPE_SPI 0 +#define SFI_DEV_TYPE_I2C 1 +#define SFI_DEV_TYPE_UART 2 +#define SFI_DEV_TYPE_HSI 3 +#define SFI_DEV_TYPE_IPC 4 + + u8 host_num; /* attached to host 0, 1...*/ + u16 addr; + u8 irq; + u32 max_freq; + char name[16]; +} __packed; + +struct sfi_gpio_table_entry { + char controller_name[16]; + u16 pin_no; + char pin_name[16]; +} __packed; + struct sfi_spi_table_entry { u16 host_num; /* attached to host 0, 1...*/ u16 cs; /* chip select */ @@ -166,7 +189,6 @@ struct sfi_gpe_table_entry { u16 phys_id; /* physical GPE id */ } __packed; - typedef int (*sfi_table_handler) (struct sfi_table_header *table); #ifdef CONFIG_SFI |