summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/i2c-core.c
diff options
context:
space:
mode:
authorWolfram Sang2015-03-12 17:17:59 +0100
committerWolfram Sang2015-03-18 13:42:14 +0100
commit03bde7c31a360f814ca42101d60563b1b803dca1 (patch)
treedef8c38af9087e4afe4849ebc5abbda33f109fa3 /drivers/i2c/i2c-core.c
parentof: base: add function to get highest id of an alias stem (diff)
downloadkernel-qcow2-linux-03bde7c31a360f814ca42101d60563b1b803dca1.tar.gz
kernel-qcow2-linux-03bde7c31a360f814ca42101d60563b1b803dca1.tar.xz
kernel-qcow2-linux-03bde7c31a360f814ca42101d60563b1b803dca1.zip
i2c: busses with dynamic ids should start after fixed ids for DT
Make sure dynamic ids do not interfere with fixed ones and let them start after the highest fixed id. This patch might cause different bus-numbers than before for dynamic ids, however it fixes a bug. Assume: - fixed id0 defers probe - fixed id1 succeeds and registers a muxed bus with dynamic id - muxed bus gets id0 - fixed id0 wants to probe again, but its fixed id is gone now - fixed id0 probe fails With this patch, the fixed ids are always reserved in the DT case. For legacy board init, we already have a mechanism like this in i2c_register_board_info(). Reported-by: Bob Feretich <bob.feretich@rafresearch.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/i2c-core.c')
-rw-r--r--drivers/i2c/i2c-core.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 57a86f4aab43..fe80f85896e2 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1878,6 +1878,13 @@ static int __init i2c_init(void)
{
int retval;
+ retval = of_alias_get_highest_id("i2c");
+
+ down_write(&__i2c_board_lock);
+ if (retval >= __i2c_first_dynamic_bus_num)
+ __i2c_first_dynamic_bus_num = retval + 1;
+ up_write(&__i2c_board_lock);
+
retval = bus_register(&i2c_bus_type);
if (retval)
return retval;