kernel: update kernel 4.9 to 4.9.17

[openwrt/staging/florian.git] / target / linux / pistachio / patches-4.9 / 104-spi-img-spfi-use-device-0-configuration-for-all-devi.patch

diff --git a/target/linux/pistachio/patches-4.9/104-spi-img-spfi-use-device-0-configuration-for-all-devi.patch b/target/linux/pistachio/patches-4.9/104-spi-img-spfi-use-device-0-configuration-for-all-devi.patch
index 01143e2c3bae563e99ba37f42e992e0ae5e010f1..6c9e6b5a768f4f5591dd0dff8b01a3d3b9ebd5ec 100644 (file)
--- a/target/linux/pistachio/patches-4.9/104-spi-img-spfi-use-device-0-configuration-for-all-devi.patch
+++ b/target/linux/pistachio/patches-4.9/104-spi-img-spfi-use-device-0-configuration-for-all-devi.patch
@@ -13,11 +13,9 @@ Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com>
  drivers/spi/spi-img-spfi.c | 23 ++++++++++++++++-------
  1 file changed, 16 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c
-index 0d73d31..231b59c 100644
 --- a/drivers/spi/spi-img-spfi.c
 +++ b/drivers/spi/spi-img-spfi.c
-@@ -437,18 +437,23 @@ static int img_spfi_prepare(struct spi_master *master, struct spi_message *msg)
+@@ -437,18 +437,23 @@ static int img_spfi_prepare(struct spi_m
        struct img_spfi *spfi = spi_master_get_devdata(master);
        u32 val;
  
@@ -46,7 +44,7 @@ index 0d73d31..231b59c 100644
        spfi_writel(spfi, val, SPFI_PORT_STATE);
  
        return 0;
-@@ -548,11 +553,15 @@ static void img_spfi_config(struct spi_master *master, struct spi_device *spi,
+@@ -548,11 +553,15 @@ static void img_spfi_config(struct spi_m
        div = DIV_ROUND_UP(clk_get_rate(spfi->spfi_clk), xfer->speed_hz);
        div = clamp(512 / (1 << get_count_order(div)), 1, 128);
  
@@ -64,6 +62,3 @@ index 0d73d31..231b59c 100644
  
        if (!list_is_last(&xfer->transfer_list, &master->cur_msg->transfers) &&
                /*
--- 
-2.7.4
-