aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i2c/software-nodes' into i2c/for-5.13

Browse Source
This commit is contained in:
Wolfram Sang
2021-04-10 21:48:34 +02:00
parent 660f58b6d2 4b2b4cc50b
commit 2375843b50
902 changed files with 7125 additions and 4004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/i2c.h
View File

@@ -391,7 +391,7 @@ static inline bool i2c_detect_slave_mode(struct device *dev) { return false; }
* @platform_data: stored in i2c_client.dev.platform_data
* @of_node: pointer to OpenFirmware device node
* @fwnode: device node supplied by the platform firmware
* @properties: additional device properties for the device
* @swnode: software node for the device
* @resources: resources associated with the device
* @num_resources: number of resources in the @resources array
* @irq: stored in i2c_client.irq
@@ -415,7 +415,7 @@ struct i2c_board_info {
void *platform_data;
struct device_node *of_node;
struct fwnode_handle *fwnode;
const struct property_entry *properties;
const struct software_node *swnode;
const struct resource *resources;
unsigned int num_resources;
int irq;