Xilinx: ARM: QSPI: remove conditional comp for dual mode

It now no longer has any kernel configuration needed for
dual mode support as it's being pulled from the device
tree only.

Signed-off-by: John Linn <john.linn@xilinx.com>

diff --git a/arch/arm/mach-zynq/board_ep107.c b/arch/arm/mach-zynq/board_ep107.c
index 41291d60af2f946fd6b60331b3997c667c633ffa..c314222844d5606de079c722caa52ed40f8f7312 100644 (file)
--- a/arch/arm/mach-zynq/board_ep107.c
+++ b/arch/arm/mach-zynq/board_ep107.c
@@ -161,11 +161,7 @@ static struct mtd_partition qspi_flash_partitions[] = {
        },
        {
                .name           = "qspi-rootfs",
-#ifdef CONFIG_XILINX_PS_QSPI_USE_DUAL_FLASH
-               .size           = 0x1800000,
-#else
                .size           = 0x800000,
-#endif
                .offset         = 0x800000,
        },
 };
@@ -174,11 +170,7 @@ static struct flash_platform_data qspi_flash_pdata = {
        .name                   = "serial_flash",
        .parts                  = qspi_flash_partitions,
        .nr_parts               = ARRAY_SIZE(qspi_flash_partitions),
-#ifdef CONFIG_XILINX_PS_QSPI_USE_DUAL_FLASH
-       .type                   = "n25q128x2"   /* dual flash devices */
-#else
        .type                   = "n25q128"     /* single flash device */
-#endif
 };
 
 static struct spi_board_info __initdata xilinx_qspipss_0_boardinfo = {

diff --git a/arch/arm/mach-zynq/board_zc770_xm010.c b/arch/arm/mach-zynq/board_zc770_xm010.c
index e44e06545b406ee82fc679fce4563bc011807377..7354cf669bd95cba704a3a655e155b45bfb00a65 100644 (file)
--- a/arch/arm/mach-zynq/board_zc770_xm010.c
+++ b/arch/arm/mach-zynq/board_zc770_xm010.c
@@ -100,11 +100,7 @@ static struct mtd_partition qspi_flash_partitions[] = {
        },
        {
                .name           = "qspi-rootfs",
-#ifdef CONFIG_XILINX_PS_QSPI_USE_DUAL_FLASH
-               .size           = 0x1800000,
-#else
                .size           = 0x800000,
-#endif
                .offset         = 0x800000,
        },
 };
@@ -113,11 +109,7 @@ static struct flash_platform_data qspi_flash_pdata = {
        .name                   = "serial_flash",
        .parts                  = qspi_flash_partitions,
        .nr_parts               = ARRAY_SIZE(qspi_flash_partitions),
-#ifdef CONFIG_XILINX_PS_QSPI_USE_DUAL_FLASH
-       .type                   = "n25q128x2"   /* dual flash devices */
-#else
        .type                   = "n25q128"     /* single flash device */
-#endif
 };
 
 #endif

diff --git a/arch/arm/mach-zynq/board_zc770_xm013.c b/arch/arm/mach-zynq/board_zc770_xm013.c
index 99b923e4b19b6f6fe47f8e608f70f62aa79d1d87..08a81a9739aa61bba85b63601d5813893a18ff84 100644 (file)
--- a/arch/arm/mach-zynq/board_zc770_xm013.c
+++ b/arch/arm/mach-zynq/board_zc770_xm013.c
@@ -115,11 +115,7 @@ static struct mtd_partition qspi_flash_partitions[] = {
        },
        {
                .name           = "qspi-rootfs",
-#ifdef CONFIG_XILINX_PS_QSPI_USE_DUAL_FLASH
-               .size           = 0x1800000,
-#else
                .size           = 0x800000,
-#endif
                .offset         = 0x800000,
        },
 };
@@ -128,11 +124,7 @@ static struct flash_platform_data qspi_flash_pdata = {
        .name                   = "serial_flash",
        .parts                  = qspi_flash_partitions,
        .nr_parts               = ARRAY_SIZE(qspi_flash_partitions),
-#ifdef CONFIG_XILINX_PS_QSPI_USE_DUAL_FLASH
-       .type                   = "s25fl129p1x2"        /* dual flash devices */
-#else
        .type                   = "s25fl129p1"  /* single flash device */
-#endif
 };
 
 #endif

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index bdf8a2a5909473c5f16bd2ad0ca908b1b897216d..89008d1e4ce90d3c43eb11f806d8ff31c4dbd2de 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -401,16 +401,6 @@ config SPI_XILINX_PS_QSPI
        help
          This selects the PS Quad SPI controller master driver from the Xilinx.
 
-config XILINX_PS_QSPI_USE_DUAL_FLASH
-       bool "Use dual flash memories with seperate QSPI buses"
-       depends on SPI_XILINX_PS_QSPI
-       default y
-       help
-         This option enables two SPI flash memories operating in parallel mode.
-         This increases the maximum addressable QSPI flash memory from 16 MB
-         (24-bit addressing) to 32 MB (25-bit addressing), and the throughput
-         by a factor of 2.
-
 config SPI_XILINX_PS_SPI
        tristate "Xilinx PS SPI controller"
        depends on SPI_MASTER && EXPERIMENTAL

diff --git a/drivers/spi/spi-xilinx-qps.c b/drivers/spi/spi-xilinx-qps.c
index 662b0ca071d5a847c38abfa848677f727314f5d7..5167e30b8fbd268629cbefa82e4c143cf6c7a6d3 100755 (executable)
--- a/drivers/spi/spi-xilinx-qps.c
+++ b/drivers/spi/spi-xilinx-qps.c
@@ -988,8 +988,6 @@ static int __devinit xqspips_probe(struct platform_device *dev)
                dev_warn(&dev->dev, "couldn't determine configuration info "
                         "about dual memories. defaulting to single memory\n");
        }
-#elif defined CONFIG_XILINX_PS_QSPI_USE_DUAL_FLASH
-       xqspi->is_dual = 1;
 #endif
 
        /* QSPI controller initializations */