diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/atmel-mci.h | 2 | ||||
| -rw-r--r-- | include/linux/i2c-ocores.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h index 2f1f95737acb..57b1846a3c87 100644 --- a/include/linux/atmel-mci.h +++ b/include/linux/atmel-mci.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * @bus_width: Number of data lines wired up the slot | 10 | * @bus_width: Number of data lines wired up the slot |
| 11 | * @detect_pin: GPIO pin wired to the card detect switch | 11 | * @detect_pin: GPIO pin wired to the card detect switch |
| 12 | * @wp_pin: GPIO pin wired to the write protect sensor | 12 | * @wp_pin: GPIO pin wired to the write protect sensor |
| 13 | * @detect_is_active_high: The state of the detect pin when it is active | ||
| 13 | * | 14 | * |
| 14 | * If a given slot is not present on the board, @bus_width should be | 15 | * If a given slot is not present on the board, @bus_width should be |
| 15 | * set to 0. The other fields are ignored in this case. | 16 | * set to 0. The other fields are ignored in this case. |
| @@ -24,6 +25,7 @@ struct mci_slot_pdata { | |||
| 24 | unsigned int bus_width; | 25 | unsigned int bus_width; |
| 25 | int detect_pin; | 26 | int detect_pin; |
| 26 | int wp_pin; | 27 | int wp_pin; |
| 28 | bool detect_is_active_high; | ||
| 27 | }; | 29 | }; |
| 28 | 30 | ||
| 29 | /** | 31 | /** |
diff --git a/include/linux/i2c-ocores.h b/include/linux/i2c-ocores.h index 8ed591b0887e..4d5e57ff6614 100644 --- a/include/linux/i2c-ocores.h +++ b/include/linux/i2c-ocores.h | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | struct ocores_i2c_platform_data { | 14 | struct ocores_i2c_platform_data { |
| 15 | u32 regstep; /* distance between registers */ | 15 | u32 regstep; /* distance between registers */ |
| 16 | u32 clock_khz; /* input clock in kHz */ | 16 | u32 clock_khz; /* input clock in kHz */ |
| 17 | u8 num_devices; /* number of devices in the devices list */ | ||
| 18 | struct i2c_board_info const *devices; /* devices connected to the bus */ | ||
| 17 | }; | 19 | }; |
| 18 | 20 | ||
| 19 | #endif /* _LINUX_I2C_OCORES_H */ | 21 | #endif /* _LINUX_I2C_OCORES_H */ |
