Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -31,15 +31,15 @@ static void i2c_mux_gpio_set(const struct gpiomux *mux, unsigned val)
|
||||
int i;
|
||||
|
||||
for (i = 0; i < mux->data.n_gpios; i++)
|
||||
gpio_set_value(mux->gpio_base + mux->data.gpios[i],
|
||||
val & (1 << i));
|
||||
gpio_set_value_cansleep(mux->gpio_base + mux->data.gpios[i],
|
||||
val & (1 << i));
|
||||
}
|
||||
|
||||
static int i2c_mux_gpio_select(struct i2c_adapter *adap, void *data, u32 chan)
|
||||
{
|
||||
struct gpiomux *mux = data;
|
||||
|
||||
i2c_mux_gpio_set(mux, mux->data.values[chan]);
|
||||
i2c_mux_gpio_set(mux, chan);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -223,7 +223,7 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev)
|
||||
unsigned int class = mux->data.classes ? mux->data.classes[i] : 0;
|
||||
|
||||
mux->adap[i] = i2c_add_mux_adapter(parent, &pdev->dev, mux, nr,
|
||||
i, class,
|
||||
mux->data.values[i], class,
|
||||
i2c_mux_gpio_select, deselect);
|
||||
if (!mux->adap[i]) {
|
||||
ret = -ENODEV;
|
||||
|
||||
Reference in New Issue
Block a user