> > +              /* TODO: provide device tree option for multi-master mode.
> > */
> 
> 
> I am curious what everyone thinks about this. It seemed that, earlier on,
> people did not like me disabling multi-master mode, but I think that it
> would make bus recovery not work as well. Given that, I think it makes the
> most sense to provide a device tree option either to enable multi-master
> support or disable it. Thoughts?

Check Documentation/devicetree/bindings/i2c/i2c.txt, there is a
"multi-master" property already which I think you could use here.