spi: Merge up fixes from Linus' tree

[platform/kernel/linux-starfive.git] / drivers / spi / spi-qcom-qspi.c

diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c
index 1954c39..b9d5641 100644 (file)
--- a/drivers/spi/spi-qcom-qspi.c
+++ b/drivers/spi/spi-qcom-qspi.c
@@ -9,7 +9,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_platform.h>
+#include <linux/platform_device.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/pm_runtime.h>
 #include <linux/pm_opp.h>
@@ -767,7 +767,7 @@ static int qcom_qspi_probe(struct platform_device *pdev)
        master->mode_bits = SPI_MODE_0 |
                            SPI_TX_DUAL | SPI_RX_DUAL |
                            SPI_TX_QUAD | SPI_RX_QUAD;
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->prepare_message = qcom_qspi_prepare_message;
        master->transfer_one = qcom_qspi_transfer_one;
        master->handle_err = qcom_qspi_handle_err;