xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'spi/topic/qup', 'spi/topic/rockchip', 'spi/topic/rspi', 'spi/topic/s3c64xx' and 'spi/topic/sc18is602' into spi-next

Browse Source
This commit is contained in:
Mark Brown
2015-04-11 23:09:25 +01:00
parent 8afba181b9 612762e82a 76b17e6e49 c9bc3e8bf0 0744ea2a01 b4e2754522
commit 165f2288e1
7 changed files with 469 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-sc18is602.c
View File

@@ -286,7 +286,7 @@ static int sc18is602_probe(struct i2c_client *client,
hw->freq = SC18IS602_CLOCK;
break;
}
master->bus_num = client->adapter->nr;
master->bus_num = np ? -1 : client->adapter->nr;
master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST;
master->bits_per_word_mask = SPI_BPW_MASK(8);
master->setup = sc18is602_setup;